From cfbolz at codespeak.net Sat Mar 1 12:24:55 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 12:24:55 +0100 (CET) Subject: [pypy-svn] r51983 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080301112455.07A09168420@codespeak.net> Author: cfbolz Date: Sat Mar 1 12:24:55 2008 New Revision: 51983 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/dump.py pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: some support for raising ops Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sat Mar 1 12:24:55 2008 @@ -116,6 +116,7 @@ self.fielddescs = [] self.arrayfielddescs = [] self.interiordescs = [] + self.exceptioninstances = [] self.oopspecdescs = [] self.promotiondescs = [] self.called_bytecodes = [] @@ -146,6 +147,8 @@ self.arrayfielddesc_positions = {} # mapping (TYPE, path) to index self.interiordesc_positions = {} + # mapping exception class to index + self.exceptioninstance_positions = {} # mapping (fnobj, can_raise) to index self.oopspecdesc_positions = {} # mapping (fnobj, can_raise) to index @@ -176,6 +179,7 @@ self.fielddescs, self.arrayfielddescs, self.interiordescs, + self.exceptioninstances, self.oopspecdescs, self.promotiondescs, self.called_bytecodes, @@ -371,13 +375,17 @@ args = [] for arg in op.args: args.append(self.serialize_oparg(color, arg)) - self.serialize_opcode(color, op) + opdesc = self.serialize_opcode(color, op) self.emit(*args) if self.hannotator.binding(op.result).is_green(): self.register_greenvar(op.result) else: self.register_redvar(op.result) - + if (opdesc is not None and + opdesc.tryfold and not opdesc.canfold and opdesc.canraise): + exc_class = opdesc.llop.canraise[0] + self.emit("split_raisingop", + self.exceptioninstance_position(exc_class)) def serialize_opcode(self, color, op): opname = op.opname @@ -390,6 +398,7 @@ self.hannotator.binding(op.result), ) index = self.interpreter.make_opcode_implementation(color, opdesc) self.emit(name) + return self.interpreter.opcode_descs[index] def serialize_oparg(self, color, arg): if color == "red": @@ -504,6 +513,18 @@ self.arrayfielddesc_positions[TYPE] = result return result + def exceptioninstance_position(self, exc_class): + if exc_class in self.exceptioninstance_positions: + return self.exceptioninstance_positions[exc_class] + bk = self.rtyper.annotator.bookkeeper + exc_classdef = bk.getuniqueclassdef(exc_class) + ll_exc = self.rtyper.exceptiondata.get_standard_ll_exc_instance( + self.rtyper, exc_classdef) + result = len(self.exceptioninstances) + self.exceptioninstances.append(ll_exc) + self.exceptioninstance_positions[exc_class] = result + return result + def oopspecdesc_position(self, fnobj, canraise): key = fnobj, canraise if key in self.oopspecdesc_positions: Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/dump.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/dump.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/dump.py Sat Mar 1 12:24:55 2008 @@ -149,6 +149,9 @@ elif argspec == "interiordesc": d = jitcode.interiordescs[src.load_2byte()] args.append(d) + elif argspec == "exception": + d = jitcode.exceptioninstances[src.load_2byte()] + args.append(d) else: assert 0, "unknown argtype declaration" Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Sat Mar 1 12:24:55 2008 @@ -21,8 +21,8 @@ def __init__(self, name, code, constants, typekinds, redboxclasses, keydescs, structtypedescs, fielddescs, arrayfielddescs, - interiordescs, oopspecdescs, promotiondescs, - called_bytecodes, num_mergepoints, + interiordescs, exceptioninstances, oopspecdescs, + promotiondescs, called_bytecodes, num_mergepoints, graph_color, calldescs, indirectcalldescs, is_portal): self.name = name self.code = code @@ -34,6 +34,7 @@ self.fielddescs = fielddescs self.arrayfielddescs = arrayfielddescs self.interiordescs = interiordescs + self.exceptioninstances = exceptioninstances self.oopspecdescs = oopspecdescs self.promotiondescs = promotiondescs self.called_bytecodes = called_bytecodes @@ -137,6 +138,9 @@ elif argspec == "interiordesc": d = self.frame.bytecode.interiordescs[self.load_2byte()] args += (d, ) + elif argspec == "exception": + d = self.frame.bytecode.exceptioninstances[self.load_2byte()] + args += (d, ) else: assert 0, "unknown argtype declaration" val = func(*args) @@ -364,16 +368,16 @@ @arguments("red", "jumptarget") def opimpl_red_goto_iftrue(self, switchbox, target): # XXX not sure about passing no green vars - descision = rtimeshift.split(self.jitstate, switchbox, self.frame.pc) - if descision: + decision = rtimeshift.split(self.jitstate, switchbox, self.frame.pc) + if decision: self.frame.pc = target @arguments("bool", "red", "red", "jumptarget") def opimpl_red_goto_ifptrnonzero(self, reverse, ptrbox, switchbox, target): # XXX not sure about passing no green vars - descision = rtimeshift.split_ptr_nonzero(self.jitstate, switchbox, + decision = rtimeshift.split_ptr_nonzero(self.jitstate, switchbox, self.frame.pc, ptrbox, reverse) - if descision: + if decision: self.frame.pc = target @arguments("red", "jumptarget") @@ -381,6 +385,16 @@ if valuebox.is_constant(): self.frame.pc = target + @arguments("exception") + def opimpl_split_raisingop(self, ll_evalue): + # XXX not sure about passing no green vars + decision = rtimeshift.split_raisingop(self.jitstate, self.frame.pc, + ll_evalue) + if decision: + self.frame.pc = target + + + @arguments("jumptarget") def opimpl_goto_if_oopcall_was_virtual(self, target): if not rtimeshift.oopspec_was_residual(self.jitstate): Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Sat Mar 1 12:24:55 2008 @@ -1495,7 +1495,6 @@ def test_red_int_add_ovf(self): - py.test.skip("not working yet") def f(n, m): try: return ovfcheck(n + m) From antocuni at codespeak.net Sat Mar 1 12:37:37 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Sat, 1 Mar 2008 12:37:37 +0100 (CET) Subject: [pypy-svn] r51985 - in pypy/dist/pypy/translator: cli cli/test oosupport Message-ID: <20080301113737.8E052168460@codespeak.net> Author: antocuni Date: Sat Mar 1 12:37:37 2008 New Revision: 51985 Modified: pypy/dist/pypy/translator/cli/constant.py pypy/dist/pypy/translator/cli/dotnet.py pypy/dist/pypy/translator/cli/test/test_class.py pypy/dist/pypy/translator/cli/test/test_dotnet.py pypy/dist/pypy/translator/oosupport/constant.py Log: add a way to cast an ootype._record to System.Object and back. Modified: pypy/dist/pypy/translator/cli/constant.py ============================================================================== --- pypy/dist/pypy/translator/cli/constant.py (original) +++ pypy/dist/pypy/translator/cli/constant.py Sat Mar 1 12:37:37 2008 @@ -84,11 +84,19 @@ type = self.cts.lltype_to_cts(EXPECTED_TYPE) gen.ilasm.opcode('castclass', type) + def _get_key_for_const(self, value): + from pypy.translator.cli.dotnet import _record_view + if isinstance(value, _record_view): + return value._record + return BaseConstantGenerator._get_key_for_const(self, value) + def _create_complex_const(self, value): - from pypy.translator.cli.dotnet import _fieldinfo + from pypy.translator.cli.dotnet import _fieldinfo, _record_view if isinstance(value, _fieldinfo): uniq = self.db.unique() return CLIFieldInfoConst(self.db, value.llvalue, uniq) + elif isinstance(value, _record_view): + return self.record_const(value._record) else: return BaseConstantGenerator._create_complex_const(self, value) Modified: pypy/dist/pypy/translator/cli/dotnet.py ============================================================================== --- pypy/dist/pypy/translator/cli/dotnet.py (original) +++ pypy/dist/pypy/translator/cli/dotnet.py Sat Mar 1 12:37:37 2008 @@ -465,6 +465,7 @@ return hop.genop('cliunbox', [v_obj, c_type], hop.r_result.lowleveltype) + native_exc_cache = {} def NativeException(cliClass): try: @@ -632,6 +633,71 @@ v_inst = hop.inputarg(hop.args_r[0], arg=0) return hop.genop('oodowncast', [v_inst], resulttype = hop.r_result.lowleveltype) +class _record_view(object): + + def __init__(self, record): + self._record = record + self._TYPE = CLR.System.Object._INSTANCE + + def __ne__(self, other): + return not (self == other) + + def __eq__(self, other): + if isinstance(other, ootype._record): + return self._record == other + assert isinstance(other, _record_view) + return self._record == other._record + + def __hash__(self): + return hash(self._record) + + def __nonzero__(self): + return bool(self._record) + + +def cast_record_to_object(record): + T = ootype.typeOf(record) + assert isinstance(T, ootype.Record) + return _record_view(record) + +def cast_object_to_record(T, obj): + assert isinstance(T, ootype.Record) + assert isinstance(obj, _record_view) + record = obj._record + assert ootype.typeOf(record) == T + return record + +class Entry(ExtRegistryEntry): + _about_ = cast_record_to_object + + def compute_result_annotation(self, s_value): + T = s_value.ootype + assert isinstance(T, ootype.Record) + can_be_None = getattr(s_value, 'can_be_None', False) + return SomeOOInstance(CLR.System.Object._INSTANCE, can_be_None=can_be_None) + + def specialize_call(self, hop): + assert isinstance(hop.args_s[0], annmodel.SomeOOInstance) + v_obj, = hop.inputargs(*hop.args_r) + hop.exception_cannot_occur() + return hop.genop('ooupcast', [v_obj], hop.r_result.lowleveltype) + +class Entry(ExtRegistryEntry): + _about_ = cast_object_to_record + + def compute_result_annotation(self, s_type, s_value): + assert s_type.is_constant() + T = s_type.const + assert isinstance(T, ootype.Record) + can_be_None = getattr(s_value, 'can_be_None', False) + return SomeOOInstance(T, can_be_None) + + def specialize_call(self, hop): + assert hop.args_s[0].is_constant() + TYPE = hop.args_s[0].const + v_obj = hop.inputarg(hop.args_r[1], arg=1) + return hop.genop('oodowncast', [v_obj], hop.r_result.lowleveltype) + class _fieldinfo(object): def __init__(self, llvalue): self._TYPE = CLR.System.Reflection.FieldInfo._INSTANCE Modified: pypy/dist/pypy/translator/cli/test/test_class.py ============================================================================== --- pypy/dist/pypy/translator/cli/test/test_class.py (original) +++ pypy/dist/pypy/translator/cli/test/test_class.py Sat Mar 1 12:37:37 2008 @@ -2,6 +2,8 @@ from pypy.translator.cli.test.runtest import CliTest from pypy.translator.oosupport.test_template.class_ import BaseTestClass, BaseTestSpecialcase +# ====> ../../oosupport/test_template/class_.py + class TestCliClass(CliTest, BaseTestClass): pass Modified: pypy/dist/pypy/translator/cli/test/test_dotnet.py ============================================================================== --- pypy/dist/pypy/translator/cli/test/test_dotnet.py (original) +++ pypy/dist/pypy/translator/cli/test/test_dotnet.py Sat Mar 1 12:37:37 2008 @@ -8,7 +8,7 @@ from pypy.translator.cli.dotnet import SomeCliClass, SomeCliStaticMethod,\ NativeInstance, CLR, box, unbox, OverloadingResolver, NativeException,\ native_exc, new_array, init_array, typeof, eventhandler, clidowncast,\ - fieldinfo_for_const, classof + fieldinfo_for_const, classof, cast_record_to_object, cast_object_to_record System = CLR.System ArrayList = CLR.System.Collections.ArrayList @@ -641,6 +641,29 @@ res = self.interpret(fn, [True]) assert res == 'Int32' + def test_mix_record_and_object(self): + T = ootype.Record({'x': ootype.Signed}) + record = ootype.new(T) + def fn(flag): + if flag: + obj = cast_record_to_object(record) + else: + obj = System.Object() + record2 = cast_object_to_record(T, obj) + return record is record2 + res = self.interpret(fn, [True]) + assert res + + def test_cast_record_pbc(self): + T = ootype.Record({'x': ootype.Signed}) + record = ootype.new(T) + record.x = 42 + obj = cast_record_to_object(record) + def fn(): + record2 = cast_object_to_record(T, obj) + return record is record2 + res = self.interpret(fn, []) + assert res class TestPythonnet(TestDotnetRtyping): # don't interpreter functions but execute them directly through pythonnet Modified: pypy/dist/pypy/translator/oosupport/constant.py ============================================================================== --- pypy/dist/pypy/translator/oosupport/constant.py (original) +++ pypy/dist/pypy/translator/oosupport/constant.py Sat Mar 1 12:37:37 2008 @@ -159,7 +159,10 @@ constant will be stored in the field of a singleton object. """ pass - + + def _get_key_for_const(self, value): + return value + # _________________________________________________________________ # Constant Object Creation # @@ -175,7 +178,8 @@ if value in self.cache: return self.cache[value] const = self._create_complex_const(value) - self.cache[value] = const + key = self._get_key_for_const(value) + self.cache[key] = const self._init_constant(const) const.record_dependencies() return const From cfbolz at codespeak.net Sat Mar 1 12:54:39 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 12:54:39 +0100 (CET) Subject: [pypy-svn] r51986 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080301115439.6036416843D@codespeak.net> Author: cfbolz Date: Sat Mar 1 12:54:37 2008 New Revision: 51986 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: add an assert that the merge point is in the portal Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sat Mar 1 12:54:37 2008 @@ -223,6 +223,7 @@ cand = 0 if (op.opname == 'hint' and op.args[1].value == {'global_merge_point': True}): + assert not self.is_portal, "global_merge_point can appare only in portal" hashint = True if block is startblock or len(entrymap[block]) > 1: global_merge_blocks[block] = True Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Sat Mar 1 12:54:37 2008 @@ -1639,11 +1639,6 @@ py.test.skip("not working yet") class MetaG: - __metaclass__ = cachedtype - - def __init__(self, hrtyper): - pass - def _freeze_(self): return True @@ -1699,7 +1694,6 @@ assert res == f(0) def test_misplaced_global_merge_point(self): - py.test.skip("not working yet") def g(n): hint(None, global_merge_point=True) return n+1 From cfbolz at codespeak.net Sat Mar 1 12:57:04 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 12:57:04 +0100 (CET) Subject: [pypy-svn] r51987 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080301115704.4899916844B@codespeak.net> Author: cfbolz Date: Sat Mar 1 12:57:02 2008 New Revision: 51987 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: this works now Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Sat Mar 1 12:57:02 2008 @@ -981,7 +981,6 @@ self.check_insns({}) def test_compile_time_const_tuple(self): - py.test.skip("no clue what's wrong") d = {(4, 5): 42, (6, 7): 12} def f(a, b): d1 = hint(d, deepfreeze=True) From antocuni at codespeak.net Sat Mar 1 13:34:37 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Sat, 1 Mar 2008 13:34:37 +0100 (CET) Subject: [pypy-svn] r51990 - pypy/extradoc/proposal Message-ID: <20080301123437.AD27A16846A@codespeak.net> Author: antocuni Date: Sat Mar 1 13:34:37 2008 New Revision: 51990 Modified: pypy/extradoc/proposal/openjdk-challenge.txt Log: reword a paragraph Modified: pypy/extradoc/proposal/openjdk-challenge.txt ============================================================================== --- pypy/extradoc/proposal/openjdk-challenge.txt (original) +++ pypy/extradoc/proposal/openjdk-challenge.txt Sat Mar 1 13:34:37 2008 @@ -41,7 +41,7 @@ Moreover, there is an experimental JIT backend that emits code for the CLI; it is still a work in progress and very incomplete, but it shows -that the is possible to adapt the PyPy JIT to emit code for object +that it is possible to adapt the PyPy JIT to emit code for object oriented virtual machines. @@ -126,11 +126,11 @@ compiled with `gcc -O0`. Making the Python interpreter to exploit the full potential of the JIT -is a separate task and it is out of the scope of this proposal; it is -important to underline that once the JVM backend for the JIT is -complete, the resulting pypy-jvm will automatically take advantage of -all the optimizations written for the other backends. XXX expand -this by one sentence because this is unclear as written +is a separate task and since it requires some small changes to the +interpreter, it is out of the scope of this proposal. It is important +to underline that once the PyPy interpreter is fully optimized for the +JIT, PyPy for the JVM will automatically take advantage of these speed +ups, without needing to change the JIT backend for the JVM. We also expect to find benchmarks in which the JIT that targets the MLVM will perform better than the JIT that targets the plain JVM, From cfbolz at codespeak.net Sat Mar 1 13:50:27 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 13:50:27 +0100 (CET) Subject: [pypy-svn] r51992 - pypy/extradoc/proposal Message-ID: <20080301125027.1F8A1168020@codespeak.net> Author: cfbolz Date: Sat Mar 1 13:50:21 2008 New Revision: 51992 Modified: pypy/extradoc/proposal/openjdk-challenge.txt Log: fix a few things, add two XXXs Modified: pypy/extradoc/proposal/openjdk-challenge.txt ============================================================================== --- pypy/extradoc/proposal/openjdk-challenge.txt (original) +++ pypy/extradoc/proposal/openjdk-challenge.txt Sat Mar 1 13:50:21 2008 @@ -26,11 +26,11 @@ such as garbage collection, microthreading (like `Stackless Python`_), etc. -The most exciting feature of the TT is the ability to automatically -turn the interpreter into a JIT compiler that exploits partial -evaluation techniques to dynamically generate efficient code. The +The most exciting feature of the TT is the ability apply partial evaluation +techniques to automatically turn the interpreter into a JIT compiler which +generates efficient code dynamically. The (XXX not so novel: hotspot does it too) novel idea behind PyPy JIT is to delay the compilation until we know -all the informations useful for emitting optimized code, thus +all the information useful for emitting optimized code, thus being potentially much more efficient than all the current other alternatives (see the "Related Work" section). @@ -109,7 +109,7 @@ Project completion ------------------ -PyPy JIT is still under heavy development; potentially, the resulting +The PyPy JIT is still under heavy development; potentially, the resulting JIT compiler will be able to optimize a large number of Python programs, but at the moment it gives the best results only with computational intensive functions that use only operations between @@ -125,11 +125,12 @@ JIT support, it runs roughly at the same speed as its C equivalent compiled with `gcc -O0`. -Making the Python interpreter to exploit the full potential of the JIT -is a separate task and since it requires some small changes to the +Supporting and thus speeding up more parts of the Python language +is a separate task and since it requires changes to the interpreter, it is out of the scope of this proposal. It is important -to underline that once the PyPy interpreter is fully optimized for the -JIT, PyPy for the JVM will automatically take advantage of these speed +to underline that this work is independent from the backend being used, +so once the PyPy interpreter is fully optimized for the +JIT, PyPy for the JVM will automatically take advantage of these improvements ups, without needing to change the JIT backend for the JVM. We also expect to find benchmarks in which the JIT that targets the @@ -145,11 +146,13 @@ languages which run on top of the JVM. Even if currently Jython_ is the only usable implementation of Python for the JVM, PyPy has the potential to become the reference implementation in the future. +(XXX careful: this enters politics country, I guess we don't want to piss of the +Jython people) To have a working JIT for the JVM is an important step towards making PyPy the fastest Python for the JVM, ever. Moreover, due to the innovative ideas implemented by PyPy, it is likely that Python could become -the fastest dynamic language that runs on the top of the JVM. +the fastest dynamic language of its class that runs on the top of the JVM. Finally, PyPy is not limited to Python: it is entirely possible to write interpreters for languages other than Python and translate them @@ -160,7 +163,7 @@ Since the JIT generator is independent of the Python languages, it will be possible to automatically add a JIT compiler to every language written using the PyPy TT; thus, PyPy could become a very attractive -platform to develop dynamic languages for the JVM. +environment to develop dynamic languages for the JVM. Dependencies on Sun @@ -187,7 +190,7 @@ really works ahead of time (AOT), because the code is fully emitted before the program starts, and it doesn't exploit additional informations that would be available only at runtime - (e.g., informations about the types that each variable can + (most importantly informations about the types that each variable can assume); - JRuby supports interpretation, AOT compilation and JIT @@ -212,7 +215,7 @@ at the same speed of manually written Java code. Moreover, the JIT compiler is automatically generated by the TT: we -believe, based on previous experiences as Psyco_, that manually +believe, based on previous experiences with Psyco_, that manually writing a JIT compiler of that kind is hard and error prone, especially when the source language is as complex as Python; by writing a JIT compiler generator, we get JIT compilers that are From cfbolz at codespeak.net Sat Mar 1 14:03:09 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 14:03:09 +0100 (CET) Subject: [pypy-svn] r51995 - pypy/extradoc/proposal Message-ID: <20080301130309.F10B2168487@codespeak.net> Author: cfbolz Date: Sat Mar 1 14:03:09 2008 New Revision: 51995 Modified: pypy/extradoc/proposal/openjdk-challenge.txt Log: add myself Modified: pypy/extradoc/proposal/openjdk-challenge.txt ============================================================================== --- pypy/extradoc/proposal/openjdk-challenge.txt (original) +++ pypy/extradoc/proposal/openjdk-challenge.txt Sat Mar 1 14:03:09 2008 @@ -223,18 +223,22 @@ free. -Developer ---------- +Developers +---------- Antonio Cuni is one of the core developers of PyPy; he is the main author of the CLI backend, and the coauthor of the JVM backend; -recently, it began working on the experimental CLI backend for the +recently, he began working on the experimental CLI backend for the JIT. Currently, he is a PhD student at Univerist? degli Studi di Genova, doing research in the area of implementation of dynamic languages on top of object oriented virtual machines. +Carl Friedrich Bolz also is a core developer of PyPy. He worked on various areas +including the garbage collectors, optimizations and the Python interpreter. He +is currently doing a Master's thesis at the Heinrich-Heine-Universit?t +D?sseldorf about improving PyPy's JIT compiler generator. .. _PyPy: http://codespeak.net/pypy .. _RPython: http://codespeak.net/pypy/dist/pypy/doc/coding-guide.html#rpython From jacob at codespeak.net Sat Mar 1 14:05:58 2008 From: jacob at codespeak.net (jacob at codespeak.net) Date: Sat, 1 Mar 2008 14:05:58 +0100 (CET) Subject: [pypy-svn] r51996 - pypy/extradoc/proposal Message-ID: <20080301130558.BEA351684C2@codespeak.net> Author: jacob Date: Sat Mar 1 14:05:57 2008 New Revision: 51996 Modified: pypy/extradoc/proposal/openjdk-challenge.txt Log: Language tweaks. Modified: pypy/extradoc/proposal/openjdk-challenge.txt ============================================================================== --- pypy/extradoc/proposal/openjdk-challenge.txt (original) +++ pypy/extradoc/proposal/openjdk-challenge.txt Sat Mar 1 14:05:57 2008 @@ -76,7 +76,7 @@ are not limited to: dynamic invocation, lightweight bytecode loading, tail calls, etc. -Implementation wise, the JIT backends for the plain JVM and for the +Implementation-wise, the JIT backends for the plain JVM and for the MLVM could share most of the code, with the latter making use of the special features when needed. @@ -150,7 +150,7 @@ Jython people) To have a working JIT for the JVM is an important step towards making PyPy -the fastest Python for the JVM, ever. Moreover, due to the innovative +the fastest Python for the JVM. Moreover, due to the innovative ideas implemented by PyPy, it is likely that Python could become the fastest dynamic language of its class that runs on the top of the JVM. @@ -228,7 +228,7 @@ Antonio Cuni is one of the core developers of PyPy; he is the main author of the CLI backend, and the coauthor of the JVM backend; -recently, he began working on the experimental CLI backend for the +recently, he began working on an experimental CLI backend for the JIT. Currently, he is a PhD student at Univerist? degli Studi di Genova, From cfbolz at codespeak.net Sat Mar 1 14:22:13 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 14:22:13 +0100 (CET) Subject: [pypy-svn] r51998 - pypy/extradoc/proposal Message-ID: <20080301132213.A5D2F16843D@codespeak.net> Author: cfbolz Date: Sat Mar 1 14:22:13 2008 New Revision: 51998 Modified: pypy/extradoc/proposal/openjdk-challenge.txt Log: kill political paragraph Modified: pypy/extradoc/proposal/openjdk-challenge.txt ============================================================================== --- pypy/extradoc/proposal/openjdk-challenge.txt (original) +++ pypy/extradoc/proposal/openjdk-challenge.txt Sat Mar 1 14:22:13 2008 @@ -142,13 +142,6 @@ Relevance to the community -------------------------- -Recently the community has shown a lot of interest in dynamic -languages which run on top of the JVM. Even if currently Jython_ is -the only usable implementation of Python for the JVM, PyPy has the -potential to become the reference implementation in the future. -(XXX careful: this enters politics country, I guess we don't want to piss of the -Jython people) - To have a working JIT for the JVM is an important step towards making PyPy the fastest Python for the JVM. Moreover, due to the innovative ideas implemented by PyPy, it is likely that Python could become From cfbolz at codespeak.net Sat Mar 1 16:18:27 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 16:18:27 +0100 (CET) Subject: [pypy-svn] r52002 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080301151827.12CB71684E2@codespeak.net> Author: cfbolz Date: Sat Mar 1 16:18:26 2008 New Revision: 52002 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/dump.py pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: implement switch handling Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sat Mar 1 16:18:26 2008 @@ -1,3 +1,4 @@ +import py from pypy.rlib.unroll import unrolling_iterable from pypy.rlib.objectmodel import we_are_translated from pypy.objspace.flow import model as flowmodel @@ -10,6 +11,8 @@ from pypy.jit.timeshifter.greenkey import KeyDesc from pypy.jit.rainbow.interpreter import JitCode, JitInterpreter from pypy.translator.backendopt.removenoops import remove_same_as +from pypy.translator.backendopt.ssa import SSA_to_SSI +from pypy.translator.unsimplify import varoftype class CallDesc: @@ -96,12 +99,14 @@ self.unfinished_graphs = [] self.num_global_mergepoints = 0 self.ptr_to_jitcode = {} + self.transformer = GraphTransformer(hannotator) def can_raise(self, op): return self.raise_analyzer.analyze(op) def make_bytecode(self, graph, is_portal=True): - remove_same_as(graph) + self.transformer.transform_graph(graph) + #graph.show() if is_portal: bytecode = JitCode.__new__(JitCode) bytecode.is_portal = True @@ -323,7 +328,30 @@ self.emit(*truerenaming) self.make_bytecode_block(linktrue.target, insert_goto=True) else: - XXX + assert self.varcolor(block.exitswitch) == "green" + for link in block.exits: + if link.exitcase == 'default': + defaultlink = link + switchlinks = [link for link in block.exits + if link is not defaultlink] + + renamings = [self.insert_renaming(link) for link in switchlinks] + defaultrenaming = self.insert_renaming(defaultlink) + cases = [flowmodel.Constant(link.exitcase, + block.exitswitch.concretetype) + for link in switchlinks] + cases = [self.serialize_oparg("green", case) for case in cases] + targets = [tlabel(link) for link in switchlinks] + self.emit("green_switch") + self.emit(self.serialize_oparg("green", block.exitswitch)) + self.emit(len(cases), *cases) + self.emit(len(targets), *targets) + self.emit(*defaultrenaming) + self.make_bytecode_block(defaultlink.target, insert_goto=True) + for renaming, link in zip(renamings, switchlinks): + self.emit(label(link)) + self.emit(*renaming) + self.make_bytecode_block(link.target, insert_goto=True) def insert_merges(self, block): if block is self.graph.returnblock: @@ -1174,6 +1202,158 @@ return c +class GraphTransformer(object): + def __init__(self, hannotator): + self.hannotator = hannotator + + def transform_graph(self, graph): + self.graph = graph + remove_same_as(graph) + self.insert_splits() + + def insert_splits(self): + hannotator = self.hannotator + for block in list(self.graph.iterblocks()): + if block.exitswitch is not None: + assert isinstance(block.exitswitch, flowmodel.Variable) + hs_switch = hannotator.binding(block.exitswitch) + if not hs_switch.is_green(): + if block.exitswitch.concretetype is not lltype.Bool: + self.insert_switch_handling(block) + + def insert_switch_handling(self, block): + v_redswitch = block.exitswitch + T = v_redswitch.concretetype + range_start = -py.std.sys.maxint-1 + range_stop = py.std.sys.maxint+1 + if T is not lltype.Signed: + if T is lltype.Char: + opcast = 'cast_char_to_int' + range_start = 0 + range_stop = 256 + elif T is lltype.UniChar: + opcast = 'cast_unichar_to_int' + range_start = 0 + elif T is lltype.Unsigned: + opcast = 'cast_uint_to_int' + else: + raise AssertionError(T) + v_redswitch = self.genop(block, opcast, [v_redswitch], + resulttype=lltype.Signed, red=True) + block.exitswitch = v_redswitch + # for now, we always turn the switch back into a chain of tests + # that perform a binary search + blockset = {block: True} # reachable from outside + cases = {} + defaultlink = None + for link in block.exits: + if link.exitcase == 'default': + defaultlink = link + blockset[link.target] = False # not reachable from outside + else: + assert lltype.typeOf(link.exitcase) == T + intval = lltype.cast_primitive(lltype.Signed, link.exitcase) + cases[intval] = link + link.exitcase = None + link.llexitcase = None + self.insert_integer_search(block, cases, defaultlink, blockset, + range_start, range_stop) + SSA_to_SSI(blockset, self.hannotator) + + def insert_integer_search(self, block, cases, defaultlink, blockset, + range_start, range_stop): + # fix the exit of the 'block' to check for the given remaining + # 'cases', knowing that if we get there then the value must + # be contained in range(range_start, range_stop). + if not cases: + assert defaultlink is not None + block.exitswitch = None + block.recloseblock(flowmodel.Link(defaultlink.args, defaultlink.target)) + elif len(cases) == 1 and (defaultlink is None or + range_start == range_stop-1): + block.exitswitch = None + block.recloseblock(cases.values()[0]) + else: + intvalues = cases.keys() + intvalues.sort() + if len(intvalues) <= 3: + # not much point in being clever with no more than 3 cases + intval = intvalues[-1] + remainingcases = cases.copy() + link = remainingcases.pop(intval) + c_intval = flowmodel.Constant(intval, lltype.Signed) + v = self.genop(block, 'int_eq', [block.exitswitch, c_intval], + resulttype=lltype.Bool, red=True) + link.exitcase = True + link.llexitcase = True + falseblock = flowmodel.Block([]) + falseblock.exitswitch = block.exitswitch + blockset[falseblock] = False + falselink = flowmodel.Link([], falseblock) + falselink.exitcase = False + falselink.llexitcase = False + block.exitswitch = v + block.recloseblock(falselink, link) + if defaultlink is None or intval == range_stop-1: + range_stop = intval + self.insert_integer_search(falseblock, remainingcases, + defaultlink, blockset, + range_start, range_stop) + else: + intval = intvalues[len(intvalues) // 2] + c_intval = flowmodel.Constant(intval, lltype.Signed) + v = self.genop(block, 'int_ge', [block.exitswitch, c_intval], + resulttype=lltype.Bool, red=True) + falseblock = flowmodel.Block([]) + falseblock.exitswitch = block.exitswitch + trueblock = flowmodel.Block([]) + trueblock.exitswitch = block.exitswitch + blockset[falseblock] = False + blockset[trueblock] = False + falselink = flowmodel.Link([], falseblock) + falselink.exitcase = False + falselink.llexitcase = False + truelink = flowmodel.Link([], trueblock) + truelink.exitcase = True + truelink.llexitcase = True + block.exitswitch = v + block.recloseblock(falselink, truelink) + falsecases = {} + truecases = {} + for intval1, link1 in cases.items(): + if intval1 < intval: + falsecases[intval1] = link1 + else: + truecases[intval1] = link1 + self.insert_integer_search(falseblock, falsecases, + defaultlink, blockset, + range_start, intval) + self.insert_integer_search(trueblock, truecases, + defaultlink, blockset, + intval, range_stop) + + def genop(self, block, opname, args, resulttype=None, result_like=None, red=False): + # 'result_like' can be a template variable whose hintannotation is + # copied + if resulttype is not None: + v_res = varoftype(resulttype) + if red: + hs = hintmodel.SomeLLAbstractVariable(resulttype) + else: + hs = hintmodel.SomeLLAbstractConstant(resulttype, {}) + self.hannotator.setbinding(v_res, hs) + elif result_like is not None: + v_res = copyvar(self.hannotator, result_like) + else: + v_res = self.new_void_var() + + spaceop = flowmodel.SpaceOperation(opname, args, v_res) + if isinstance(block, list): + block.append(spaceop) + else: + block.operations.append(spaceop) + return v_res + class label(object): def __init__(self, name): self.name = name Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/dump.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/dump.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/dump.py Sat Mar 1 16:18:26 2008 @@ -105,6 +105,9 @@ args.append(jitcode.typekinds[src.load_2byte()]) elif argspec == "jumptarget": args.append(src.load_jumptarget()) + elif argspec == "jumptargets": + num = src.load_2byte() + args.append([src.load_jumptarget() for i in range(num)], ) elif argspec == "bool": args.append(src.load_bool()) elif argspec == "redboxcls": Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Sat Mar 1 16:18:26 2008 @@ -95,6 +95,9 @@ args += (self.frame.bytecode.typekinds[self.load_2byte()], ) elif argspec == "jumptarget": args += (self.load_4byte(), ) + elif argspec == "jumptargets": + num = self.load_2byte() + args += ([self.load_4byte() for i in range(num)], ) elif argspec == "bool": args += (self.load_bool(), ) elif argspec == "redboxcls": @@ -365,6 +368,16 @@ if arg: self.frame.pc = target + @arguments("green", "green_varargs", "jumptargets") + def opimpl_green_switch(self, exitcase, cases, targets): + arg = exitcase.revealconst(lltype.Signed) + assert len(cases) == len(targets) + for i in range(len(cases)): + if arg == cases[i].revealconst(lltype.Signed): + self.frame.pc = targets[i] + break + + @arguments("red", "jumptarget") def opimpl_red_goto_iftrue(self, switchbox, target): # XXX not sure about passing no green vars Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Sat Mar 1 16:18:26 2008 @@ -1588,21 +1588,20 @@ assert res == -7 def test_switch(self): - py.test.skip("not working yet") - def g(n): + def g(n, x): if n == 0: - return 12 + return 12 + x elif n == 1: - return 34 + return 34 + x elif n == 3: - return 56 + return 56 + x elif n == 7: - return 78 + return 78 + x else: - return 90 + return 90 + x def f(n, m): - x = g(n) # gives a red switch - y = g(hint(m, concrete=True)) # gives a green switch + x = g(n, n) # gives a red switch + y = g(hint(m, concrete=True), n) # gives a green switch return x - y res = self.interpret(f, [7, 2], backendoptimize=True) @@ -1611,22 +1610,21 @@ assert res == 90 - 34 def test_switch_char(self): - py.test.skip("not working yet") - def g(n): + def g(n, x): n = chr(n) if n == '\x00': - return 12 + return 12 + x elif n == '\x01': - return 34 + return 34 + x elif n == '\x02': - return 56 + return 56 + x elif n == '\x03': - return 78 + return 78 + x else: - return 90 + return 90 + x def f(n, m): - x = g(n) # gives a red switch - y = g(hint(m, concrete=True)) # gives a green switch + x = g(n, n) # gives a red switch + y = g(hint(m, concrete=True), n) # gives a green switch return x - y res = self.interpret(f, [3, 0], backendoptimize=True) From cfbolz at codespeak.net Sat Mar 1 16:23:12 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 16:23:12 +0100 (CET) Subject: [pypy-svn] r52003 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080301152312.6CF621684E2@codespeak.net> Author: cfbolz Date: Sat Mar 1 16:23:11 2008 New Revision: 52003 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Log: nonsense assertion Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sat Mar 1 16:23:11 2008 @@ -228,7 +228,7 @@ cand = 0 if (op.opname == 'hint' and op.args[1].value == {'global_merge_point': True}): - assert not self.is_portal, "global_merge_point can appare only in portal" + assert self.is_portal, "global_merge_point can appare only in portal" hashint = True if block is startblock or len(entrymap[block]) > 1: global_merge_blocks[block] = True From antocuni at codespeak.net Sat Mar 1 16:46:23 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Sat, 1 Mar 2008 16:46:23 +0100 (CET) Subject: [pypy-svn] r52004 - pypy/extradoc/proposal Message-ID: <20080301154623.4B72C1684DF@codespeak.net> Author: antocuni Date: Sat Mar 1 16:46:20 2008 New Revision: 52004 Modified: pypy/extradoc/proposal/openjdk-challenge.txt Log: fix the last XXX. Modified: pypy/extradoc/proposal/openjdk-challenge.txt ============================================================================== --- pypy/extradoc/proposal/openjdk-challenge.txt (original) +++ pypy/extradoc/proposal/openjdk-challenge.txt Sat Mar 1 16:46:20 2008 @@ -26,13 +26,13 @@ such as garbage collection, microthreading (like `Stackless Python`_), etc. -The most exciting feature of the TT is the ability apply partial evaluation -techniques to automatically turn the interpreter into a JIT compiler which -generates efficient code dynamically. The (XXX not so novel: hotspot does it too) -novel idea behind PyPy JIT is to delay the compilation until we know -all the information useful for emitting optimized code, thus -being potentially much more efficient than all the current other -alternatives (see the "Related Work" section). +The most exciting feature of the TT is the ability apply partial +evaluation techniques to automatically turn the interpreter into a JIT +compiler which generates efficient code dynamically. The key idea +behind PyPy JIT is to delay the compilation until we know all the +information useful for emitting optimized code, thus being potentially +much more efficient than all the current other alternatives (see the +"Related Work" section). Currently, the PyPy JIT works only in conjunction with the C backend. Early results are very good. The resulting Python interpreter @@ -131,7 +131,7 @@ to underline that this work is independent from the backend being used, so once the PyPy interpreter is fully optimized for the JIT, PyPy for the JVM will automatically take advantage of these improvements -ups, without needing to change the JIT backend for the JVM. +without needing to change the JIT backend for the JVM. We also expect to find benchmarks in which the JIT that targets the MLVM will perform better than the JIT that targets the plain JVM, @@ -222,9 +222,7 @@ Antonio Cuni is one of the core developers of PyPy; he is the main author of the CLI backend, and the coauthor of the JVM backend; recently, he began working on an experimental CLI backend for the -JIT. - -Currently, he is a PhD student at Univerist? degli Studi di Genova, +JIT. Currently, he is a PhD student at Univerist? degli Studi di Genova, doing research in the area of implementation of dynamic languages on top of object oriented virtual machines. From cfbolz at codespeak.net Sat Mar 1 16:55:00 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 16:55:00 +0100 (CET) Subject: [pypy-svn] r52005 - pypy/extradoc/proposal Message-ID: <20080301155500.035A11684E2@codespeak.net> Author: cfbolz Date: Sat Mar 1 16:55:00 2008 New Revision: 52005 Modified: pypy/extradoc/proposal/openjdk-challenge.txt Log: add another sentence, fix english. still not quite happy about it, but probably fine. Modified: pypy/extradoc/proposal/openjdk-challenge.txt ============================================================================== --- pypy/extradoc/proposal/openjdk-challenge.txt (original) +++ pypy/extradoc/proposal/openjdk-challenge.txt Sat Mar 1 16:55:00 2008 @@ -26,13 +26,14 @@ such as garbage collection, microthreading (like `Stackless Python`_), etc. -The most exciting feature of the TT is the ability apply partial +The most exciting feature of the TT is the ability to apply partial evaluation techniques to automatically turn the interpreter into a JIT compiler which generates efficient code dynamically. The key idea -behind PyPy JIT is to delay the compilation until we know all the +behind the PyPy JIT is to systematically delay compilation until we know all the information useful for emitting optimized code, thus being potentially much more efficient than all the current other alternatives (see the -"Related Work" section). +"Related Work" section). This is done using a mechanism which can be seen as a +generalized version of polymorphic inline caches. Currently, the PyPy JIT works only in conjunction with the C backend. Early results are very good. The resulting Python interpreter From cfbolz at codespeak.net Sat Mar 1 18:02:09 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 18:02:09 +0100 (CET) Subject: [pypy-svn] r52008 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080301170209.4C5F21684EB@codespeak.net> Author: cfbolz Date: Sat Mar 1 18:02:07 2008 New Revision: 52008 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: Enable the lazy exception path. This requires the insertion of some global_merge_point hints and a hack around the residual call handling. One test is going into an infinite loop, investigating. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sat Mar 1 18:02:07 2008 @@ -90,7 +90,7 @@ etrafo = hannotator.exceptiontransformer type_system = self.rtyper.type_system.name self.exceptiondesc = exception.ExceptionDesc( - RGenOp, etrafo, type_system, False) + RGenOp, etrafo, type_system, True) self.interpreter = JitInterpreter(self.exceptiondesc, RGenOp) self.RGenOp = RGenOp self.current_block = None @@ -821,7 +821,6 @@ self.emit("goto_if_oopcall_was_virtual", tlabel(("oop_call", op))) self.emit("after_oop_residual_call") self.emit(self.promotiondesc_position(lltype.Signed)) - self.emit(label(("oop_call", op))) def handle_green_call(self, op, withexc): Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Sat Mar 1 18:02:07 2008 @@ -601,7 +601,13 @@ check_forced = False flagbox = rtimeshift.after_residual_call(self.jitstate, exceptiondesc, check_forced) - done = rtimeshift.promote(self.jitstate, flagbox, promotiondesc) + # XXX slightly hackish: the flagbox needs to be in local_boxes + # to be passed along to the new block + self.frame.local_boxes.append(flagbox) + try: + done = rtimeshift.promote(self.jitstate, flagbox, promotiondesc) + finally: + self.frame.local_boxes.pop() if done: return self.dispatch() gv_flag = flagbox.getgenvar(self.jitstate) @@ -623,7 +629,13 @@ exceptiondesc = None flagbox = rtimeshift.after_residual_call(self.jitstate, exceptiondesc, True) - done = rtimeshift.promote(self.jitstate, flagbox, promotiondesc) + # XXX slightly hackish: the flagbox needs to be in local_boxes + # to be passed along to the new block + self.frame.local_boxes.append(flagbox) + try: + done = rtimeshift.promote(self.jitstate, flagbox, promotiondesc) + finally: + self.frame.local_boxes.pop() if done: return self.dispatch() gv_flag = flagbox.getgenvar(self.jitstate) Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Sat Mar 1 18:02:07 2008 @@ -1014,6 +1014,7 @@ return 2*h(x) def f(x): + hint(None, global_merge_point=True) try: return g(x) except ValueError: @@ -1260,6 +1261,7 @@ else: return -12 + y def f(x, y): + hint(None, global_merge_point=True) x = hint(x, concrete=True) if x == 1: return g(lltype.nullptr(S), y) @@ -1312,6 +1314,7 @@ ll_assert(bool(s), "please don't give me a null") return 5 def f(m): + hint(None, global_merge_point=True) s = h() n = g(s) if not s: @@ -1354,6 +1357,7 @@ return h(n) + x def f(n, x): + hint(None, global_merge_point=True) try: return g(n, x) except ValueError: From cfbolz at codespeak.net Sat Mar 1 18:42:45 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 18:42:45 +0100 (CET) Subject: [pypy-svn] r52009 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080301174245.868D016842A@codespeak.net> Author: cfbolz Date: Sat Mar 1 18:42:44 2008 New Revision: 52009 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_vlist.py Log: support for green indirect calls Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sat Mar 1 18:42:44 2008 @@ -80,6 +80,7 @@ self.graphs = [graph for (graph, tsgraph) in graph2tsgraph] self.jitcodes = values + self.calldesc = CallDesc(codewriter.RGenOp, lltype.typeOf(fnptr)) class BytecodeWriter(object): @@ -733,6 +734,8 @@ def serialize_op_indirect_call(self, op): kind, withexc = self.guess_call_kind(op) + if kind == "green": + return self.handle_green_call(op, withexc, exclude_last=True) targets = dict(self.graphs_from(op)) fnptrindex = self.serialize_oparg("red", op.args[0]) has_result = (self.varcolor(op.result) != "gray" and @@ -772,10 +775,11 @@ elif kind == "gray": self.emit("red_after_direct_call") else: - XXX + assert 0, "unknown call kind %s" % (kind, ) self.emit(label(("after indirect call", op))) + def handle_oopspec_call(self, op, withexc): from pypy.jit.timeshifter.oop import Index fnobj = op.args[0].value._obj @@ -823,17 +827,21 @@ self.emit(self.promotiondesc_position(lltype.Signed)) self.emit(label(("oop_call", op))) - def handle_green_call(self, op, withexc): - voidargs = [const.value for const in op.args[1:] + def handle_green_call(self, op, withexc, exclude_last=False): + if exclude_last: + args = op.args[1:-1] + else: + args = op.args[1:] + voidargs = [const.value for const in args if const.concretetype == lltype.Void] fnptr = op.args[0] - pos = self.calldesc_position(lltype.typeOf(fnptr.value), *voidargs) + pos = self.calldesc_position(fnptr.concretetype, *voidargs) func = self.serialize_oparg("green", fnptr) emitted_args = [] for v in op.args[1:]: if v.concretetype != lltype.Void: emitted_args.append(self.serialize_oparg("green", v)) - self.emit("green_direct_call") + self.emit("green_call") self.emit(func, pos) self.emit(len(emitted_args)) self.emit(*emitted_args) Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Sat Mar 1 18:42:44 2008 @@ -525,7 +525,7 @@ self.portalstate.portal_reentry(greenargs, redargs) @arguments("green", "calldesc", "green_varargs") - def opimpl_green_direct_call(self, fnptr_gv, calldesc, greenargs): + def opimpl_green_call(self, fnptr_gv, calldesc, greenargs): calldesc.green_call(self, fnptr_gv, greenargs) @arguments("green_varargs", "red_varargs", "bytecode") Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Sat Mar 1 18:42:44 2008 @@ -1445,7 +1445,6 @@ self.check_insns({'direct_call': 1}) def test_indirect_sometimes_residual_pure_but_fixed_red_call(self): - py.test.skip("not working yet") def h1(x): return x-2 def h2(x): Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_vlist.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_vlist.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_vlist.py Sat Mar 1 18:42:44 2008 @@ -144,7 +144,6 @@ self.check_insns({}) def test_frozen_list_indexerror(self): - py.test.skip("implement me") lst = [5, 7, 9] def ll_function(x): mylist = hint(lst, deepfreeze=True) From antocuni at codespeak.net Sat Mar 1 19:01:36 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Sat, 1 Mar 2008 19:01:36 +0100 (CET) Subject: [pypy-svn] r52010 - pypy/extradoc/proposal Message-ID: <20080301180136.85C981684E2@codespeak.net> Author: antocuni Date: Sat Mar 1 19:01:35 2008 New Revision: 52010 Modified: pypy/extradoc/proposal/openjdk-challenge.txt Log: add email addresses Modified: pypy/extradoc/proposal/openjdk-challenge.txt ============================================================================== --- pypy/extradoc/proposal/openjdk-challenge.txt (original) +++ pypy/extradoc/proposal/openjdk-challenge.txt Sat Mar 1 19:01:35 2008 @@ -220,17 +220,18 @@ Developers ---------- -Antonio Cuni is one of the core developers of PyPy; he is the main -author of the CLI backend, and the coauthor of the JVM backend; -recently, he began working on an experimental CLI backend for the -JIT. Currently, he is a PhD student at Univerist? degli Studi di Genova, -doing research in the area of implementation of dynamic languages on -top of object oriented virtual machines. +Antonio Cuni (anto.cuni at gmail.com) is one of the core developers of +PyPy; he is the main author of the CLI backend, and the coauthor of +the JVM backend; recently, he began working on an experimental CLI +backend for the JIT. Currently, he is a PhD student at Univerist? +degli Studi di Genova, doing research in the area of implementation of +dynamic languages on top of object oriented virtual machines. -Carl Friedrich Bolz also is a core developer of PyPy. He worked on various areas -including the garbage collectors, optimizations and the Python interpreter. He -is currently doing a Master's thesis at the Heinrich-Heine-Universit?t -D?sseldorf about improving PyPy's JIT compiler generator. +Carl Friedrich Bolz (cfbolz at gmx.de) also is a core developer of +PyPy. He worked on various areas including the garbage collectors, +optimizations and the Python interpreter. He is currently doing a +Master's thesis at the Heinrich-Heine-Universit?t D?sseldorf about +improving PyPy's JIT compiler generator. .. _PyPy: http://codespeak.net/pypy .. _RPython: http://codespeak.net/pypy/dist/pypy/doc/coding-guide.html#rpython From arigo at codespeak.net Sat Mar 1 19:06:56 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 1 Mar 2008 19:06:56 +0100 (CET) Subject: [pypy-svn] r52011 - pypy/extradoc/proposal Message-ID: <20080301180656.0A70B1684EB@codespeak.net> Author: arigo Date: Sat Mar 1 19:06:56 2008 New Revision: 52011 Modified: pypy/extradoc/proposal/openjdk-challenge.txt Log: Minor clarification (IMHO) Modified: pypy/extradoc/proposal/openjdk-challenge.txt ============================================================================== --- pypy/extradoc/proposal/openjdk-challenge.txt (original) +++ pypy/extradoc/proposal/openjdk-challenge.txt Sat Mar 1 19:06:56 2008 @@ -182,7 +182,7 @@ has already been started, by generating and loading bytecode on the fly; despite emitting code at runtime, this kind of compiler really works ahead of time (AOT), because the code is fully - emitted before the program starts, and it doesn't exploit + emitted before the (Python) program starts, and it doesn't exploit additional informations that would be available only at runtime (most importantly informations about the types that each variable can assume); From niko at codespeak.net Sat Mar 1 19:22:01 2008 From: niko at codespeak.net (niko at codespeak.net) Date: Sat, 1 Mar 2008 19:22:01 +0100 (CET) Subject: [pypy-svn] r52012 - pypy/extradoc/proposal Message-ID: <20080301182201.258671684EA@codespeak.net> Author: niko Date: Sat Mar 1 19:21:59 2008 New Revision: 52012 Modified: pypy/extradoc/proposal/openjdk-challenge.txt Log: tweak slightly Modified: pypy/extradoc/proposal/openjdk-challenge.txt ============================================================================== --- pypy/extradoc/proposal/openjdk-challenge.txt (original) +++ pypy/extradoc/proposal/openjdk-challenge.txt Sat Mar 1 19:21:59 2008 @@ -233,6 +233,11 @@ Master's thesis at the Heinrich-Heine-Universit?t D?sseldorf about improving PyPy's JIT compiler generator. +Nicholas Matsakis (nicholas.matsakis at inf.ethz.ch) is also a core developer of +PyPy. He was the primary developer of the current JVM backend for PyPy, and +has participated in several PyPy sprints on various topics. He is currently +doing his PhD at ETH Zurich under the tutelage of Professor Thomas Gross. + .. _PyPy: http://codespeak.net/pypy .. _RPython: http://codespeak.net/pypy/dist/pypy/doc/coding-guide.html#rpython .. _`Stackless Python`: http://www.stackless.com/ From cfbolz at codespeak.net Sat Mar 1 19:36:34 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 19:36:34 +0100 (CET) Subject: [pypy-svn] r52013 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080301183634.4A8991684FB@codespeak.net> Author: cfbolz Date: Sat Mar 1 19:36:33 2008 New Revision: 52013 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py Log: this belonged to the last commit Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py Sat Mar 1 19:36:33 2008 @@ -289,7 +289,7 @@ writer, jitcode = self.serialize(ll_function, [int]) assert jitcode.code == assemble(writer.interpreter, - "green_direct_call", -1, 0, 1, 0, + "green_call", -1, 0, 1, 0, "make_redbox", 1, 0, "make_new_redvars", 1, 0, "make_new_greenvars", 0, From cfbolz at codespeak.net Sat Mar 1 19:41:09 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 19:41:09 +0100 (CET) Subject: [pypy-svn] r52014 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080301184109.6B723168507@codespeak.net> Author: cfbolz Date: Sat Mar 1 19:41:07 2008 New Revision: 52014 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Log: support for green calls raising exceptions Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sat Mar 1 19:41:07 2008 @@ -18,7 +18,7 @@ class CallDesc: __metaclass__ = cachedtype - def __init__(self, RGenOp, FUNCTYPE, voidargs=()): + def __init__(self, RGenOp, rtyper, FUNCTYPE, voidargs=()): self.sigtoken = RGenOp.sigToken(FUNCTYPE.TO) self.result_kind = RGenOp.kindToken(FUNCTYPE.TO.RESULT) # xxx what if the result is virtualizable? @@ -49,8 +49,17 @@ try: result = rgenop.genconst(fnptr(*args)) except Exception, e: - XXX # set exception - return rgenop.genconst(whatever_return_value) + if not we_are_translated(): + # since we have a normal exception instance here + # we need to turn it into a low level one + bk = rtyper.annotator.bookkeeper + exc_classdef = bk.getuniqueclassdef(type(e)) + ll_exc = rtyper.exceptiondata.get_standard_ll_exc_instance( + rtyper, exc_classdef) + interpreter.jitstate.residual_ll_exception(ll_exc) + else: + interpreter.jitstate.residual_exception(ll_exc) + result = rgenop.genconst(whatever_return_value) interpreter.green_result(result) self.green_call = green_call @@ -80,7 +89,8 @@ self.graphs = [graph for (graph, tsgraph) in graph2tsgraph] self.jitcodes = values - self.calldesc = CallDesc(codewriter.RGenOp, lltype.typeOf(fnptr)) + self.calldesc = CallDesc(codewriter.RGenOp, codewriter.rtyper, + lltype.typeOf(fnptr)) class BytecodeWriter(object): @@ -591,7 +601,7 @@ return self.calldesc_positions[key] result = len(self.calldescs) self.calldescs.append( - CallDesc(self.RGenOp, FUNCTYPE, voidargs)) + CallDesc(self.RGenOp, self.rtyper, FUNCTYPE, voidargs)) self.calldesc_positions[key] = result return result From cfbolz at codespeak.net Sat Mar 1 20:26:10 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 20:26:10 +0100 (CET) Subject: [pypy-svn] r52015 - in pypy/branch/jit-refactoring/pypy/jit: rainbow timeshifter Message-ID: <20080301192610.F2A461684EA@codespeak.net> Author: cfbolz Date: Sat Mar 1 20:26:08 2008 New Revision: 52015 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py Log: try to support virtual oop operations that raise Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sat Mar 1 20:26:08 2008 @@ -14,6 +14,15 @@ from pypy.translator.backendopt.ssa import SSA_to_SSI from pypy.translator.unsimplify import varoftype +def residual_exception_nontranslated(jitstate, e, rtyper): + # since we have a normal exception instance here + # we need to turn it into a low level one + assert not we_are_translated() + bk = rtyper.annotator.bookkeeper + exc_classdef = bk.getuniqueclassdef(type(e)) + ll_exc = rtyper.exceptiondata.get_standard_ll_exc_instance( + rtyper, exc_classdef) + jitstate.residual_ll_exception(ll_exc) class CallDesc: __metaclass__ = cachedtype @@ -50,15 +59,9 @@ result = rgenop.genconst(fnptr(*args)) except Exception, e: if not we_are_translated(): - # since we have a normal exception instance here - # we need to turn it into a low level one - bk = rtyper.annotator.bookkeeper - exc_classdef = bk.getuniqueclassdef(type(e)) - ll_exc = rtyper.exceptiondata.get_standard_ll_exc_instance( - rtyper, exc_classdef) - interpreter.jitstate.residual_ll_exception(ll_exc) + residual_exception_nontranslated(interpreter.jitstate, e, rtyper) else: - interpreter.jitstate.residual_exception(ll_exc) + interpreter.jitstate.residual_exception(e) result = rgenop.genconst(whatever_return_value) interpreter.green_result(result) self.green_call = green_call Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py Sat Mar 1 20:26:08 2008 @@ -1,10 +1,11 @@ -from pypy.rpython.lltypesystem import lltype -from pypy.rpython.extregistry import ExtRegistryEntry -from pypy.jit.timeshifter.rcontainer import cachedtype from pypy.jit.timeshifter import rvalue, rtimeshift -from pypy.translator import exceptiontransform +from pypy.jit.timeshifter.rcontainer import cachedtype +from pypy.rlib.objectmodel import we_are_translated from pypy.rlib.unroll import unrolling_iterable +from pypy.rpython.extregistry import ExtRegistryEntry +from pypy.rpython.lltypesystem import lltype from pypy.tool.sourcetools import func_with_new_name +from pypy.translator import exceptiontransform class SegfaultException(Exception): @@ -21,6 +22,7 @@ do_call = None def __init__(self, RGenOp, rtyper, fnobj, can_raise): + self.rtyper = rtyper ll_func = fnobj._callable FUNCTYPE = lltype.typeOf(fnobj) nb_args = len(FUNCTYPE.ARGS) @@ -151,8 +153,12 @@ return self.redboxbuilder(self.result_kind, gv_result) def residual_exception(self, jitstate, ExcCls): - ll_evalue = get_ll_instance_for_exccls(ExcCls) - jitstate.residual_ll_exception(ll_evalue) + from pypy.jit.rainbow.codewriter import residual_exception_nontranslated + if we_are_translated(): + ll_evalue = get_ll_instance_for_exccls(ExcCls) + jitstate.residual_ll_exception(ll_evalue) + else: + residual_exception_nontranslated(jitstate, ExcClass(), self.rtyper) return self.errorbox residual_exception._annspecialcase_ = 'specialize:arg(2)' Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py Sat Mar 1 20:26:08 2008 @@ -555,7 +555,7 @@ jitstate.next = dispatchqueue.return_chain dispatchqueue.return_chain = jitstate -def ll_learn_nonzeroness(jitstate, ptrbox, nonzeroness): +def learn_nonzeroness(jitstate, ptrbox, nonzeroness): ptrbox.learn_nonzeroness(jitstate, nonzeroness) ##def ll_gvar_from_redbox(jitstate, redbox): @@ -1204,7 +1204,6 @@ def residual_exception(self, e): self.residual_ll_exception(cast_instance_to_base_ptr(e)) - def get_resuming(self): return self.frame.dispatchqueue.resuming From cfbolz at codespeak.net Sat Mar 1 20:57:59 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 20:57:59 +0100 (CET) Subject: [pypy-svn] r52016 - pypy/branch/jit-refactoring/pypy/jit/timeshifter/test Message-ID: <20080301195759.C332C1684EA@codespeak.net> Author: cfbolz Date: Sat Mar 1 20:57:58 2008 New Revision: 52016 Removed: pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_promotion.py Log: these are all ported to the rainbow interp From cfbolz at codespeak.net Sat Mar 1 21:10:36 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 21:10:36 +0100 (CET) Subject: [pypy-svn] r52017 - in pypy/branch/jit-refactoring/pypy/jit: rainbow rainbow/test timeshifter/test Message-ID: <20080301201036.537D116851E@codespeak.net> Author: cfbolz Date: Sat Mar 1 21:10:34 2008 New Revision: 52017 Added: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_0tlc.py - copied, changed from r51886, pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_0tlc.py Removed: pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_0tlc.py Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Log: port over one of the tiny language test files Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sat Mar 1 21:10:34 2008 @@ -722,6 +722,14 @@ def handle_reverse_split_queue_hint(self, op, arg, result): self.emit("reverse_split_queue") + def handle_forget_hint(self, op, arg, result): + # a hint for testing only + assert self.varcolor(result) == "green" + assert self.varcolor(arg) != "green" + self.emit("revealconst") + self.emit(self.serialize_oparg("red", arg)) + self.register_greenvar(result) + def args_of_call(self, args, colored_as): result = [] reds, greens = self.sort_by_color(args, colored_as) @@ -1036,7 +1044,6 @@ destboxindex = self.serialize_oparg("red", args[0]) indexboxindex = self.serialize_oparg("red", args[1]) valboxindex = self.serialize_oparg("red", args[2]) - fieldname = args[1].value fielddescindex = self.arrayfielddesc_position(PTRTYPE.TO) if fielddescindex == -1: # Void field return Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Sat Mar 1 21:10:34 2008 @@ -358,6 +358,10 @@ kind = self.frame.bytecode.typekinds[typeid] return redboxcls(kind, genconst) + @arguments("red", returns="green_from_red") + def opimpl_revealconst(self, box): + return box + @arguments("jumptarget") def opimpl_goto(self, target): self.frame.pc = target From cfbolz at codespeak.net Sat Mar 1 21:13:39 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 21:13:39 +0100 (CET) Subject: [pypy-svn] r52018 - in pypy/branch/jit-refactoring/pypy/jit: rainbow/test timeshifter/test Message-ID: <20080301201339.36C7A1684DF@codespeak.net> Author: cfbolz Date: Sat Mar 1 21:13:38 2008 New Revision: 52018 Added: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_1tl.py - copied, changed from r51886, pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_1tl.py Removed: pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_1tl.py Log: this test just passes From cfbolz at codespeak.net Sat Mar 1 21:31:53 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 21:31:53 +0100 (CET) Subject: [pypy-svn] r52019 - in pypy/branch/jit-refactoring/pypy/jit: rainbow/test timeshifter timeshifter/test Message-ID: <20080301203153.F16A2168504@codespeak.net> Author: cfbolz Date: Sat Mar 1 21:31:53 2008 New Revision: 52019 Added: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_exception.py - copied, changed from r51886, pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_exception.py Removed: pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_exception.py Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py Log: port over exception tests, most of which pass Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Sat Mar 1 21:31:53 2008 @@ -10,7 +10,7 @@ from pypy.jit.rainbow.test.test_serializegraph import AbstractSerializationTest from pypy.jit.timeshifter import rtimeshift, rvalue from pypy.rpython.lltypesystem import lltype, rstr -from pypy.rpython.llinterp import LLInterpreter +from pypy.rpython.llinterp import LLInterpreter, LLException from pypy.rpython.module.support import LLSupport from pypy.annotation import model as annmodel from pypy.objspace.flow.model import summary, Variable @@ -144,7 +144,7 @@ def serialize(self, func, values, policy=None, inline=None, backendoptimize=False, - portal=None): + portal=None, **kwds): key = func, backendoptimize try: cache, argtypes = self._cache[key] @@ -205,9 +205,26 @@ graph.show() llinterp = LLInterpreter( self.rtyper, exc_data_ptr=writer.exceptiondesc.exc_data_ptr) - res = llinterp.eval_graph(graph, residualargs) + + if 'check_raises' not in kwds: + res = llinterp.eval_graph(graph, residualargs) + else: + try: + llinterp.eval_graph(graph, residualargs) + except LLException, e: + exc = kwds['check_raises'] + assert llinterp.find_exception(e) is exc, ( + "wrong exception type") + else: + raise AssertionError("DID NOT RAISE") + return True return res + def interpret_raises(self, ExcCls, ll_function, values, opt_consts=[], + *args, **kwds): + kwds['check_raises'] = ExcCls + return self.interpret(ll_function, values, opt_consts, *args, **kwds) + def get_residual_graph(self): return self.residual_graph Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py Sat Mar 1 21:31:53 2008 @@ -158,7 +158,7 @@ ll_evalue = get_ll_instance_for_exccls(ExcCls) jitstate.residual_ll_exception(ll_evalue) else: - residual_exception_nontranslated(jitstate, ExcClass(), self.rtyper) + residual_exception_nontranslated(jitstate, ExcCls(), self.rtyper) return self.errorbox residual_exception._annspecialcase_ = 'specialize:arg(2)' From cfbolz at codespeak.net Sat Mar 1 21:33:24 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 21:33:24 +0100 (CET) Subject: [pypy-svn] r52020 - in pypy/branch/jit-refactoring/pypy/jit: rainbow/test timeshifter/test Message-ID: <20080301203324.EB3CB168504@codespeak.net> Author: cfbolz Date: Sat Mar 1 21:33:24 2008 New Revision: 52020 Added: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_tlr.py - copied, changed from r51886, pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_tlr.py Removed: pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_tlr.py Log: yet another ported test file From cfbolz at codespeak.net Sat Mar 1 22:39:33 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 22:39:33 +0100 (CET) Subject: [pypy-svn] r52021 - in pypy/branch/jit-refactoring/pypy/jit: rainbow rainbow/test timeshifter timeshifter/test Message-ID: <20080301213933.2CE8A1684DF@codespeak.net> Author: cfbolz Date: Sat Mar 1 22:39:32 2008 New Revision: 52021 Added: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_frontend.py - copied, changed from r51886, pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_frontend.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_virtualizable.py - copied, changed from r51886, pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_virtualizable.py Removed: pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_frontend.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_virtualizable.py Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/rvirtualizable.py Log: copy remaining tests over. fix most virtualizable problems. way too easy, somehow. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sat Mar 1 22:39:32 2008 @@ -927,6 +927,21 @@ self.emit("yellow_retrieve_result") self.register_greenvar(op.result) + def handle_vable_call(self, op, withexc): + assert op.opname == 'direct_call' + oopspec = op.args[0].value._obj._callable.oopspec + name, _ = oopspec.split('(') + kind, name = name.split('_', 1) + + if kind == 'vable.get': + opname = 'getfield' + else: + assert kind == 'vable.set' + opname = 'setfield' + args = op.args[1:] + args.insert(1, flowmodel.Constant(name, lltype.Void)) + newop = flowmodel.SpaceOperation(opname, args, op.result) + self.serialize_op(newop) def serialize_op_malloc(self, op): index = self.structtypedesc_position(op.args[0].value) @@ -979,7 +994,7 @@ # virtualizable access read PTRTYPE = args[0].concretetype if PTRTYPE.TO._hints.get('virtualizable', False): - XXX + assert op.args[1].value != 'vable_access' # non virtual case index = self.serialize_oparg("red", args[0]) Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Sat Mar 1 22:39:32 2008 @@ -1,7 +1,7 @@ from pypy.rlib.rarithmetic import intmask from pypy.rlib.unroll import unrolling_iterable from pypy.rlib.objectmodel import we_are_translated, CDefinedIntSymbolic -from pypy.jit.timeshifter import rtimeshift, rcontainer +from pypy.jit.timeshifter import rtimeshift, rcontainer, rvalue from pypy.jit.timeshifter.greenkey import empty_key, GreenKey, newgreendict from pypy.rpython.lltypesystem import lltype, llmemory Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py Sat Mar 1 22:39:32 2008 @@ -1,5 +1,5 @@ from pypy.jit.hintannotator.model import originalconcretetype -from pypy.jit.timeshifter import rvalue +from pypy.jit.timeshifter import rvalue, rcontainer from pypy.objspace.flow import model as flowmodel from pypy.rlib.objectmodel import we_are_translated from pypy.rlib.unroll import unrolling_iterable @@ -315,7 +315,6 @@ def gettypedesc(self): if self.typedesc is None: - hrtyper = self.hrtyper T = self.original_concretetype.TO self.typedesc = rcontainer.StructTypeDesc(self.RGenOp, T) return self.typedesc @@ -325,7 +324,7 @@ redirected_fielddescs = unrolling_iterable( typedesc.redirected_fielddescs) TYPE = self.original_concretetype - kind = self.hrtyper.RGenOp.kindToken(TYPE) + kind = self.RGenOp.kindToken(TYPE) def make_arg_redbox(jitstate, inputargs_gv, i): box = typedesc.factory() @@ -348,7 +347,6 @@ def residual_argtypes(self): argtypes = [self.original_concretetype] - getredrepr = self.hrtyper.getredrepr typedesc = self.gettypedesc() for fielddesc, _ in typedesc.redirected_fielddescs: FIELDTYPE = fielddesc.RESTYPE Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Sat Mar 1 22:39:32 2008 @@ -109,21 +109,7 @@ jitcode = writer.make_bytecode(graph2) # the bytecode writer can ask for llhelpers about lists and dicts rtyper.specialize_more_blocks() - argcolors = [] - - # make residual functype - RESTYPE = originalconcretetype(hannotator.binding(graph2.getreturnvar())) - ARGS = [] - for var in graph2.getargs(): - # XXX ignoring virtualizables for now - binding = hannotator.binding(var) - if not binding.is_green(): - ARGS.append(originalconcretetype(binding)) - self.RESIDUAL_FUNCTYPE = lltype.FuncType(ARGS, RESTYPE) - for i, ll_val in enumerate(values): - color = writer.varcolor(graph2.startblock.inputargs[i]) - argcolors.append(color) # rewire the original portal @@ -136,10 +122,10 @@ rewriter.rewrite(origportalgraph=origportalgraph, portalgraph=portalgraph, view = conftest.option.view and self.small) + self.RESIDUAL_FUNCTYPE = rewriter.RESIDUAL_FUNCTYPE self.writer = writer self.jitcode = jitcode - self.argcolors = argcolors def serialize(self, func, values, policy=None, @@ -153,22 +139,25 @@ else: self.__dict__.update(cache) assert argtypes == getargtypes(self.rtyper.annotator, values) - return self.writer, self.jitcode, self.argcolors + return self.writer, self.jitcode if len(self._cache_order) >= 3: del self._cache[self._cache_order.pop(0)] self._serialize(func, values, policy, inline, backendoptimize, portal) cache = self.__dict__.copy() self._cache[key] = cache, getargtypes(self.rtyper.annotator, values) self._cache_order.append(key) - return self.writer, self.jitcode, self.argcolors + return self.writer, self.jitcode def interpret(self, ll_function, values, opt_consts=[], *args, **kwds): if hasattr(ll_function, 'convert_arguments'): assert len(ll_function.convert_arguments) == len(values) values = [decoder(value) for decoder, value in zip( ll_function.convert_arguments, values)] - writer, jitcode, argcolors = self.serialize(ll_function, values, - **kwds) + writer, jitcode= self.serialize(ll_function, values, **kwds) + argcolors = [] + for i, ll_val in enumerate(values): + color = writer.varcolor(self.graph.startblock.inputargs[i]) + argcolors.append(color) rgenop = writer.interpreter.rgenop sigtoken = rgenop.sigToken(self.RESIDUAL_FUNCTYPE) builder, gv_generated, inputargs_gv = rgenop.newgraph(sigtoken, "generated") Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/rcontainer.py Sat Mar 1 22:39:32 2008 @@ -2,9 +2,10 @@ from pypy.rpython.lltypesystem import lltype, llmemory from pypy.rpython.annlowlevel import cachedtype, cast_base_ptr_to_instance from pypy.rpython.annlowlevel import base_ptr_lltype, cast_instance_to_base_ptr -from pypy.jit.timeshifter import rvalue +from pypy.rpython.annlowlevel import llhelper +from pypy.jit.timeshifter import rvalue, rvirtualizable from pypy.rlib.unroll import unrolling_iterable -from pypy.jit.timeshifter import rvirtualizable +from pypy.rlib.objectmodel import we_are_translated from pypy.annotation import model as annmodel @@ -211,8 +212,7 @@ """.split() def __init__(self, RGenOp, TYPE): - XXX - StructTypeDesc.__init__(self, hrtyper, TYPE) + StructTypeDesc.__init__(self, RGenOp, TYPE) ACCESS = self.TYPE.ACCESS redirected_fields = ACCESS.redirected_fields self.redirected_fielddescs = [] @@ -227,6 +227,7 @@ self.rti_desc = self.getfielddesc('vable_rti') self.access_desc = self.getfielddesc('vable_access') TOPPTR = self.access_desc.PTRTYPE + self.STRUCTTYPE = TOPPTR self.s_structtype = annmodel.lltype_to_annotation(TOPPTR) self.my_redirected_getsetters_untouched = {} @@ -238,7 +239,7 @@ if fielddesc.PTRTYPE != self.PTRTYPE: continue my_redirected_names.append(fielddesc.fieldname) - self._define_getset_field_ptr(hrtyper, fielddesc, j) + self._define_getset_field_ptr(RGenOp, fielddesc, j) access_untouched = lltype.malloc(ACCESS, immortal=True) @@ -253,32 +254,28 @@ self._define_collect_residual_args() - self._define_access_is_null(hrtyper) + self._define_access_is_null(RGenOp) def _define_virtual_desc(self): pass - def _define_getset_field_ptr(self, hrtyper, fielddesc, j): - XXX - annhelper = hrtyper.annhelper - s_lltype = annmodel.lltype_to_annotation(fielddesc.RESTYPE) - + def _define_getset_field_ptr(self, RGenOp, fielddesc, j): untouched = self.my_redirected_getsetters_untouched touched = self.my_redirected_getsetters_touched - mkptr = annhelper.delayedfunction - fnpairs = rvirtualizable.define_getset_field_ptrs(fielddesc, j) name = fielddesc.fieldname for getsetters, (get_field, set_field) in zip((untouched, touched), fnpairs): - get_field_ptr = mkptr(get_field, [self.s_structtype], s_lltype, - needtype = True) - set_field_ptr = mkptr(set_field, [self.s_structtype, s_lltype], - annmodel.s_None, needtype=True) + TYPE = lltype.Ptr(lltype.FuncType([self.STRUCTTYPE], + fielddesc.RESTYPE)) + get_field_ptr = llhelper(TYPE, get_field) + TYPE = lltype.Ptr(lltype.FuncType( + [self.STRUCTTYPE, fielddesc.RESTYPE], lltype.Void)) + set_field_ptr = llhelper(TYPE, set_field) getsetters[name] = get_field_ptr, set_field_ptr @@ -322,16 +319,11 @@ self.collect_residual_args = collect_residual_args - def _define_access_is_null(self, hrtyper): - XXX - RGenOp = hrtyper.RGenOp - annhelper = hrtyper.annhelper + def _define_access_is_null(self, RGenOp): def access_is_null(struc): assert not struc.vable_access - access_is_null_ptr = annhelper.delayedfunction(access_is_null, - [self.s_structtype], - annmodel.s_None, - needtype = True) + TYPE = lltype.Ptr(lltype.FuncType([self.STRUCTTYPE], lltype.Void)) + access_is_null_ptr = llhelper(TYPE, access_is_null) self.gv_access_is_null_ptr = RGenOp.constPrebuiltGlobal( access_is_null_ptr) self.access_is_null_token = RGenOp.sigToken( @@ -924,7 +916,11 @@ base_desc = typedesc.base_desc base_token = base_desc.fieldtoken builder.genop_setfield(base_token, gv_outside, gv_base) - vable_rti_ptr = cast_instance_to_base_ptr(vable_rti) + if we_are_translated(): + vable_rti_ptr = cast_instance_to_base_ptr(vable_rti) + else: + vable_rti_ptr = vable_rti + gv_vable_rti = builder.rgenop.genconst(vable_rti_ptr) rti_token = typedesc.rti_desc.fieldtoken builder.genop_setfield(rti_token, gv_outside, gv_vable_rti) Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/rvirtualizable.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/rvirtualizable.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/rvirtualizable.py Sat Mar 1 22:39:32 2008 @@ -1,7 +1,8 @@ from pypy.rpython.lltypesystem import lltype, llmemory, lloperation -from pypy.rpython.annlowlevel import cachedtype +from pypy.rpython.annlowlevel import cachedtype, base_ptr_lltype from pypy.rpython.annlowlevel import cast_base_ptr_to_instance from pypy.rpython.annlowlevel import cast_instance_to_base_ptr +from pypy.rlib.objectmodel import we_are_translated from pypy.rlib.unroll import unrolling_iterable debug_print = lloperation.llop.debug_print @@ -13,7 +14,8 @@ def touch_update(strucref): struc = lltype.cast_opaque_ptr(TOPPTR, strucref) vable_rti = struc.vable_rti - vable_rti = cast_base_ptr_to_instance(VirtualizableRTI, vable_rti) + if we_are_translated(): + vable_rti = cast_base_ptr_to_instance(VirtualizableRTI, vable_rti) vable_rti.touch(struc.vable_base) vable_base = struc.vable_base @@ -37,7 +39,8 @@ T = fielddesc.RESTYPE if fielddesc.canbevirtual and fielddesc.gcref: vable_rti = struc.vable_rti - vable_rti = cast_base_ptr_to_instance(VirtualizableRTI, vable_rti) + if we_are_translated(): + vable_rti = cast_base_ptr_to_instance(VirtualizableRTI, vable_rti) vable_rti.touched_ptr_field(struc.vable_base, j) struc = lltype.cast_pointer(fielddesc.PTRTYPE, struc) setattr(struc, fielddesc.fieldname, value) @@ -47,7 +50,8 @@ tgt = lltype.cast_pointer(fielddesc.PTRTYPE, struc) if fielddesc.canbevirtual and fielddesc.gcref: vable_rti = struc.vable_rti - vable_rti = cast_base_ptr_to_instance(VirtualizableRTI, vable_rti) + if we_are_translated(): + vable_rti = cast_base_ptr_to_instance(VirtualizableRTI, vable_rti) vable_base = struc.vable_base if vable_rti.is_field_virtual(vable_base, j): # this will force @@ -58,13 +62,15 @@ def set_field_untouched(struc, value): vable_rti = struc.vable_rti - vable_rti = cast_base_ptr_to_instance(VirtualizableRTI, vable_rti) + if we_are_translated(): + vable_rti = cast_base_ptr_to_instance(VirtualizableRTI, vable_rti) vable_rti.touch_update(lltype.cast_opaque_ptr(llmemory.GCREF, struc)) set_field_touched(struc, value) def get_field_untouched(struc): vable_rti = struc.vable_rti - vable_rti = cast_base_ptr_to_instance(VirtualizableRTI, vable_rti) + if we_are_translated(): + vable_rti = cast_base_ptr_to_instance(VirtualizableRTI, vable_rti) return vable_rti.read_field(fielddesc, struc.vable_base, j) return ((get_field_untouched, set_field_untouched), @@ -94,6 +100,9 @@ return vrti._get_forced(vablerti, fielddesc, base) _read_field._annspecialcase_ = "specialize:arg(2)" + # hack for testing: make the llinterpreter believe this is a Ptr to base + # instance + _TYPE = base_ptr_lltype() class VirtualizableRTI(RTI): _attrs_ = "frameinfo touch_update shape_place".split() From cfbolz at codespeak.net Sat Mar 1 22:43:03 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 1 Mar 2008 22:43:03 +0100 (CET) Subject: [pypy-svn] r52022 - pypy/branch/jit-refactoring/pypy/jit/timeshifter/test Message-ID: <20080301214303.7C0CB168506@codespeak.net> Author: cfbolz Date: Sat Mar 1 22:43:02 2008 New Revision: 52022 Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/support.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_rcontainer.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_rvalue.py Log: fix those tests Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/support.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/support.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/support.py Sat Mar 1 22:43:02 2008 @@ -57,11 +57,6 @@ raise AttributeError, name -class FakeHRTyper(object): - RGenOp = FakeRGenOp - -fakehrtyper = FakeHRTyper() - class FakeGenVar(GenVar): def __init__(self, count=0): self.count=count @@ -87,7 +82,7 @@ def vmalloc(TYPE, *boxes): jitstate = FakeJITState() assert isinstance(TYPE, lltype.Struct) # for now - structdesc = rcontainer.StructTypeDesc(fakehrtyper, TYPE) + structdesc = rcontainer.StructTypeDesc(FakeRGenOp, TYPE) box = structdesc.factory() for fielddesc, valuebox in zip(structdesc.fielddescs, boxes): if valuebox is None: @@ -104,5 +99,5 @@ def getfielddesc(STRUCT, name): assert isinstance(STRUCT, lltype.Struct) - structdesc = rcontainer.StructTypeDesc(fakehrtyper, STRUCT) + structdesc = rcontainer.StructTypeDesc(FakeRGenOp, STRUCT) return structdesc.fielddesc_by_name[name] Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_rcontainer.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_rcontainer.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_rcontainer.py Sat Mar 1 22:43:02 2008 @@ -2,7 +2,7 @@ from pypy.jit.timeshifter import rvalue, rcontainer from pypy.jit.timeshifter.test.support import FakeJITState, FakeGenVar from pypy.jit.timeshifter.test.support import FakeGenConst -from pypy.jit.timeshifter.test.support import fakehrtyper, signed_kind +from pypy.jit.timeshifter.test.support import signed_kind from pypy.jit.timeshifter.test.support import vmalloc, makebox from pypy.jit.timeshifter.test.support import getfielddesc Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_rvalue.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_rvalue.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/test/test_rvalue.py Sat Mar 1 22:43:02 2008 @@ -60,7 +60,7 @@ V0 = FakeGenVar() box = rvalue.PtrRedBox("dummy pointer", V0) STRUCT = lltype.Struct("dummy", ("foo", lltype.Signed)) - desc = rcontainer.StructFieldDesc(FakeHRTyper(), lltype.Ptr(STRUCT), "foo", 0) + desc = rcontainer.StructFieldDesc(FakeRGenOp, lltype.Ptr(STRUCT), "foo", 0) box2 = box.op_getfield(jitstate, desc) V1 = box2.genvar assert box.known_nonzero From jared.grubb at codespeak.net Sun Mar 2 02:15:51 2008 From: jared.grubb at codespeak.net (jared.grubb at codespeak.net) Date: Sun, 2 Mar 2008 02:15:51 +0100 (CET) Subject: [pypy-svn] r52024 - in pypy/dist/pypy: interpreter/pyparser rlib/parsing rlib/parsing/test Message-ID: <20080302011551.F07C6168506@codespeak.net> Author: jared.grubb Date: Sun Mar 2 02:15:50 2008 New Revision: 52024 Modified: pypy/dist/pypy/interpreter/pyparser/parsestring.py pypy/dist/pypy/rlib/parsing/regexparse.py pypy/dist/pypy/rlib/parsing/test/test_pcre_regtest.py Log: parsestring: simplify the octal parsing a bit regexparse: simplify the unescape() function test_pcre_regtest: preprocesses the testoutput1 file and runs most of the tests Modified: pypy/dist/pypy/interpreter/pyparser/parsestring.py ============================================================================== --- pypy/dist/pypy/interpreter/pyparser/parsestring.py (original) +++ pypy/dist/pypy/interpreter/pyparser/parsestring.py Sun Mar 2 02:15:50 2008 @@ -155,15 +155,13 @@ lis.append('\013') # VT elif ch == 'a': lis.append('\007') # BEL, not classic C - elif '0' <= ch <= '7': - c = ord(s[ps - 1]) - ord('0') - if ps < end and '0' <= s[ps] <= '7': - c = (c << 3) + ord(s[ps]) - ord('0') - ps += 1 - if ps < end and '0' <= s[ps] <= '7': - c = (c << 3) + ord(s[ps]) - ord('0') - ps += 1 - lis.append(chr(c)) + elif ch in '01234567': + # Look for up to two more octal digits + span = ps + span += (span < end) and (s[span] in '01234567') + span += (span < end) and (s[span] in '01234567') + lis.append(chr(int(s[ps - 1 : span], 8))) + ps = span elif ch == 'x': if ps+2 <= end and isxdigit(s[ps]) and isxdigit(s[ps + 1]): lis.append(chr(int(s[ps : ps + 2], 16))) Modified: pypy/dist/pypy/rlib/parsing/regexparse.py ============================================================================== --- pypy/dist/pypy/rlib/parsing/regexparse.py (original) +++ pypy/dist/pypy/rlib/parsing/regexparse.py Sun Mar 2 02:15:50 2008 @@ -9,72 +9,59 @@ set = py.builtin.set ESCAPES = { - "\\a": "\a", - "\\b": "\b", - "\\e": "\x1b", - "\\f": "\f", - "\\n": "\n", - "\\r": "\r", - "\\t": "\t", - "\\v": "\v", - "\\": "\\" + "a": "\a", + "b": "\b", + "e": "\x1b", + "f": "\f", + "n": "\n", + "r": "\r", + "t": "\t", + "v": "\v", } for i in range(256): - if chr(i) not in 'x01234567sSwWdD': - # 'x' and numbers are reserved for hexadecimal/octal escapes - escaped = "\\" + chr(i) - if escaped not in ESCAPES: - ESCAPES[escaped] = chr(i) - - # Three digit octals - escaped = "\\%03o" % i - if escaped not in ESCAPES: - ESCAPES[escaped] = chr(i) - - if 0 <= i <= 077: - # Two digit octal digs are ok too - escaped = "\\%02o" % i - if escaped not in ESCAPES: - ESCAPES[escaped] = chr(i) - # Add the ctrl-x types: # Rule, according to PCRE: # if x is a lower case letter, it is converted to upper case. # Then bit 6 of the character (hex 40) is inverted. - # Thus, \cz => 0x1A, but \c{ => 0x3B, while \c; => 0x7B. - escaped = "\\c%s" % chr(i) - if escaped not in ESCAPES: - ESCAPES[escaped] = chr(ord(chr(i).upper()) ^ 0x40) + # Thus, \cz => 0x1A, \c{ => 0x3B, \c; => 0x7B. + escaped = "c%s" % chr(i) + ESCAPES[escaped] = chr(ord(chr(i).upper()) ^ 0x40) + +def unescape_muncher(string): + """Return a tuple, representing the first character of the string + (appropriately unescaped) and the rest of the string that wasn't + handled.""" + if string[0] != '\\': + # Not an escape character + return string[0], string[1:] + if string[1] == 'x': + # Hex char, must have two hex digits + char = chr(int(string[2:4], 16)) + return char, string[4:] + if string[1] in '01234567': + # Octal number, up to three digits long + span = 2 + span += (span < len(string)) and (string[span] in '01234567') + span += (span < len(string)) and (string[span] in '01234567') + char = chr(int(string[1:span], 8)) + return char, string[span:] + if string[1] == 'c': + # Special \cx types + return ESCAPES['c'+string[2]], string[3:] + if string[1] in ESCAPES: + # Special escapes are in ESCAPE + return ESCAPES[string[1]], string[2:] + # Otherwise, it's just the character it's meant to be (e.g., '\.') + return string[1], string[2:] - -for a in "0123456789ABCDEFabcdef": - for b in "0123456789ABCDEFabcdef": - escaped = "\\x%s%s" % (a, b) - if escaped not in ESCAPES: - ESCAPES[escaped] = chr(int("%s%s" % (a, b), 16)) - + def unescape(s): + """Unescape a whole string.""" result = [] - i = 0 - while i < len(s): - if s[i] != "\\": - result.append(s[i]) - i += 1 - continue - if s[i + 1] == "x": - escaped = s[i: i + 4] - i += 4 - elif s[i + 1] in "01234567": - escaped = s[i: i + 4] - i += 4 - else: - escaped = s[i: i + 2] - i += 2 - if escaped not in ESCAPES: - raise ValueError("escape %r unknown" % (escaped, )) - else: - result.append(ESCAPES[escaped]) + while s: + char, s = unescape_muncher(s) + result.append(char) return "".join(result) syntax = r""" @@ -184,20 +171,15 @@ charclass: '\' 'd' return { set([chr(c) for c in range(ord('0'), ord('9')+1)]) } - | '\' - 's' + | '\' 's' return { set(['\t', '\n', '\f', '\r', ' ']) } - | '\' - 'w' + | '\' 'w' return { set([chr(c) for c in range(ord('a'), ord('z')+1)] + [chr(c) for c in range(ord('A'), ord('Z')+1)] + [chr(c) for c in range(ord('0'), ord('9')+1)] + ['_']) } - | '\' - 'D' + | '\' 'D' return { set([chr(c) for c in range(256)]) - set([chr(c) for c in range(ord('0'), ord('9')+1)]) } - | '\' - 'S' + | '\' 'S' return { set([chr(c) for c in range(256)]) - set(['\t', '\n', '\f', '\r', ' ']) } - | '\' - 'W' + | '\' 'W' return { set([chr(c) for c in range(256)]) - set([chr(c) for c in range(ord('a'), ord('z')+1)] + [chr(c) for c in range(ord('A'), ord('Z')+1)] + [chr(c) for c in range(ord('0'), ord('9')+1)] + ['_'])}; NUM: @@ -1862,6 +1844,9 @@ + + + def test_generate(): f = py.magic.autopath() oldcontent = f.read() Modified: pypy/dist/pypy/rlib/parsing/test/test_pcre_regtest.py ============================================================================== --- pypy/dist/pypy/rlib/parsing/test/test_pcre_regtest.py (original) +++ pypy/dist/pypy/rlib/parsing/test/test_pcre_regtest.py Sun Mar 2 02:15:50 2008 @@ -12,143 +12,121 @@ py.test.skip("In Progress...") -def get_simult_lines(tests, results, test_line_num=0): - """Returns a line from the input/output, ensuring that - we are sync'd up between the two.""" - test = tests.pop(0) - result = results.pop(0) +def read_file(file): + lines = [line for line in file.readlines()] - test_line_num += 1 - - if test != result: - raise Exception("Lost sync between files at input line %d.\n INPUT: %s\n OUTPUT: %s" % (test_line_num, test, result)) - - return test - -def create_regex_iterator(tests, results): - """Gets a test definition line, formatted per the PCRE spec. This is a - generator that returns each regex test.""" - while tests: + # Look for things to skip... + no_escape = r'(^|[^\\])(\\\\)*' # Make sure there's no escaping \ + greedy_ops = re.compile(no_escape + r'[*?+}\(]\?') # Look for *? +? }? (? + back_refs = re.compile(no_escape + r'\(.*' + no_escape + r'\\1') # find a \1 + + # suite = [ + # [regex, flags, [(test,result),(test,result),...]] + # [regex, flags, [(test,result),(test,result),...]] + # ] + suite = [] + while lines: delim = None regex = '' - # A line is marked by a start-delimeter and an end-delimeter. # The delimeter is non-alphanumeric # If a backslash follows the delimiter, then the backslash should # be appended to the end. (Otherwise, \ + delim would not be a # delim anymore!) while 1: - regex += get_simult_lines(tests, results) - - if delim is None: - delim = regex[0] + regex += lines.pop(0) + if not delim: + if not regex.strip(): # Suppress blank lanes before delim + regex = '' + continue + delim = regex.strip()[0] assert delim in (set(string.printable) - set(string.letters) - set(string.digits)) - test_re = re.compile(r'%(delim)s(([^%(delim)s]|\\%(delim)s)*([^\\]))%(delim)s(\\?)(.*)' % {'delim': delim}) + test_re = re.compile(r'%(delim)s(([^%(delim)s]|\\%(delim)s)*([^\\]))%(delim)s(\\?)([^\n\r]*)' % {'delim': delim}) # last two groups are an optional backslash and optional flags matches = test_re.findall(regex) if matches: break - assert len(matches)==1 + assert len(matches)==1 # check to make sure we matched right regex = matches[0][0] regex += matches[0][-2] # Add the backslash, if we gotta flags = matches[0][-1] # Get the flags for the regex - yield regex, flags + tests = [] -def create_result_iterator(tests, results): - """Gets the expected return sets for each regular expression.""" - # Second line is the test to run against the regex - # ' TEXT' - while 1: - test = get_simult_lines(tests, results) - if not test: - raise StopIteration - if not test.startswith(' '): - raise Exception("Input & output match, but I don't understand. (Got %r)" % test) - if test.endswith('\\'): # Tests that end in \ expect the \ to be chopped off - assert not test.endswith('\\\\') # make sure there are no \\ at end - test = test[:-1] - test = unescape(test[4:]) - - # Third line in the OUTPUT is the result, either: - # ' 0: ...' for a match (but this is ONLY escaped by \x__ types) - # 'No match' for no match - result = results.pop(0) - result = re.sub(r'\\x([0-9a-fA-F]{2})', lambda m: chr(int(m.group(1),16)), result) - if result == 'No match': + if greedy_ops.search(regex) or back_refs.search(regex): + # Suppress complex features we can't do + pass + elif flags: + # Suppress any test that requires PCRE flags pass - elif result.startswith(' 0:'): - # Now we need to eat any further lines like: - # ' 1: ....' a subgroup match - while results[0]: - if results[0][2] == ':': - results.pop(0) - else: - break else: - raise Exception("Lost sync in output.") - yield test, result - -class SkipException(Exception): - pass - + # In any other case, we're going to add the test + # All the above test fall through and DONT get appended + suite.append([regex, flags, tests]) + + # Now find the test and expected result + while lines: + test = lines.pop(0).strip() + if not test: + break # blank line ends the set + if test.endswith('\\'): # Tests that end in \ expect the \ to be chopped off + assert not test.endswith('\\\\\\') # Make sure not three \'s. otherwise this check will get ridiculous + if not test.endswith('\\\\'): # Two \'s means a real \ + test = test[:-1] + test = unescape(test) + + # Third line in the OUTPUT is the result, either: + # ' 0: ...' for a match (but this is ONLY escaped by \x__ types) + # 'No match' for no match + match = lines.pop(0).rstrip('\r\n') + match = re.sub(r'\\x([0-9a-fA-F]{2})', lambda m: chr(int(m.group(1),16)), match) + if match.startswith('No match'): + pass + elif match.startswith(' 0:'): + # Now we need to eat any further lines like: + # ' 1: ....' a subgroup match + while lines[0].strip(): + # ' 0+ ...' is also possible here + if lines[0][2] in [':','+']: + lines.pop(0) + else: + break + else: + print " *** %r ***" % match + raise Exception("Lost sync in output.") + tests.append((test,match)) + return suite + def test_file(): """Open the PCRE tests and run them.""" - tests = [line.rstrip() for line in open('testinput1','r').readlines()] - results = [line.rstrip() for line in open('testoutput1','r').readlines()] - - regex_flag_mapping = { '': lambda s: s, - 'i': lambda s: s.upper() - } - - regex_set = create_regex_iterator(tests, results) - import pdb - for regex, regex_flags in regex_set: - try: - print '%r' % regex - - # Create an iterator to grab the test/results for this regex - result_set = create_result_iterator(tests, results) - - # Handle the flags: - if regex_flags in regex_flag_mapping: - text_prepare = regex_flag_mapping[regex_flags] - elif 'x' in regex_flags: - raise SkipException("Cant do extended PRCE expressions") - else: - print "UNKNOWN FLAGS: %s" % regex_flags - continue - - skipped = any([op in regex for op in ['*?', '??', '+?', '}?', '(?']]) - if skipped: - raise SkipException("Cant do non-greedy operators or '(?' constructions)") - - regex_to_use = text_prepare(regex) + suite = read_file(open('testoutput1','r')) - anchor_left = regex_to_use.startswith('^') - anchor_right = regex_to_use.endswith('$') and not regex_to_use.endswith('\\$') - if anchor_left: - regex_to_use = regex_to_use[1:] # chop the ^ if it's there - if anchor_right: - regex_to_use = regex_to_use[:-1] # chop the $ if it's there - - if not regex_to_use: - raise SkipException("Cant do blank regex") - except SkipException, e: - print " SKIPPED (%s)" % e.message - # now burn all the tests for this regex - for _ in result_set: - pass + import pdb + while suite: + regex, flags, tests = suite.pop(0) + print '/%r/%s' % (regex, flags) + + regex_to_use = regex + + anchor_left = regex_to_use.startswith('^') + anchor_right = regex_to_use.endswith('$') and not regex_to_use.endswith('\\$') + if anchor_left: + regex_to_use = regex_to_use[1:] # chop the ^ if it's there + if anchor_right: + regex_to_use = regex_to_use[:-1] # chop the $ if it's there + + if not regex_to_use: + print " SKIPPED (Cant do blank regex)" continue # Finally, we make the pypy regex runner runner = make_runner(regex_to_use) # Now run the test expressions against the Regex - for test, result in result_set: + for test, match in tests: # Create possible subsequences that we should test if anchor_left: start_range = [0] @@ -163,21 +141,23 @@ # Search the possibilities for a match... for start, end in subseq_gen: - attempt = text_prepare(test[start:end]) + attempt = test[start:end] matched = runner.recognize(attempt) if matched: break # Did we get what we expected? - if result == 'No match': + if match == 'No match': if matched: print " FALSE MATCH: regex==%r test==%r" % (regex, test) else: - print " pass: regex==%r test==%r" % (regex, test) - elif result.startswith(' 0: '): + pass + #print " pass: regex==%r test==%r" % (regex, test) + elif match.startswith(' 0: '): if not matched: print " MISSED: regex==%r test==%r" % (regex, test) - elif not attempt==text_prepare(result[4:]): - print " BAD MATCH: regex==%r test==%r found==%r expect==%r" % (regex, test, attempt, result[4:]) + elif not attempt==match[4:]: + print " BAD MATCH: regex==%r test==%r found==%r expect==%r" % (regex, test, attempt, match[4:]) else: - print " pass: regex==%r test==%r" % (regex, test) + pass + #print " pass: regex==%r test==%r" % (regex, test) From pypy-svn at codespeak.net Sun Mar 2 10:04:29 2008 From: pypy-svn at codespeak.net (pypy-svn at codespeak.net) Date: Sun, 2 Mar 2008 10:04:29 +0100 (CET) Subject: [pypy-svn] Best Sales 2008! Message-ID: 20080302130352.113855.qmail@lan-84-240-8-65.vln.skynet.lt An HTML attachment was scrubbed... URL: From cfbolz at codespeak.net Sun Mar 2 15:53:21 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 2 Mar 2008 15:53:21 +0100 (CET) Subject: [pypy-svn] r52040 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080302145321.A52E516855E@codespeak.net> Author: cfbolz Date: Sun Mar 2 15:53:21 2008 New Revision: 52040 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/dump.py pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: support for metacalls Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sun Mar 2 15:53:21 2008 @@ -69,6 +69,53 @@ def _freeze_(self): return True + +class CallDesc: + __metaclass__ = cachedtype + + def __init__(self, RGenOp, rtyper, FUNCTYPE, voidargs=()): + self.sigtoken = RGenOp.sigToken(FUNCTYPE.TO) + self.result_kind = RGenOp.kindToken(FUNCTYPE.TO.RESULT) + # xxx what if the result is virtualizable? + self.redboxbuilder = rvalue.ll_redboxbuilder(FUNCTYPE.TO.RESULT) + whatever_return_value = FUNCTYPE.TO.RESULT._defl() + numargs = len(FUNCTYPE.TO.ARGS) + argiter = unrolling_iterable(FUNCTYPE.TO.ARGS) + def green_call(interpreter, fnptr_gv, greenargs): + fnptr = fnptr_gv.revealconst(FUNCTYPE) + assert len(greenargs) + len(voidargs) == numargs + args = () + j = 0 + k = 0 + for ARG in argiter: + if ARG == lltype.Void: + arg = voidargs[k] + # XXX terrible hack + if not we_are_translated(): + arg._TYPE = lltype.Void + args += (arg, ) + k += 1 + else: + genconst = greenargs[j] + arg = genconst.revealconst(ARG) + args += (arg, ) + j += 1 + rgenop = interpreter.jitstate.curbuilder.rgenop + try: + result = rgenop.genconst(fnptr(*args)) + except Exception, e: + if not we_are_translated(): + residual_exception_nontranslated(interpreter.jitstate, e, rtyper) + else: + interpreter.jitstate.residual_exception(e) + result = rgenop.genconst(whatever_return_value) + interpreter.green_result(result) + self.green_call = green_call + + def _freeze_(self): + return True + + class IndirectCallsetDesc(object): __metaclass__ = cachedtype @@ -143,6 +190,7 @@ self.graph_color = self.graph_calling_color(graph) self.calldescs = [] self.indirectcalldescs = [] + self.metacalldescs = [] self.is_portal = is_portal # mapping constant -> index in constants self.const_positions = {} @@ -176,6 +224,8 @@ self.graph_positions = {} # mapping fnobjs to index self.calldesc_positions = {} + # mapping class to index + self.metacalldesc_positions = {} # mapping fnobjs to index self.indirectcalldesc_positions = {} @@ -205,6 +255,7 @@ self.num_local_mergepoints, self.graph_color, self.calldescs, + self.metacalldescs, self.indirectcalldescs, self.is_portal) bytecode._source = self.assembler @@ -608,6 +659,29 @@ self.calldesc_positions[key] = result return result + def metacalldesc_position(self, op): + key = op + if key in self.metacalldesc_positions: + return self.metacalldesc_positions[key] + result = len(self.metacalldescs) + metadesc = op.args[1].value(self) + ARGS = [arg.concretetype for arg in op.args[2:]] + argiter = unrolling_iterable(ARGS) + def func(interpreter, redargs): + args = () + j = 0 + for ARG in argiter: + if ARG == lltype.Void: + args += (None, ) + else: + box = redargs[j] + args += (box, ) + j += 1 + return metadesc.metafunc(interpreter.jitstate, *args) + self.metacalldescs.append(func) + self.metacalldesc_positions[key] = result + return result + def indirectcalldesc_position(self, graph2code): key = graph2code.items() key.sort() @@ -753,6 +827,15 @@ print op, kind, withexc return handler(op, withexc) + def serialize_op_ts_metacall(self, op): + emitted_args = [] + for v in op.args[2:]: + if v.concretetype != lltype.Void: + emitted_args.append(self.serialize_oparg("red", v)) + metaindex = self.metacalldesc_position(op) + self.emit("metacall", metaindex, len(emitted_args), *emitted_args) + self.register_redvar(op.result) + def serialize_op_indirect_call(self, op): kind, withexc = self.guess_call_kind(op) if kind == "green": Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/dump.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/dump.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/dump.py Sun Mar 2 15:53:21 2008 @@ -132,6 +132,10 @@ index = src.load_2byte() function = jitcode.calldescs[index] args.append(function) + elif argspec == "metacalldesc": + index = src.load_2byte() + function = jitcode.metacalldescs[index] + args.append(function) elif argspec == "indirectcalldesc": index = src.load_2byte() function = jitcode.indirectcalldescs[index] Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Sun Mar 2 15:53:21 2008 @@ -23,7 +23,8 @@ keydescs, structtypedescs, fielddescs, arrayfielddescs, interiordescs, exceptioninstances, oopspecdescs, promotiondescs, called_bytecodes, num_mergepoints, - graph_color, calldescs, indirectcalldescs, is_portal): + graph_color, calldescs, metacalldescs, + indirectcalldescs, is_portal): self.name = name self.code = code self.constants = constants @@ -41,6 +42,7 @@ self.num_mergepoints = num_mergepoints self.graph_color = graph_color self.calldescs = calldescs + self.metacalldescs = metacalldescs self.indirectcalldescs = indirectcalldescs self.is_portal = is_portal @@ -121,6 +123,10 @@ index = self.load_2byte() function = self.frame.bytecode.calldescs[index] args += (function, ) + elif argspec == "metacalldesc": + index = self.load_2byte() + function = self.frame.bytecode.metacalldescs[index] + args += (function, ) elif argspec == "indirectcalldesc": index = self.load_2byte() function = self.frame.bytecode.indirectcalldescs[index] @@ -647,6 +653,11 @@ rtimeshift.residual_fetch(self.jitstate, self.exceptiondesc, True, flagbox) + @arguments("metacalldesc", "red_varargs", returns="red") + def opimpl_metacall(self, metafunc, redargs): + return metafunc(self, redargs) + + # exceptions @arguments(returns="red") Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Sun Mar 2 15:53:21 2008 @@ -1641,10 +1641,49 @@ res = self.interpret(f, [2, 4], backendoptimize=True) assert res == 56 - 90 - def test_substitute_graph(self): - py.test.skip("not working yet") + def test_simple_substitute_graph(self): class MetaG: + def __init__(self, codewriter): + pass + + def _freeze_(self): + return True + + def metafunc(self, jitstate, abox, bbox): + from pypy.jit.timeshifter.rvalue import IntRedBox + builder = jitstate.curbuilder + gv_result = builder.genop2("int_sub", abox.getgenvar(jitstate), + bbox.getgenvar(jitstate)) + return IntRedBox(abox.kind, gv_result) + + def g(a, b): + return a + b + + def f(a, b): + x = g(a, b) + y = g(b, a) + return x + y + + class MyPolicy(HintAnnotatorPolicy): + novirtualcontainer = True + + def look_inside_graph(self, graph): + if graph.func is g: + return MetaG # replaces g with a meta-call to metafunc() + else: + return True + + res = self.interpret(f, [3, 6], policy=MyPolicy()) + assert res == 0 + self.check_insns({'int_add': 1, 'int_sub': 2}) + + def test_substitute_graph_void(self): + + class MetaG: + def __init__(self, codewriter): + pass + def _freeze_(self): return True From cfbolz at codespeak.net Sun Mar 2 16:12:54 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 2 Mar 2008 16:12:54 +0100 (CET) Subject: [pypy-svn] r52041 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080302151254.2C755168566@codespeak.net> Author: cfbolz Date: Sun Mar 2 16:12:52 2008 New Revision: 52041 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: support the portal returning green stuff Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sun Mar 2 16:12:52 2008 @@ -348,7 +348,15 @@ if block.exits == (): returnvar, = block.inputargs color = self.graph_calling_color(self.graph) - if color == "red": + if self.is_portal: + if color == "yellow": + place = self.serialize_oparg("red", returnvar) + assert place == 0 + if color == "gray": + self.emit("gray_return") + else: + self.emit("red_return") + elif color == "red": self.emit("red_return") elif color == "gray": self.emit("gray_return") Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Sun Mar 2 16:12:52 2008 @@ -256,16 +256,16 @@ resumepoint = rtimeshift.getresumepoint(newjitstate) self.newjitstate(newjitstate) if resumepoint == -1: - if graph_color == "red": + if graph_color == "gray": + assert not is_portal + newjitstate = rtimeshift.leave_graph_gray(queue) + elif is_portal or graph_color == "red": newjitstate = rtimeshift.leave_graph_red( queue, is_portal) elif graph_color == "yellow": newjitstate = rtimeshift.leave_graph_yellow(queue) elif graph_color == "green": assert 0, "green graphs shouldn't be seen by the rainbow interp" - elif graph_color == "gray": - assert not is_portal - newjitstate = rtimeshift.leave_graph_gray(queue) else: assert 0, "unknown graph color %s" % (graph_color, ) Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Sun Mar 2 16:12:52 2008 @@ -251,7 +251,6 @@ small = True def test_simple_fixed(self): - py.test.skip("green return") def ll_function(x, y): return hint(x + y, concrete=True) res = self.interpret(ll_function, [5, 7]) @@ -452,7 +451,6 @@ assert res == ll_function(-70) def test_merge_const_at_return(self): - py.test.skip("green return") def ll_function(x): if x > 0: return 17 From arigo at codespeak.net Sun Mar 2 16:50:31 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 2 Mar 2008 16:50:31 +0100 (CET) Subject: [pypy-svn] r52042 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080302155031.14E6216856C@codespeak.net> Author: arigo Date: Sun Mar 2 16:50:30 2008 New Revision: 52042 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Log: Attach names early, to make early calls to dump() show the target of calls instead of just '?'. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sun Mar 2 16:50:30 2008 @@ -170,6 +170,7 @@ #graph.show() if is_portal: bytecode = JitCode.__new__(JitCode) + bytecode.name = graph.name # for dump() bytecode.is_portal = True self.all_graphs[graph] = bytecode self.seen_blocks = {} @@ -272,6 +273,7 @@ if graph in self.all_graphs: return self.all_graphs[graph] bytecode = JitCode.__new__(JitCode) + bytecode.name = graph.name # for dump() self.all_graphs[graph] = bytecode self.unfinished_graphs.append(graph) return bytecode From cfbolz at codespeak.net Sun Mar 2 16:58:39 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 2 Mar 2008 16:58:39 +0100 (CET) Subject: [pypy-svn] r52048 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080302155839.5553516854C@codespeak.net> Author: cfbolz Date: Sun Mar 2 16:58:38 2008 New Revision: 52048 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py Log: a test showing the current promotion problem Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py Sun Mar 2 16:58:38 2008 @@ -100,6 +100,33 @@ assert res == 186 self.check_insns(int_add=1, int_mul=0, int_sub=0) + def test_promote_inside_call2(self): + py.test.skip("bug in promotion") + def ll_two(n): + k = hint(n, promote=True) + k *= 17 + return hint(k, variable=True) + def ll_function(n, m): + hint(None, global_merge_point=True) + if not n: + return -41 + if m: + return 42 + return ll_two(n + 1) - 1 + + res = self.interpret(ll_function, [10, 0], [], policy=P_NOVIRTUAL) + assert res == 186 + self.check_insns(int_add=1, int_mul=0, int_sub=0) + + res = self.interpret(ll_function, [0, 0], [], policy=P_NOVIRTUAL) + assert res == -41 + self.check_insns(int_add=1, int_mul=0, int_sub=0) + + res = self.interpret(ll_function, [1, 1], [], policy=P_NOVIRTUAL) + assert res == 42 + self.check_insns(int_add=1, int_mul=0, int_sub=0) + + def test_two_promotions(self): def ll_function(n, m): hint(None, global_merge_point=True) From arigo at codespeak.net Sun Mar 2 17:40:23 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 2 Mar 2008 17:40:23 +0100 (CET) Subject: [pypy-svn] r52050 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080302164023.9B5C416854C@codespeak.net> Author: arigo Date: Sun Mar 2 17:40:21 2008 New Revision: 52050 Added: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py (contents, props changed) Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: Support for, and a test for, translating the JIT support code. Many RPython fixes pending. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py Sun Mar 2 17:40:21 2008 @@ -9,12 +9,14 @@ # graph transformations for transforming the portal graph(s) class PortalRewriter(object): - def __init__(self, hintannotator, rtyper, RGenOp, codewriter): + def __init__(self, hintannotator, rtyper, RGenOp, codewriter, + translate_support_code = True): self.hintannotator = hintannotator self.rtyper = rtyper self.interpreter = codewriter.interpreter self.codewriter = codewriter self.RGenOp = RGenOp + self.translate_support_code = translate_support_code def rewrite(self, origportalgraph, portalgraph, view=False): self.origportalgraph = origportalgraph @@ -64,12 +66,26 @@ self.interpreter.set_portalstate(state) def mutate_origportalgraph(self): - # XXX - # the following line should really be a call to a mixlevel annotator - # but for now the jit stuff should be run directly to make tests faster - # currently this makes it untranslatable - portal_entry_graph_ptr = llhelper(lltype.Ptr(self.PORTAL_FUNCTYPE), - self.portal_entry) + if not self.translate_support_code: + # this case is used for most tests: the jit stuff should be run + # directly to make these tests faster + portal_entry_graph_ptr = llhelper(lltype.Ptr(self.PORTAL_FUNCTYPE), + self.portal_entry) + else: + # this translates portal_entry into low-level graphs, recursively + # dragging the whole jit support code with it. Depending on which + # descs are reachable from the portalbytecode, this will create + # the specialized versions of the support code as needed. + from pypy.rpython import annlowlevel + from pypy.annotation import model as annmodel + annhelper = annlowlevel.MixLevelHelperAnnotator(self.rtyper) + FUNC = self.PORTAL_FUNCTYPE + args_s = [annmodel.lltype_to_annotation(ARG) for ARG in FUNC.ARGS] + s_result = annmodel.lltype_to_annotation(FUNC.RESULT) + portal_entry_graph_ptr = annhelper.delayedfunction( + self.portal_entry, args_s, s_result) + annhelper.finish() + # the following gives a pdb prompt when portal_entry raises an exception portal_entry_graph_ptr._obj.__dict__['_debugexc'] = True # XXX hack hack hack Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Sun Mar 2 17:40:21 2008 @@ -75,6 +75,7 @@ RGenOp = LLRGenOp small = False + translate_support_code = False # only works for portal tests for now def setup_class(cls): cls.on_llgraph = cls.RGenOp is LLRGenOp @@ -115,7 +116,7 @@ # rewire the original portal rewriter = PortalRewriter(self.hintannotator, self.rtyper, self.RGenOp, - writer) + writer, self.translate_support_code) self.rewriter = rewriter origportalgraph = graphof(self.rtyper.annotator.translator, portal) portalgraph = graphof(t, portal) Added: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py ============================================================================== --- (empty file) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py Sun Mar 2 17:40:21 2008 @@ -0,0 +1,9 @@ +import py; py.test.skip("in-progress") +from pypy.jit.rainbow.test import test_portal + + +class TestLLInterpreted(test_portal.TestPortal): + translate_support_code = True + + # for the individual tests see + # ====> test_portal.py From arigo at codespeak.net Sun Mar 2 17:50:29 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 2 Mar 2008 17:50:29 +0100 (CET) Subject: [pypy-svn] r52051 - pypy/branch/jit-refactoring/pypy/jit/timeshifter Message-ID: <20080302165029.822EE16856C@codespeak.net> Author: arigo Date: Sun Mar 2 17:50:27 2008 New Revision: 52051 Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/greenkey.py Log: RPythonification (the easy first step) Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/greenkey.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/greenkey.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/greenkey.py Sun Mar 2 17:50:27 2008 @@ -69,6 +69,9 @@ raise TypeError("don't store GreenKeys in a normal dict") def __hash__(self): + if len(self.values) == 0: + # to support using the empty_key as an annotation-time constant + return 7623876 raise TypeError("not hashable") def greenkey_eq(self, other): From arigo at codespeak.net Sun Mar 2 17:55:55 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 2 Mar 2008 17:55:55 +0100 (CET) Subject: [pypy-svn] r52052 - pypy/branch/jit-refactoring/pypy/jit/timeshifter Message-ID: <20080302165555.615AE16856C@codespeak.net> Author: arigo Date: Sun Mar 2 17:55:54 2008 New Revision: 52052 Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py Log: hrtyper used to providea more precise annotation of "instance of PtrRedBox" for some of these helpers, instead of the "instance of RedBox" that the rainbow interp now provides. Fix this with asserts. Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py Sun Mar 2 17:55:54 2008 @@ -142,6 +142,7 @@ return rvalue.PtrRedBox(contdesc.ptrkind, genvar, known_nonzero=True) def gengetfield(jitstate, deepfrozen, fielddesc, argbox): + assert isinstance(argbox, rvalue.PtrRedBox) if (fielddesc.immutable or deepfrozen) and argbox.is_constant(): resgv = fielddesc.getfield_if_non_null( jitstate, argbox.getgenvar(jitstate)) @@ -150,9 +151,11 @@ return argbox.op_getfield(jitstate, fielddesc) def gensetfield(jitstate, fielddesc, destbox, valuebox): + assert isinstance(destbox, rvalue.PtrRedBox) destbox.op_setfield(jitstate, fielddesc, valuebox) def ll_gengetsubstruct(jitstate, fielddesc, argbox): + assert isinstance(argbox, rvalue.PtrRedBox) if argbox.is_constant(): ptr = rvalue.ll_getvalue(argbox, fielddesc.PTRTYPE) if ptr: # else don't constant-fold - we'd get a bogus pointer @@ -213,6 +216,7 @@ def genptrnonzero(jitstate, argbox, reverse): + assert isinstance(argbox, rvalue.PtrRedBox) if argbox.is_constant(): addr = rvalue.ll_getvalue(argbox, llmemory.Address) return rvalue.ll_fromvalue(jitstate, bool(addr) ^ reverse) @@ -228,6 +232,8 @@ return rvalue.IntRedBox(builder.rgenop.kindToken(lltype.Bool), gv_res) def genptreq(jitstate, argbox0, argbox1, reverse): + assert isinstance(argbox0, rvalue.PtrRedBox) + assert isinstance(argbox1, rvalue.PtrRedBox) builder = jitstate.curbuilder if argbox0.is_constant() and argbox1.is_constant(): addr0 = rvalue.ll_getvalue(argbox0, llmemory.Address) @@ -386,6 +392,7 @@ def split_ptr_nonzero(jitstate, switchredbox, resumepoint, ptrbox, reverse, *greens_gv): + assert isinstance(ptrbox, rvalue.PtrRedBox) exitgvar = switchredbox.getgenvar(jitstate) if exitgvar.is_const: return exitgvar.revealconst(lltype.Bool) @@ -540,6 +547,8 @@ jitstate.exc_value_box = box def setexception(jitstate, typebox, valuebox): + assert isinstance(typebox, rvalue.PtrRedBox) + assert isinstance(valuebox, rvalue.PtrRedBox) ok1 = typebox .learn_nonzeroness(jitstate, True) ok2 = valuebox.learn_nonzeroness(jitstate, True) assert ok1 & ok2 # probably... maybe it's false but it would be @@ -556,6 +565,7 @@ dispatchqueue.return_chain = jitstate def learn_nonzeroness(jitstate, ptrbox, nonzeroness): + assert isinstance(ptrbox, rvalue.PtrRedBox) ptrbox.learn_nonzeroness(jitstate, nonzeroness) ##def ll_gvar_from_redbox(jitstate, redbox): From arigo at codespeak.net Sun Mar 2 18:04:52 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 2 Mar 2008 18:04:52 +0100 (CET) Subject: [pypy-svn] r52053 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080302170452.0142016855A@codespeak.net> Author: arigo Date: Sun Mar 2 18:04:52 2008 New Revision: 52053 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Log: Only register opimpl_xxx() functions if they are actually used by codewriter.py. This helps fight blocked blocks caused by the translation of code that is really unreachable. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Sun Mar 2 18:04:52 2008 @@ -183,7 +183,6 @@ self.portalstate = None self.num_global_mergepoints = -1 self.global_state_dicts = None - self._add_implemented_opcodes() def set_portalstate(self, portalstate): assert self.portalstate is None @@ -768,16 +767,16 @@ # ____________________________________________________________ # construction-time interface - def _add_implemented_opcodes(self): - for name in dir(self): - if not name.startswith("opimpl_"): - continue - opname = name[len("opimpl_"):] + def _register_opcode_if_implemented(self, opname): + name = "opimpl_" + opname + if hasattr(self, name): self.opname_to_index[opname] = len(self.opcode_implementations) self.opcode_implementations.append(getattr(self, name).im_func) self.opcode_descs.append(None) def find_opcode(self, name): + if name not in self.opname_to_index: + self._register_opcode_if_implemented(name) return self.opname_to_index.get(name, -1) def make_opcode_implementation(self, color, opdesc): From arigo at codespeak.net Sun Mar 2 18:28:35 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 2 Mar 2008 18:28:35 +0100 (CET) Subject: [pypy-svn] r52059 - in pypy/branch/jit-refactoring/pypy/annotation: . test Message-ID: <20080302172835.92317168574@codespeak.net> Author: arigo Date: Sun Mar 2 18:28:35 2008 New Revision: 52059 Modified: pypy/branch/jit-refactoring/pypy/annotation/binaryop.py pypy/branch/jit-refactoring/pypy/annotation/test/test_annrpython.py Log: Experimental, to help in translating the rainbow interpreter: reading from empty lists is not fatal Modified: pypy/branch/jit-refactoring/pypy/annotation/binaryop.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/annotation/binaryop.py (original) +++ pypy/branch/jit-refactoring/pypy/annotation/binaryop.py Sun Mar 2 18:28:35 2008 @@ -16,7 +16,7 @@ from pypy.annotation.model import SomeSingleFloat from pypy.annotation.model import unionof, UnionError, set, missing_operation from pypy.annotation.model import isdegenerated, TLS -from pypy.annotation.model import read_can_only_throw +from pypy.annotation.model import read_can_only_throw, HarmlesslyBlocked from pypy.annotation.model import add_knowntypedata, merge_knowntypedata from pypy.annotation.model import lltype_to_annotation from pypy.annotation.model import SomeGenericCallable @@ -603,7 +603,10 @@ def getitem((lst1, int2)): getbookkeeper().count("list_getitem", int2) - return lst1.listdef.read_item() + s_item = lst1.listdef.read_item() + if isinstance(s_item, SomeImpossibleValue): + raise HarmlesslyBlocked("getitem on an empty list") + return s_item getitem.can_only_throw = [] getitem_key = getitem Modified: pypy/branch/jit-refactoring/pypy/annotation/test/test_annrpython.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/annotation/test/test_annrpython.py (original) +++ pypy/branch/jit-refactoring/pypy/annotation/test/test_annrpython.py Sun Mar 2 18:28:35 2008 @@ -3040,6 +3040,25 @@ a.build_types(f, [str]) + def test_empty_list_blocks_harmlessly(self): + class X: + pass + x = X() + x.foobar = [] + def f(n): + if n < 0: + # this example shows up in cases where the next line is + # really unreachable, but in ways that the annotator cannot + # figure out + return x.foobar[~n] + else: + return 42 + + a = self.RPythonAnnotator() + s = a.build_types(f, [int]) + assert s.const == 42 + + def g(n): return [0,1,2,n] From arigo at codespeak.net Sun Mar 2 18:42:49 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 2 Mar 2008 18:42:49 +0100 (CET) Subject: [pypy-svn] r52060 - in pypy/branch/jit-refactoring/pypy: jit/rainbow jit/rainbow/test translator Message-ID: <20080302174249.7F344168568@codespeak.net> Author: arigo Date: Sun Mar 2 18:42:46 2008 New Revision: 52060 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py pypy/branch/jit-refactoring/pypy/translator/translator.py Log: Improve the --view for test_llinterp.py. Now we should be able to follow the call graph inside the JIT support code. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py Sun Mar 2 18:42:46 2008 @@ -82,8 +82,10 @@ FUNC = self.PORTAL_FUNCTYPE args_s = [annmodel.lltype_to_annotation(ARG) for ARG in FUNC.ARGS] s_result = annmodel.lltype_to_annotation(FUNC.RESULT) - portal_entry_graph_ptr = annhelper.delayedfunction( + self.portal_entry_graph = annhelper.getgraph( self.portal_entry, args_s, s_result) + portal_entry_graph_ptr = annhelper.graph2delayed( + self.portal_entry_graph, FUNC) annhelper.finish() # the following gives a pdb prompt when portal_entry raises an exception Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py Sun Mar 2 18:42:46 2008 @@ -40,7 +40,11 @@ backendoptimize=backendoptimize) if conftest.option.view and self.small: - self.rtyper.annotator.translator.view() + if self.translate_support_code: + startgraph = self.rewriter.portal_entry_graph + self.rtyper.annotator.translator.viewcg(startgraph) + else: + self.rtyper.annotator.translator.view() # Populate the cache if len(self._cache_order) >= 3: Modified: pypy/branch/jit-refactoring/pypy/translator/translator.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/translator/translator.py (original) +++ pypy/branch/jit-refactoring/pypy/translator/translator.py Sun Mar 2 18:42:46 2008 @@ -142,18 +142,25 @@ raise TypeError, "don't know about %r" % x - def view(self): + def view(self, graph=None): """Shows the control flow graph with annotations if computed. Requires 'dot' and pygame.""" from pypy.translator.tool.graphpage import FlowGraphPage - FlowGraphPage(self).display() + if graph is None: + functions = None + else: + functions = [graph] + FlowGraphPage(self, functions).display() - def viewcg(self): + def viewcg(self, startgraph=None): """Shows the whole call graph and the class hierarchy, based on the computed annotations.""" - from pypy.translator.tool.graphpage import TranslatorPage - TranslatorPage(self).display() - + if startgraph is None: + from pypy.translator.tool.graphpage import TranslatorPage + TranslatorPage(self).display() + else: + from pypy.translator.tool.graphpage import LocalizedCallGraphPage + LocalizedCallGraphPage(self, [startgraph]).display() # _______________________________________________________________ From arigo at codespeak.net Sun Mar 2 18:46:34 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 2 Mar 2008 18:46:34 +0100 (CET) Subject: [pypy-svn] r52061 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080302174634.41EE6168571@codespeak.net> Author: arigo Date: Sun Mar 2 18:46:33 2008 New Revision: 52061 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py Log: Duh Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py Sun Mar 2 18:46:33 2008 @@ -43,7 +43,6 @@ binding = self.hintannotator.binding(v) concretetype = originalconcretetype(binding) if binding.is_green(): - ORIGARGS.append(concretetype) arg_spec = "green", None, None, concretetype else: argdesc = self.getportalargdesc(concretetype) From niko at codespeak.net Sun Mar 2 18:48:49 2008 From: niko at codespeak.net (niko at codespeak.net) Date: Sun, 2 Mar 2008 18:48:49 +0100 (CET) Subject: [pypy-svn] r52062 - in pypy/branch/fixed-list-ootype/pypy/translator/jvm: . src/pypy test Message-ID: <20080302174849.60172168571@codespeak.net> Author: niko Date: Sun Mar 2 18:48:48 2008 New Revision: 52062 Added: pypy/branch/fixed-list-ootype/pypy/translator/jvm/src/pypy/VoidArray.java Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/builtin.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/constant.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/generator.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/metavm.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/methods.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/node.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/opcodes.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/test_class.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/typesystem.py Log: a big refactoring aiming at better support for array branch. Move most jvm constants etc into typesystem.py, which should eventually be renamed to jvm.py as it is more general now. Change arrays to use the new VoidArray class, and refactor how array methods were supported to make them more general (there is now an OpcodeMethod which is something that can be called like a method, but is implemented via a native opcode). Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/builtin.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/builtin.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/builtin.py Sun Mar 2 18:48:48 2008 @@ -1,5 +1,4 @@ -from pypy.translator.jvm import typesystem as jvmtype -from pypy.translator.jvm import generator as jvmgen +import pypy.translator.jvm.typesystem as jvm from pypy.rpython.ootypesystem import ootype from pypy.translator.jvm.typesystem import \ jInt, jVoid, jStringBuilder, jString, jPyPy, jChar, jArrayList, jObject, \ @@ -9,7 +8,7 @@ # ______________________________________________________________________ # Mapping of built-in OOTypes to JVM types -class JvmBuiltInType(jvmtype.JvmClassType): +class JvmBuiltInType(jvm.JvmClassType): """ Represents built-in types to JVM. May optionally be associated @@ -18,7 +17,7 @@ """ def __init__(self, db, classty, OOTYPE): - jvmtype.JvmClassType.__init__(self, classty.name) + jvm.JvmClassType.__init__(self, classty.name) self.db = db self.OOTYPE = OOTYPE self.gen = Generifier(OOTYPE) @@ -30,14 +29,14 @@ return hash(self.name) def lookup_field(self, fieldnm): - """ Given a field name, returns a jvmgen.Field object """ + """ Given a field name, returns a jvm.Field object """ _, FIELDTY = self.OOTYPE._lookup_field(fieldnm) jfieldty = self.db.lltype_to_cts(FIELDTY) - return jvmgen.Field( + return jvm.Field( self.descriptor.class_name(), fieldnm, jfieldty, False) def lookup_method(self, methodnm): - """ Given the method name, returns a jvmgen.Method object """ + """ Given the method name, returns a jvm.Method object """ # Look for a shortcut method in our table of remappings: try: @@ -56,14 +55,14 @@ if self.OOTYPE.__class__ in bridged_objects: # Bridged objects are ones where we have written a java class # that has methods with the correct names and types already - return jvmgen.Method.v(self, methodnm, jargtypes, jrettype) + return jvm.Method.v(self, methodnm, jargtypes, jrettype) else: # By default, we assume it is a static method on the PyPy # object, that takes an instance of this object as the first # argument. The other arguments we just convert to java versions, # except for generics. jargtypes = [self] + jargtypes - return jvmgen.Method.s(jPyPy, methodnm, jargtypes, jrettype) + return jvm.Method.s(jPyPy, methodnm, jargtypes, jrettype) # When we lookup a method on a BuiltInClassNode, we first check the # 'built_in_methods' and 'bridged_objects' tables. This allows us to @@ -80,73 +79,73 @@ # .__class__ is required (ootype.StringBuilder.__class__, "ll_allocate"): - jvmgen.Method.v(jStringBuilder, "ensureCapacity", (jInt,), jVoid), + jvm.Method.v(jStringBuilder, "ensureCapacity", (jInt,), jVoid), (ootype.StringBuilder.__class__, "ll_build"): - jvmgen.Method.v(jStringBuilder, "toString", (), jString), + jvm.Method.v(jStringBuilder, "toString", (), jString), (ootype.String.__class__, "ll_streq"): - jvmgen.Method.v(jString, "equals", (jObject,), jBool), + jvm.Method.v(jString, "equals", (jObject,), jBool), (ootype.String.__class__, "ll_strlen"): - jvmgen.Method.v(jString, "length", (), jInt), + jvm.Method.v(jString, "length", (), jInt), (ootype.String.__class__, "ll_stritem_nonneg"): - jvmgen.Method.v(jString, "charAt", (jInt,), jChar), + jvm.Method.v(jString, "charAt", (jInt,), jChar), (ootype.String.__class__, "ll_startswith"): - jvmgen.Method.v(jString, "startsWith", (jString,), jBool), + jvm.Method.v(jString, "startsWith", (jString,), jBool), (ootype.String.__class__, "ll_endswith"): - jvmgen.Method.v(jString, "endsWith", (jString,), jBool), + jvm.Method.v(jString, "endsWith", (jString,), jBool), (ootype.String.__class__, "ll_strcmp"): - jvmgen.Method.v(jString, "compareTo", (jString,), jInt), + jvm.Method.v(jString, "compareTo", (jString,), jInt), (ootype.String.__class__, "ll_upper"): - jvmgen.Method.v(jString, "toUpperCase", (), jString), + jvm.Method.v(jString, "toUpperCase", (), jString), (ootype.String.__class__, "ll_lower"): - jvmgen.Method.v(jString, "toLowerCase", (), jString), + jvm.Method.v(jString, "toLowerCase", (), jString), (ootype.String.__class__, "ll_replace_chr_chr"): - jvmgen.Method.v(jString, "replace", (jChar, jChar), jString), + jvm.Method.v(jString, "replace", (jChar, jChar), jString), (ootype.Dict, "ll_set"): - jvmgen.Method.v(jHashMap, "put", (jObject, jObject), jObject), + jvm.Method.v(jHashMap, "put", (jObject, jObject), jObject), (ootype.Dict, "ll_get"): - jvmgen.Method.v(jHashMap, "get", (jObject,), jObject), + jvm.Method.v(jHashMap, "get", (jObject,), jObject), (ootype.Dict, "ll_contains"): - jvmgen.Method.v(jHashMap, "containsKey", (jObject,), jBool), + jvm.Method.v(jHashMap, "containsKey", (jObject,), jBool), (ootype.Dict, "ll_length"): - jvmgen.Method.v(jHashMap, "size", (), jInt), + jvm.Method.v(jHashMap, "size", (), jInt), (ootype.Dict, "ll_clear"): - jvmgen.Method.v(jHashMap, "clear", (), jVoid), + jvm.Method.v(jHashMap, "clear", (), jVoid), (ootype.CustomDict, "ll_set"): - jvmgen.Method.v(jPyPyCustomDict, "put", (jObject, jObject), jObject), + jvm.Method.v(jPyPyCustomDict, "put", (jObject, jObject), jObject), (ootype.CustomDict, "ll_get"): - jvmgen.Method.v(jPyPyCustomDict, "get", (jObject,), jObject), + jvm.Method.v(jPyPyCustomDict, "get", (jObject,), jObject), (ootype.CustomDict, "ll_contains"): - jvmgen.Method.v(jPyPyCustomDict, "containsKey", (jObject,), jBool), + jvm.Method.v(jPyPyCustomDict, "containsKey", (jObject,), jBool), (ootype.CustomDict, "ll_length"): - jvmgen.Method.v(jPyPyCustomDict, "size", (), jInt), + jvm.Method.v(jPyPyCustomDict, "size", (), jInt), (ootype.CustomDict, "ll_clear"): - jvmgen.Method.v(jPyPyCustomDict, "clear", (), jVoid), + jvm.Method.v(jPyPyCustomDict, "clear", (), jVoid), (ootype.List, "ll_length"): - jvmgen.Method.v(jArrayList, "size", (), jInt), + jvm.Method.v(jArrayList, "size", (), jInt), (ootype.List, "ll_getitem_fast"): - jvmgen.Method.v(jArrayList, "get", (jInt,), jObject), + jvm.Method.v(jArrayList, "get", (jInt,), jObject), } Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/constant.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/constant.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/constant.py Sun Mar 2 18:48:48 2008 @@ -1,15 +1,14 @@ from pypy.rpython.ootypesystem import ootype from pypy.objspace.flow import model as flowmodel -from pypy.translator.jvm.generator import \ - Field, Method, CUSTOMDICTMAKE +import pypy.translator.jvm.typesystem as jvm +from pypy.translator.jvm.typesystem import \ + jVoid, Method, Field from pypy.translator.oosupport.constant import \ BaseConstantGenerator, RecordConst, InstanceConst, ClassConst, \ StaticMethodConst, CustomDictConst, WeakRefConst, push_constant, \ MAX_CONST_PER_STEP -from pypy.translator.jvm.typesystem import \ - jObject, jVoid, jPyPyWeakRef, JvmClassType -jPyPyConstantInit = JvmClassType('pypy.ConstantInit') +jPyPyConstantInit = jvm.JvmClassType('pypy.ConstantInit') jPyPyConstantInitMethod = Method.s(jPyPyConstantInit, 'init', [], jVoid) # ___________________________________________________________________________ @@ -51,7 +50,7 @@ # This prevents any one class from getting too big. if (self.num_constants % MAX_CONST_PER_STEP) == 0: cc_num = len(self.ccs) - self.ccs.append(JvmClassType('pypy.Constant_%d' % cc_num)) + self.ccs.append(jvm.JvmClassType('pypy.Constant_%d' % cc_num)) self.num_constants += 1 const.fieldobj = Field(self.ccs[-1].name, const.name, jfieldty, True) @@ -99,7 +98,7 @@ except KeyError: constants_by_cls[const.fieldobj.class_name] = [const] for cc in self.ccs: - ilasm.begin_class(cc, jObject) + ilasm.begin_class(cc, jvm.jObject) for const in constants_by_cls[cc.name]: ilasm.add_field(const.fieldobj) ilasm.end_class() @@ -122,8 +121,9 @@ self._push_constant_during_init(gen, const) def _declare_step(self, gen, stepnum): - self.step_classes.append(JvmClassType('pypy.ConstantInit_%d' % stepnum)) - gen.begin_class(self.step_classes[-1], jObject) + self.step_classes.append(jvm.JvmClassType( + 'pypy.ConstantInit_%d' % stepnum)) + gen.begin_class(self.step_classes[-1], jvm.jObject) gen.begin_function('constant_init', [], [], jVoid, True) def _close_step(self, gen, stepnum): @@ -132,7 +132,7 @@ gen.end_class() # end pypy.ConstantInit_NNN def _end_gen_constants(self, gen, numsteps): - gen.begin_class(jPyPyConstantInit, jObject) + gen.begin_class(jPyPyConstantInit, jvm.jObject) gen.begin_j_function(jPyPyConstantInit, jPyPyConstantInitMethod) for cls in self.step_classes: m = Method.s(cls, "constant_init", [], jVoid) @@ -156,7 +156,7 @@ if self.delegate_impl: gen.new_with_jtype(self.delegate_impl) else: - gen.push_null(jObject) + gen.push_null(jvm.jObject) def initialize_data(self, constgen, gen): return Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py Sun Mar 2 18:48:48 2008 @@ -7,21 +7,15 @@ from pypy.rpython.lltypesystem import lltype from pypy.rpython.ootypesystem import ootype, rclass from pypy.rpython.ootypesystem.module import ll_os -from pypy.translator.jvm import typesystem as jvmtype from pypy.translator.jvm import node, methods from pypy.translator.jvm.option import getoption -import pypy.translator.jvm.generator as jvmgen -from pypy.translator.jvm.generator import Method, Property, Field -import pypy.translator.jvm.constant as jvmconst -from pypy.translator.jvm.typesystem import \ - jStringBuilder, jInt, jVoid, jString, jChar, jObject, \ - jThrowable, JvmNativeClass, jPyPy, JvmClassType from pypy.translator.jvm.builtin import JvmBuiltInType - from pypy.translator.oosupport.database import Database as OODatabase from pypy.rpython.ootypesystem.bltregistry import ExternalType from pypy.annotation.signature import annotation from pypy.annotation.model import annotation_to_lltype +import pypy.translator.jvm.constant as jvmconst +import pypy.translator.jvm.typesystem as jvm # ______________________________________________________________________ # Database object @@ -34,7 +28,7 @@ self._jasmin_files = [] # list of strings --- .j files we made self._classes = {} # Maps ootype class objects to node.Class objects, # and JvmType objects as well - self._functions = {} # graph -> jvmgen.Method + self._functions = {} # graph -> jvm.Method # (jargtypes, jrettype) -> node.StaticMethodInterface self._delegates = {} @@ -44,7 +38,7 @@ self._function_names = {} # graph --> function_name - self._constants = {} # flowmodel.Variable --> jvmgen.Const + self._constants = {} # flowmodel.Variable --> jvm.Const # Special fields for the Object class, see _translate_Object self._object_interf = None @@ -60,8 +54,8 @@ # # These are public attributes that are referenced from # elsewhere in the code. - self.jPyPyMain = JvmClassType(self._pkg('Main')) - self.pypy_field = jvmgen.Field.s(self.jPyPyMain, 'pypy', jPyPy) + self.jPyPyMain = jvm.JvmClassType(self._pkg('Main')) + self.pypy_field = jvm.Field.s(self.jPyPyMain, 'pypy', jvm.jPyPy) # _________________________________________________________________ # Java String vs Byte Array @@ -85,7 +79,7 @@ def class_name(self, TYPE): jtype = self.lltype_to_cts(TYPE) - assert isinstance(jtype, jvmtype.JvmClassType) + assert isinstance(jtype, jvm.JvmClassType) return jtype.name def add_jasmin_file(self, jfile): @@ -112,14 +106,14 @@ like. The 'methods' argument should be a dictionary whose keys are - method names and whose entries are jvmgen.Method objects which + method names and whose entries are jvm.Method objects which the corresponding method should invoke. """ nm = self._pkg(self._uniq('InterlinkImplementation')) - cls = node.Class(nm, supercls=jObject) + cls = node.Class(nm, supercls=jvm.jObject) for method_name, helper in methods.items(): cls.add_method(node.InterlinkFunction(cls, method_name, helper)) - cls.add_interface(jvmtype.jPyPyInterlink) + cls.add_interface(jvm.jPyPyInterlink) self.jInterlinkImplementation = cls self.pending_node(cls) @@ -161,7 +155,7 @@ # Create the class object first clsnm = self._pkg(self._uniq('Record')) - clsobj = node.Class(clsnm, jObject) + clsobj = node.Class(clsnm, jvm.jObject) self._classes[OOTYPE] = clsobj # Add fields: @@ -197,8 +191,8 @@ def gen_name(): return self._pkg(self._uniq(OBJ._name)) internm, implnm, exc_implnm = gen_name(), gen_name(), gen_name() self._object_interf = node.Interface(internm) - self._object_impl = node.Class(implnm, supercls=jObject) - self._object_exc_impl = node.Class(exc_implnm, supercls=jThrowable) + self._object_impl = node.Class(implnm, supercls=jvm.jObject) + self._object_exc_impl = node.Class(exc_implnm, supercls=jvm.jThrowable) self._object_impl.add_interface(self._object_interf) self._object_exc_impl.add_interface(self._object_interf) @@ -212,12 +206,12 @@ methodnm = "_jvm_"+fieldnm def getter_method_obj(node): - return Method.v(node, methodnm+"_g", [], fieldty) + return jvm.Method.v(node, methodnm+"_g", [], fieldty) def putter_method_obj(node): - return Method.v(node, methodnm+"_p", [fieldty], jVoid) + return jvm.Method.v(node, methodnm+"_p", [fieldty], jvm.jVoid) # Add get/put methods to the interface: - prop = Property( + prop = jvm.Property( fieldnm, getter_method_obj(self._object_interf), putter_method_obj(self._object_interf), @@ -227,7 +221,7 @@ # Generate implementations: def generate_impl(clsobj): clsnm = clsobj.name - fieldobj = Field(clsnm, fieldnm, fieldty, False, FIELDOOTY) + fieldobj = jvm.Field(clsnm, fieldnm, fieldty, False, FIELDOOTY) clsobj.add_field(fieldobj, fielddef) clsobj.add_method(node.GetterFunction( self, clsobj, getter_method_obj(clsobj), fieldobj)) @@ -288,7 +282,7 @@ arglist = [self.lltype_to_cts(ARG) for ARG in METH.ARGS if ARG is not ootype.Void] returntype = self.lltype_to_cts(METH.RESULT) - clsobj.add_abstract_method(jvmgen.Method.v( + clsobj.add_abstract_method(jvm.Method.v( clsobj, mname, arglist, returntype)) else: # if the first argument's type is not a supertype of @@ -315,7 +309,7 @@ if FIELDOOTY is ootype.Void: continue fieldty = self.lltype_to_cts(FIELDOOTY) clsobj.add_field( - jvmgen.Field(clsobj.name, fieldnm, fieldty, False, FIELDOOTY), + jvm.Field(clsobj.name, fieldnm, fieldty, False, FIELDOOTY), fielddef) def pending_class(self, OOTYPE): @@ -326,7 +320,7 @@ This is invoked when a standalone function is to be compiled. It creates a class named after the function with a single method, invoke(). This class is added to the worklist. - Returns a jvmgen.Method object that allows this function to be + Returns a jvm.Method object that allows this function to be invoked. """ if graph in self._functions: @@ -358,7 +352,7 @@ """ Like record_delegate, but the signature is in terms of java types. jargs is a list of JvmTypes, one for each argument, - and jret is a JvmType. Note that jargs does NOT include an + and jret is a Jvm. Note that jargs does NOT include an entry for the this pointer of the resulting object. """ key = (jargs, jret) @@ -416,17 +410,17 @@ # any type. _toString_methods = { - ootype.Signed:jvmgen.INTTOSTRINGI, - ootype.Unsigned:jvmgen.PYPYSERIALIZEUINT, - ootype.SignedLongLong:jvmgen.LONGTOSTRINGL, - ootype.UnsignedLongLong: jvmgen.PYPYSERIALIZEULONG, - ootype.Float:jvmgen.DOUBLETOSTRINGD, - ootype.Bool:jvmgen.PYPYSERIALIZEBOOLEAN, - ootype.Void:jvmgen.PYPYSERIALIZEVOID, - ootype.Char:jvmgen.PYPYESCAPEDCHAR, - ootype.UniChar:jvmgen.PYPYESCAPEDUNICHAR, - ootype.String:jvmgen.PYPYESCAPEDSTRING, - ootype.Unicode:jvmgen.PYPYESCAPEDUNICODE, + ootype.Signed:jvm.INTTOSTRINGI, + ootype.Unsigned:jvm.PYPYSERIALIZEUINT, + ootype.SignedLongLong:jvm.LONGTOSTRINGL, + ootype.UnsignedLongLong: jvm.PYPYSERIALIZEULONG, + ootype.Float:jvm.DOUBLETOSTRINGD, + ootype.Bool:jvm.PYPYSERIALIZEBOOLEAN, + ootype.Void:jvm.PYPYSERIALIZEVOID, + ootype.Char:jvm.PYPYESCAPEDCHAR, + ootype.UniChar:jvm.PYPYESCAPEDUNICHAR, + ootype.String:jvm.PYPYESCAPEDSTRING, + ootype.Unicode:jvm.PYPYESCAPEDUNICODE, } def toString_method_for_ootype(self, OOTYPE): @@ -443,7 +437,7 @@ to print the value of 'var'. """ - return self._toString_methods.get(OOTYPE, jvmgen.PYPYSERIALIZEOBJECT) + return self._toString_methods.get(OOTYPE, jvm.PYPYSERIALIZEOBJECT) # _________________________________________________________________ # Type translation functions @@ -463,46 +457,52 @@ # Dictionary for scalar types; in this case, if we see the key, we # will return the value ootype_to_scalar = { - ootype.Void: jvmtype.jVoid, - ootype.Signed: jvmtype.jInt, - ootype.Unsigned: jvmtype.jInt, - ootype.SignedLongLong: jvmtype.jLong, - ootype.UnsignedLongLong: jvmtype.jLong, - ootype.Bool: jvmtype.jBool, - ootype.Float: jvmtype.jDouble, - ootype.Char: jvmtype.jChar, # byte would be sufficient, but harder - ootype.UniChar: jvmtype.jChar, - ootype.Class: jvmtype.jClass, - ootype.ROOT: jvmtype.jObject, # treat like a scalar + ootype.Void: jvm.jVoid, + ootype.Signed: jvm.jInt, + ootype.Unsigned: jvm.jInt, + ootype.SignedLongLong: jvm.jLong, + ootype.UnsignedLongLong: jvm.jLong, + ootype.Bool: jvm.jBool, + ootype.Float: jvm.jDouble, + ootype.Char: jvm.jChar, # byte would be sufficient, but harder + ootype.UniChar: jvm.jChar, + ootype.Class: jvm.jClass, + ootype.ROOT: jvm.jObject, # treat like a scalar } # Dictionary for non-scalar types; in this case, if we see the key, we # will return a JvmBuiltInType based on the value ootype_to_builtin = { - ootype.String: jvmtype.jString, - ootype.Unicode: jvmtype.jString, - ootype.StringBuilder: jvmtype.jStringBuilder, - ootype.UnicodeBuilder: jvmtype.jStringBuilder, - ootype.List: jvmtype.jArrayList, - ootype.Dict: jvmtype.jHashMap, - ootype.DictItemsIterator:jvmtype.jPyPyDictItemsIterator, - ootype.CustomDict: jvmtype.jPyPyCustomDict, - ootype.WeakReference: jvmtype.jPyPyWeakRef, - ll_os.STAT_RESULT: jvmtype.jPyPyStatResult, + ootype.String: jvm.jString, + ootype.Unicode: jvm.jString, + ootype.StringBuilder: jvm.jStringBuilder, + ootype.UnicodeBuilder: jvm.jStringBuilder, + ootype.List: jvm.jArrayList, + ootype.Dict: jvm.jHashMap, + ootype.DictItemsIterator:jvm.jPyPyDictItemsIterator, + ootype.CustomDict: jvm.jPyPyCustomDict, + ootype.WeakReference: jvm.jPyPyWeakRef, + ll_os.STAT_RESULT: jvm.jPyPyStatResult, # These are some configured records that are generated by Java # code. #ootype.Record({"item0": ootype.Signed, "item1": ootype.Signed}): - #jvmtype.jPyPyRecordSignedSigned, + #jvm.jPyPyRecordSignedSigned, #ootype.Record({"item0": ootype.Float, "item1": ootype.Signed}): - #jvmtype.jPyPyRecordFloatSigned, + #jvm.jPyPyRecordFloatSigned, #ootype.Record({"item0": ootype.Float, "item1": ootype.Float}): - #jvmtype.jPyPyRecordFloatFloat, + #jvm.jPyPyRecordFloatFloat, #ootype.Record({"item0": ootype.String, "item1": ootype.String}): - #jvmtype.jPyPyRecordStringString, + #jvm.jPyPyRecordStringString, } def lltype_to_cts(self, OOT): + import sys + res = self._lltype_to_cts(OOT) + print >> sys.stderr, "lltype_to_cts(%r) -> %r" % (OOT, res) + return res + + def _lltype_to_cts(self, OOT): """ Returns an instance of JvmType corresponding to the given OOType """ @@ -510,7 +510,7 @@ if OOT in self.ootype_to_scalar: return self.ootype_to_scalar[OOT] if isinstance(OOT, lltype.Ptr) and isinstance(t.TO, lltype.OpaqueType): - return jObject + return jvm.jObject if OOT in self.ootype_to_builtin: return JvmBuiltInType(self, self.ootype_to_builtin[OOT], OOT) if isinstance(OOT, ootype.Array): @@ -536,19 +536,19 @@ assert False, "Untranslatable type %s!" % OOT ooitemtype_to_array = { - ootype.Signed : jvmtype.jIntArray, - ootype.Unsigned : jvmtype.jIntArray, - ootype.Char : jvmtype.jCharArray, - ootype.Bool : jvmtype.jByteArray, - ootype.UniChar : jvmtype.jCharArray, - ootype.String : jvmtype.jStringArray, - ootype.Void : jvmtype.jVoidArray, + ootype.Signed : jvm.jIntArray, + ootype.Unsigned : jvm.jIntArray, + ootype.Char : jvm.jCharArray, + ootype.Bool : jvm.jByteArray, + ootype.UniChar : jvm.jCharArray, + ootype.String : jvm.jStringArray, + ootype.Void : jvm.jVoidArray, } def _array_type(self, ITEM): if ITEM in self.ooitemtype_to_array: return self.ooitemtype_to_array[ITEM] - return jvmtype.jObjectArray + return jvm.jObjectArray def annotation_to_cts(self, _tp): s_tp = annotation(_tp) Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/generator.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/generator.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/generator.py Sun Mar 2 18:48:48 2008 @@ -12,261 +12,11 @@ from pypy.rlib.objectmodel import CDefinedIntSymbolic from pypy.rlib.rarithmetic import isnan, isinf from pypy.translator.oosupport.constant import push_constant -import pypy.translator.jvm.typesystem as jvmtype -from pypy.translator.jvm.typesystem import \ - JvmType, jString, jInt, jLong, jDouble, jBool, jString, \ - jPyPy, jVoid, jMath, desc_for_method, jPrintStream, jClass, jChar, \ - jObject, jByteArray, jPyPyExcWrap, jIntegerClass, jLongClass, \ - jDoubleClass, jCharClass, jStringBuilder, JvmScalarType, jArrayList, \ - jObjectArray, jPyPyInterlink, jPyPyCustomDict, jPyPyEquals, \ - jPyPyHashCode, jMap, jPyPyWeakRef, jSystem, jll_os, jPyPyInterlink, \ - jVoidArray - - -# ___________________________________________________________________________ -# JVM Opcodes: -# -# Map from symbolic name to an instance of the Opcode class - -class Opcode(object): - def __init__(self, jvmstr): - """ - flags is a set of flags (see above) that describe opcode #UPDATE - jvmstr is the name for jasmin printouts - """ - self.jvmstr = jvmstr - self.flags = None #Should flags be added to args? - - def __repr__(self): - return "" % (self.jvmstr, self.flags) - - def specialize(self, args): - """ Process the argument list according to the various flags. - Returns a tuple (OPCODE, ARGS) where OPCODE is a string representing - the new opcode, and ARGS is a list of arguments or empty tuple. - Most of these do not do anything. """ - return (self.jvmstr, args) - -class IntConstOpcode(Opcode): - """ The ICONST opcode specializes itself for small integer opcodes. """ - def specialize(self, args): - assert len(args) == 1 - if args[0] == -1: - return self.jvmstr + "_m1", () - elif args[0] >= 0 and args[0] <= 5: - return self.jvmstr + "_" + str(args[0]), () - # Non obvious: convert ICONST to LDC if the constant is out of - # range - return "ldc", args - -class VarOpcode(Opcode): - """ An Opcode which takes a variable index as an argument; specialized - to small integer indices. """ - def specialize(self, args): - assert len(args) == 1 - if args[0] >= 0 and args[0] <= 3: - return self.jvmstr + "_" + str(args[0]), () - return Opcode.specialize(self, args) - -class IntClassNameOpcode(Opcode): - """ An opcode which takes an internal class name as its argument; - the actual argument will be a JvmType instance. """ - def specialize(self, args): - args = [args[0].descriptor.int_class_name()] - return self.jvmstr, args - -class OpcodeFamily(object): - """ - Many opcodes in JVM have variants that depend on the type of the - operands; for example, one must choose the correct ALOAD, ILOAD, - or DLOAD depending on whether one is loading a reference, integer, - or double variable respectively. Each instance of this class - defines one 'family' of opcodes, such as the LOAD family shown - above, and produces Opcode objects specific to a particular type. - """ - def __init__(self, opcclass, suffix): - """ - opcclass is the opcode subclass to use (see above) when - instantiating a particular opcode - - jvmstr is the name for jasmin printouts - """ - self.opcode_class = opcclass - self.suffix = suffix - self.cache = {} +import pypy.translator.jvm.typesystem as jvm - def _o(self, prefix): - try: - return self.cache[prefix] - except KeyError: - self.cache[prefix] = obj = self.opcode_class( - prefix+self.suffix) - return obj - - def for_type(self, argtype): - """ Returns a customized opcode of this family appropriate to - 'argtype', a JvmType object. """ - - desc = argtype.descriptor - - # These are always true: - if desc[0] == 'L': return self._o("a") # Objects - if desc[0] == '[': return self._o("a") # Arrays - if desc == 'I': return self._o("i") # Integers - if desc == 'J': return self._o("l") # Integers - if desc == 'D': return self._o("d") # Doubles - if desc == 'V': return self._o("") # Void [used by RETURN] - - # Chars/Bytes/Booleans are normally represented as ints - # in the JVM, but some opcodes are different. They use a - # different OpcodeFamily (see ArrayOpcodeFamily for ex) - if desc == 'C': return self._o("i") # Characters - if desc == 'B': return self._o("i") # Bytes - if desc == 'Z': return self._o("i") # Boolean - - assert False, "Unknown argtype=%s" % repr(argtype) - raise NotImplementedError - -class ArrayOpcodeFamily(OpcodeFamily): - """ Opcode family specialized for array access instr """ - def for_type(self, argtype): - desc = argtype.descriptor - if desc == 'J': return self._o("l") # Integers - if desc == 'D': return self._o("d") # Doubles - if desc == 'C': return self._o("c") # Characters - if desc == 'B': return self._o("b") # Bytes - if desc == 'Z': return self._o("b") # Boolean (access as bytes) - return OpcodeFamily.for_type(self, argtype) - -class NewArrayOpcodeFamily(object): - def __init__(self): - # a void array is just an int, therefore oonewarray does not need to - # do anything, because it the new can just use the int argument that is - # already on the stack - self.cache = {jVoidArray: None} - - def for_type(self, arraytype): - try: - return self.cache[arraytype] - except KeyError: - pass - desc = arraytype.descriptor - if desc == '[I': - s = "newarray int" - elif desc == '[D': - s = "newarray double" - elif desc == '[C': - s = "newarray char" - elif desc == '[B': - s = "newarray byte" - else: - s = "anewarray " + arraytype.element_type.descriptor.int_class_name() - self.cache[arraytype] = obj = Opcode(s) - return obj - -NEWARRAY = NewArrayOpcodeFamily() -ARRAYLENGTH = Opcode("arraylength") - -# Define the opcodes for IFNE, IFEQ, IFLT, IF_ICMPLT, etc. The IFxx -# variants compare a single integer arg against 0, and the IF_ICMPxx -# variants compare 2 integer arguments against each other. -for cmpop in ('ne', 'eq', 'lt', 'gt', 'le', 'ge'): - ifop = "if%s" % cmpop - if_icmpop = "if_icmp%s" % cmpop - globals()[ifop.upper()] = Opcode(ifop) - globals()[if_icmpop.upper()] = Opcode(if_icmpop) - -# Compare references, either against NULL or against each other -IFNULL = Opcode('ifnull') -IFNONNULL = Opcode('ifnonnull') -IF_ACMPEQ = Opcode('if_acmpeq') -IF_ACMPNE = Opcode('if_acmpne') - -# Method invocation -INVOKESTATIC = Opcode('invokestatic') -INVOKEVIRTUAL = Opcode('invokevirtual') -INVOKESPECIAL = Opcode('invokespecial') -INVOKEINTERFACE = Opcode('invokeinterface') - -# Other opcodes -LDC = Opcode('ldc') # single-word types -LDC2 = Opcode('ldc2_w') # double-word types: doubles and longs -GOTO = Opcode('goto') -ICONST = IntConstOpcode('iconst') -ICONST_0 = Opcode('iconst_0') # sometimes convenient to refer to this directly -ACONST_NULL=Opcode('aconst_null') -DCONST_0 = Opcode('dconst_0') -DCONST_1 = Opcode('dconst_1') -LCONST_0 = Opcode('lconst_0') -LCONST_1 = Opcode('lconst_1') -GETFIELD = Opcode('getfield') -PUTFIELD = Opcode('putfield') -GETSTATIC = Opcode('getstatic') -PUTSTATIC = Opcode('putstatic') -CHECKCAST = IntClassNameOpcode('checkcast') -INEG = Opcode('ineg') -IXOR = Opcode('ixor') -IADD = Opcode('iadd') -ISUB = Opcode('isub') -IMUL = Opcode('imul') -IDIV = Opcode('idiv') -IREM = Opcode('irem') -IAND = Opcode('iand') -IOR = Opcode('ior') -ISHL = Opcode('ishl') -ISHR = Opcode('ishr') -IUSHR = Opcode('iushr') -LCMP = Opcode('lcmp') -DCMPG = Opcode('dcmpg') -DCMPL = Opcode('dcmpl') -NOP = Opcode('nop') -I2D = Opcode('i2d') -I2L = Opcode('i2l') -D2I= Opcode('d2i') -#D2L= Opcode('d2l') #PAUL -L2I = Opcode('l2i') -L2D = Opcode('l2d') -ATHROW = Opcode('athrow') -DNEG = Opcode('dneg') -DADD = Opcode('dadd') -DSUB = Opcode('dsub') -DMUL = Opcode('dmul') -DDIV = Opcode('ddiv') -DREM = Opcode('drem') -LNEG = Opcode('lneg') -LADD = Opcode('ladd') -LSUB = Opcode('lsub') -LMUL = Opcode('lmul') -LDIV = Opcode('ldiv') -LREM = Opcode('lrem') -LAND = Opcode('land') -LOR = Opcode('lor') -LXOR = Opcode('lxor') -LSHL = Opcode('lshl') -LSHR = Opcode('lshr') -LUSHR = Opcode('lushr') -NEW = IntClassNameOpcode('new') -DUP = Opcode('dup') -DUP2 = Opcode('dup2') -DUP_X1 = Opcode('dup_x1') -POP = Opcode('pop') -POP2 = Opcode('pop2') -SWAP = Opcode('swap') -INSTANCEOF= IntClassNameOpcode('instanceof') -# Loading/storing local variables -LOAD = OpcodeFamily(VarOpcode, "load") -STORE = OpcodeFamily(VarOpcode, "store") -RETURN = OpcodeFamily(Opcode, "return") - -# Loading/storing from arrays -# *NOTE*: This family is characterized by the type of the ELEMENT, -# not the type of the ARRAY. -# -# Also: here I break from convention by naming the objects ARRLOAD -# rather than ALOAD, even though the suffix is 'aload'. This is to -# avoid confusion with the ALOAD opcode. -ARRLOAD = ArrayOpcodeFamily(Opcode, "aload") -ARRSTORE = ArrayOpcodeFamily(Opcode, "astore") +# Load a few commonly used names, but prefer to use 'jvm.Name' +from pypy.translator.jvm.typesystem import \ + jPyPy, jString, jInt, jVoid # ___________________________________________________________________________ # Labels @@ -287,310 +37,6 @@ return self.label # ___________________________________________________________________________ -# Methods -# -# "Method" objects describe all the information needed to invoke a -# method. We create one for each node.Function object, as well as for -# various helper methods (defined below). To invoke a method, you -# push its arguments and then use generator.emit(methobj) where -# methobj is its Method instance. - -class Method(object): - - # Create a constructor: - def c(classty, argtypes): - return Method(classty.name, "", argtypes, jVoid, - opcode=INVOKESPECIAL) - c = staticmethod(c) - - # Create a virtual or interface method: - def v(classty, methnm, argtypes, rettype): - """ - Shorthand to create a virtual method. - 'class' - JvmType object for the class - 'methnm' - name of the method (Python string) - 'argtypes' - list of JvmType objects, one for each argument but - not the this ptr - 'rettype' - JvmType for return type - """ - assert argtypes is not None - assert rettype is not None - classnm = classty.name - if isinstance(classty, jvmtype.JvmInterfaceType): - opc = INVOKEINTERFACE - else: - assert isinstance(classty, jvmtype.JvmClassType) - opc = INVOKEVIRTUAL - return Method(classnm, methnm, argtypes, rettype, opcode=opc) - v = staticmethod(v) - - # Create a static method: - def s(classty, methnm, argtypes, rettype): - """ - Shorthand to create a static method. - 'class' - JvmType object for the class - 'methnm' - name of the method (Python string) - 'argtypes' - list of JvmType objects, one for each argument but - not the this ptr - 'rettype' - JvmType for return type - """ - assert isinstance(classty, JvmType) - classnm = classty.name - return Method(classnm, methnm, argtypes, rettype) - s = staticmethod(s) - - def __init__(self, classnm, methnm, argtypes, rettype, opcode=INVOKESTATIC): - self.opcode = opcode - self.class_name = classnm # String, ie. "java.lang.Math" - self.method_name = methnm # String "abs" - self.argument_types = argtypes # List of jvmtypes - self.return_type = rettype # jvmtype - - # Compute the method descriptior, which is a string like "()I": - argtypesdesc = [a.descriptor for a in argtypes] - rettypedesc = rettype.descriptor - self.descriptor = desc_for_method(argtypesdesc, rettypedesc) - def invoke(self, gen): - gen._instr(self.opcode, self) - def is_static(self): - return self.opcode == INVOKESTATIC - def jasmin_syntax(self): - res = "%s/%s%s" % (self.class_name.replace('.','/'), - self.method_name, - self.descriptor) - # A weird, inexplicable quirk of Jasmin syntax is that it requires - # the number of arguments after an invokeinterface call: - if self.opcode == INVOKEINTERFACE: - res += " %d" % (len(self.argument_types)+1,) - return res - -OBJHASHCODE = Method.v(jObject, 'hashCode', (), jInt) -OBJTOSTRING = Method.v(jObject, 'toString', (), jString) -OBJEQUALS = Method.v(jObject, 'equals', (jObject,), jBool) -SYSTEMGC = Method.s(jSystem, 'gc', (), jVoid) -INTTOSTRINGI = Method.s(jIntegerClass, 'toString', (jInt,), jString) -LONGTOSTRINGL = Method.s(jLongClass, 'toString', (jLong,), jString) -DOUBLETOSTRINGD = Method.s(jDoubleClass, 'toString', (jDouble,), jString) -CHARTOSTRINGC = Method.s(jCharClass, 'toString', (jChar,), jString) -MATHIABS = Method.s(jMath, 'abs', (jInt,), jInt) -IABSOVF = Method.v(jPyPy, 'abs_ovf', (jInt,), jInt) -MATHLABS = Method.s(jMath, 'abs', (jLong,), jLong) -LABSOVF = Method.v(jPyPy, 'abs_ovf', (jLong,), jLong) -MATHDABS = Method.s(jMath, 'abs', (jDouble,), jDouble) -INEGOVF = Method.v(jPyPy, 'negate_ovf', (jInt,), jInt) -LNEGOVF = Method.v(jPyPy, 'negate_ovf', (jLong,), jLong) -IADDOVF = Method.v(jPyPy, 'add_ovf', (jInt, jInt), jInt) -LADDOVF = Method.v(jPyPy, 'add_ovf', (jLong, jLong), jLong) -ISUBOVF = Method.v(jPyPy, 'subtract_ovf', (jInt, jInt), jInt) -LSUBOVF = Method.v(jPyPy, 'subtract_ovf', (jLong, jLong), jLong) -IMULOVF = Method.v(jPyPy, 'multiply_ovf', (jInt, jInt), jInt) -LMULOVF = Method.v(jPyPy, 'multiply_ovf', (jLong, jLong), jLong) -MATHFLOOR = Method.s(jMath, 'floor', (jDouble,), jDouble) -IFLOORDIVOVF = Method.v(jPyPy, 'floordiv_ovf', (jInt, jInt), jInt) -LFLOORDIVOVF = Method.v(jPyPy, 'floordiv_ovf', (jLong, jLong), jLong) -IFLOORDIVZEROVF = Method.v(jPyPy, 'floordiv_zer_ovf', (jInt, jInt), jInt) -LFLOORDIVZEROVF = Method.v(jPyPy, 'floordiv_zer_ovf', (jLong, jLong), jLong) -IREMOVF = Method.v(jPyPy, 'mod_ovf', (jInt, jInt), jInt) -LREMOVF = Method.v(jPyPy, 'mod_ovf', (jLong, jLong), jLong) -ISHLOVF = Method.v(jPyPy, 'lshift_ovf', (jInt, jInt), jInt) -LSHLOVF = Method.v(jPyPy, 'lshift_ovf', (jLong, jLong), jLong) -MATHDPOW = Method.s(jMath, 'pow', (jDouble, jDouble), jDouble) -PRINTSTREAMPRINTSTR = Method.v(jPrintStream, 'print', (jString,), jVoid) -CLASSFORNAME = Method.s(jClass, 'forName', (jString,), jClass) -CLASSISASSIGNABLEFROM = Method.v(jClass, 'isAssignableFrom', (jClass,), jBool) -STRINGBUILDERAPPEND = Method.v(jStringBuilder, 'append', - (jString,), jStringBuilder) -PYPYUINTCMP = Method.s(jPyPy, 'uint_cmp', (jInt,jInt,), jInt) -PYPYULONGCMP = Method.s(jPyPy, 'ulong_cmp', (jLong,jLong), jInt) -PYPYUINTMOD = Method.v(jPyPy, 'uint_mod', (jInt, jInt), jInt) -PYPYUINTMUL = Method.v(jPyPy, 'uint_mul', (jInt, jInt), jInt) -PYPYUINTDIV = Method.v(jPyPy, 'uint_div', (jInt, jInt), jInt) -PYPYULONGMOD = Method.v(jPyPy, 'ulong_mod', (jLong, jLong), jLong) -PYPYUINTTODOUBLE = Method.s(jPyPy, 'uint_to_double', (jInt,), jDouble) -PYPYDOUBLETOUINT = Method.s(jPyPy, 'double_to_uint', (jDouble,), jInt) -PYPYDOUBLETOLONG = Method.v(jPyPy, 'double_to_long', (jDouble,), jLong) #PAUL -PYPYLONGBITWISENEGATE = Method.v(jPyPy, 'long_bitwise_negate', (jLong,), jLong) -PYPYSTRTOINT = Method.v(jPyPy, 'str_to_int', (jString,), jInt) -PYPYSTRTOUINT = Method.v(jPyPy, 'str_to_uint', (jString,), jInt) -PYPYSTRTOLONG = Method.v(jPyPy, 'str_to_long', (jString,), jLong) -PYPYSTRTOULONG = Method.v(jPyPy, 'str_to_ulong', (jString,), jLong) -PYPYSTRTOBOOL = Method.v(jPyPy, 'str_to_bool', (jString,), jBool) -PYPYSTRTODOUBLE = Method.v(jPyPy, 'str_to_double', (jString,), jDouble) -PYPYSTRTOCHAR = Method.v(jPyPy, 'str_to_char', (jString,), jChar) -PYPYBOOLTODOUBLE = Method.v(jPyPy, 'bool_to_double', (jBool,), jDouble) -PYPYDUMP = Method.s(jPyPy, 'dump', (jString,), jVoid) -PYPYDUMPEXCWRAPPER = Method.s(jPyPy, 'dump_exc_wrapper', (jObject,), jVoid) -PYPYSERIALIZEBOOLEAN = Method.s(jPyPy, 'serialize_boolean', (jBool,), jString) -PYPYSERIALIZEUINT = Method.s(jPyPy, 'serialize_uint', (jInt,), jString) -PYPYSERIALIZEULONG = Method.s(jPyPy, 'serialize_ulonglong', (jLong,),jString) -PYPYSERIALIZEVOID = Method.s(jPyPy, 'serialize_void', (), jString) -PYPYESCAPEDCHAR = Method.s(jPyPy, 'escaped_char', (jChar,), jString) -PYPYESCAPEDUNICHAR = Method.s(jPyPy, 'escaped_unichar', (jChar,), jString) -PYPYESCAPEDSTRING = Method.s(jPyPy, 'escaped_string', (jString,), jString) -PYPYESCAPEDUNICODE = Method.s(jPyPy, 'escaped_unicode', (jString,), jString) -PYPYSERIALIZEOBJECT = Method.s(jPyPy, 'serializeObject', (jObject,), jString) -PYPYRUNTIMENEW = Method.s(jPyPy, 'RuntimeNew', (jClass,), jObject) -PYPYSTRING2BYTES = Method.s(jPyPy, 'string2bytes', (jString,), jByteArray) -PYPYARRAYTOLIST = Method.s(jPyPy, 'array_to_list', (jObjectArray,), jArrayList) -PYPYOOPARSEFLOAT = Method.v(jPyPy, 'ooparse_float', (jString,), jDouble) -OBJECTGETCLASS = Method.v(jObject, 'getClass', (), jClass) -CLASSGETNAME = Method.v(jClass, 'getName', (), jString) -CUSTOMDICTMAKE = Method.s(jPyPyCustomDict, 'make', - (jPyPyEquals, jPyPyHashCode), jPyPyCustomDict) -PYPYWEAKREFCREATE = Method.s(jPyPyWeakRef, 'create', (jObject,), jPyPyWeakRef) -PYPYWEAKREFGET = Method.s(jPyPyWeakRef, 'll_get', (), jObject) - - -# special methods for arrays that are not really methods in the JVM -# XXX slightly hackish -class ArrayMethod(Method): - def __init__(self, arraytype, methodname): - self.arraytype = arraytype - self.ootype_methodname = methodname - Method.__init__(self, "", "", self._argtypes(), self._rettype(), - opcode=None) - - def _argtypes(self): - if self.ootype_methodname == "ll_length": - return [] - elif self.ootype_methodname == "ll_getitem_fast": - return [jInt] - elif self.ootype_methodname == "ll_setitem_fast": - return [jInt, self.arraytype.element_type] - else: - assert 0, "unknown array method" - - def _rettype(self): - if self.ootype_methodname == "ll_length": - return jInt - elif self.ootype_methodname == "ll_getitem_fast": - return self.arraytype.element_type - elif self.ootype_methodname == "ll_setitem_fast": - return jVoid - else: - assert 0, "unknown array method" - - def invoke(self, gen): - if self.ootype_methodname == "ll_length": - gen._instr(ARRAYLENGTH) - elif self.ootype_methodname == "ll_getitem_fast": - gen._instr(ARRLOAD.for_type(self.arraytype.element_type)) - elif self.ootype_methodname == "ll_setitem_fast": - gen._instr(ARRSTORE.for_type(self.arraytype.element_type)) - else: - assert 0, "unknown array method" - -class VoidArrayMethod(ArrayMethod): - def _argtypes(self): - if self.ootype_methodname == "ll_length": - return [] - elif self.ootype_methodname == "ll_getitem_fast": - return [jInt] - elif self.ootype_methodname == "ll_setitem_fast": - return [jInt] - else: - assert 0, "unknown array method" - - def _rettype(self): - if self.ootype_methodname == "ll_length": - return jInt - return jVoid - - def invoke(self, gen): - if self.ootype_methodname == "ll_length": - pass - elif self.ootype_methodname == "ll_getitem_fast": - gen.emit(POP); gen.emit(POP) - elif self.ootype_methodname == "ll_setitem_fast": - gen.emit(POP); gen.emit(POP) - else: - assert 0, "unknown array method" - -# ___________________________________________________________________________ -# Fields -# -# Field objects encode information about fields. - -class Field(object): - - @staticmethod - def i(classty, fieldnm, fieldty, OOTYPE=None): - """ - Shorthand to create an instance field. - 'class' - JvmType object for the class containing the field - 'fieldnm' - name of the field (Python string) - 'fieldty' - JvmType object for the type of the field - 'OOTYPE' - optional OOTYPE object for the type of the field - """ - return Field(classty.name, fieldnm, fieldty, False, OOTYPE) - - @staticmethod - def s(classty, fieldnm, fieldty, OOTYPE=None): - """ - Shorthand to create a static field. - 'class' - JvmType object for the class containing the field - 'fieldnm' - name of the field (Python string) - 'fieldty' - JvmType object for the type of the field - 'OOTYPE' - optional OOTYPE object for the type of the field - """ - return Field(classty.name, fieldnm, fieldty, True, OOTYPE) - - def __init__(self, classnm, fieldnm, jtype, static, OOTYPE=None): - # All fields are public - self.class_name = classnm # String, ie. "java.lang.Math" - self.field_name = fieldnm # String "someField" - self.OOTYPE = OOTYPE # OOTYPE equivalent of JvmType, may be None - self.jtype = jtype # JvmType - self.is_static = static # True or False - def load(self, gen): - if self.is_static: - gen._instr(GETSTATIC, self) - else: - gen._instr(GETFIELD, self) - def store(self, gen): - if self.is_static: - gen._instr(PUTSTATIC, self) - else: - gen._instr(PUTFIELD, self) - def jasmin_syntax(self): - return "%s/%s %s" % ( - self.class_name.replace('.','/'), - self.field_name, - self.jtype.descriptor) - -class Property(object): - """ - An object which acts like a Field, but when a value is loaded or - stored it actually invokes accessor methods. - """ - def __init__(self, field_name, get_method, put_method, OOTYPE=None): - self.get_method = get_method - self.put_method = put_method - self.field_name = field_name - self.OOTYPE = OOTYPE - - # Synthesize the Field attributes from the get_method/put_method: - self.class_name = get_method.class_name - assert put_method.class_name == self.class_name - self.jtype = get_method.return_type - self.is_static = get_method.is_static - def load(self, gen): - self.get_method.invoke(gen) - def store(self, gen): - self.put_method.invoke(gen) - # jasmin_syntax is not needed, since this object itself never appears - # as an argument an Opcode - -SYSTEMOUT = Field.s(jSystem, 'out', jPrintStream) -SYSTEMERR = Field.s(jSystem, 'err', jPrintStream) -DOUBLENAN = Field.s(jDoubleClass, 'NaN', jDouble) -DOUBLEPOSINF = Field.s(jDoubleClass, 'POSITIVE_INFINITY', jDouble) -DOUBLENEGINF = Field.s(jDoubleClass, 'NEGATIVE_INFINITY', jDouble) - -PYPYINTERLINK= Field.i(jPyPy, 'interlink', jPyPyInterlink) -PYPYOS = Field.i(jPyPy, 'os', jll_os) - -# ___________________________________________________________________________ # Generator State class ClassState(object): @@ -721,8 +167,7 @@ """ self.begin_function("", [], [self.current_type()], jVoid) self.load_jvm_var(self.current_type(), 0) - jmethod = Method(self.curclass.superclass_type.name, "", - (), jVoid, opcode=INVOKESPECIAL) + jmethod = jvm.Method.c(self.curclass.superclass_type, ()) jmethod.invoke(self) def end_constructor(self): @@ -796,14 +241,14 @@ def return_val(self, jtype): """ Returns a value from top of stack of the JvmType 'jtype' """ - self._instr(RETURN.for_type(jtype)) + self._instr(jvm.RETURN.for_type(jtype)) def load_class_name(self): """ Loads the name of the *Java* class of the object on the top of the stack as a Java string. Note that the result for a PyPy generated class will look something like 'pypy.some.pkg.cls' """ - self.emit(OBJECTGETCLASS) - self.emit(CLASSGETNAME) + self.emit(jvm.OBJECTGETCLASS) + self.emit(jvm.CLASSGETNAME) def load_string(self, str): """ Pushes a Java version of a Python string onto the stack. @@ -820,7 +265,7 @@ '"') # Use LDC to load the Java version: # XXX --- support byte arrays here? Would be trickier! - self._instr(LDC, res) + self._instr(jvm.LDC, res) def load_jvm_var(self, jvartype, varidx): """ Loads from jvm slot #varidx, which is expected to hold a value of @@ -828,7 +273,7 @@ assert varidx < self.curfunc.next_offset if jvartype is jVoid: return - opc = LOAD.for_type(jvartype) + opc = jvm.LOAD.for_type(jvartype) self.add_comment(" load_jvm_jar: jvartype=%s varidx=%s" % ( repr(jvartype), repr(varidx))) self._instr(opc, varidx) @@ -838,14 +283,14 @@ type vartype """ self.add_comment(" store_jvm_jar: vartype=%s varidx=%s" % ( repr(vartype), repr(varidx))) - self._instr(STORE.for_type(vartype), varidx) + self._instr(jvm.STORE.for_type(vartype), varidx) def load_from_array(self, elemtype): """ Loads something from an array; the result will be of type 'elemtype' (and hence the array is of type 'array_of(elemtype)'), where 'elemtype' is a JvmType. Assumes that the array ref and index are already pushed onto stack (in that order). """ - self._instr(ARRLOAD.for_type(elemtype)) + self._instr(jvm.ARRLOAD.for_type(elemtype)) def store_to_array(self, elemtype): """ Stores something into an array; the result will be of type @@ -853,7 +298,7 @@ 'array_of(elemtype)'), where 'elemtype' is a JvmType. Assumes that the array ref, index, and value are already pushed onto stack (in that order).""" - self._instr(ARRLOAD.for_type(elemtype)) + self._instr(jvm.ARRLOAD.for_type(elemtype)) def unique_label(self, desc, mark=False): """ Returns an opaque, unique label object that can be passed an @@ -873,7 +318,7 @@ def load_this_ptr(self): """ Convenience method. Be sure you only call it from a virtual method, not static methods. """ - self.load_jvm_var(jObject, 0) + self.load_jvm_var(jvm.jObject, 0) def load_function_argument(self, index): """ Convenience method. Loads function argument #index; note that @@ -886,9 +331,9 @@ self.prepare_generic_argument_with_jtype(jty) def prepare_generic_argument_with_jtype(self, jty): - if jty is jvmtype.jVoid: - self.emit(ACONST_NULL) - elif isinstance(jty, JvmScalarType): + if jty is jVoid: + self.emit(jvm.ACONST_NULL) + elif isinstance(jty, jvm.JvmScalarType): self.box_value(jty) def prepare_generic_result(self, ITEMTYPE): @@ -896,9 +341,9 @@ self.prepare_generic_result_with_jtype(jresty) def prepare_generic_result_with_jtype(self, jresty): - if jresty is jvmtype.jVoid: - self.emit(POP) - elif isinstance(jresty, JvmScalarType): + if jresty is jVoid: + self.emit(jvm.POP) + elif isinstance(jresty, jvm.JvmScalarType): # Perform any un-boxing required: self.downcast_jtype(jresty.box_type) self.unbox_value(jresty) @@ -910,20 +355,21 @@ """ Assuming that an value of type jscalartype is on the stack, boxes it into an Object. """ jclasstype = jscalartype.box_type - jmethod = Method.s(jclasstype, 'valueOf', (jscalartype,), jclasstype) + jmethod = jvm.Method.s( + jclasstype, 'valueOf', (jscalartype,), jclasstype) self.emit(jmethod) def unbox_value(self, jscalartype): """ Assuming that a boxed value of type jscalartype is on the stack, unboxes it. """ jclasstype = jscalartype.box_type - jmethod = Method.v( + jmethod = jvm.Method.v( jclasstype, jscalartype.unbox_method, (), jscalartype) self.emit(jmethod) def swap(self): """ Swaps the two words highest on the stack. """ - self.emit(SWAP) + self.emit(jvm.SWAP) # __________________________________________________________________ # Exception Handling @@ -976,14 +422,14 @@ _equals = { ootype.Void: (None,None), - ootype.SignedLongLong: (LCMP,IFEQ), - ootype.UnsignedLongLong: (LCMP,IFEQ), - ootype.Float: (DCMPG,IFEQ), - ootype.Signed: (None,IF_ICMPNE), - ootype.Unsigned: (None,IF_ICMPNE), - ootype.Bool: (None,IF_ICMPNE), - ootype.Char: (None,IF_ICMPNE), - ootype.UniChar: (None,IF_ICMPNE), + ootype.SignedLongLong: (jvm.LCMP, jvm.IFEQ), + ootype.UnsignedLongLong: (jvm.LCMP, jvm.IFEQ), + ootype.Float: (jvm.DCMPG, jvm.IFEQ), + ootype.Signed: (None,jvm.IF_ICMPNE), + ootype.Unsigned: (None,jvm.IF_ICMPNE), + ootype.Bool: (None,jvm.IF_ICMPNE), + ootype.Char: (None,jvm.IF_ICMPNE), + ootype.UniChar: (None,jvm.IF_ICMPNE), } def compare_values(self, OOTYPE, unequal_lbl): """ Assumes that two instances of OOTYPE are pushed on the stack; @@ -993,14 +439,14 @@ if i1: self.emit(i1) if i2: self.emit(i2, unequal_lbl) return - self.emit(OBJEQUALS) - self.emit(IFEQ, unequal_lbl) + self.emit(jvm.OBJEQUALS) + self.emit(jvm.IFEQ, unequal_lbl) _hash = { - ootype.Void: ICONST_0, - ootype.SignedLongLong: L2I, - ootype.UnsignedLongLong: L2I, - ootype.Float: D2I, + ootype.Void: jvm.ICONST_0, + ootype.SignedLongLong: jvm.L2I, + ootype.UnsignedLongLong: jvm.L2I, + ootype.Float: jvm.D2I, ootype.Signed: None, ootype.Unsigned: None, ootype.Bool: None, @@ -1014,7 +460,7 @@ i1 = self._hash[OOTYPE] if i1: self.emit(i1) return - self.emit(OBJHASHCODE) + self.emit(jvm.OBJHASHCODE) # __________________________________________________________________ # Generator methods and others that are invoked by MicroInstructions @@ -1032,13 +478,13 @@ if isinstance(instr, str): return getattr(self, instr)(*args) - if isinstance(instr, Opcode): + if isinstance(instr, jvm.Opcode): return self._instr(instr, *args) - if isinstance(instr, Method): + if isinstance(instr, jvm.BaseMethod): return instr.invoke(self) - if isinstance(instr, Field) or isinstance(instr, Property): + if isinstance(instr, jvm.Field) or isinstance(instr, jvm.Property): return instr.load(self) raise Exception("Unknown object in call to emit(): "+repr(instr)) @@ -1046,6 +492,8 @@ def _var_data(self, v): # Determine java type: jty = self.db.lltype_to_cts(v.concretetype) + import sys + print >> sys.stderr, "_var_data(%s) -> %r" % (v.name, jty) # Determine index in stack frame slots: # note that arguments and locals can be treated the same here return jty, self.curfunc.var_offset(v, jty) @@ -1094,11 +542,11 @@ self.downcast_jtype(jtype) def downcast_jtype(self, jtype): - self._instr(CHECKCAST, jtype) + self._instr(jvm.CHECKCAST, jtype) def instanceof(self, TYPE): jtype = self.db.lltype_to_cts(TYPE) - self._instr(INSTANCEOF, jtype) + self._instr(jvm.INSTANCEOF, jtype) # included for compatibility with oosupport, but instanceof_jtype # follows our naming convention better @@ -1106,22 +554,22 @@ return self.instanceof_jtype(jtype) def instanceof_jtype(self, jtype): - self._instr(INSTANCEOF, jtype) + self._instr(jvm.INSTANCEOF, jtype) def branch_unconditionally(self, target_label): self.goto(target_label) def branch_conditionally(self, cond, target_label): if cond: - self._instr(IFNE, target_label) + self._instr(jvm.IFNE, target_label) else: - self._instr(IFEQ, target_label) + self._instr(jvm.IFEQ, target_label) def branch_if_equal(self, target_label): - self._instr(IF_ICMPEQ, target_label) + self._instr(jvm.IF_ICMPEQ, target_label) def branch_if_not_equal(self, target_label): - self._instr(IF_ICMPNE, target_label) + self._instr(jvm.IF_ICMPNE, target_label) def call_graph(self, graph): mthd = self.db.pending_function(graph) @@ -1133,7 +581,7 @@ mthd.invoke(self) # Check if we have to convert the result type at all: - gener = jvmtype.Generifier(OOCLASS) + gener = jvm.Generifier(OOCLASS) RETTYPE = gener.full_types(method_name)[1] jrettype = self.db.lltype_to_cts(RETTYPE) if jrettype != mthd.return_type: @@ -1148,7 +596,7 @@ # If necessary, load the ll_os object pointer instead: if module == 'll_os': - PYPYOS.load(self) + jvm.PYPYOS.load(self) def call_primitive(self, op, module, name): callee = op.args[0].value @@ -1157,7 +605,7 @@ # Determine what class the primitive is implemented in: if module == 'll_os': - jcls = jll_os + jcls = jvm.jll_os else: jcls = jPyPy @@ -1167,9 +615,9 @@ # the method cannot directly refer to the Java type in # .java source, as its name is not yet known. if jrettype.is_generated(): - mthd = Method.v(jcls, name, jargtypes, jObject) + mthd = jvm.Method.v(jcls, name, jargtypes, jvm.jObject) else: - mthd = Method.v(jcls, name, jargtypes, jrettype) + mthd = jvm.Method.v(jcls, name, jargtypes, jrettype) # Invoke the method self.emit(mthd) @@ -1186,13 +634,13 @@ cts_type = self.db.lltype_to_cts(OOTYPE) # treat all objects the same: - if isinstance(cts_type, jvmtype.JvmClassType): - cts_type = jObject + if isinstance(cts_type, jvm.JvmClassType): + cts_type = jvm.jObject - mthd = Method.v(jPyPy, 'oostring', [cts_type, jInt], jString) + mthd = jvm.Method.v(jPyPy, 'oostring', [cts_type, jInt], jString) self.emit(mthd) if self.db.using_byte_array: - self.emit(PYPYSTRING2BYTES) + self.emit(jvm.PYPYSTRING2BYTES) def prepare_call_oounicode(self, OOTYPE): # Load the PyPy object pointer onto the stack: @@ -1200,10 +648,10 @@ def call_oounicode(self, OOTYPE): cts_type = self.db.lltype_to_cts(OOTYPE) - mthd = Method.v(jPyPy, 'oounicode', [cts_type], jString) + mthd = jvm.Method.v(jPyPy, 'oounicode', [cts_type], jString) self.emit(mthd) if self.db.using_byte_array: - self.emit(PYPYSTRING2BYTES) + self.emit(jvm.PYPYSTRING2BYTES) def new(self, TYPE): jtype = self.db.lltype_to_cts(TYPE) @@ -1211,43 +659,43 @@ def new_with_jtype(self, jtype, ctor=None): if ctor is None: - ctor = Method.c(jtype, ()) - self.emit(NEW, jtype) - self.emit(DUP) + ctor = jvm.Method.c(jtype, ()) + self.emit(jvm.NEW, jtype) + self.emit(jvm.DUP) self.emit(ctor) def oonewarray(self, TYPE, length): jtype = self.db.lltype_to_cts(TYPE) self.load(length) - self.emit(NEWARRAY.for_type(jtype)) + jtype.make(self) def instantiate(self): - self.emit(PYPYRUNTIMENEW) + self.emit(jvm.PYPYRUNTIMENEW) def getclassobject(self, OOINSTANCE): - jvmtype = self.db.lltype_to_cts(OOINSTANCE) - self.load_string(jvmtype.name) - CLASSFORNAME.invoke(self) + jtype = self.db.lltype_to_cts(OOINSTANCE) + self.load_string(jtype.name) + jvm.CLASSFORNAME.invoke(self) def dup(self, OOTYPE): - jvmtype = self.db.lltype_to_cts(OOTYPE) - self.dup_jtype(jvmtype) + jtype = self.db.lltype_to_cts(OOTYPE) + self.dup_jtype(jtype) - def dup_jtype(self, jvmtype): - if jvmtype.descriptor.type_width() == 1: - self.emit(DUP) + def dup_jtype(self, jtype): + if jtype.descriptor.type_width() == 1: + self.emit(jvm.DUP) else: - self.emit(DUP2) + self.emit(jvm.DUP2) def pop(self, OOTYPE): - jvmtype = self.db.lltype_to_cts(OOTYPE) - if jvmtype.descriptor.type_width() == 1: - self.emit(POP) + jtype = self.db.lltype_to_cts(OOTYPE) + if jtype.descriptor.type_width() == 1: + self.emit(jvm.POP) else: - self.emit(POP2) + self.emit(jvm.POP2) def push_null(self, OOTYPE): - self.emit(ACONST_NULL) + self.emit(jvm.ACONST_NULL) # we can't assume MALLOC_ZERO_FILLED, because for scalar type the # default item for ArrayList is null, not e.g. Integer(0) or @@ -1260,16 +708,16 @@ if TYPE is ootype.Void: return elif isinstance(value, CDefinedIntSymbolic): - self.emit(ICONST, self.DEFINED_INT_SYMBOLICS[value.expr]) + self.emit(jvm.ICONST, self.DEFINED_INT_SYMBOLICS[value.expr]) elif TYPE in (ootype.Bool, ootype.Signed): - self.emit(ICONST, int(value)) + self.emit(jvm.ICONST, int(value)) elif TYPE is ootype.Unsigned: # Converts the unsigned int into its corresponding signed value: if value > 0x7FFFFFFF: value = -((int(value) ^ 0xFFFFFFFF)+1) - self.emit(ICONST, value) + self.emit(jvm.ICONST, value) elif TYPE is ootype.Char or TYPE is ootype.UniChar: - self.emit(ICONST, ord(value)) + self.emit(jvm.ICONST, ord(value)) elif TYPE is ootype.SignedLongLong: self._push_long_constant(long(value)) elif TYPE is ootype.UnsignedLongLong: @@ -1281,7 +729,7 @@ self._push_double_constant(float(value)) elif TYPE in (ootype.String, ootype.Unicode): if value == ootype.null(TYPE): - self.emit(ACONST_NULL) + self.emit(jvm.ACONST_NULL) else: self.load_string(value._str) else: @@ -1289,25 +737,25 @@ def _push_long_constant(self, value): if value == 0: - self.emit(LCONST_0) + self.emit(jvm.LCONST_0) elif value == 1: - self.emit(LCONST_1) + self.emit(jvm.LCONST_1) else: - self.emit(LDC2, value) + self.emit(jvm.LDC2, value) def _push_double_constant(self, value): if isnan(value): - DOUBLENAN.load(self) + jvm.DOUBLENAN.load(self) elif isinf(value): - if value > 0: DOUBLEPOSINF.load(self) - else: DOUBLENEGINF.load(self) + if value > 0: jvm.DOUBLEPOSINF.load(self) + else: jvm.DOUBLENEGINF.load(self) elif value == 0.0: - self.emit(DCONST_0) + self.emit(jvm.DCONST_0) elif value == 1.0: - self.emit(DCONST_1) + self.emit(jvm.DCONST_1) else: # Big hack to avoid exponential notation: - self.emit(LDC2, "%22.22f" % value) + self.emit(jvm.LDC2, "%22.22f" % value) def create_weakref(self, OOTYPE): """ @@ -1317,7 +765,7 @@ The result will be that at the top of the stack is a weak reference. """ self.prepare_generic_argument(OOTYPE) - self.emit(PYPYWEAKREFCREATE) + self.emit(jvm.PYPYWEAKREFCREATE) def deref_weakref(self, OOTYPE): """ @@ -1325,7 +773,7 @@ that this weak ref is a pointer to. OOTYPE is the kind of object you had a weak reference to. """ - self.emit(PYPYWEAKREFGET) + self.emit(jvm.PYPYWEAKREFGET) self.prepare_generic_result(OOTYPE) # __________________________________________________________________ @@ -1333,30 +781,30 @@ def throw(self): """ Throw the object from top of the stack as an exception """ - self._instr(ATHROW) + self._instr(jvm.ATHROW) def iabs(self): - MATHIABS.invoke(self) + jvm.MATHIABS.invoke(self) def dbl_abs(self): - MATHDABS.invoke(self) + jvm.MATHDABS.invoke(self) def bitwise_negate(self): """ Invert all the bits in the "int" on the top of the stack """ - self._instr(ICONST, -1) - self._instr(IXOR) + self._instr(jvm.ICONST, -1) + self._instr(jvm.IXOR) def goto(self, label): """ Jumps unconditionally """ - self._instr(GOTO, label) + self._instr(jvm.GOTO, label) def goto_if_true(self, label): """ Jumps if the top of stack is true """ - self._instr(IFNE, label) + self._instr(jvm.IFNE, label) def goto_if_false(self, label): """ Jumps if the top of stack is false """ - self._instr(IFEQ, label) + self._instr(jvm.IFEQ, label) ##### Comparison methods @@ -1371,27 +819,27 @@ midlbl = self.unique_label('cmpop') endlbl = self.unique_label('cmpop') self._instr(cmpopcode, midlbl) - self._instr(ICONST, 0) - self._instr(GOTO, endlbl) + self._instr(jvm.ICONST, 0) + self._instr(jvm.GOTO, endlbl) self.mark(midlbl) - self._instr(ICONST, 1) + self._instr(jvm.ICONST, 1) self.mark(endlbl) - is_null = lambda self: self._compare_op(IFNULL) - is_not_null = lambda self: self._compare_op(IFNONNULL) + is_null = lambda self: self._compare_op(jvm.IFNULL) + is_not_null = lambda self: self._compare_op(jvm.IFNONNULL) - ref_is_eq = lambda self: self._compare_op(IF_ACMPEQ) - ref_is_neq = lambda self: self._compare_op(IF_ACMPNEQ) + ref_is_eq = lambda self: self._compare_op(jvm.IF_ACMPEQ) + ref_is_neq = lambda self: self._compare_op(jvm.IF_ACMPNEQ) - logical_not = lambda self: self._compare_op(IFEQ) + logical_not = lambda self: self._compare_op(jvm.IFEQ) equals_zero = logical_not - not_equals_zero = lambda self: self._compare_op(IFNE) - equals = lambda self: self._compare_op(IF_ICMPEQ) - not_equals = lambda self: self._compare_op(IF_ICMPNE) - less_than = lambda self: self._compare_op(IF_ICMPLT) - greater_than = lambda self: self._compare_op(IF_ICMPGT) - less_equals = lambda self: self._compare_op(IF_ICMPLE) - greater_equals = lambda self: self._compare_op(IF_ICMPGE) + not_equals_zero = lambda self: self._compare_op(jvm.IFNE) + equals = lambda self: self._compare_op(jvm.IF_ICMPEQ) + not_equals = lambda self: self._compare_op(jvm.IF_ICMPNE) + less_than = lambda self: self._compare_op(jvm.IF_ICMPLT) + greater_than = lambda self: self._compare_op(jvm.IF_ICMPGT) + less_equals = lambda self: self._compare_op(jvm.IF_ICMPLE) + greater_equals = lambda self: self._compare_op(jvm.IF_ICMPGE) def _uint_compare_op(self, cmpopcode): PYPYUINTCMP.invoke(self) @@ -1399,33 +847,33 @@ u_equals = equals u_not_equals = not_equals - u_less_than = lambda self: self._uint_compare_op(IFLT) - u_greater_than = lambda self: self._uint_compare_op(IFGT) - u_less_equals = lambda self: self._uint_compare_op(IFLE) - u_greater_equals = lambda self: self._uint_compare_op(IFGE) + u_less_than = lambda self: self._uint_compare_op(jvm.IFLT) + u_greater_than = lambda self: self._uint_compare_op(jvm.IFGT) + u_less_equals = lambda self: self._uint_compare_op(jvm.IFLE) + u_greater_equals = lambda self: self._uint_compare_op(jvm.IFGE) def _dbl_compare_op(self, cmpopcode): # XXX --- NaN behavior? - self.emit(DCMPG) + self.emit(jvm.DCMPG) self._compare_op(cmpopcode) - dbl_equals = lambda self: self._dbl_compare_op(IFEQ) - dbl_not_equals = lambda self: self._dbl_compare_op(IFNE) - dbl_less_than = lambda self: self._dbl_compare_op(IFLT) - dbl_greater_than = lambda self: self._dbl_compare_op(IFGT) - dbl_less_equals = lambda self: self._dbl_compare_op(IFLE) - dbl_greater_equals = lambda self: self._dbl_compare_op(IFGE) + dbl_equals = lambda self: self._dbl_compare_op(jvm.IFEQ) + dbl_not_equals = lambda self: self._dbl_compare_op(jvm.IFNE) + dbl_less_than = lambda self: self._dbl_compare_op(jvm.IFLT) + dbl_greater_than = lambda self: self._dbl_compare_op(jvm.IFGT) + dbl_less_equals = lambda self: self._dbl_compare_op(jvm.IFLE) + dbl_greater_equals = lambda self: self._dbl_compare_op(jvm.IFGE) def _long_compare_op(self, cmpopcode): - self.emit(LCMP) + self.emit(jvm.LCMP) self._compare_op(cmpopcode) - long_equals = lambda self: self._long_compare_op(IFEQ) - long_not_equals = lambda self: self._long_compare_op(IFNE) - long_less_than = lambda self: self._long_compare_op(IFLT) - long_greater_than = lambda self: self._long_compare_op(IFGT) - long_less_equals = lambda self: self._long_compare_op(IFLE) - long_greater_equals = lambda self: self._long_compare_op(IFGE) + long_equals = lambda self: self._long_compare_op(jvm.IFEQ) + long_not_equals = lambda self: self._long_compare_op(jvm.IFNE) + long_less_than = lambda self: self._long_compare_op(jvm.IFLT) + long_greater_than = lambda self: self._long_compare_op(jvm.IFGT) + long_less_equals = lambda self: self._long_compare_op(jvm.IFLE) + long_greater_equals = lambda self: self._long_compare_op(jvm.IFGE) def _ulong_compare_op(self, cmpopcode): PYPYULONGCMP.invoke(self) @@ -1433,10 +881,10 @@ ulong_equals = long_equals ulong_not_equals = long_not_equals - ulong_less_than = lambda self: self._ulong_compare_op(IFLT) - ulong_greater_than = lambda self: self._ulong_compare_op(IFGT) - ulong_less_equals = lambda self: self._ulong_compare_op(IFLE) - ulong_greater_equals = lambda self: self._ulong_compare_op(IFGE) + ulong_less_than = lambda self: self._ulong_compare_op(jvm.IFLT) + ulong_greater_than = lambda self: self._ulong_compare_op(jvm.IFGT) + ulong_less_equals = lambda self: self._ulong_compare_op(jvm.IFLE) + ulong_greater_equals = lambda self: self._ulong_compare_op(jvm.IFGE) class JasminGenerator(JVMGenerator): Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/metavm.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/metavm.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/metavm.py Sun Mar 2 18:48:48 2008 @@ -1,8 +1,7 @@ from pypy.rpython.ootypesystem import ootype from pypy.translator.oosupport.metavm import MicroInstruction from pypy.translator.jvm.typesystem import JvmScalarType, JvmClassType -import pypy.translator.jvm.generator as jvmgen -import pypy.translator.jvm.typesystem as jvmtype +import pypy.translator.jvm.typesystem as jvm from pypy.translator.jvm.builtin import JvmBuiltInType class _IndirectCall(MicroInstruction): @@ -73,8 +72,8 @@ just find the class to throw normally, but I don't know how. """ self.java_exc = jexc - self.pypy_method = jvmgen.Method.v( - jvmtype.jPyPyInterlink, pexcmthd, [], jvmtype.jVoid) + self.pypy_method = jvm.Method.v( + jvm.jPyPyInterlink, pexcmthd, [], jvm.jVoid) self.instruction = inst def render(self, gen, op): @@ -88,16 +87,16 @@ gen.goto(donelbl) # } catch (JavaExceptionType) { gen.mark(catchlbl) - gen.emit(jvmgen.POP) # throw away the exception object + gen.emit(jvm.POP) # throw away the exception object gen.push_pypy() # load the PyPy object - gen.emit(jvmgen.PYPYINTERLINK) # load the interlink field from it + gen.emit(jvm.PYPYINTERLINK) # load the interlink field from it gen.emit(self.pypy_method) # invoke the method # Note: these instructions will never execute, as we expect # the pypy_method to throw an exception and not to return. We # need them here to satisfy the Java verifier, however, as it # does not know that the pypy_method will never return. - gen.emit(jvmgen.ACONST_NULL) - gen.emit(jvmgen.ATHROW) + gen.emit(jvm.ACONST_NULL) + gen.emit(jvm.ATHROW) # } gen.mark(donelbl) @@ -126,7 +125,7 @@ def render(self, generator, op): self._load_func(generator, *op.args[1:4]) self._load_func(generator, *op.args[4:7]) - generator.emit(jvmgen.CUSTOMDICTMAKE) + generator.emit(jvm.CUSTOMDICTMAKE) NewCustomDict = _NewCustomDict() #XXX These classes have been adapted to the new @@ -148,8 +147,8 @@ CASTS = { # FROM TO - (ootype.Signed, ootype.UnsignedLongLong): jvmgen.I2L, - (ootype.SignedLongLong, ootype.Signed): jvmgen.L2I, + (ootype.Signed, ootype.UnsignedLongLong): jvm.I2L, + (ootype.SignedLongLong, ootype.Signed): jvm.L2I, (ootype.UnsignedLongLong, ootype.SignedLongLong): None, } Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/methods.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/methods.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/methods.py Sun Mar 2 18:48:48 2008 @@ -7,8 +7,7 @@ """ -import pypy.translator.jvm.generator as jvmgen -import pypy.translator.jvm.typesystem as jvmtype +import pypy.translator.jvm.typesystem as jvm from pypy.rpython.ootypesystem import ootype, rclass class BaseDumpMethod(object): @@ -19,7 +18,7 @@ self.clsobj = clsobj self.name = "toString" self.jargtypes = [clsobj] - self.jrettype = jvmtype.jString + self.jrettype = jvm.jString def _print_field_value(self, fieldnm, FIELDOOTY): self.gen.load_this_ptr() @@ -27,21 +26,21 @@ fieldobj.load(self.gen) dumpmethod = self.db.toString_method_for_ootype(FIELDOOTY) self.gen.emit(dumpmethod) - self.gen.emit(jvmgen.STRINGBUILDERAPPEND) + self.gen.emit(jvm.STRINGBUILDERAPPEND) def _print(self, str): self.gen.load_string(str) - self.gen.emit(jvmgen.STRINGBUILDERAPPEND) + self.gen.emit(jvm.STRINGBUILDERAPPEND) def render(self, gen): self.gen = gen gen.begin_function( self.name, (), self.jargtypes, self.jrettype, static=False) - gen.new_with_jtype(jvmtype.jStringBuilder) + gen.new_with_jtype(jvm.jStringBuilder) self._render_guts(gen) - gen.emit(jvmgen.OBJTOSTRING) - gen.emit(jvmgen.RETURN.for_type(jvmtype.jString)) + gen.emit(jvm.OBJTOSTRING) + gen.emit(jvm.RETURN.for_type(jvm.jString)) gen.end_function() self.gen = None @@ -117,8 +116,8 @@ self.OOCLASS = OOCLASS self.clsobj = clsobj self.name = "equals" - self.jargtypes = [clsobj, jvmtype.jObject] - self.jrettype = jvmtype.jBool + self.jargtypes = [clsobj, jvm.jObject] + self.jrettype = jvm.jBool def render(self, gen): self.gen = gen @@ -156,10 +155,10 @@ # Return true or false as appropriate gen.push_primitive_constant(ootype.Bool, True) - gen.return_val(jvmtype.jBool) + gen.return_val(jvm.jBool) gen.mark(unequal_lbl) gen.push_primitive_constant(ootype.Bool, False) - gen.return_val(jvmtype.jBool) + gen.return_val(jvm.jBool) gen.end_function() @@ -171,7 +170,7 @@ self.clsobj = clsobj self.name = "hashCode" self.jargtypes = [clsobj] - self.jrettype = jvmtype.jInt + self.jrettype = jvm.jInt def render(self, gen): self.gen = gen @@ -194,10 +193,10 @@ gen.hash_value(FIELDOOTY) # XOR that with the main hash - gen.emit(jvmgen.IXOR) + gen.emit(jvm.IXOR) # Return the final hash - gen.return_val(jvmtype.jInt) + gen.return_val(jvm.jInt) gen.end_function() Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/node.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/node.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/node.py Sun Mar 2 18:48:48 2008 @@ -34,7 +34,7 @@ from pypy.translator.oosupport.constant import \ push_constant -import pypy.translator.jvm.generator as jvmgen +import pypy.translator.jvm.typesystem as jvm from pypy.translator.jvm.log import log class Node(object): @@ -79,14 +79,14 @@ # XXX --- perhaps this table would be better placed in typesystem.py # so as to constrain the knowledge of lltype and ootype _type_conversion_methods = { - ootype.Signed:jvmgen.PYPYSTRTOINT, - ootype.Unsigned:jvmgen.PYPYSTRTOUINT, - lltype.SignedLongLong:jvmgen.PYPYSTRTOLONG, - lltype.UnsignedLongLong:jvmgen.PYPYSTRTOULONG, - ootype.Bool:jvmgen.PYPYSTRTOBOOL, - ootype.Float:jvmgen.PYPYSTRTODOUBLE, - ootype.Char:jvmgen.PYPYSTRTOCHAR, - ootype.UniChar:jvmgen.PYPYSTRTOCHAR, + ootype.Signed:jvm.PYPYSTRTOINT, + ootype.Unsigned:jvm.PYPYSTRTOUINT, + lltype.SignedLongLong:jvm.PYPYSTRTOLONG, + lltype.UnsignedLongLong:jvm.PYPYSTRTOULONG, + ootype.Bool:jvm.PYPYSTRTOBOOL, + ootype.Float:jvm.PYPYSTRTODOUBLE, + ootype.Char:jvm.PYPYSTRTOCHAR, + ootype.UniChar:jvm.PYPYSTRTOCHAR, ootype.String:None } @@ -101,12 +101,11 @@ # # 2. Run the initialization method for the constant class. # - gen.begin_function( - '', (), [], jVoid, static=True) - gen.emit(jvmgen.NEW, jPyPy) - gen.emit(jvmgen.DUP) + gen.begin_function('', (), [], jVoid, static=True) + gen.emit(jvm.NEW, jPyPy) + gen.emit(jvm.DUP) gen.new_with_jtype(gen.db.jInterlinkImplementation) - gen.emit(jvmgen.Method.c(jPyPy, [jPyPyInterlink])) + gen.emit(jvm.Method.c(jPyPy, [jPyPyInterlink])) gen.db.pypy_field.store(gen) gen.db.constant_generator.runtime_init(gen) gen.return_val(jVoid) @@ -133,7 +132,7 @@ conv = self._type_conversion_methods[arg.concretetype] if conv: gen.push_pypy() gen.load_jvm_var(jStringArray, 0) - gen.emit(jvmgen.ICONST, i) + gen.emit(jvm.ICONST, i) gen.load_from_array(jString) if conv: gen.emit(conv) else: @@ -143,7 +142,7 @@ assert isinstance(arg0.concretetype, ootype.List), str(arg0.concretetype) assert arg0.concretetype.ITEM is ootype.String gen.load_jvm_var(jStringArray, 0) - gen.emit(jvmgen.PYPYARRAYTOLIST) + gen.emit(jvm.PYPYARRAYTOLIST) # Generate a call to this method gen.emit(self.db.pending_function(self.graph)) @@ -161,13 +160,13 @@ gen.add_comment('Invoking dump method for result of type ' +str(RESOOTYPE)) gen.emit(dumpmethod) # generate the string - gen.emit(jvmgen.PYPYDUMP) # dump to stdout + gen.emit(jvm.PYPYDUMP) # dump to stdout gen.goto(done_printing) gen.end_try() jexc = self.db.exception_root_object() gen.begin_catch(jexc) - gen.emit(jvmgen.PYPYDUMPEXCWRAPPER) # dumps to stdout + gen.emit(jvm.PYPYDUMPEXCWRAPPER) # dumps to stdout gen.end_catch() gen.mark(done_printing) @@ -188,12 +187,12 @@ name = None def render(self, gen): - """ Uses the gen argument, a jvmgen.Generator, to create the + """ Uses the gen argument, a jvm.Generator, to create the appropriate JVM assembly for this method. """ raise NotImplementedError def method(self): - """ Returns a jvmgen.Method object that would allow this + """ Returns a jvm.Method object that would allow this function to be invoked. """ raise NotImplementedError @@ -262,12 +261,12 @@ return self.generator.unique_label(prefix) def method(self): - """ Returns a jvmgen.Method that can invoke this function """ + """ Returns a jvm.Method that can invoke this function """ if not self.is_method: - ctor = jvmgen.Method.s + ctor = jvm.Method.s startidx = 0 else: - ctor = jvmgen.Method.v + ctor = jvm.Method.v startidx = 1 return ctor(self.classty, self.name, self.jargtypes[startidx:], self.jrettype) @@ -334,7 +333,7 @@ else: # the exception value is on the stack, store it in the proper place if isinstance(link.last_exception, flowmodel.Variable): - self.ilasm.emit(jvmgen.DUP) + self.ilasm.emit(jvm.DUP) self.ilasm.store(link.last_exc_value) fld = self.db.lltype_to_cts(rclass.OBJECT).lookup_field('meta') self.ilasm.emit(fld) @@ -394,9 +393,9 @@ def _trace(self, str, writeline=False): if writeline: str += '\n' - jvmgen.SYSTEMERR.load(self.generator) + jvm.SYSTEMERR.load(self.generator) self.generator.load_string(str) - jvmgen.PRINTSTREAMPRINTSTR.invoke(self.generator) + jvm.PRINTSTREAMPRINTSTR.invoke(self.generator) def _is_printable(self, res): @@ -431,10 +430,10 @@ res.concretetype) self._trace(" "+prompt+": ") - self.generator.emit(jvmgen.SYSTEMERR) + self.generator.emit(jvm.SYSTEMERR) self.generator.load(res) self.generator.emit(jmethod) - self.generator.emit(jvmgen.PRINTSTREAMPRINTSTR) + self.generator.emit(jvm.PRINTSTREAMPRINTSTR) self._trace("\n") def _trace_enabled(self): @@ -473,7 +472,7 @@ self.java_return_type = jrettype self.dump_method = ConstantStringDumpMethod( self, "StaticMethodInterface") - self.invoke_method_obj = jvmgen.Method.v( + self.invoke_method_obj = jvm.Method.v( self, 'invoke', self.java_argument_types[1:], self.java_return_type) @@ -481,7 +480,7 @@ raise KeyError(fieldnm) # no fields def lookup_method(self, methodnm): - """ Given the method name, returns a jvmgen.Method object """ + """ Given the method name, returns a jvm.Method object """ assert isinstance(self.java_return_type, JvmType) if methodnm == 'invoke': return self.invoke_method_obj @@ -575,9 +574,9 @@ if bound_to_jty: self.bound_to_jty = bound_to_jty - self.bound_to_fld = jvmgen.Field( + self.bound_to_fld = jvm.Field( self.name, 'bound_to', bound_to_jty, False) - self.bind_method = jvmgen.Method.s( + self.bind_method = jvm.Method.s( self, 'bind', (self.bound_to_jty,), self) else: self.bound_to_jty = None @@ -608,7 +607,7 @@ gen.begin_function( 'bind', [], (self.bound_to_jty,), self, static=True) gen.new_with_jtype(self) - gen.emit(jvmgen.DUP) + gen.emit(jvm.DUP) gen.load_jvm_var(self.bound_to_jty, 0) self.bound_to_fld.store(gen) gen.return_val(self) @@ -688,10 +687,10 @@ JvmGeneratedClassType.__init__(self, name) self.rendered = False # has rendering occurred? self.abstract = False # is this an abstract class? - self.fields = {} # maps field name to jvmgen.Field object + self.fields = {} # maps field name to jvm.Field object self.interfaces = [] # list of JvmTypes self.methods = {} # maps method name to a Function object* - self.abstract_methods = {} # maps method name to jvmgen.Method object + self.abstract_methods = {} # maps method name to jvm.Method object self.set_super_class(supercls) # * --- actually maps to an object that defines the @@ -711,9 +710,9 @@ self.throwable = True def add_field(self, fieldobj, fielddef): - """ Creates a new field accessed via the jvmgen.Field + """ Creates a new field accessed via the jvm.Field descriptor 'fieldobj'. Must be called before render().""" - assert not self.rendered and isinstance(fieldobj, jvmgen.Field) + assert not self.rendered and isinstance(fieldobj, jvm.Field) self.fields[fieldobj.field_name] = (fieldobj, fielddef) def add_interface(self, inter): @@ -726,7 +725,7 @@ return self.super_class.lookup_field(fieldnm) def lookup_method(self, methodnm): - """ Given the method name, returns a jvmgen.Method object """ + """ Given the method name, returns a jvm.Method object """ if methodnm in self.methods: return self.methods[methodnm].method() if methodnm in self.abstract_methods: @@ -742,7 +741,7 @@ def add_abstract_method(self, jmethod): """ Adds an abstract method to our list of methods; jmethod should - be a jvmgen.Method object """ + be a jvm.Method object """ assert jmethod.method_name not in self.methods self.abstract = True self.abstract_methods[jmethod.method_name] = jmethod @@ -789,7 +788,7 @@ """ interlink: the JvmType of the Interlink implementation name: the name of the method - helper: a jvmgen.Method object for the helper func we should invoke + helper: a jvm.Method object for the helper func we should invoke """ self.interlink = interlink self.name = name @@ -803,7 +802,7 @@ else: self.return_type = self.helper.return_type - self.method_obj = jvmgen.Method.v(interlink, + self.method_obj = jvm.Method.v(interlink, self.name, self.helper.argument_types, self.return_type) Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/opcodes.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/opcodes.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/opcodes.py Sun Mar 2 18:48:48 2008 @@ -14,19 +14,18 @@ CastPrimitive, PushPyPy from pypy.rpython.ootypesystem import ootype -import pypy.translator.jvm.generator as jvmgen -import pypy.translator.jvm.typesystem as jvmtype +import pypy.translator.jvm.typesystem as jvm def _proc(val): if isinstance(val, list): # Lists of instructions we leave alone: return InstructionList(val) - elif isinstance(val, jvmgen.Method) and not val.is_static(): + elif isinstance(val, jvm.Method) and not val.is_static(): # For virtual methods, we first push an instance of the relevant # class, then the arguments, and then invoke the method. Note # that we only allow virtual methods of certain pre-designated # classes to be in the table. - if val.class_name == jvmtype.jPyPy.name: + if val.class_name == jvm.jPyPy.name: return InstructionList( (PushPyPy, PushAllArgs, val, StoreResult)) else: @@ -48,7 +47,7 @@ def _check_zer(op): return [TranslateException( - jvmtype.jArithmeticException, + jvm.jArithmeticException, 'throwZeroDivisionError', _proc(op))] @@ -73,19 +72,19 @@ 'oois': 'ref_is_eq', 'oononnull': 'is_not_null', 'instanceof': [CastTo, StoreResult], - 'subclassof': [PushAllArgs, jvmgen.SWAP, jvmgen.CLASSISASSIGNABLEFROM, StoreResult], - 'ooidentityhash': [PushAllArgs, jvmgen.OBJHASHCODE, StoreResult], - 'oohash': [PushAllArgs, jvmgen.OBJHASHCODE, StoreResult], + 'subclassof': [PushAllArgs, jvm.SWAP, jvm.CLASSISASSIGNABLEFROM, StoreResult], + 'ooidentityhash': [PushAllArgs, jvm.OBJHASHCODE, StoreResult], + 'oohash': [PushAllArgs, jvm.OBJHASHCODE, StoreResult], 'oostring': [OOString, StoreResult], 'oounicode': [OOUnicode, StoreResult], - 'ooparse_float': jvmgen.PYPYOOPARSEFLOAT, + 'ooparse_float': jvm.PYPYOOPARSEFLOAT, 'oonewcustomdict': [NewCustomDict, StoreResult], 'same_as': DoNothing, 'hint': [PushArg(0), StoreResult], 'direct_call': [Call, StoreResult], 'indirect_call': [PushAllArgs, IndirectCall, StoreResult], - 'gc__collect': jvmgen.SYSTEMGC, + 'gc__collect': jvm.SYSTEMGC, 'gc_set_max_heap_size': Ignore, 'resume_point': Ignore, @@ -106,83 +105,83 @@ 'unichar_ne': 'not_equals', 'int_is_true': 'not_equals_zero', - 'int_neg': jvmgen.INEG, - 'int_neg_ovf': jvmgen.INEGOVF, + 'int_neg': jvm.INEG, + 'int_neg_ovf': jvm.INEGOVF, 'int_abs': 'iabs', - 'int_abs_ovf': jvmgen.IABSOVF, + 'int_abs_ovf': jvm.IABSOVF, 'int_invert': 'bitwise_negate', - 'int_add': jvmgen.IADD, - 'int_sub': jvmgen.ISUB, - 'int_mul': jvmgen.IMUL, - 'int_floordiv': jvmgen.IDIV, - 'int_floordiv_zer': _check_zer(jvmgen.IDIV), - 'int_mod': jvmgen.IREM, + 'int_add': jvm.IADD, + 'int_sub': jvm.ISUB, + 'int_mul': jvm.IMUL, + 'int_floordiv': jvm.IDIV, + 'int_floordiv_zer': _check_zer(jvm.IDIV), + 'int_mod': jvm.IREM, 'int_lt': 'less_than', 'int_le': 'less_equals', 'int_eq': 'equals', 'int_ne': 'not_equals', 'int_gt': 'greater_than', 'int_ge': 'greater_equals', - 'int_and': jvmgen.IAND, - 'int_or': jvmgen.IOR, - 'int_lshift': jvmgen.ISHL, - 'int_rshift': jvmgen.ISHR, - 'int_xor': jvmgen.IXOR, - 'int_add_ovf': jvmgen.IADDOVF, - 'int_add_nonneg_ovf': jvmgen.IADDOVF, - 'int_sub_ovf': jvmgen.ISUBOVF, - 'int_mul_ovf': jvmgen.IMULOVF, - 'int_floordiv_ovf': jvmgen.IDIV, # these can't overflow! - 'int_mod_zer': _check_zer(jvmgen.IREM), - 'int_mod_ovf': jvmgen.IREMOVF, + 'int_and': jvm.IAND, + 'int_or': jvm.IOR, + 'int_lshift': jvm.ISHL, + 'int_rshift': jvm.ISHR, + 'int_xor': jvm.IXOR, + 'int_add_ovf': jvm.IADDOVF, + 'int_add_nonneg_ovf': jvm.IADDOVF, + 'int_sub_ovf': jvm.ISUBOVF, + 'int_mul_ovf': jvm.IMULOVF, + 'int_floordiv_ovf': jvm.IDIV, # these can't overflow! + 'int_mod_zer': _check_zer(jvm.IREM), + 'int_mod_ovf': jvm.IREMOVF, 'int_lt_ovf': 'less_than', 'int_le_ovf': 'less_equals', 'int_eq_ovf': 'equals', 'int_ne_ovf': 'not_equals', 'int_gt_ovf': 'greater_than', 'int_ge_ovf': 'greater_equals', - 'int_and_ovf': jvmgen.IAND, - 'int_or_ovf': jvmgen.IOR, + 'int_and_ovf': jvm.IAND, + 'int_or_ovf': jvm.IOR, - 'int_lshift_ovf': jvmgen.ISHLOVF, - 'int_lshift_ovf_val': jvmgen.ISHLOVF, # VAL... what is val used for?? + 'int_lshift_ovf': jvm.ISHLOVF, + 'int_lshift_ovf_val': jvm.ISHLOVF, # VAL... what is val used for?? - 'int_rshift_ovf': jvmgen.ISHR, # these can't overflow! - 'int_xor_ovf': jvmgen.IXOR, - 'int_floordiv_ovf_zer': _check_zer(jvmgen.IDIV), - 'int_mod_ovf_zer': _check_zer(jvmgen.IREMOVF), + 'int_rshift_ovf': jvm.ISHR, # these can't overflow! + 'int_xor_ovf': jvm.IXOR, + 'int_floordiv_ovf_zer': _check_zer(jvm.IDIV), + 'int_mod_ovf_zer': _check_zer(jvm.IREMOVF), 'uint_is_true': 'not_equals_zero', 'uint_invert': 'bitwise_negate', - 'uint_add': jvmgen.IADD, - 'uint_sub': jvmgen.ISUB, - 'uint_mul': jvmgen.PYPYUINTMUL, - 'uint_div': jvmgen.PYPYUINTDIV, + 'uint_add': jvm.IADD, + 'uint_sub': jvm.ISUB, + 'uint_mul': jvm.PYPYUINTMUL, + 'uint_div': jvm.PYPYUINTDIV, 'uint_truediv': None, # TODO - 'uint_floordiv': jvmgen.PYPYUINTDIV, - 'uint_mod': jvmgen.PYPYUINTMOD, + 'uint_floordiv': jvm.PYPYUINTDIV, + 'uint_mod': jvm.PYPYUINTMOD, 'uint_lt': 'u_less_than', 'uint_le': 'u_less_equals', 'uint_eq': 'u_equals', 'uint_ne': 'u_not_equals', 'uint_gt': 'u_greater_than', 'uint_ge': 'u_greater_equals', - 'uint_and': jvmgen.IAND, - 'uint_or': jvmgen.IOR, - 'uint_lshift': jvmgen.ISHL, - 'uint_rshift': jvmgen.IUSHR, - 'uint_xor': jvmgen.IXOR, + 'uint_and': jvm.IAND, + 'uint_or': jvm.IOR, + 'uint_lshift': jvm.ISHL, + 'uint_rshift': jvm.IUSHR, + 'uint_xor': jvm.IXOR, - 'float_is_true': [PushAllArgs, jvmgen.DCONST_0, 'dbl_not_equals', StoreResult], - 'float_neg': jvmgen.DNEG, + 'float_is_true': [PushAllArgs, jvm.DCONST_0, 'dbl_not_equals', StoreResult], + 'float_neg': jvm.DNEG, 'float_abs': 'dbl_abs', - 'float_add': jvmgen.DADD, - 'float_sub': jvmgen.DSUB, - 'float_mul': jvmgen.DMUL, - 'float_truediv': jvmgen.DDIV, + 'float_add': jvm.DADD, + 'float_sub': jvm.DSUB, + 'float_mul': jvm.DMUL, + 'float_truediv': jvm.DDIV, 'float_lt': 'dbl_less_than', 'float_le': 'dbl_less_equals', 'float_eq': 'dbl_equals', @@ -190,56 +189,56 @@ 'float_gt': 'dbl_greater_than', 'float_ge': 'dbl_greater_equals', - 'llong_is_true': [PushAllArgs, jvmgen.LCONST_0, 'long_not_equals', StoreResult], - 'llong_neg': jvmgen.LNEG, - 'llong_neg_ovf': jvmgen.LNEGOVF, - 'llong_abs': jvmgen.MATHLABS, - 'llong_abs_ovf': jvmgen.LABSOVF, - 'llong_invert': jvmgen.PYPYLONGBITWISENEGATE, - - 'llong_add': jvmgen.LADD, - 'llong_sub': jvmgen.LSUB, - 'llong_mul': jvmgen.LMUL, - 'llong_div': jvmgen.LDIV, + 'llong_is_true': [PushAllArgs, jvm.LCONST_0, 'long_not_equals', StoreResult], + 'llong_neg': jvm.LNEG, + 'llong_neg_ovf': jvm.LNEGOVF, + 'llong_abs': jvm.MATHLABS, + 'llong_abs_ovf': jvm.LABSOVF, + 'llong_invert': jvm.PYPYLONGBITWISENEGATE, + + 'llong_add': jvm.LADD, + 'llong_sub': jvm.LSUB, + 'llong_mul': jvm.LMUL, + 'llong_div': jvm.LDIV, 'llong_truediv': None, # TODO - 'llong_floordiv': jvmgen.LDIV, - 'llong_floordiv_zer': _check_zer(jvmgen.LDIV), - 'llong_mod': jvmgen.LREM, - 'llong_mod_zer': _check_zer(jvmgen.LREM), + 'llong_floordiv': jvm.LDIV, + 'llong_floordiv_zer': _check_zer(jvm.LDIV), + 'llong_mod': jvm.LREM, + 'llong_mod_zer': _check_zer(jvm.LREM), 'llong_lt': 'long_less_than', 'llong_le': 'long_less_equals', 'llong_eq': 'long_equals', 'llong_ne': 'long_not_equals', 'llong_gt': 'long_greater_than', 'llong_ge': 'long_greater_equals', - 'llong_and': jvmgen.LAND, - 'llong_or': jvmgen.LOR, - 'llong_lshift': jvmgen.LSHL, - 'llong_rshift': [PushAllArgs, jvmgen.L2I, jvmgen.LSHR, StoreResult], - 'llong_xor': jvmgen.LXOR, - 'llong_floordiv_ovf': jvmgen.LDIV, # these can't overflow! - 'llong_mod_ovf': jvmgen.LREMOVF, - 'llong_lshift_ovf': jvmgen.LSHLOVF, - - 'ullong_is_true': [PushAllArgs, jvmgen.LCONST_0, 'long_not_equals', StoreResult], - 'ullong_invert': jvmgen.PYPYLONGBITWISENEGATE, - - 'ullong_add': jvmgen.LADD, - 'ullong_sub': jvmgen.LSUB, - 'ullong_mul': jvmgen.LMUL, - 'ullong_div': jvmgen.LDIV, # valid? + 'llong_and': jvm.LAND, + 'llong_or': jvm.LOR, + 'llong_lshift': jvm.LSHL, + 'llong_rshift': [PushAllArgs, jvm.L2I, jvm.LSHR, StoreResult], + 'llong_xor': jvm.LXOR, + 'llong_floordiv_ovf': jvm.LDIV, # these can't overflow! + 'llong_mod_ovf': jvm.LREMOVF, + 'llong_lshift_ovf': jvm.LSHLOVF, + + 'ullong_is_true': [PushAllArgs, jvm.LCONST_0, 'long_not_equals', StoreResult], + 'ullong_invert': jvm.PYPYLONGBITWISENEGATE, + + 'ullong_add': jvm.LADD, + 'ullong_sub': jvm.LSUB, + 'ullong_mul': jvm.LMUL, + 'ullong_div': jvm.LDIV, # valid? 'ullong_truediv': None, # TODO - 'ullong_floordiv': jvmgen.LDIV, # valid? - 'ullong_mod': jvmgen.PYPYULONGMOD, + 'ullong_floordiv': jvm.LDIV, # valid? + 'ullong_mod': jvm.PYPYULONGMOD, 'ullong_lt': 'ulong_less_than', 'ullong_le': 'ulong_less_equals', 'ullong_eq': 'ulong_equals', 'ullong_ne': 'ulong_not_equals', 'ullong_gt': 'ulong_greater_than', 'ullong_ge': 'ulong_greater_equals', - 'ullong_lshift': [PushAllArgs, jvmgen.L2I, jvmgen.LSHL, StoreResult], - 'ullong_rshift': [PushAllArgs, jvmgen.L2I, jvmgen.LUSHR, StoreResult], - 'ullong_mod_zer': jvmgen.PYPYULONGMOD, + 'ullong_lshift': [PushAllArgs, jvm.L2I, jvm.LSHL, StoreResult], + 'ullong_rshift': [PushAllArgs, jvm.L2I, jvm.LUSHR, StoreResult], + 'ullong_mod_zer': jvm.PYPYULONGMOD, # when casting from bool we want that every truth value is casted # to 1: we can't simply DoNothing, because the CLI stack could @@ -247,21 +246,21 @@ # trick. #THIS COMMENT NEEDS TO BE VALIDATED AND UPDATED 'cast_bool_to_int': DoNothing, 'cast_bool_to_uint': DoNothing, - 'cast_bool_to_float': jvmgen.PYPYBOOLTODOUBLE, #PAUL, inefficient + 'cast_bool_to_float': jvm.PYPYBOOLTODOUBLE, #PAUL, inefficient 'cast_char_to_int': DoNothing, 'cast_unichar_to_int': DoNothing, 'cast_int_to_char': DoNothing, 'cast_int_to_unichar': DoNothing, 'cast_int_to_uint': DoNothing, - 'cast_int_to_float': jvmgen.I2D, - 'cast_int_to_longlong': jvmgen.I2L, + 'cast_int_to_float': jvm.I2D, + 'cast_int_to_longlong': jvm.I2L, 'cast_uint_to_int': DoNothing, - 'cast_uint_to_float': jvmgen.PYPYUINTTODOUBLE, - 'cast_float_to_int': jvmgen.D2I, - 'cast_float_to_longlong': jvmgen.PYPYDOUBLETOLONG, #PAUL - 'cast_float_to_uint': jvmgen.PYPYDOUBLETOUINT, - 'truncate_longlong_to_int': jvmgen.L2I, - 'cast_longlong_to_float': jvmgen.L2D, + 'cast_uint_to_float': jvm.PYPYUINTTODOUBLE, + 'cast_float_to_int': jvm.D2I, + 'cast_float_to_longlong': jvm.PYPYDOUBLETOLONG, #PAUL + 'cast_float_to_uint': jvm.PYPYDOUBLETOUINT, + 'truncate_longlong_to_int': jvm.L2I, + 'cast_longlong_to_float': jvm.L2D, 'cast_primitive': [PushAllArgs, CastPrimitive, StoreResult], 'is_early_constant': [PushPrimitive(ootype.Bool, False), StoreResult] Added: pypy/branch/fixed-list-ootype/pypy/translator/jvm/src/pypy/VoidArray.java ============================================================================== --- (empty file) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/src/pypy/VoidArray.java Sun Mar 2 18:48:48 2008 @@ -0,0 +1,24 @@ +package pypy; + +class VoidArray { + public final int length; + + public VoidArray(int length) { + this.length = length; + } + + /** invoked by generated code because it is easier than the constructor */ + public static VoidArray make(int length) { + return new VoidArray(length); + } + + public int ll_length() { + return length; + } + + public void ll_getitem_fast(int index) { + } + + public void ll_setitem_fast(int index) { + } +} \ No newline at end of file Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/test_class.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/test_class.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/test_class.py Sun Mar 2 18:48:48 2008 @@ -24,7 +24,8 @@ assert self.interpret(fn, [2]) == 42 - + def test_specialize_methods(self): + py.test.skip('ABSTRACT METHOD FIX: RE-TEST AFTER MERGE') class TestJvmSpecialCase(JvmTest, BaseTestSpecialcase): pass Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/typesystem.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/typesystem.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/typesystem.py Sun Mar 2 18:48:48 2008 @@ -1,33 +1,28 @@ """ -Definition and some basic translations between PyPy ootypesystem and -JVM type system. - -Here are some tentative non-obvious decisions: - -Signed scalar types mostly map as is. - -Unsigned scalar types are a problem; the basic idea is to store them -as signed values, but execute special code when working with them. Another -option would be to use classes, or to use the "next larger" type and remember to use appropriate modulos. The jury is out on -this. Another idea would be to add a variant type system that does -not have unsigned values, and write the required helper and conversion -methods in RPython --- then it could be used for multiple backends. - -Python strings are mapped to byte arrays, not Java Strings, since -Python strings are really sets of bytes, not unicode code points. -Jury is out on this as well; this is not the approach taken by cli, -for example. - -Python Unicode strings, on the other hand, map directly to Java Strings. - -WeakRefs are mapped to a thin wrapper class, PyPyWeakRef, to allow for -mutation of the object being referenced (the ll_set method). - -Collections can hopefully map to Java collections instances. Note -that JVM does not have an idea of generic typing at its lowest level -(well, they do have signature attributes, but those don't really count -for much). +Defines the basic structures which are used to represent JVM abstraction, +such as Java types, fields, methods and opcodes. +The structures in this file generally two different, but related, +roles. First, they describe a JVM abstraction. For example, jObject +describes some of the properties of the built-in class +java.lang.Object. Second, they can represent the concrete realization +of an OOTYPE construct. For example, JvmType instances are used to +represent the translated class which will be generated for some OOTYPE +class. + +This file itself is intended to be imported from a wide variety of +locations, and thus generally restricts itself to classes and global +variables that describe intrinsic parts of the JVM. For example, +there are objects representing different opcodes, type definitions for +built-in types like java.lang.Object and java.lang.System, and +method/field declarations for well-known methods and fields on those +types. + +Other files extend this set with objects that represent the JVM +realization of some OOTYPE construct. For example, the module +builtin.py describes the JVM types that are used to define the +built-in OOTYPE types, such as lists or dictionaries. The module +node.py contains code for representing user-defined classes. """ from pypy.rpython.lltypesystem import lltype, llmemory from pypy.rpython.ootypesystem import ootype @@ -105,6 +100,13 @@ # ______________________________________________________________________ # Basic JVM Types +# +# As described above, some of these define well-known types in the JVM +# or standard Java library. In addition, there are subtypes of +# JvmType which represent the translated version of some RPython +# class, such as a list, dictionary, or user-defined class. Those +# subtypes are generally defined in other modules, as they have +# dependencies that would cause circular imports. class JvmType(object): """ @@ -119,15 +121,23 @@ # (None for scalars and arrays) def lookup_field(self, fieldnm): - """ If the class has a field named 'fieldnm', returns a - jvmgen.Field or jvmgen.Property object that represents it and can - be used with the interpreter to load/store it. If no such field - exists, or this is not a class, then raises KeyError. """ + """ Returns a Field or Property object that represents the + field named 'fieldnm', or raises KeyError if no such field + exists. 'fieldnm' generally represents an OOTYPE field, and + thus this method is generally not implemenented by the JvmType + classes that just represent native Java classes, even if they + have fields. Instead, such fields are described as global + Field constants, either in this file or elsewhere. """ raise NotImplementedException + def lookup_method(self, methodnm): - """ Returns a jvm.generator.Method object representing the method - with the given name, or raises KeyError if that field does not - exist on this type. """ + """ Returns a BaseMethod object that represents the method + named 'methodnm', or raises KeyError if no such field exists. + 'methodnm' represents an OOTYPE method, and thus this method + is generally not implemenented by the JvmType classes that + just represent native Java classes, even if they have methods. + Instead, such methods are described as global Method constants + in this file, either in this file or elsewhere. """ raise NotImplementedException def is_generated(self): @@ -226,38 +236,6 @@ jByte = JvmScalarType('B', jByteClass, 'byteValue') jChar = JvmScalarType('C', jCharClass, 'charValue') -class JvmArrayType(JvmType): - """ - Subclass used for all array instances. - """ - def __init__(self, elemtype): - JvmType.__init__(self, desc_for_array_of(elemtype.descriptor)) - self.element_type = elemtype - def lookup_field(self, fieldnm): - raise KeyError(fieldnm) # TODO adjust interface to permit opcode here - def lookup_method(self, methodnm): - # Arrays don't have methods in Java, but they do in the ootype system - from pypy.translator.jvm.generator import ArrayMethod - return ArrayMethod(self, methodnm) - -class JvmVoidArrayType(JvmArrayType): - def __init__(self): - JvmType.__init__(self, JvmTypeDescriptor("I")) - self.element_type = jVoid - def lookup_method(self, methodnm): - # Arrays don't have methods in Java, but they do in the ootype system - from pypy.translator.jvm.generator import VoidArrayMethod - return VoidArrayMethod(self, methodnm) - - -jByteArray = JvmArrayType(jByte) -jObjectArray = JvmArrayType(jObject) -jStringArray = JvmArrayType(jString) -jDoubleArray = JvmArrayType(jDouble) -jCharArray = JvmArrayType(jChar) -jIntArray = JvmArrayType(jInt) -jVoidArray = JvmVoidArrayType() - class Generifier(object): """ @@ -317,7 +295,7 @@ # Java Callback Interfaces # # A list of interfaces which static functions that we generate will -# automatically implement if application. See the pypy/Callback.java, +# automatically implement if applicable. See the pypy/Callback.java, # node.py/StaticMethodInterface for more information. jCallbackInterfaces = [] # collects all of the defined JvmCallbackInterfaces @@ -374,3 +352,621 @@ restype = self.db.annotation_to_cts(methspec.retval._type) self.methods[methname] = Method.v(self, methname, argtypes, restype) + +# ______________________________________________________________________ +# The bridge between RPython array and JVM arrays. The main differences +# are that (a) RPython has arrays of void type, and (b) RPython arrays +# have methods, whereas Java methods don't. We inline those methods +# into the appropriate bytecode. + +class _JvmVoidArray(JvmClassType): + """ + A special case for void arrays. These are represented by an instance + of the VoidArray class, which implements the required methods. + """ + + method_types = { + 'll_length': ([], jInt), + 'll_getitem_fast': ([jInt], jVoid), + 'll_setitem_fast': ([jInt], jVoid), + } + + def __init__(self): + JvmClassType.__init__(self, 'pypy.VoidArray') + + def make(self, gen): + # Construct a new VoidArray object, assuming the length has + # been pushed onto the stack already. + gen.emit(PYPYVOIDARRAYMAKE) + + def lookup_field(self, fieldnm): + raise KeyError(fieldnm) # no fields + + def lookup_method(self, methodnm): + jargtypes, jrettype = self.method_types[methodnm] + return jvmgen.Method.v(self, methodnm, jargtypes, jrettype) + +class JvmArrayType(JvmType): + """ + Subclass used for all array instances. + """ + def __init__(self, elemtype): + JvmType.__init__(self, desc_for_array_of(elemtype.descriptor)) + self.element_type = elemtype + def make(self, gen): + # Issues the opcode to build a new array of the appropriate type. + # Assumes the length has been pushed onto the stack already. + gen.emit(NEWARRAY.for_type(self)) + def lookup_field(self, fieldnm): + raise KeyError(fieldnm) + def lookup_method(self, methodnm): + # Arrays don't have methods in Java, but they do in the ootype system + if methodnm == "ll_length": + return OpcodeMethod([], jInt, ARRAYLENGTH) + elif methodnm == "ll_getitem_fast": + return OpcodeMethod([jInt], self.element_type, + ARRLOAD.for_type(self.element_type)) + elif methodnm == "ll_setitem_fast": + return OpcodeMethod([jInt, self.element_type], jVoid, + ARRSTORE.for_type(self.element_type)) + else: + raise KeyError(methodnm) + +jByteArray = JvmArrayType(jByte) +jObjectArray = JvmArrayType(jObject) +jStringArray = JvmArrayType(jString) +jDoubleArray = JvmArrayType(jDouble) +jCharArray = JvmArrayType(jChar) +jIntArray = JvmArrayType(jInt) +jVoidArray = _JvmVoidArray() + +# ______________________________________________________________________ +# Opcodes +# +# Objects describing the various opcodes which we use. In some cases, +# there are also opcode families, which consist of a set of related +# opcodes that are specialized by the types they operate on (i.e., +# IADD, DADD, etc). + +class Opcode(object): + def __init__(self, jvmstr): + """ + flags is a set of flags (see above) that describe opcode #UPDATE + jvmstr is the name for jasmin printouts + """ + self.jvmstr = jvmstr + self.flags = None #Should flags be added to args? + + def __repr__(self): + return "" % (self.jvmstr, self.flags) + + def specialize(self, args): + """ Process the argument list according to the various flags. + Returns a tuple (OPCODE, ARGS) where OPCODE is a string representing + the new opcode, and ARGS is a list of arguments or empty tuple. + Most of these do not do anything. """ + return (self.jvmstr, args) + +class IntConstOpcode(Opcode): + """ The ICONST opcode specializes itself for small integer opcodes. """ + def specialize(self, args): + assert len(args) == 1 + if args[0] == -1: + return self.jvmstr + "_m1", () + elif args[0] >= 0 and args[0] <= 5: + return self.jvmstr + "_" + str(args[0]), () + # Non obvious: convert ICONST to LDC if the constant is out of + # range + return "ldc", args + +class VarOpcode(Opcode): + """ An Opcode which takes a variable index as an argument; specialized + to small integer indices. """ + def specialize(self, args): + assert len(args) == 1 + if args[0] >= 0 and args[0] <= 3: + return self.jvmstr + "_" + str(args[0]), () + return Opcode.specialize(self, args) + +class IntClassNameOpcode(Opcode): + """ An opcode which takes an internal class name as its argument; + the actual argument will be a JvmType instance. """ + def specialize(self, args): + args = [args[0].descriptor.int_class_name()] + return self.jvmstr, args + +class OpcodeFamily(object): + """ + Many opcodes in JVM have variants that depend on the type of the + operands; for example, one must choose the correct ALOAD, ILOAD, + or DLOAD depending on whether one is loading a reference, integer, + or double variable respectively. Each instance of this class + defines one 'family' of opcodes, such as the LOAD family shown + above, and produces Opcode objects specific to a particular type. + """ + def __init__(self, opcclass, suffix): + """ + opcclass is the opcode subclass to use (see above) when + instantiating a particular opcode + + jvmstr is the name for jasmin printouts + """ + self.opcode_class = opcclass + self.suffix = suffix + self.cache = {} + + def _o(self, prefix): + try: + return self.cache[prefix] + except KeyError: + self.cache[prefix] = obj = self.opcode_class( + prefix+self.suffix) + return obj + + def for_type(self, argtype): + """ Returns a customized opcode of this family appropriate to + 'argtype', a JvmType object. """ + + desc = argtype.descriptor + + # These are always true: + if desc[0] == 'L': return self._o("a") # Objects + if desc[0] == '[': return self._o("a") # Arrays + if desc == 'I': return self._o("i") # Integers + if desc == 'J': return self._o("l") # Integers + if desc == 'D': return self._o("d") # Doubles + if desc == 'V': return self._o("") # Void [used by RETURN] + + # Chars/Bytes/Booleans are normally represented as ints + # in the JVM, but some opcodes are different. They use a + # different OpcodeFamily (see ArrayOpcodeFamily for ex) + if desc == 'C': return self._o("i") # Characters + if desc == 'B': return self._o("i") # Bytes + if desc == 'Z': return self._o("i") # Boolean + + assert False, "Unknown argtype=%s" % repr(argtype) + raise NotImplementedError + +class ArrayOpcodeFamily(OpcodeFamily): + """ Opcode family specialized for array access instr """ + def for_type(self, argtype): + desc = argtype.descriptor + if desc == 'J': return self._o("l") # Integers + if desc == 'D': return self._o("d") # Doubles + if desc == 'C': return self._o("c") # Characters + if desc == 'B': return self._o("b") # Bytes + if desc == 'Z': return self._o("b") # Boolean (access as bytes) + return OpcodeFamily.for_type(self, argtype) + +class NewArrayOpcodeFamily(object): + def __init__(self): + self.cache = {} + + def for_type(self, arraytype): + try: + return self.cache[arraytype] + except KeyError: + pass + desc = arraytype.descriptor + if desc == '[I': + s = "newarray int" + elif desc == '[D': + s = "newarray double" + elif desc == '[C': + s = "newarray char" + elif desc == '[B': + s = "newarray byte" + else: + s = "anewarray " + arraytype.element_type.descriptor.int_class_name() + self.cache[arraytype] = obj = Opcode(s) + return obj + +NEWARRAY = NewArrayOpcodeFamily() +ARRAYLENGTH = Opcode("arraylength") + +# Define the opcodes for IFNE, IFEQ, IFLT, IF_ICMPLT, etc. The IFxx +# variants compare a single integer arg against 0, and the IF_ICMPxx +# variants compare 2 integer arguments against each other. +for cmpop in ('ne', 'eq', 'lt', 'gt', 'le', 'ge'): + ifop = "if%s" % cmpop + if_icmpop = "if_icmp%s" % cmpop + globals()[ifop.upper()] = Opcode(ifop) + globals()[if_icmpop.upper()] = Opcode(if_icmpop) + +# Compare references, either against NULL or against each other +IFNULL = Opcode('ifnull') +IFNONNULL = Opcode('ifnonnull') +IF_ACMPEQ = Opcode('if_acmpeq') +IF_ACMPNE = Opcode('if_acmpne') + +# Method invocation +INVOKESTATIC = Opcode('invokestatic') +INVOKEVIRTUAL = Opcode('invokevirtual') +INVOKESPECIAL = Opcode('invokespecial') +INVOKEINTERFACE = Opcode('invokeinterface') + +# Other opcodes +LDC = Opcode('ldc') # single-word types +LDC2 = Opcode('ldc2_w') # double-word types: doubles and longs +GOTO = Opcode('goto') +ICONST = IntConstOpcode('iconst') +ICONST_0 = Opcode('iconst_0') # sometimes convenient to refer to this directly +ACONST_NULL=Opcode('aconst_null') +DCONST_0 = Opcode('dconst_0') +DCONST_1 = Opcode('dconst_1') +LCONST_0 = Opcode('lconst_0') +LCONST_1 = Opcode('lconst_1') +GETFIELD = Opcode('getfield') +PUTFIELD = Opcode('putfield') +GETSTATIC = Opcode('getstatic') +PUTSTATIC = Opcode('putstatic') +CHECKCAST = IntClassNameOpcode('checkcast') +INEG = Opcode('ineg') +IXOR = Opcode('ixor') +IADD = Opcode('iadd') +ISUB = Opcode('isub') +IMUL = Opcode('imul') +IDIV = Opcode('idiv') +IREM = Opcode('irem') +IAND = Opcode('iand') +IOR = Opcode('ior') +ISHL = Opcode('ishl') +ISHR = Opcode('ishr') +IUSHR = Opcode('iushr') +LCMP = Opcode('lcmp') +DCMPG = Opcode('dcmpg') +DCMPL = Opcode('dcmpl') +NOP = Opcode('nop') +I2D = Opcode('i2d') +I2L = Opcode('i2l') +D2I= Opcode('d2i') +#D2L= Opcode('d2l') #PAUL +L2I = Opcode('l2i') +L2D = Opcode('l2d') +ATHROW = Opcode('athrow') +DNEG = Opcode('dneg') +DADD = Opcode('dadd') +DSUB = Opcode('dsub') +DMUL = Opcode('dmul') +DDIV = Opcode('ddiv') +DREM = Opcode('drem') +LNEG = Opcode('lneg') +LADD = Opcode('ladd') +LSUB = Opcode('lsub') +LMUL = Opcode('lmul') +LDIV = Opcode('ldiv') +LREM = Opcode('lrem') +LAND = Opcode('land') +LOR = Opcode('lor') +LXOR = Opcode('lxor') +LSHL = Opcode('lshl') +LSHR = Opcode('lshr') +LUSHR = Opcode('lushr') +NEW = IntClassNameOpcode('new') +DUP = Opcode('dup') +DUP2 = Opcode('dup2') +DUP_X1 = Opcode('dup_x1') +POP = Opcode('pop') +POP2 = Opcode('pop2') +SWAP = Opcode('swap') +INSTANCEOF= IntClassNameOpcode('instanceof') +# Loading/storing local variables +LOAD = OpcodeFamily(VarOpcode, "load") +STORE = OpcodeFamily(VarOpcode, "store") +RETURN = OpcodeFamily(Opcode, "return") + +# Loading/storing from arrays +# *NOTE*: This family is characterized by the type of the ELEMENT, +# not the type of the ARRAY. +# +# Also: here I break from convention by naming the objects ARRLOAD +# rather than ALOAD, even though the suffix is 'aload'. This is to +# avoid confusion with the ALOAD opcode. +ARRLOAD = ArrayOpcodeFamily(Opcode, "aload") +ARRSTORE = ArrayOpcodeFamily(Opcode, "astore") + +# ______________________________________________________________________ +# Methods and Fields +# +# These structures are used throughout the code to refer to JVM +# methods and fields. Similarly to JvmType instances, they are used +# both to represent random fields/methods in the JVM, and to represent +# the translation of an OOTYPE field/method. Therefore, these may not +# actually generate code corresponding to a real JVM method: for +# example, arrays use a BaseMethod subclass to generate the +# appropriate JVM opcodes that correspond to RPython arrays. +# Likewise, the Property class (see below) allows us to use a pair of +# JVM methods to represent an OOTYPE field. + +class BaseMethod(object): + def __init__(self, argtypes, rettype): + self.argument_types = argtypes # List of jvmtypes + self.return_type = rettype # jvmtype + + def is_static(self): + raise NotImplementedError + + def invoke(self, gen): + raise NotImplementedError + +class OpcodeMethod(BaseMethod): + """ + Represents a "method" that is actually implemented by a single opcode, + such as ARRAYLENGTH + """ + def __init__(self, argtypes, rettype, opcode, static=False): + """ + argtypes = an array of jvm types indicating what we expect on stack + rettype = the type we will push on the stack (if any) + opcode = the opcode to emit + static = should we be considered static? if true, then we will + not push the receiver onto the stack in metavm + """ + BaseMethod.__init__(self, argtypes, rettype) + self.opcode = opcode + self.static = static + + def is_static(self): + return self.static + + def invoke(self, gen): + gen.emit(self.opcode) + +class Method(BaseMethod): + + """ + Represents a method implemented by a genuine JVM method. Unlike + OpcodeMethod, when we emit the opcode this class is an argument to + it, and contains the extra info about the class/method being + invoked that is required. + """ + + # Create a constructor: + def c(classty, argtypes): + return Method(classty.name, "", argtypes, jVoid, + opcode=INVOKESPECIAL) + c = staticmethod(c) + + # Create a virtual or interface method: + def v(classty, methnm, argtypes, rettype): + """ + Shorthand to create a virtual method. + 'class' - JvmType object for the class + 'methnm' - name of the method (Python string) + 'argtypes' - list of JvmType objects, one for each argument but + not the this ptr + 'rettype' - JvmType for return type + """ + assert argtypes is not None + assert rettype is not None + classnm = classty.name + if isinstance(classty, JvmInterfaceType): + opc = INVOKEINTERFACE + else: + assert isinstance(classty, JvmClassType) + opc = INVOKEVIRTUAL + return Method(classnm, methnm, argtypes, rettype, opcode=opc) + v = staticmethod(v) + + # Create a static method: + def s(classty, methnm, argtypes, rettype): + """ + Shorthand to create a static method. + 'class' - JvmType object for the class + 'methnm' - name of the method (Python string) + 'argtypes' - list of JvmType objects, one for each argument but + not the this ptr + 'rettype' - JvmType for return type + """ + assert isinstance(classty, JvmType) + classnm = classty.name + return Method(classnm, methnm, argtypes, rettype) + s = staticmethod(s) + + def __init__(self, classnm, methnm, argtypes, rettype, opcode=INVOKESTATIC): + BaseMethod.__init__(self, argtypes, rettype) + self.opcode = opcode + self.class_name = classnm # String, ie. "java.lang.Math" + self.method_name = methnm # String "abs" + + # Compute the method descriptior, which is a string like "()I": + argtypesdesc = [a.descriptor for a in argtypes] + rettypedesc = rettype.descriptor + self.descriptor = desc_for_method(argtypesdesc, rettypedesc) + def invoke(self, gen): + gen._instr(self.opcode, self) + def is_static(self): + return self.opcode == INVOKESTATIC + def jasmin_syntax(self): + res = "%s/%s%s" % (self.class_name.replace('.','/'), + self.method_name, + self.descriptor) + # A weird, inexplicable quirk of Jasmin syntax is that it requires + # the number of arguments after an invokeinterface call: + if self.opcode == INVOKEINTERFACE: + res += " %d" % (len(self.argument_types)+1,) + return res + +class Field(object): + + """ + Represents an actual JVM field. Use the methods + fld.load(gen) / gen.emit(fld) + or + fld.store(gen) + to load the field's value onto the stack, or store into the field. + If this is not a static field, you must have pushed the object + containing the field and the field's value first. + + See also Property. + """ + + @staticmethod + def i(classty, fieldnm, fieldty, OOTYPE=None): + """ + Shorthand to create an instance field. + 'class' - JvmType object for the class containing the field + 'fieldnm' - name of the field (Python string) + 'fieldty' - JvmType object for the type of the field + 'OOTYPE' - optional OOTYPE object for the type of the field + """ + return Field(classty.name, fieldnm, fieldty, False, OOTYPE) + + @staticmethod + def s(classty, fieldnm, fieldty, OOTYPE=None): + """ + Shorthand to create a static field. + 'class' - JvmType object for the class containing the field + 'fieldnm' - name of the field (Python string) + 'fieldty' - JvmType object for the type of the field + 'OOTYPE' - optional OOTYPE object for the type of the field + """ + return Field(classty.name, fieldnm, fieldty, True, OOTYPE) + + def __init__(self, classnm, fieldnm, jtype, static, OOTYPE=None): + # All fields are public + self.class_name = classnm # String, ie. "java.lang.Math" + self.field_name = fieldnm # String "someField" + self.OOTYPE = OOTYPE # OOTYPE equivalent of JvmType, may be None + self.jtype = jtype # JvmType + self.is_static = static # True or False + def load(self, gen): + if self.is_static: + gen._instr(GETSTATIC, self) + else: + gen._instr(GETFIELD, self) + def store(self, gen): + if self.is_static: + gen._instr(PUTSTATIC, self) + else: + gen._instr(PUTFIELD, self) + def jasmin_syntax(self): + return "%s/%s %s" % ( + self.class_name.replace('.','/'), + self.field_name, + self.jtype.descriptor) + +class Property(object): + """ + An object which acts like a Field, but when a value is loaded or + stored it actually invokes accessor methods. Use like a field + (prop.load(gen), prop.store(gen), etc). + """ + def __init__(self, field_name, get_method, put_method, OOTYPE=None): + self.get_method = get_method + self.put_method = put_method + self.field_name = field_name + self.OOTYPE = OOTYPE + + # Synthesize the Field attributes from the get_method/put_method: + self.class_name = get_method.class_name + assert put_method.class_name == self.class_name + self.jtype = get_method.return_type + self.is_static = get_method.is_static + def load(self, gen): + self.get_method.invoke(gen) + def store(self, gen): + self.put_method.invoke(gen) + # jasmin_syntax is not needed, since this object itself never appears + # as an argument an Opcode + +# ___________________________________________________________________________ +# Methods +# +# "Method" objects describe all the information needed to invoke a +# method. We create one for each node.Function object, as well as for +# various helper methods (defined below). To invoke a method, you +# push its arguments and then use generator.emit(methobj) where +# methobj is its Method instance. + +OBJHASHCODE = Method.v(jObject, 'hashCode', (), jInt) +OBJTOSTRING = Method.v(jObject, 'toString', (), jString) +OBJEQUALS = Method.v(jObject, 'equals', (jObject,), jBool) +SYSTEMGC = Method.s(jSystem, 'gc', (), jVoid) +INTTOSTRINGI = Method.s(jIntegerClass, 'toString', (jInt,), jString) +LONGTOSTRINGL = Method.s(jLongClass, 'toString', (jLong,), jString) +DOUBLETOSTRINGD = Method.s(jDoubleClass, 'toString', (jDouble,), jString) +CHARTOSTRINGC = Method.s(jCharClass, 'toString', (jChar,), jString) +MATHIABS = Method.s(jMath, 'abs', (jInt,), jInt) +IABSOVF = Method.v(jPyPy, 'abs_ovf', (jInt,), jInt) +MATHLABS = Method.s(jMath, 'abs', (jLong,), jLong) +LABSOVF = Method.v(jPyPy, 'abs_ovf', (jLong,), jLong) +MATHDABS = Method.s(jMath, 'abs', (jDouble,), jDouble) +INEGOVF = Method.v(jPyPy, 'negate_ovf', (jInt,), jInt) +LNEGOVF = Method.v(jPyPy, 'negate_ovf', (jLong,), jLong) +IADDOVF = Method.v(jPyPy, 'add_ovf', (jInt, jInt), jInt) +LADDOVF = Method.v(jPyPy, 'add_ovf', (jLong, jLong), jLong) +ISUBOVF = Method.v(jPyPy, 'subtract_ovf', (jInt, jInt), jInt) +LSUBOVF = Method.v(jPyPy, 'subtract_ovf', (jLong, jLong), jLong) +IMULOVF = Method.v(jPyPy, 'multiply_ovf', (jInt, jInt), jInt) +LMULOVF = Method.v(jPyPy, 'multiply_ovf', (jLong, jLong), jLong) +MATHFLOOR = Method.s(jMath, 'floor', (jDouble,), jDouble) +IFLOORDIVOVF = Method.v(jPyPy, 'floordiv_ovf', (jInt, jInt), jInt) +LFLOORDIVOVF = Method.v(jPyPy, 'floordiv_ovf', (jLong, jLong), jLong) +IFLOORDIVZEROVF = Method.v(jPyPy, 'floordiv_zer_ovf', (jInt, jInt), jInt) +LFLOORDIVZEROVF = Method.v(jPyPy, 'floordiv_zer_ovf', (jLong, jLong), jLong) +IREMOVF = Method.v(jPyPy, 'mod_ovf', (jInt, jInt), jInt) +LREMOVF = Method.v(jPyPy, 'mod_ovf', (jLong, jLong), jLong) +ISHLOVF = Method.v(jPyPy, 'lshift_ovf', (jInt, jInt), jInt) +LSHLOVF = Method.v(jPyPy, 'lshift_ovf', (jLong, jLong), jLong) +MATHDPOW = Method.s(jMath, 'pow', (jDouble, jDouble), jDouble) +PRINTSTREAMPRINTSTR = Method.v(jPrintStream, 'print', (jString,), jVoid) +CLASSFORNAME = Method.s(jClass, 'forName', (jString,), jClass) +CLASSISASSIGNABLEFROM = Method.v(jClass, 'isAssignableFrom', (jClass,), jBool) +STRINGBUILDERAPPEND = Method.v(jStringBuilder, 'append', + (jString,), jStringBuilder) +PYPYUINTCMP = Method.s(jPyPy, 'uint_cmp', (jInt,jInt,), jInt) +PYPYULONGCMP = Method.s(jPyPy, 'ulong_cmp', (jLong,jLong), jInt) +PYPYUINTMOD = Method.v(jPyPy, 'uint_mod', (jInt, jInt), jInt) +PYPYUINTMUL = Method.v(jPyPy, 'uint_mul', (jInt, jInt), jInt) +PYPYUINTDIV = Method.v(jPyPy, 'uint_div', (jInt, jInt), jInt) +PYPYULONGMOD = Method.v(jPyPy, 'ulong_mod', (jLong, jLong), jLong) +PYPYUINTTODOUBLE = Method.s(jPyPy, 'uint_to_double', (jInt,), jDouble) +PYPYDOUBLETOUINT = Method.s(jPyPy, 'double_to_uint', (jDouble,), jInt) +PYPYDOUBLETOLONG = Method.v(jPyPy, 'double_to_long', (jDouble,), jLong) #PAUL +PYPYLONGBITWISENEGATE = Method.v(jPyPy, 'long_bitwise_negate', (jLong,), jLong) +PYPYSTRTOINT = Method.v(jPyPy, 'str_to_int', (jString,), jInt) +PYPYSTRTOUINT = Method.v(jPyPy, 'str_to_uint', (jString,), jInt) +PYPYSTRTOLONG = Method.v(jPyPy, 'str_to_long', (jString,), jLong) +PYPYSTRTOULONG = Method.v(jPyPy, 'str_to_ulong', (jString,), jLong) +PYPYSTRTOBOOL = Method.v(jPyPy, 'str_to_bool', (jString,), jBool) +PYPYSTRTODOUBLE = Method.v(jPyPy, 'str_to_double', (jString,), jDouble) +PYPYSTRTOCHAR = Method.v(jPyPy, 'str_to_char', (jString,), jChar) +PYPYBOOLTODOUBLE = Method.v(jPyPy, 'bool_to_double', (jBool,), jDouble) +PYPYDUMP = Method.s(jPyPy, 'dump', (jString,), jVoid) +PYPYDUMPEXCWRAPPER = Method.s(jPyPy, 'dump_exc_wrapper', (jObject,), jVoid) +PYPYSERIALIZEBOOLEAN = Method.s(jPyPy, 'serialize_boolean', (jBool,), jString) +PYPYSERIALIZEUINT = Method.s(jPyPy, 'serialize_uint', (jInt,), jString) +PYPYSERIALIZEULONG = Method.s(jPyPy, 'serialize_ulonglong', (jLong,),jString) +PYPYSERIALIZEVOID = Method.s(jPyPy, 'serialize_void', (), jString) +PYPYESCAPEDCHAR = Method.s(jPyPy, 'escaped_char', (jChar,), jString) +PYPYESCAPEDUNICHAR = Method.s(jPyPy, 'escaped_unichar', (jChar,), jString) +PYPYESCAPEDSTRING = Method.s(jPyPy, 'escaped_string', (jString,), jString) +PYPYESCAPEDUNICODE = Method.s(jPyPy, 'escaped_unicode', (jString,), jString) +PYPYSERIALIZEOBJECT = Method.s(jPyPy, 'serializeObject', (jObject,), jString) +PYPYRUNTIMENEW = Method.s(jPyPy, 'RuntimeNew', (jClass,), jObject) +PYPYSTRING2BYTES = Method.s(jPyPy, 'string2bytes', (jString,), jByteArray) +PYPYARRAYTOLIST = Method.s(jPyPy, 'array_to_list', (jObjectArray,), jArrayList) +PYPYOOPARSEFLOAT = Method.v(jPyPy, 'ooparse_float', (jString,), jDouble) +OBJECTGETCLASS = Method.v(jObject, 'getClass', (), jClass) +CLASSGETNAME = Method.v(jClass, 'getName', (), jString) +CUSTOMDICTMAKE = Method.s(jPyPyCustomDict, 'make', + (jPyPyEquals, jPyPyHashCode), jPyPyCustomDict) +PYPYWEAKREFCREATE = Method.s(jPyPyWeakRef, 'create', (jObject,), jPyPyWeakRef) +PYPYWEAKREFGET = Method.s(jPyPyWeakRef, 'll_get', (), jObject) +PYPYVOIDARRAYMAKE = Method.s(jVoidArray, 'make', (jInt,), jVoidArray) + +# ___________________________________________________________________________ +# Fields +# +# Field objects encode information about fields. + +SYSTEMOUT = Field.s(jSystem, 'out', jPrintStream) +SYSTEMERR = Field.s(jSystem, 'err', jPrintStream) +DOUBLENAN = Field.s(jDoubleClass, 'NaN', jDouble) +DOUBLEPOSINF = Field.s(jDoubleClass, 'POSITIVE_INFINITY', jDouble) +DOUBLENEGINF = Field.s(jDoubleClass, 'NEGATIVE_INFINITY', jDouble) + +PYPYINTERLINK= Field.i(jPyPy, 'interlink', jPyPyInterlink) +PYPYOS = Field.i(jPyPy, 'os', jll_os) + From cfbolz at codespeak.net Sun Mar 2 19:08:21 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 2 Mar 2008 19:08:21 +0100 (CET) Subject: [pypy-svn] r52063 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080302180821.6FC66168571@codespeak.net> Author: cfbolz Date: Sun Mar 2 19:08:18 2008 New Revision: 52063 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py Log: fix a bug with dispatching logic: if a callee is done, it must continue dispatching in the caller, obviously. This only showed when the caller still had stuff to do and the callee did a promote. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Sun Mar 2 19:08:18 2008 @@ -250,29 +250,37 @@ def dispatch(self): is_portal = self.frame.bytecode.is_portal graph_color = self.frame.bytecode.graph_color + frame = self.frame queue = self.queue - newjitstate = rtimeshift.dispatch_next(queue) - resumepoint = rtimeshift.getresumepoint(newjitstate) - self.newjitstate(newjitstate) - if resumepoint == -1: - if graph_color == "gray": - assert not is_portal - newjitstate = rtimeshift.leave_graph_gray(queue) - elif is_portal or graph_color == "red": - newjitstate = rtimeshift.leave_graph_red( - queue, is_portal) - elif graph_color == "yellow": - newjitstate = rtimeshift.leave_graph_yellow(queue) - elif graph_color == "green": - assert 0, "green graphs shouldn't be seen by the rainbow interp" - else: - assert 0, "unknown graph color %s" % (graph_color, ) - + while 1: + newjitstate = rtimeshift.dispatch_next(queue) + resumepoint = rtimeshift.getresumepoint(newjitstate) self.newjitstate(newjitstate) - if self.frame is None: - return STOP - else: - self.frame.pc = resumepoint + if resumepoint == -1: + if graph_color == "gray": + assert not is_portal + newjitstate = rtimeshift.leave_graph_gray(queue) + elif is_portal or graph_color == "red": + newjitstate = rtimeshift.leave_graph_red( + queue, is_portal) + elif graph_color == "yellow": + newjitstate = rtimeshift.leave_graph_yellow(queue) + elif graph_color == "green": + assert 0, "green graphs shouldn't be seen by the rainbow interp" + else: + assert 0, "unknown graph color %s" % (graph_color, ) + + self.newjitstate(newjitstate) + if self.frame is None: + if frame.backframe is not None: + import pdb; pdb.set_trace() + frame = frame.backframe + queue = frame.dispatchqueue + continue + return STOP + else: + self.frame.pc = resumepoint + return # operation helper functions def load_byte(self): Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py Sun Mar 2 19:08:18 2008 @@ -528,7 +528,6 @@ res = self.timeshift_from_portal(f, g, [42], policy=P_NOVIRTUAL) def test_recursive_portal_call(self): - py.test.skip("not working yet") def indirection(green, red): newgreen = hint((green + red) % 100, promote=True) return portal(newgreen, red + 1) Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py Sun Mar 2 19:08:18 2008 @@ -101,11 +101,10 @@ self.check_insns(int_add=1, int_mul=0, int_sub=0) def test_promote_inside_call2(self): - py.test.skip("bug in promotion") def ll_two(n): k = hint(n, promote=True) k *= 17 - return hint(k, variable=True) + return k def ll_function(n, m): hint(None, global_merge_point=True) if not n: From arigo at codespeak.net Sun Mar 2 19:14:16 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 2 Mar 2008 19:14:16 +0100 (CET) Subject: [pypy-svn] r52064 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080302181416.42A3F168571@codespeak.net> Author: arigo Date: Sun Mar 2 19:14:15 2008 New Revision: 52064 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Log: Kill Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Sun Mar 2 19:14:15 2008 @@ -273,7 +273,6 @@ self.newjitstate(newjitstate) if self.frame is None: if frame.backframe is not None: - import pdb; pdb.set_trace() frame = frame.backframe queue = frame.dispatchqueue continue From cfbolz at codespeak.net Sun Mar 2 19:15:30 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 2 Mar 2008 19:15:30 +0100 (CET) Subject: [pypy-svn] r52065 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080302181530.00F3C168571@codespeak.net> Author: cfbolz Date: Sun Mar 2 19:15:30 2008 New Revision: 52065 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Log: fix tests on 2.4 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sun Mar 2 19:15:30 2008 @@ -19,7 +19,7 @@ # we need to turn it into a low level one assert not we_are_translated() bk = rtyper.annotator.bookkeeper - exc_classdef = bk.getuniqueclassdef(type(e)) + exc_classdef = bk.getuniqueclassdef(e.__class__) ll_exc = rtyper.exceptiondata.get_standard_ll_exc_instance( rtyper, exc_classdef) jitstate.residual_ll_exception(ll_exc) From arigo at codespeak.net Sun Mar 2 19:18:46 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 2 Mar 2008 19:18:46 +0100 (CET) Subject: [pypy-svn] r52066 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080302181846.E2DB7168575@codespeak.net> Author: arigo Date: Sun Mar 2 19:18:46 2008 New Revision: 52066 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py Log: For test_llinterp, we need to translate a function to fish for the generated residual graph. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py Sun Mar 2 19:18:46 2008 @@ -79,12 +79,20 @@ from pypy.annotation import model as annmodel annhelper = annlowlevel.MixLevelHelperAnnotator(self.rtyper) FUNC = self.PORTAL_FUNCTYPE + RESFUNC = self.RESIDUAL_FUNCTYPE args_s = [annmodel.lltype_to_annotation(ARG) for ARG in FUNC.ARGS] s_result = annmodel.lltype_to_annotation(FUNC.RESULT) self.portal_entry_graph = annhelper.getgraph( self.portal_entry, args_s, s_result) portal_entry_graph_ptr = annhelper.graph2delayed( self.portal_entry_graph, FUNC) + # debugging + state = self.state + def ll_get_residual_fnptr(): + return state.get_residual_fnptr() + self.get_residual_fnptr_graph = annhelper.getgraph( + ll_get_residual_fnptr, [], + annmodel.lltype_to_annotation(lltype.Ptr(RESFUNC))) annhelper.finish() # the following gives a pdb prompt when portal_entry raises an exception @@ -113,6 +121,17 @@ redportargdesccls = RedPortalArgDesc return redportargdesccls(lowleveltype, self.RGenOp) + def get_residual_graph(self, llinterp): + # debugging helper + portalstate = self.state + if not self.translate_support_code: + residual_graph_ptr = portalstate.get_residual_fnptr() + else: + residual_graph_ptr = llinterp.eval_graph( + self.get_residual_fnptr_graph, []) + residual_graph = residual_graph_ptr._obj.graph + return residual_graph + def make_state_class(args_specification, RESIDUAL_FUNCTYPE, sigtoken, portal_jitcode, rtyper, codewriter): @@ -287,6 +306,16 @@ def readallportals(self): return [gv_gen.revealconst(lltype.Ptr(RESIDUAL_FUNCTYPE)) for gv_gen in self.cache.values()] + + def get_residual_fnptr(self): + lst = self.readallportals() + if len(lst) == 1: + return lst[0] + elif len(lst) == 0: + raise Exception("no residual graph!") + else: + raise Exception("multiple residual graphs") + return PortalState Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py Sun Mar 2 19:18:46 2008 @@ -62,22 +62,14 @@ inline=inline, policy=policy, backendoptimize=backendoptimize) self.main_args = main_args - self.main_is_portal = main is portal - llinterp = LLInterpreter(self.rtyper, + self.llinterp = LLInterpreter(self.rtyper, exc_data_ptr= self.writer.exceptiondesc.exc_data_ptr) - res = llinterp.eval_graph(self.maingraph, main_args) + res = self.llinterp.eval_graph(self.maingraph, main_args) return res def get_residual_graph(self): - portalstate = self.rewriter.state - if self.main_is_portal: - residual_graph = portalstate.readportal(*self.main_args)._obj.graph - else: - residual_graphs = portalstate.readallportals() - assert len(residual_graphs) == 1 - residual_graph = residual_graphs[0]._obj.graph - return residual_graph + return self.rewriter.get_residual_graph(self.llinterp) def count_direct_calls(self): residual_graph = self.get_residual_graph() From arigo at codespeak.net Sun Mar 2 20:18:07 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 2 Mar 2008 20:18:07 +0100 (CET) Subject: [pypy-svn] r52067 - pypy/branch/jit-refactoring/pypy/jit/timeshifter Message-ID: <20080302191807.1D1BE168569@codespeak.net> Author: arigo Date: Sun Mar 2 20:18:06 2008 New Revision: 52067 Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/vdict.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/vlist.py Log: Sprinkle more of these checks. Adding them by metaprogramming is messy. Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/vdict.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/vdict.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/vdict.py Sun Mar 2 20:18:06 2008 @@ -268,6 +268,7 @@ return oopspecdesc.typedesc.factory() def oop_dict_setitem(jitstate, oopspecdesc, deepfrozen, selfbox, keybox, valuebox): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, AbstractVirtualDict) and keybox.is_constant(): content.setitem(keybox, valuebox) @@ -275,6 +276,7 @@ oopspecdesc.residual_call(jitstate, [selfbox, keybox, valuebox]) def oop_dict_getitem(jitstate, oopspecdesc, deepfrozen, selfbox, keybox): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, AbstractVirtualDict) and keybox.is_constant(): try: @@ -287,6 +289,7 @@ oop_dict_getitem.couldfold = True def oop_dict_contains(jitstate, oopspecdesc, deepfrozen, selfbox, keybox): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, AbstractVirtualDict) and keybox.is_constant(): try: Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/vlist.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/vlist.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/vlist.py Sun Mar 2 20:18:06 2008 @@ -274,6 +274,7 @@ return oopspecdesc.residual_call(jitstate, [lengthbox, itembox]) def oop_list_copy(jitstate, oopspecdesc, deepfrozen, selfbox): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): copybox = oopspecdesc.typedesc.factory(0, None) @@ -285,6 +286,7 @@ return oopspecdesc.residual_call(jitstate, [selfbox]) def oop_list_len(jitstate, oopspecdesc, deepfrozen, selfbox): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): return rvalue.ll_fromvalue(jitstate, len(content.item_boxes)) @@ -294,6 +296,7 @@ oop_list_len.couldfold = True def oop_list_nonzero(jitstate, oopspecdesc, deepfrozen, selfbox): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): return rvalue.ll_fromvalue(jitstate, bool(content.item_boxes)) @@ -303,6 +306,7 @@ oop_list_nonzero.couldfold = True def oop_list_append(jitstate, oopspecdesc, deepfrozen, selfbox, itembox): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): content.item_boxes.append(itembox) @@ -310,6 +314,7 @@ oopspecdesc.residual_call(jitstate, [selfbox, itembox]) def oop_list_insert(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox, itembox): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList) and indexbox.is_constant(): index = rvalue.ll_getvalue(indexbox, lltype.Signed) @@ -320,6 +325,7 @@ oopspecdesc.residual_call(jitstate, [selfbox, indexbox, itembox]) def oop_list_concat(jitstate, oopspecdesc, deepfrozen, selfbox, otherbox): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): assert isinstance(otherbox, rvalue.PtrRedBox) @@ -334,6 +340,7 @@ return oopspecdesc.residual_call(jitstate, [selfbox, otherbox]) def oop_list_pop(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox=None): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if indexbox is None: if isinstance(content, VirtualList): @@ -354,6 +361,7 @@ return oopspecdesc.residual_call(jitstate, [selfbox, indexbox]) def oop_list_reverse(jitstate, oopspecdesc, deepfrozen, selfbox): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): content.item_boxes.reverse() @@ -361,6 +369,7 @@ oopspecdesc.residual_call(jitstate, [selfbox]) def oop_list_getitem(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList) and indexbox.is_constant(): index = rvalue.ll_getvalue(indexbox, lltype.Signed) @@ -374,6 +383,7 @@ oop_list_getitem.couldfold = True def oop_list_setitem(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox, itembox): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList) and indexbox.is_constant(): index = rvalue.ll_getvalue(indexbox, lltype.Signed) @@ -385,6 +395,7 @@ oopspecdesc.residual_call(jitstate, [selfbox, indexbox, itembox]) def oop_list_delitem(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox): + assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList) and indexbox.is_constant(): index = rvalue.ll_getvalue(indexbox, lltype.Signed) From niko at codespeak.net Sun Mar 2 20:26:47 2008 From: niko at codespeak.net (niko at codespeak.net) Date: Sun, 2 Mar 2008 20:26:47 +0100 (CET) Subject: [pypy-svn] r52068 - pypy/branch/fixed-list-ootype/pypy/translator/jvm Message-ID: <20080302192647.ACE5F168570@codespeak.net> Author: niko Date: Sun Mar 2 20:26:47 2008 New Revision: 52068 Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/constant.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py Log: 1. add double arrays to database table 2. add missing package in constant.py Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/constant.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/constant.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/constant.py Sun Mar 2 20:26:47 2008 @@ -180,7 +180,7 @@ def create_pointer(self, gen): gen.new_with_jtype(self.eq_jcls) gen.new_with_jtype(self.hash_jcls) - gen.emit(CUSTOMDICTMAKE) + gen.emit(jvm.CUSTOMDICTMAKE) class JVMWeakRefConst(WeakRefConst): Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py Sun Mar 2 20:26:47 2008 @@ -542,6 +542,7 @@ ootype.Bool : jvm.jByteArray, ootype.UniChar : jvm.jCharArray, ootype.String : jvm.jStringArray, + ootype.Float : jvm.jDoubleArray, ootype.Void : jvm.jVoidArray, } From arigo at codespeak.net Sun Mar 2 20:27:25 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 2 Mar 2008 20:27:25 +0100 (CET) Subject: [pypy-svn] r52069 - pypy/branch/jit-refactoring/pypy/jit/timeshifter Message-ID: <20080302192725.D4BEA168570@codespeak.net> Author: arigo Date: Sun Mar 2 20:27:25 2008 New Revision: 52069 Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py Log: Now that promote() is no longer specialized (which looks like a good idea for a function this large anyway), we need an RPython fix. Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py Sun Mar 2 20:27:25 2008 @@ -778,9 +778,17 @@ self.ll_continue_compilation = ll_continue_compilation FUNCTYPE = lltype.FuncType([base_ptr_lltype(), ERASED], lltype.Void) - self.FUNCPTRTYPE = lltype.Ptr(FUNCTYPE) + FUNCPTRTYPE = lltype.Ptr(FUNCTYPE) + self.FUNCPTRTYPE = FUNCPTRTYPE self.sigtoken = interpreter.rgenop.sigToken(FUNCTYPE) + def get_gv_continue_compilation(builder): + fnptr = llhelper(FUNCPTRTYPE, ll_continue_compilation) + # ^^^ the llhelper cannot be attached on 'self' directly, because + # the translator needs to see its construction done by RPython code + return builder.rgenop.genconst(fnptr) + self.get_gv_continue_compilation = get_gv_continue_compilation + def _freeze_(self): return True @@ -813,11 +821,9 @@ exceptiondesc.gv_null_exc_type ) exceptiondesc.genop_set_exc_value(default_builder, exceptiondesc.gv_null_exc_value) - fnptr = llhelper(promotiondesc.FUNCPTRTYPE, - promotiondesc.ll_continue_compilation) - gv_continue_compilation = default_builder.rgenop.genconst(fnptr) + gv_cc = promotiondesc.get_gv_continue_compilation(default_builder) default_builder.genop_call(promotiondesc.sigtoken, - gv_continue_compilation, + gv_cc, [gv_pm, gv_switchvar]) exceptiondesc.genop_set_exc_type (default_builder, gv_exc_type ) exceptiondesc.genop_set_exc_value(default_builder, gv_exc_value) From cfbolz at codespeak.net Sun Mar 2 20:34:27 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 2 Mar 2008 20:34:27 +0100 (CET) Subject: [pypy-svn] r52070 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080302193427.3C557168574@codespeak.net> Author: cfbolz Date: Sun Mar 2 20:34:26 2008 New Revision: 52070 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_virtualizable.py Log: fix test Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_virtualizable.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_virtualizable.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_virtualizable.py Sun Mar 2 20:34:26 2008 @@ -825,7 +825,6 @@ self.check_insns(getfield=0) def test_simple_interpreter_with_frame(self): - py.test.skip("strange problem") class Log: acc = 0 log = Log() @@ -872,8 +871,8 @@ assert res == 42 if self.on_llgraph: calls = self.count_direct_calls() - call_count = sum([count for graph, count in calls.iteritems() - if not graph.name.startswith('rpyexc_')]) + call_count = sum(calls.values()) + # one call to "continue_compilation" and one call to debug assert call_count == 2 From cfbolz at codespeak.net Sun Mar 2 20:37:34 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 2 Mar 2008 20:37:34 +0100 (CET) Subject: [pypy-svn] r52071 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080302193734.0394B168575@codespeak.net> Author: cfbolz Date: Sun Mar 2 20:37:34 2008 New Revision: 52071 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_virtualizable.py Log: fix yet another skipped test Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Sun Mar 2 20:37:34 2008 @@ -229,7 +229,8 @@ if not self.on_llgraph: return oops = {} - for block in self.residual_graph.iterblocks(): + residual_graph = self.get_residual_graph() + for block in residual_graph.iterblocks(): for op in block.operations: if op.opname == 'direct_call': f = getattr(op.args[0].value._obj, "_callable", None) @@ -240,9 +241,11 @@ assert oops == expected for name, count in counts.items(): assert oops.get(name, 0) == count + def check_flexswitches(self, expected_count): + residual_graph = self.get_residual_graph() count = 0 - for block in self.residual_graph.iterblocks(): + for block in residual_graph.iterblocks(): if (isinstance(block.exitswitch, Variable) and block.exitswitch.concretetype is lltype.Signed): count += 1 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_virtualizable.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_virtualizable.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_virtualizable.py Sun Mar 2 20:37:34 2008 @@ -1200,7 +1200,6 @@ assert res == main() def test_simple_interpreter_with_frame_with_stack(self): - py.test.skip("strange problem") class Log: stack = None log = Log() From cfbolz at codespeak.net Sun Mar 2 20:43:29 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 2 Mar 2008 20:43:29 +0100 (CET) Subject: [pypy-svn] r52072 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080302194329.E701A168578@codespeak.net> Author: cfbolz Date: Sun Mar 2 20:43:27 2008 New Revision: 52072 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_frontend.py Log: this just works Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_frontend.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_frontend.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_frontend.py Sun Mar 2 20:43:27 2008 @@ -7,7 +7,6 @@ type_system = "lltype" def test_we_are_jitted(self): - py.test.skip("implement me") def f(): if we_are_jitted(): return 42 From cfbolz at codespeak.net Sun Mar 2 20:56:13 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 2 Mar 2008 20:56:13 +0100 (CET) Subject: [pypy-svn] r52073 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080302195613.CDFB2168577@codespeak.net> Author: cfbolz Date: Sun Mar 2 20:56:13 2008 New Revision: 52073 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_frontend.py Log: support for _is_early_constant as well Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Sun Mar 2 20:56:13 2008 @@ -1236,6 +1236,19 @@ else: self.register_greenvar(op.result) + def serialize_op_is_early_constant(self, op): + consttrue = flowmodel.Constant(True, lltype.Bool) + trueindex = self.serialize_oparg("green", consttrue) + if self.varcolor(op.args[0]) == "green": + self.register_greenvar(op.result, trueindex) + else: + constfalse = flowmodel.Constant(False, lltype.Bool) + falseindex = self.serialize_oparg("green", constfalse) + argindex = self.serialize_oparg("red", op.args[0]) + self.emit("is_constant") + self.emit(argindex, trueindex, falseindex) + self.register_greenvar(op.result) + # call handling Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Sun Mar 2 20:56:13 2008 @@ -771,6 +771,13 @@ return interiordesc.gengetinteriorarraysize( self.jitstate, arraybox, indexboxes) + @arguments("red", "green", "green", returns="green") + def opimpl_is_constant(self, arg, true, false): + if arg.is_constant(): + return true + return false + + # ____________________________________________________________ # construction-time interface Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_frontend.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_frontend.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_frontend.py Sun Mar 2 20:56:13 2008 @@ -20,7 +20,6 @@ assert res == 42 def test_is_early_constant(self): - py.test.skip("implement me") def f(x): if _is_early_constant(x): return 42 @@ -32,7 +31,6 @@ assert res == 42 def test_is_early_constant_for_green(self): - py.test.skip("implement me") def g(x): if _is_early_constant(x): return 42 From cfbolz at codespeak.net Sun Mar 2 21:17:51 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 2 Mar 2008 21:17:51 +0100 (CET) Subject: [pypy-svn] r52074 - in pypy/branch/jit-refactoring/pypy/jit: . rainbow/test Message-ID: <20080302201751.D5712168575@codespeak.net> Author: cfbolz Date: Sun Mar 2 21:17:49 2008 New Revision: 52074 Modified: pypy/branch/jit-refactoring/pypy/jit/conftest.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py Log: enable the llinterp tests, but add a --quicktest option to disable them again Modified: pypy/branch/jit-refactoring/pypy/jit/conftest.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/conftest.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/conftest.py Sun Mar 2 21:17:49 2008 @@ -17,7 +17,11 @@ dest="benchmark", default=False, help="give benchmarks in tests that support it"), ) - +option = py.test.config.addoptions("pypy options", + Option('--quicktest', action="store_true", + dest="quicktest", default=False, + help="only run the tests that take a reasonable amount of time"), + ) class Benchmark(object): RUN_TIME = 2.0 # repeat the benchmarked loop for two seconds Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py Sun Mar 2 21:17:49 2008 @@ -1,6 +1,11 @@ -import py; py.test.skip("in-progress") +import py +from pypy.jit.conftest import option from pypy.jit.rainbow.test import test_portal +if option.quicktest: + py.test.skip("slow") + + class TestLLInterpreted(test_portal.TestPortal): translate_support_code = True From jared.grubb at codespeak.net Sun Mar 2 21:51:38 2008 From: jared.grubb at codespeak.net (jared.grubb at codespeak.net) Date: Sun, 2 Mar 2008 21:51:38 +0100 (CET) Subject: [pypy-svn] r52075 - pypy/dist/pypy/rlib/parsing/test Message-ID: <20080302205138.CE040168443@codespeak.net> Author: jared.grubb Date: Sun Mar 2 21:51:37 2008 New Revision: 52075 Added: pypy/dist/pypy/rlib/parsing/test/testoutput1.pickle Modified: pypy/dist/pypy/rlib/parsing/test/test_pcre_regtest.py Log: Add the PCRE testoutput1 file, including license in the regtest. Modified: pypy/dist/pypy/rlib/parsing/test/test_pcre_regtest.py ============================================================================== --- pypy/dist/pypy/rlib/parsing/test/test_pcre_regtest.py (original) +++ pypy/dist/pypy/rlib/parsing/test/test_pcre_regtest.py Sun Mar 2 21:51:37 2008 @@ -1,18 +1,87 @@ -# This file can (in progress) read and parse PCRE regression tests to try out -# on our regular expression library. -# -# To try this out, 'man pcretest' and then grab testinput1 and testoutput1 from -# the PCRE source code. (I need to look into whether we could distribute these -# files with pypy?) +"""This test can read and parse PCRE regression tests to try out +on our regular expression library.""" + +# The PCRE library is distributed under the BSD license. We have borrowed some +# of the regression tests (the ones that fit under the DFA scope) in order to +# exercise our regex implementation. Those tests are distributed under PCRE's +# BSD license. Here is the text: + +# PCRE LICENCE +# ------------ +# +# PCRE is a library of functions to support regular expressions whose syntax +# and semantics are as close as possible to those of the Perl 5 language. +# +# Release 7 of PCRE is distributed under the terms of the "BSD" licence, as +# specified below. The documentation for PCRE, supplied in the "doc" +# directory, is distributed under the same terms as the software itself. +# +# The basic library functions are written in C and are freestanding. Also +# included in the distribution is a set of C++ wrapper functions. +# +# THE BASIC LIBRARY FUNCTIONS +# --------------------------- +# +# Written by: Philip Hazel +# Email local part: ph10 +# Email domain: cam.ac.uk +# +# University of Cambridge Computing Service, +# Cambridge, England. +# +# Copyright (c) 1997-2008 University of Cambridge +# All rights reserved. +# +# THE C++ WRAPPER FUNCTIONS +# ------------------------- +# +# Contributed by: Google Inc. +# +# Copyright (c) 2007-2008, Google Inc. +# All rights reserved. +# +# THE "BSD" LICENCE +# ----------------- +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the name of the University of Cambridge nor the name of Google +# Inc. nor the names of their contributors may be used to endorse or +# promote products derived from this software without specific prior +# written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +# End import py from pypy.rlib.parsing.regexparse import make_runner, unescape import string import re -py.test.skip("In Progress...") +py.test.skip("Still in progress") + +def create_pcre_pickle(file, picklefile): + import pickle -def read_file(file): lines = [line for line in file.readlines()] # Look for things to skip... @@ -98,66 +167,74 @@ print " *** %r ***" % match raise Exception("Lost sync in output.") tests.append((test,match)) + pickle.dump(suite, picklefile) + +def get_pcre_pickle(file): + import pickle + suite = pickle.load(file) return suite -def test_file(): - """Open the PCRE tests and run them.""" - suite = read_file(open('testoutput1','r')) +def run_individual_test(regex, tests): + regex_to_use = regex + + anchor_left = regex_to_use.startswith('^') + anchor_right = regex_to_use.endswith('$') and not regex_to_use.endswith('\\$') + if anchor_left: + regex_to_use = regex_to_use[1:] # chop the ^ if it's there + if anchor_right: + regex_to_use = regex_to_use[:-1] # chop the $ if it's there + + if not regex_to_use: + #print " SKIPPED (Cant do blank regex)" + return - import pdb - while suite: - regex, flags, tests = suite.pop(0) - print '/%r/%s' % (regex, flags) - - regex_to_use = regex - - anchor_left = regex_to_use.startswith('^') - anchor_right = regex_to_use.endswith('$') and not regex_to_use.endswith('\\$') + runner = make_runner(regex) + # Now run the test expressions against the Regex + for test, match in tests: + # Create possible subsequences that we should test if anchor_left: - regex_to_use = regex_to_use[1:] # chop the ^ if it's there + start_range = [0] + else: + start_range = range(0, len(test)) + if anchor_right: - regex_to_use = regex_to_use[:-1] # chop the $ if it's there - - if not regex_to_use: - print " SKIPPED (Cant do blank regex)" - continue - - # Finally, we make the pypy regex runner - runner = make_runner(regex_to_use) + subseq_gen = ( (start, len(test)) for start in start_range ) + else: + # Go backwards to simulate greediness + subseq_gen = ( (start, end) for start in start_range for end in range(len(test)+1, start, -1) ) + + # Search the possibilities for a match... + for start, end in subseq_gen: + attempt = test[start:end] + matched = runner.recognize(attempt) + if matched: + break - # Now run the test expressions against the Regex - for test, match in tests: - # Create possible subsequences that we should test - if anchor_left: - start_range = [0] + # Did we get what we expected? + if match == 'No match': + if matched: + assert "FALSE MATCH: regex==%r test==%r" % (regex, test) else: - start_range = range(0, len(test)) - - if anchor_right: - subseq_gen = ( (start, len(test)) for start in start_range ) + pass + #print " pass: regex==%r test==%r" % (regex, test) + elif match.startswith(' 0: '): + if not matched: + assert "MISSED: regex==%r test==%r" % (regex, test) + elif not attempt==match[4:]: + assert "BAD MATCH: regex==%r test==%r found==%r expect==%r" % (regex, test, attempt, match[4:]) else: - # Go backwards to simulate greediness - subseq_gen = ( (start, end) for start in start_range for end in range(len(test)+1, start, -1) ) + pass + #print " pass: regex==%r test==%r" % (regex, test) - # Search the possibilities for a match... - for start, end in subseq_gen: - attempt = test[start:end] - matched = runner.recognize(attempt) - if matched: - break - - # Did we get what we expected? - if match == 'No match': - if matched: - print " FALSE MATCH: regex==%r test==%r" % (regex, test) - else: - pass - #print " pass: regex==%r test==%r" % (regex, test) - elif match.startswith(' 0: '): - if not matched: - print " MISSED: regex==%r test==%r" % (regex, test) - elif not attempt==match[4:]: - print " BAD MATCH: regex==%r test==%r found==%r expect==%r" % (regex, test, attempt, match[4:]) - else: - pass - #print " pass: regex==%r test==%r" % (regex, test) +def run_pcre_tests(suite): + """Run PCRE tests as given in suite.""" + while suite: + regex, flags, tests = suite.pop(0) + yield run_individual_test, regex, tests + + +def test_output1(): + suite = get_pcre_pickle(open('testoutput1.pickle','r')) + for test in run_pcre_tests(suite): + yield test + \ No newline at end of file Added: pypy/dist/pypy/rlib/parsing/test/testoutput1.pickle ============================================================================== --- (empty file) +++ pypy/dist/pypy/rlib/parsing/test/testoutput1.pickle Sun Mar 2 21:51:37 2008 @@ -0,0 +1,5080 @@ +(lp0 +(lp1 +S'the quick brown fox' +p2 +aS'' +p3 +a(lp4 +(S'the quick brown fox' +p5 +S' 0: the quick brown fox' +p6 +tp7 +a(S'The quick brown FOX' +p8 +S'No match' +p9 +tp10 +a(S'What do you know about the quick brown fox?' +p11 +S' 0: the quick brown fox' +p12 +tp13 +a(S'What do you know about THE QUICK BROWN FOX?' +p14 +S'No match' +p15 +tp16 +aaa(lp17 +S'abcd\\t\\n\\r\\f\\a\\e\\071\\x3b\\$\\\\\\?caxyz' +p18 +ag3 +a(lp19 +(S'abcd\t\n\r\x0c\x07\x1b9;$\\?caxyz' +p20 +S' 0: abcd\t\n\r\x0c\x07\x1b9;$\\?caxyz' +p21 +tp22 +aaa(lp23 +S'a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz' +p24 +ag3 +a(lp25 +(S'abxyzpqrrrabbxyyyypqAzz' +p26 +S' 0: abxyzpqrrrabbxyyyypqAzz' +p27 +tp28 +a(S'abxyzpqrrrabbxyyyypqAzz' +p29 +S' 0: abxyzpqrrrabbxyyyypqAzz' +p30 +tp31 +a(S'aabxyzpqrrrabbxyyyypqAzz' +p32 +S' 0: aabxyzpqrrrabbxyyyypqAzz' +p33 +tp34 +a(S'aaabxyzpqrrrabbxyyyypqAzz' +p35 +S' 0: aaabxyzpqrrrabbxyyyypqAzz' +p36 +tp37 +a(S'aaaabxyzpqrrrabbxyyyypqAzz' +p38 +S' 0: aaaabxyzpqrrrabbxyyyypqAzz' +p39 +tp40 +a(S'abcxyzpqrrrabbxyyyypqAzz' +p41 +S' 0: abcxyzpqrrrabbxyyyypqAzz' +p42 +tp43 +a(S'aabcxyzpqrrrabbxyyyypqAzz' +p44 +S' 0: aabcxyzpqrrrabbxyyyypqAzz' +p45 +tp46 +a(S'aaabcxyzpqrrrabbxyyyypAzz' +p47 +S' 0: aaabcxyzpqrrrabbxyyyypAzz' +p48 +tp49 +a(S'aaabcxyzpqrrrabbxyyyypqAzz' +p50 +S' 0: aaabcxyzpqrrrabbxyyyypqAzz' +p51 +tp52 +a(S'aaabcxyzpqrrrabbxyyyypqqAzz' +p53 +S' 0: aaabcxyzpqrrrabbxyyyypqqAzz' +p54 +tp55 +a(S'aaabcxyzpqrrrabbxyyyypqqqAzz' +p56 +S' 0: aaabcxyzpqrrrabbxyyyypqqqAzz' +p57 +tp58 +a(S'aaabcxyzpqrrrabbxyyyypqqqqAzz' +p59 +S' 0: aaabcxyzpqrrrabbxyyyypqqqqAzz' +p60 +tp61 +a(S'aaabcxyzpqrrrabbxyyyypqqqqqAzz' +p62 +S' 0: aaabcxyzpqrrrabbxyyyypqqqqqAzz' +p63 +tp64 +a(S'aaabcxyzpqrrrabbxyyyypqqqqqqAzz' +p65 +S' 0: aaabcxyzpqrrrabbxyyyypqqqqqqAzz' +p66 +tp67 +a(S'aaaabcxyzpqrrrabbxyyyypqAzz' +p68 +S' 0: aaaabcxyzpqrrrabbxyyyypqAzz' +p69 +tp70 +a(S'abxyzzpqrrrabbxyyyypqAzz' +p71 +S' 0: abxyzzpqrrrabbxyyyypqAzz' +p72 +tp73 +a(S'aabxyzzzpqrrrabbxyyyypqAzz' +p74 +S' 0: aabxyzzzpqrrrabbxyyyypqAzz' +p75 +tp76 +a(S'aaabxyzzzzpqrrrabbxyyyypqAzz' +p77 +S' 0: aaabxyzzzzpqrrrabbxyyyypqAzz' +p78 +tp79 +a(S'aaaabxyzzzzpqrrrabbxyyyypqAzz' +p80 +S' 0: aaaabxyzzzzpqrrrabbxyyyypqAzz' +p81 +tp82 +a(S'abcxyzzpqrrrabbxyyyypqAzz' +p83 +S' 0: abcxyzzpqrrrabbxyyyypqAzz' +p84 +tp85 +a(S'aabcxyzzzpqrrrabbxyyyypqAzz' +p86 +S' 0: aabcxyzzzpqrrrabbxyyyypqAzz' +p87 +tp88 +a(S'aaabcxyzzzzpqrrrabbxyyyypqAzz' +p89 +S' 0: aaabcxyzzzzpqrrrabbxyyyypqAzz' +p90 +tp91 +a(S'aaaabcxyzzzzpqrrrabbxyyyypqAzz' +p92 +S' 0: aaaabcxyzzzzpqrrrabbxyyyypqAzz' +p93 +tp94 +a(S'aaaabcxyzzzzpqrrrabbbxyyyypqAzz' +p95 +S' 0: aaaabcxyzzzzpqrrrabbbxyyyypqAzz' +p96 +tp97 +a(S'aaaabcxyzzzzpqrrrabbbxyyyyypqAzz' +p98 +S' 0: aaaabcxyzzzzpqrrrabbbxyyyyypqAzz' +p99 +tp100 +a(S'aaabcxyzpqrrrabbxyyyypABzz' +p101 +S' 0: aaabcxyzpqrrrabbxyyyypABzz' +p102 +tp103 +a(S'aaabcxyzpqrrrabbxyyyypABBzz' +p104 +S' 0: aaabcxyzpqrrrabbxyyyypABBzz' +p105 +tp106 +a(S'>>>aaabxyzpqrrrabbxyyyypqAzz' +p107 +S' 0: aaabxyzpqrrrabbxyyyypqAzz' +p108 +tp109 +a(S'>aaaabxyzpqrrrabbxyyyypqAzz' +p110 +S' 0: aaaabxyzpqrrrabbxyyyypqAzz' +p111 +tp112 +a(S'>>>>abcxyzpqrrrabbxyyyypqAzz' +p113 +S' 0: abcxyzpqrrrabbxyyyypqAzz' +p114 +tp115 +a(S'*** Failers' +p116 +S'No match' +p117 +tp118 +a(S'abxyzpqrrabbxyyyypqAzz' +p119 +S'No match' +p120 +tp121 +a(S'abxyzpqrrrrabbxyyyypqAzz' +p122 +S'No match' +p123 +tp124 +a(S'abxyzpqrrrabxyyyypqAzz' +p125 +S'No match' +p126 +tp127 +a(S'aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz' +p128 +S'No match' +p129 +tp130 +a(S'aaaabcxyzzzzpqrrrabbbxyyypqAzz' +p131 +S'No match' +p132 +tp133 +a(S'aaabcxyzpqrrrabbxyyyypqqqqqqqAzz' +p134 +S'No match' +p135 +tp136 +aaa(lp137 +S'^(abc){1,2}zz' +p138 +ag3 +a(lp139 +(S'abczz' +p140 +S' 0: abczz' +p141 +tp142 +a(S'abcabczz' +p143 +S' 0: abcabczz' +p144 +tp145 +a(S'*** Failers' +p146 +S'No match' +p147 +tp148 +a(S'zz' +p149 +S'No match' +p150 +tp151 +a(S'abcabcabczz' +p152 +S'No match' +p153 +tp154 +a(S'>>abczz' +p155 +S'No match' +p156 +tp157 +aaa(lp158 +S'^(b+|a){1,2}c' +p159 +ag3 +a(lp160 +(S'bc' +p161 +S' 0: bc' +p162 +tp163 +a(S'bbc' +p164 +S' 0: bbc' +p165 +tp166 +a(S'bbbc' +p167 +S' 0: bbbc' +p168 +tp169 +a(S'bac' +p170 +S' 0: bac' +p171 +tp172 +a(S'bbac' +p173 +S' 0: bbac' +p174 +tp175 +a(S'aac' +p176 +S' 0: aac' +p177 +tp178 +a(S'abbbbbbbbbbbc' +p179 +S' 0: abbbbbbbbbbbc' +p180 +tp181 +a(S'bbbbbbbbbbbac' +p182 +S' 0: bbbbbbbbbbbac' +p183 +tp184 +a(S'*** Failers' +p185 +S'No match' +p186 +tp187 +a(S'aaac' +p188 +S'No match' +p189 +tp190 +a(S'abbbbbbbbbbbac' +p191 +S'No match' +p192 +tp193 +aaa(lp194 +S'^\\ca\\cA\\c[\\c{\\c:' +p195 +ag3 +a(lp196 +(S'\x01\x01\x1b;z' +p197 +S' 0: \x01\x01\x1b;z' +p198 +tp199 +aaa(lp200 +S'^[ab\\]cde]' +p201 +ag3 +a(lp202 +(S'athing' +p203 +S' 0: a' +p204 +tp205 +a(S'bthing' +p206 +S' 0: b' +p207 +tp208 +a(S']thing' +p209 +S' 0: ]' +p210 +tp211 +a(S'cthing' +p212 +S' 0: c' +p213 +tp214 +a(S'dthing' +p215 +S' 0: d' +p216 +tp217 +a(S'ething' +p218 +S' 0: e' +p219 +tp220 +a(S'*** Failers' +p221 +S'No match' +p222 +tp223 +a(S'fthing' +p224 +S'No match' +p225 +tp226 +a(S'[thing' +p227 +S'No match' +p228 +tp229 +a(S'\\thing' +p230 +S'No match' +p231 +tp232 +aaa(lp233 +S'^[]cde]' +p234 +ag3 +a(lp235 +(S']thing' +p236 +S' 0: ]' +p237 +tp238 +a(S'cthing' +p239 +S' 0: c' +p240 +tp241 +a(S'dthing' +p242 +S' 0: d' +p243 +tp244 +a(S'ething' +p245 +S' 0: e' +p246 +tp247 +a(S'*** Failers' +p248 +S'No match' +p249 +tp250 +a(S'athing' +p251 +S'No match' +p252 +tp253 +a(S'fthing' +p254 +S'No match' +p255 +tp256 +aaa(lp257 +S'^[^ab\\]cde]' +p258 +ag3 +a(lp259 +(S'fthing' +p260 +S' 0: f' +p261 +tp262 +a(S'[thing' +p263 +S' 0: [' +p264 +tp265 +a(S'\\thing' +p266 +S' 0: \\' +p267 +tp268 +a(S'*** Failers' +p269 +S' 0: *' +p270 +tp271 +a(S'athing' +p272 +S'No match' +p273 +tp274 +a(S'bthing' +p275 +S'No match' +p276 +tp277 +a(S']thing' +p278 +S'No match' +p279 +tp280 +a(S'cthing' +p281 +S'No match' +p282 +tp283 +a(S'dthing' +p284 +S'No match' +p285 +tp286 +a(S'ething' +p287 +S'No match' +p288 +tp289 +aaa(lp290 +S'^[^]cde]' +p291 +ag3 +a(lp292 +(S'athing' +p293 +S' 0: a' +p294 +tp295 +a(S'fthing' +p296 +S' 0: f' +p297 +tp298 +a(S'*** Failers' +p299 +S' 0: *' +p300 +tp301 +a(S']thing' +p302 +S'No match' +p303 +tp304 +a(S'cthing' +p305 +S'No match' +p306 +tp307 +a(S'dthing' +p308 +S'No match' +p309 +tp310 +a(S'ething' +p311 +S'No match' +p312 +tp313 +aaa(lp314 +S'^\\\x81' +p315 +ag3 +a(lp316 +(S'\x81' +p317 +S' 0: \x81' +p318 +tp319 +aaa(lp320 +S'^\xff' +p321 +ag3 +a(lp322 +(S'\xff' +p323 +S' 0: \xff' +p324 +tp325 +aaa(lp326 +S'^[0-9]+$' +p327 +ag3 +a(lp328 +(S'0' +p329 +S' 0: 0' +p330 +tp331 +a(S'1' +p332 +S' 0: 1' +p333 +tp334 +a(S'2' +p335 +S' 0: 2' +p336 +tp337 +a(S'3' +p338 +S' 0: 3' +p339 +tp340 +a(S'4' +p341 +S' 0: 4' +p342 +tp343 +a(S'5' +p344 +S' 0: 5' +p345 +tp346 +a(S'6' +p347 +S' 0: 6' +p348 +tp349 +a(S'7' +p350 +S' 0: 7' +p351 +tp352 +a(S'8' +p353 +S' 0: 8' +p354 +tp355 +a(S'9' +p356 +S' 0: 9' +p357 +tp358 +a(S'10' +p359 +S' 0: 10' +p360 +tp361 +a(S'100' +p362 +S' 0: 100' +p363 +tp364 +a(S'*** Failers' +p365 +S'No match' +p366 +tp367 +a(S'abc' +p368 +S'No match' +p369 +tp370 +aaa(lp371 +S'^.*nter' +p372 +ag3 +a(lp373 +(S'enter' +p374 +S' 0: enter' +p375 +tp376 +a(S'inter' +p377 +S' 0: inter' +p378 +tp379 +a(S'uponter' +p380 +S' 0: uponter' +p381 +tp382 +aaa(lp383 +S'^xxx[0-9]+$' +p384 +ag3 +a(lp385 +(S'xxx0' +p386 +S' 0: xxx0' +p387 +tp388 +a(S'xxx1234' +p389 +S' 0: xxx1234' +p390 +tp391 +a(S'*** Failers' +p392 +S'No match' +p393 +tp394 +a(S'xxx' +p395 +S'No match' +p396 +tp397 +aaa(lp398 +S'^.+[0-9][0-9][0-9]$' +p399 +ag3 +a(lp400 +(S'x123' +p401 +S' 0: x123' +p402 +tp403 +a(S'xx123' +p404 +S' 0: xx123' +p405 +tp406 +a(S'123456' +p407 +S' 0: 123456' +p408 +tp409 +a(S'*** Failers' +p410 +S'No match' +p411 +tp412 +a(S'123' +p413 +S'No match' +p414 +tp415 +a(S'x1234' +p416 +S' 0: x1234' +p417 +tp418 +aaa(lp419 +S'^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$' +p420 +ag3 +a(lp421 +(S'abc!pqr=apquxz.ixr.zzz.ac.uk' +p422 +S' 0: abc!pqr=apquxz.ixr.zzz.ac.uk' +p423 +tp424 +a(S'*** Failers' +p425 +S'No match' +p426 +tp427 +a(S'!pqr=apquxz.ixr.zzz.ac.uk' +p428 +S'No match' +p429 +tp430 +a(S'abc!=apquxz.ixr.zzz.ac.uk' +p431 +S'No match' +p432 +tp433 +a(S'abc!pqr=apquxz:ixr.zzz.ac.uk' +p434 +S'No match' +p435 +tp436 +a(S'abc!pqr=apquxz.ixr.zzz.ac.ukk' +p437 +S'No match' +p438 +tp439 +aaa(lp440 +S':' +p441 +ag3 +a(lp442 +(S'Well, we need a colon: somewhere' +p443 +S' 0: :' +p444 +tp445 +a(S"*** Fail if we don't" +p446 +S'No match' +p447 +tp448 +aaa(lp449 +S'^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$' +p450 +ag3 +a(lp451 +(S'.1.2.3' +p452 +S' 0: .1.2.3' +p453 +tp454 +a(S'A.12.123.0' +p455 +S' 0: A.12.123.0' +p456 +tp457 +a(S'*** Failers' +p458 +S'No match' +p459 +tp460 +a(S'.1.2.3333' +p461 +S'No match' +p462 +tp463 +a(S'1.2.3' +p464 +S'No match' +p465 +tp466 +a(S'1234.2.3' +p467 +S'No match' +p468 +tp469 +aaa(lp470 +S'^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$' +p471 +ag3 +a(lp472 +(S'1 IN SOA non-sp1 non-sp2(' +p473 +S' 0: 1 IN SOA non-sp1 non-sp2(' +p474 +tp475 +a(S'1 IN SOA non-sp1 non-sp2 (' +p476 +S' 0: 1 IN SOA non-sp1 non-sp2 (' +p477 +tp478 +a(S'*** Failers' +p479 +S'No match' +p480 +tp481 +a(S'1IN SOA non-sp1 non-sp2(' +p482 +S'No match' +p483 +tp484 +aaa(lp485 +S'^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$' +p486 +ag3 +a(lp487 +(S'a.' +p488 +S' 0: a.' +p489 +tp490 +a(S'Z.' +p491 +S' 0: Z.' +p492 +tp493 +a(S'2.' +p494 +S' 0: 2.' +p495 +tp496 +a(S'ab-c.pq-r.' +p497 +S' 0: ab-c.pq-r.' +p498 +tp499 +a(S'sxk.zzz.ac.uk.' +p500 +S' 0: sxk.zzz.ac.uk.' +p501 +tp502 +a(S'x-.y-.' +p503 +S' 0: x-.y-.' +p504 +tp505 +a(S'*** Failers' +p506 +S'No match' +p507 +tp508 +a(S'-abc.peq.' +p509 +S'No match' +p510 +tp511 +aaa(lp512 +S'^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$' +p513 +ag3 +a(lp514 +(S'*.a' +p515 +S' 0: *.a' +p516 +tp517 +a(S'*.b0-a' +p518 +S' 0: *.b0-a' +p519 +tp520 +a(S'*.c3-b.c' +p521 +S' 0: *.c3-b.c' +p522 +tp523 +a(S'*.c-a.b-c' +p524 +S' 0: *.c-a.b-c' +p525 +tp526 +a(S'*** Failers' +p527 +S'No match' +p528 +tp529 +a(S'*.0' +p530 +S'No match' +p531 +tp532 +a(S'*.a-' +p533 +S'No match' +p534 +tp535 +a(S'*.a-b.c-' +p536 +S'No match' +p537 +tp538 +a(S'*.c-a.0-c' +p539 +S'No match' +p540 +tp541 +aaa(lp542 +S'^\\".*\\"\\s*(;.*)?$' +p543 +ag3 +a(lp544 +(S'"1234"' +p545 +S' 0: "1234"' +p546 +tp547 +a(S'"abcd" ;' +p548 +S' 0: "abcd" ;' +p549 +tp550 +a(S'"" ; rhubarb' +p551 +S' 0: "" ; rhubarb' +p552 +tp553 +a(S'*** Failers' +p554 +S'No match' +p555 +tp556 +a(S'"1234" : things' +p557 +S'No match' +p558 +tp559 +aaa(lp560 +S'^$' +p561 +ag3 +a(lp562 +(g3 +S' 0: ' +p563 +tp564 +a(S'*** Failers' +p565 +S'No match' +p566 +tp567 +aaa(lp568 +S'^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$' +p569 +ag3 +a(lp570 +(S'abcdefhijklm' +p571 +S' 0: abcdefhijklm' +p572 +tp573 +aaa(lp574 +S'^[\\w][\\W][\\s][\\S][\\d][\\D][\\b][\\n][\\c]][\\022]' +p575 +ag3 +a(lp576 +(S'a+ Z0+\x08\n\x1d\x12' +p577 +S' 0: a+ Z0+\x08\n\x1d\x12' +p578 +tp579 +aaa(lp580 +S'^a*\\w' +p581 +ag3 +a(lp582 +(S'z' +p583 +S' 0: z' +p584 +tp585 +a(S'az' +p586 +S' 0: az' +p587 +tp588 +a(S'aaaz' +p589 +S' 0: aaaz' +p590 +tp591 +a(S'a' +p592 +S' 0: a' +p593 +tp594 +a(S'aa' +p595 +S' 0: aa' +p596 +tp597 +a(S'aaaa' +p598 +S' 0: aaaa' +p599 +tp600 +a(S'a+' +p601 +S' 0: a' +p602 +tp603 +a(S'aa+' +p604 +S' 0: aa' +p605 +tp606 +aaa(lp607 +S'^a+\\w' +p608 +ag3 +a(lp609 +(S'az' +p610 +S' 0: az' +p611 +tp612 +a(S'aaaz' +p613 +S' 0: aaaz' +p614 +tp615 +a(S'aa' +p616 +S' 0: aa' +p617 +tp618 +a(S'aaaa' +p619 +S' 0: aaaa' +p620 +tp621 +a(S'aa+' +p622 +S' 0: aa' +p623 +tp624 +aaa(lp625 +S'^\\d{8}\\w{2,}' +p626 +ag3 +a(lp627 +(S'1234567890' +p628 +S' 0: 1234567890' +p629 +tp630 +a(S'12345678ab' +p631 +S' 0: 12345678ab' +p632 +tp633 +a(S'12345678__' +p634 +S' 0: 12345678__' +p635 +tp636 +a(S'*** Failers' +p637 +S'No match' +p638 +tp639 +a(S'1234567' +p640 +S'No match' +p641 +tp642 +aaa(lp643 +S'^[aeiou\\d]{4,5}$' +p644 +ag3 +a(lp645 +(S'uoie' +p646 +S' 0: uoie' +p647 +tp648 +a(S'1234' +p649 +S' 0: 1234' +p650 +tp651 +a(S'12345' +p652 +S' 0: 12345' +p653 +tp654 +a(S'aaaaa' +p655 +S' 0: aaaaa' +p656 +tp657 +a(S'*** Failers' +p658 +S'No match' +p659 +tp660 +a(S'123456' +p661 +S'No match' +p662 +tp663 +aaa(lp664 +S'^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]' +p665 +ag3 +a(lp666 +(S'From abcd Mon Sep 01 12:33:02 1997' +p667 +S' 0: From abcd Mon Sep 01 12:33' +p668 +tp669 +aaa(lp670 +S'^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d' +p671 +ag3 +a(lp672 +(S'From abcd Mon Sep 01 12:33:02 1997' +p673 +S' 0: From abcd Mon Sep 01 12:33' +p674 +tp675 +a(S'From abcd Mon Sep 1 12:33:02 1997' +p676 +S' 0: From abcd Mon Sep 1 12:33' +p677 +tp678 +a(S'*** Failers' +p679 +S'No match' +p680 +tp681 +a(S'From abcd Sep 01 12:33:02 1997' +p682 +S'No match' +p683 +tp684 +aaa(lp685 +S'^[ab]{1,3}(ab*|b)' +p686 +ag3 +a(lp687 +(S'aabbbbb' +p688 +S' 0: aabb' +p689 +tp690 +aaa(lp691 +S'abc\\0def\\00pqr\\000xyz\\0000AB' +p692 +ag3 +a(lp693 +(S'abc\x00def\x00pqr\x00xyz\x000AB' +p694 +S' 0: abc\x00def\x00pqr\x00xyz\x000AB' +p695 +tp696 +a(S'abc456 abc\x00def\x00pqr\x00xyz\x000ABCDE' +p697 +S' 0: abc\x00def\x00pqr\x00xyz\x000AB' +p698 +tp699 +aaa(lp700 +S'abc\\x0def\\x00pqr\\x000xyz\\x0000AB' +p701 +ag3 +a(lp702 +(S'abc\ref\x00pqr\x000xyz\x0000AB' +p703 +S' 0: abc\ref\x00pqr\x000xyz\x0000AB' +p704 +tp705 +a(S'abc456 abc\ref\x00pqr\x000xyz\x0000ABCDE' +p706 +S' 0: abc\ref\x00pqr\x000xyz\x0000AB' +p707 +tp708 +aaa(lp709 +S'^[\\000-\\037]' +p710 +ag3 +a(lp711 +(S'\x00A' +p712 +S' 0: \x00' +p713 +tp714 +a(S'\x01B' +p715 +S' 0: \x01' +p716 +tp717 +a(S'\x1fC' +p718 +S' 0: \x1f' +p719 +tp720 +aaa(lp721 +S'\\0*' +p722 +ag3 +a(lp723 +(S'\x00\x00\x00\x00' +p724 +S' 0: \x00\x00\x00\x00' +p725 +tp726 +aaa(lp727 +S'A\\x00{2,3}Z' +p728 +ag3 +a(lp729 +(S'The A\x00\x00Z' +p730 +S' 0: A\x00\x00Z' +p731 +tp732 +a(S'An A\x00\x00\x00Z' +p733 +S' 0: A\x00\x00\x00Z' +p734 +tp735 +a(S'*** Failers' +p736 +S'No match' +p737 +tp738 +a(S'A\x00Z' +p739 +S'No match' +p740 +tp741 +a(S'A\x00\x00\x00\x00Z' +p742 +S'No match' +p743 +tp744 +aaa(lp745 +S'^\\s' +p746 +ag3 +a(lp747 +(S' abc' +p748 +S' 0: ' +p749 +tp750 +a(S'\x0cabc' +p751 +S' 0: \x0c' +p752 +tp753 +a(S'\nabc' +p754 +S' 0: \n' +p755 +tp756 +a(S'\rabc' +p757 +S' 0: \r' +p758 +tp759 +a(S'\tabc' +p760 +S' 0: \t' +p761 +tp762 +a(S'*** Failers' +p763 +S'No match' +p764 +tp765 +a(S'abc' +p766 +S'No match' +p767 +tp768 +aaa(lp769 +S'ab{1,3}bc' +p770 +ag3 +a(lp771 +(S'abbbbc' +p772 +S' 0: abbbbc' +p773 +tp774 +a(S'abbbc' +p775 +S' 0: abbbc' +p776 +tp777 +a(S'abbc' +p778 +S' 0: abbc' +p779 +tp780 +a(S'*** Failers' +p781 +S'No match' +p782 +tp783 +a(S'abc' +p784 +S'No match' +p785 +tp786 +a(S'abbbbbc' +p787 +S'No match' +p788 +tp789 +aaa(lp790 +S'([^.]*)\\.([^:]*):[T ]+(.*)' +p791 +ag3 +a(lp792 +(S'track1.title:TBlah blah blah' +p793 +S' 0: track1.title:TBlah blah blah' +p794 +tp795 +aaa(lp796 +S'^[W-c]+$' +p797 +ag3 +a(lp798 +(S'WXY_^abc' +p799 +S' 0: WXY_^abc' +p800 +tp801 +a(S'*** Failers' +p802 +S'No match' +p803 +tp804 +a(S'wxy' +p805 +S'No match' +p806 +tp807 +aaa(lp808 +S'^abc$' +p809 +ag3 +a(lp810 +(S'abc' +p811 +S' 0: abc' +p812 +tp813 +a(S'*** Failers' +p814 +S'No match' +p815 +tp816 +a(S'qqq\nabc' +p817 +S'No match' +p818 +tp819 +a(S'abc\nzzz' +p820 +S'No match' +p821 +tp822 +a(S'qqq\nabc\nzzz' +p823 +S'No match' +p824 +tp825 +aaa(lp826 +S'[-az]+' +p827 +ag3 +a(lp828 +(S'az-' +p829 +S' 0: az-' +p830 +tp831 +a(S'*** Failers' +p832 +S' 0: a' +p833 +tp834 +a(S'b' +p835 +S'No match' +p836 +tp837 +aaa(lp838 +S'[az-]+' +p839 +ag3 +a(lp840 +(S'za-' +p841 +S' 0: za-' +p842 +tp843 +a(S'*** Failers' +p844 +S' 0: a' +p845 +tp846 +a(g835 +S'No match' +p847 +tp848 +aaa(lp849 +S'[a\\-z]+' +p850 +ag3 +a(lp851 +(S'a-z' +p852 +S' 0: a-z' +p853 +tp854 +a(S'*** Failers' +p855 +S' 0: a' +p856 +tp857 +a(g835 +S'No match' +p858 +tp859 +aaa(lp860 +S'[a-z]+' +p861 +ag3 +a(lp862 +(S'abcdxyz' +p863 +S' 0: abcdxyz' +p864 +tp865 +aaa(lp866 +S'[\\d-]+' +p867 +ag3 +a(lp868 +(S'12-34' +p869 +S' 0: 12-34' +p870 +tp871 +a(S'*** Failers' +p872 +S'No match' +p873 +tp874 +a(S'aaa' +p875 +S'No match' +p876 +tp877 +aaa(lp878 +S'[\\d-z]+' +p879 +ag3 +a(lp880 +(S'12-34z' +p881 +S' 0: 12-34z' +p882 +tp883 +a(S'*** Failers' +p884 +S'No match' +p885 +tp886 +a(S'aaa' +p887 +S'No match' +p888 +tp889 +aaa(lp890 +S'\\x5c' +p891 +ag3 +a(lp892 +(S'\\' +p893 +S' 0: \\' +p894 +tp895 +aaa(lp896 +S'\\x20Z' +p897 +ag3 +a(lp898 +(S'the Zoo' +p899 +S' 0: Z' +p900 +tp901 +a(S'*** Failers' +p902 +S'No match' +p903 +tp904 +a(S'Zulu' +p905 +S'No match' +p906 +tp907 +aaa(lp908 +S'ab{3cd' +p909 +ag3 +a(lp910 +(S'ab{3cd' +p911 +S' 0: ab{3cd' +p912 +tp913 +aaa(lp914 +S'ab{3,cd' +p915 +ag3 +a(lp916 +(S'ab{3,cd' +p917 +S' 0: ab{3,cd' +p918 +tp919 +aaa(lp920 +S'ab{3,4a}cd' +p921 +ag3 +a(lp922 +(S'ab{3,4a}cd' +p923 +S' 0: ab{3,4a}cd' +p924 +tp925 +aaa(lp926 +S'{4,5a}bc' +p927 +ag3 +a(lp928 +(S'{4,5a}bc' +p929 +S' 0: {4,5a}bc' +p930 +tp931 +aaa(lp932 +S'abc$' +p933 +ag3 +a(lp934 +(S'abc' +p935 +S' 0: abc' +p936 +tp937 +a(S'abc\n' +p938 +S' 0: abc' +p939 +tp940 +a(S'*** Failers' +p941 +S'No match' +p942 +tp943 +a(S'abc\ndef' +p944 +S'No match' +p945 +tp946 +aaa(lp947 +S'(abc)\\223' +p948 +ag3 +a(lp949 +(S'abc\x93' +p950 +S' 0: abc\x93' +p951 +tp952 +aaa(lp953 +S'(abc)\\323' +p954 +ag3 +a(lp955 +(S'abc\xd3' +p956 +S' 0: abc\xd3' +p957 +tp958 +aaa(lp959 +S'abc\\81' +p960 +ag3 +a(lp961 +(S'abc\x0081' +p962 +S' 0: abc\x0081' +p963 +tp964 +a(S'abc\x0081' +p965 +S' 0: abc\x0081' +p966 +tp967 +aaa(lp968 +S'abc\\91' +p969 +ag3 +a(lp970 +(S'abc\x0091' +p971 +S' 0: abc\x0091' +p972 +tp973 +a(S'abc\x0091' +p974 +S' 0: abc\x0091' +p975 +tp976 +aaa(lp977 +S'ab\\idef' +p978 +ag3 +a(lp979 +(S'abidef' +p980 +S' 0: abidef' +p981 +tp982 +aaa(lp983 +S'a{0}bc' +p984 +ag3 +a(lp985 +(S'bc' +p986 +S' 0: bc' +p987 +tp988 +aaa(lp989 +S'abc[\\10]de' +p990 +ag3 +a(lp991 +(S'abc\x08de' +p992 +S' 0: abc\x08de' +p993 +tp994 +aaa(lp995 +S'abc[\\1]de' +p996 +ag3 +a(lp997 +(S'abc\x01de' +p998 +S' 0: abc\x01de' +p999 +tp1000 +aaa(lp1001 +S'^([^a])([^\\b])([^c]*)([^d]{3,4})' +p1002 +ag3 +a(lp1003 +(S'baNOTccccd' +p1004 +S' 0: baNOTcccc' +p1005 +tp1006 +a(S'baNOTcccd' +p1007 +S' 0: baNOTccc' +p1008 +tp1009 +a(S'baNOTccd' +p1010 +S' 0: baNOTcc' +p1011 +tp1012 +a(S'bacccd' +p1013 +S' 0: baccc' +p1014 +tp1015 +a(S'*** Failers' +p1016 +S' 0: *** Failers' +p1017 +tp1018 +a(S'anything' +p1019 +S'No match' +p1020 +tp1021 +a(S'b\x08c' +p1022 +S'No match' +p1023 +tp1024 +a(S'baccd' +p1025 +S'No match' +p1026 +tp1027 +aaa(lp1028 +S'[^a]' +p1029 +ag3 +a(lp1030 +(S'Abc' +p1031 +S' 0: A' +p1032 +tp1033 +aaa(lp1034 +S'[^a]+' +p1035 +ag3 +a(lp1036 +(S'AAAaAbc' +p1037 +S' 0: AAA' +p1038 +tp1039 +aaa(lp1040 +S'[^a]+' +p1041 +ag3 +a(lp1042 +(S'bbb\nccc' +p1043 +S' 0: bbb\nccc' +p1044 +tp1045 +aaa(lp1046 +S'[^k]$' +p1047 +ag3 +a(lp1048 +(S'abc' +p1049 +S' 0: c' +p1050 +tp1051 +a(S'*** Failers' +p1052 +S' 0: s' +p1053 +tp1054 +a(S'abk' +p1055 +S'No match' +p1056 +tp1057 +aaa(lp1058 +S'[^k]{2,3}$' +p1059 +ag3 +a(lp1060 +(S'abc' +p1061 +S' 0: abc' +p1062 +tp1063 +a(S'kbc' +p1064 +S' 0: bc' +p1065 +tp1066 +a(S'kabc' +p1067 +S' 0: abc' +p1068 +tp1069 +a(S'*** Failers' +p1070 +S' 0: ers' +p1071 +tp1072 +a(S'abk' +p1073 +S'No match' +p1074 +tp1075 +a(S'akb' +p1076 +S'No match' +p1077 +tp1078 +a(S'akk' +p1079 +S'No match' +p1080 +tp1081 +aaa(lp1082 +S'^\\d{8,}\\@.+[^k]$' +p1083 +ag3 +a(lp1084 +(S'12345678 at a.b.c.d' +p1085 +S' 0: 12345678 at a.b.c.d' +p1086 +tp1087 +a(S'123456789 at x.y.z' +p1088 +S' 0: 123456789 at x.y.z' +p1089 +tp1090 +a(S'*** Failers' +p1091 +S'No match' +p1092 +tp1093 +a(S'12345678 at x.y.uk' +p1094 +S'No match' +p1095 +tp1096 +a(S'1234567 at a.b.c.d' +p1097 +S'No match' +p1098 +tp1099 +aaa(lp1100 +S'[^a]' +p1101 +ag3 +a(lp1102 +(S'aaaabcd' +p1103 +S' 0: b' +p1104 +tp1105 +a(S'aaAabcd' +p1106 +S' 0: A' +p1107 +tp1108 +aaa(lp1109 +S'[^az]' +p1110 +ag3 +a(lp1111 +(S'aaaabcd' +p1112 +S' 0: b' +p1113 +tp1114 +a(S'aaAabcd' +p1115 +S' 0: A' +p1116 +tp1117 +aaa(lp1118 +S'\\000\\001\\002\\003\\004\\005\\006\\007\\010\\011\\012\\013\\014\\015\\016\\017\\020\\021\\022\\023\\024\\025\\026\\027\\030\\031\\032\\033\\034\\035\\036\\037\\040\\041\\042\\043\\044\\045\\046\\047\\050\\051\\052\\053\\054\\055\\056\\057\\060\\061\\062\\063\\064\\065\\066\\067\\070\\071\\072\\073\\074\\075\\076\\077\\100\\101\\102\\103\\104\\105\\106\\107\\110\\111\\112\\113\\114\\115\\116\\117\\120\\121\\122\\123\\124\\125\\126\\127\\130\\131\\132\\133\\134\\135\\136\\137\\140\\141\\142\\143\\144\\145\\146\\147\\150\\151\\152\\153\\154\\155\\156\\157\\160\\161\\162\\163\\164\\165\\166\\167\\170\\171\\172\\173\\174\\175\\176\\177\\200\\201\\202\\203\\204\\205\\206\\207\\210\\211\\212\\213\\214\\215\\216\\217\\220\\221\\222\\223\\224\\225\\226\\227\\230\\231\\232\\233\\234\\235\\236\\237\\240\\241\\242\\243\\244\\245\\246\\247\\250\\251\\252\\253\\254\\255\\256\\257\\260\\261\\262\\263\\264\\265\\266\\267\\270\\271\\272\\273\\274\\275\\276\\277\\300\\301\\302\\303\\304\\305\\306\\307\\310\\311\\312\\313\\314\\315\\316\\317\\320\\321\\322\\323\\324\\325\\326\\327\\330\\331\\332\\333\\334\\335\\336\\337\\340\\341\\342\\343\\344\\345\\346\\347\\350\\351\\352\\353\\354\\355\\356\\357\\360\\361\\362\\363\\364\\365\\366\\367\\370\\371\\372\\373\\374\\375\\376\\377' +p1119 +ag3 +a(lp1120 +(S'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff' +p1121 +S' 0: \x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff' +p1122 +tp1123 +aaa(lp1124 +S'(\\.\\d\\d[1-9]?)\\d+' +p1125 +ag3 +a(lp1126 +(S'1.230003938' +p1127 +S' 0: .230003938' +p1128 +tp1129 +a(S'1.875000282' +p1130 +S' 0: .875000282' +p1131 +tp1132 +a(S'1.235' +p1133 +S' 0: .235' +p1134 +tp1135 +aaa(lp1136 +S'foo(.*)bar' +p1137 +ag3 +a(lp1138 +(S'The food is under the bar in the barn.' +p1139 +S' 0: food is under the bar in the bar' +p1140 +tp1141 +aaa(lp1142 +S'(.*)(\\d*)' +p1143 +ag3 +a(lp1144 +(S'I have 2 numbers: 53147' +p1145 +S' 0: I have 2 numbers: 53147' +p1146 +tp1147 +aaa(lp1148 +S'(.*)(\\d+)' +p1149 +ag3 +a(lp1150 +(S'I have 2 numbers: 53147' +p1151 +S' 0: I have 2 numbers: 53147' +p1152 +tp1153 +aaa(lp1154 +S'(.*)(\\d+)$' +p1155 +ag3 +a(lp1156 +(S'I have 2 numbers: 53147' +p1157 +S' 0: I have 2 numbers: 53147' +p1158 +tp1159 +aaa(lp1160 +S'(.*)\\b(\\d+)$' +p1161 +ag3 +a(lp1162 +(S'I have 2 numbers: 53147' +p1163 +S' 0: I have 2 numbers: 53147' +p1164 +tp1165 +aaa(lp1166 +S'(.*\\D)(\\d+)$' +p1167 +ag3 +a(lp1168 +(S'I have 2 numbers: 53147' +p1169 +S' 0: I have 2 numbers: 53147' +p1170 +tp1171 +aaa(lp1172 +S'^[W-]46]' +p1173 +ag3 +a(lp1174 +(S'W46]789' +p1175 +S' 0: W46]' +p1176 +tp1177 +a(S'-46]789' +p1178 +S' 0: -46]' +p1179 +tp1180 +a(S'*** Failers' +p1181 +S'No match' +p1182 +tp1183 +a(S'Wall' +p1184 +S'No match' +p1185 +tp1186 +a(S'Zebra' +p1187 +S'No match' +p1188 +tp1189 +a(S'42' +p1190 +S'No match' +p1191 +tp1192 +a(S'[abcd]' +p1193 +S'No match' +p1194 +tp1195 +a(S']abcd[' +p1196 +S'No match' +p1197 +tp1198 +aaa(lp1199 +S'^[W-\\]46]' +p1200 +ag3 +a(lp1201 +(S'W46]789' +p1202 +S' 0: W' +p1203 +tp1204 +a(S'Wall' +p1205 +S' 0: W' +p1206 +tp1207 +a(S'Zebra' +p1208 +S' 0: Z' +p1209 +tp1210 +a(S'Xylophone' +p1211 +S' 0: X' +p1212 +tp1213 +a(S'42' +p1214 +S' 0: 4' +p1215 +tp1216 +a(S'[abcd]' +p1217 +S' 0: [' +p1218 +tp1219 +a(S']abcd[' +p1220 +S' 0: ]' +p1221 +tp1222 +a(S'\\backslash' +p1223 +S' 0: \\' +p1224 +tp1225 +a(S'*** Failers' +p1226 +S'No match' +p1227 +tp1228 +a(S'-46]789' +p1229 +S'No match' +p1230 +tp1231 +a(S'well' +p1232 +S'No match' +p1233 +tp1234 +aaa(lp1235 +S'\\d\\d\\/\\d\\d\\/\\d\\d\\d\\d' +p1236 +ag3 +a(lp1237 +(S'01/01/2000' +p1238 +S' 0: 01/01/2000' +p1239 +tp1240 +aaa(lp1241 +S'^(a){0,0}' +p1242 +ag3 +a(lp1243 +(S'bcd' +p1244 +S' 0: ' +p1245 +tp1246 +a(S'abc' +p1247 +S' 0: ' +p1248 +tp1249 +a(S'aab' +p1250 +S' 0: ' +p1251 +tp1252 +aaa(lp1253 +S'^(a){0,1}' +p1254 +ag3 +a(lp1255 +(S'bcd' +p1256 +S' 0: ' +p1257 +tp1258 +a(S'abc' +p1259 +S' 0: a' +p1260 +tp1261 +a(S'aab' +p1262 +S' 0: a' +p1263 +tp1264 +aaa(lp1265 +S'^(a){0,2}' +p1266 +ag3 +a(lp1267 +(S'bcd' +p1268 +S' 0: ' +p1269 +tp1270 +a(S'abc' +p1271 +S' 0: a' +p1272 +tp1273 +a(S'aab' +p1274 +S' 0: aa' +p1275 +tp1276 +aaa(lp1277 +S'^(a){0,3}' +p1278 +ag3 +a(lp1279 +(S'bcd' +p1280 +S' 0: ' +p1281 +tp1282 +a(S'abc' +p1283 +S' 0: a' +p1284 +tp1285 +a(S'aab' +p1286 +S' 0: aa' +p1287 +tp1288 +a(S'aaa' +p1289 +S' 0: aaa' +p1290 +tp1291 +aaa(lp1292 +S'^(a){0,}' +p1293 +ag3 +a(lp1294 +(S'bcd' +p1295 +S' 0: ' +p1296 +tp1297 +a(S'abc' +p1298 +S' 0: a' +p1299 +tp1300 +a(S'aab' +p1301 +S' 0: aa' +p1302 +tp1303 +a(S'aaa' +p1304 +S' 0: aaa' +p1305 +tp1306 +a(S'aaaaaaaa' +p1307 +S' 0: aaaaaaaa' +p1308 +tp1309 +aaa(lp1310 +S'^(a){1,1}' +p1311 +ag3 +a(lp1312 +(S'bcd' +p1313 +S'No match' +p1314 +tp1315 +a(S'abc' +p1316 +S' 0: a' +p1317 +tp1318 +a(S'aab' +p1319 +S' 0: a' +p1320 +tp1321 +aaa(lp1322 +S'^(a){1,2}' +p1323 +ag3 +a(lp1324 +(S'bcd' +p1325 +S'No match' +p1326 +tp1327 +a(S'abc' +p1328 +S' 0: a' +p1329 +tp1330 +a(S'aab' +p1331 +S' 0: aa' +p1332 +tp1333 +aaa(lp1334 +S'^(a){1,3}' +p1335 +ag3 +a(lp1336 +(S'bcd' +p1337 +S'No match' +p1338 +tp1339 +a(S'abc' +p1340 +S' 0: a' +p1341 +tp1342 +a(S'aab' +p1343 +S' 0: aa' +p1344 +tp1345 +a(S'aaa' +p1346 +S' 0: aaa' +p1347 +tp1348 +aaa(lp1349 +S'^(a){1,}' +p1350 +ag3 +a(lp1351 +(S'bcd' +p1352 +S'No match' +p1353 +tp1354 +a(S'abc' +p1355 +S' 0: a' +p1356 +tp1357 +a(S'aab' +p1358 +S' 0: aa' +p1359 +tp1360 +a(S'aaa' +p1361 +S' 0: aaa' +p1362 +tp1363 +a(S'aaaaaaaa' +p1364 +S' 0: aaaaaaaa' +p1365 +tp1366 +aaa(lp1367 +S'.*\\.gif' +p1368 +ag3 +a(lp1369 +(S'borfle\nbib.gif\nno' +p1370 +S' 0: bib.gif' +p1371 +tp1372 +aaa(lp1373 +S'.{0,}\\.gif' +p1374 +ag3 +a(lp1375 +(S'borfle\nbib.gif\nno' +p1376 +S' 0: bib.gif' +p1377 +tp1378 +aaa(lp1379 +S'.*$' +p1380 +ag3 +a(lp1381 +(S'borfle\nbib.gif\nno' +p1382 +S' 0: no' +p1383 +tp1384 +aaa(lp1385 +S'.*$' +p1386 +ag3 +a(lp1387 +(S'borfle\nbib.gif\nno\n' +p1388 +S' 0: no' +p1389 +tp1390 +aaa(lp1391 +S'(.*X|^B)' +p1392 +ag3 +a(lp1393 +(S'abcde\n1234Xyz' +p1394 +S' 0: 1234X' +p1395 +tp1396 +a(S'BarFoo' +p1397 +S' 0: B' +p1398 +tp1399 +a(S'*** Failers' +p1400 +S'No match' +p1401 +tp1402 +a(S'abcde\nBar' +p1403 +S'No match' +p1404 +tp1405 +aaa(lp1406 +S'^.*B' +p1407 +ag3 +a(lp1408 +(S'**** Failers' +p1409 +S'No match' +p1410 +tp1411 +a(S'abc\nB' +p1412 +S'No match' +p1413 +tp1414 +aaa(lp1415 +S'^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]' +p1416 +ag3 +a(lp1417 +(S'123456654321' +p1418 +S' 0: 123456654321' +p1419 +tp1420 +aaa(lp1421 +S'^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d' +p1422 +ag3 +a(lp1423 +(S'123456654321' +p1424 +S' 0: 123456654321' +p1425 +tp1426 +aaa(lp1427 +S'^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]' +p1428 +ag3 +a(lp1429 +(S'123456654321' +p1430 +S' 0: 123456654321' +p1431 +tp1432 +aaa(lp1433 +S'^[abc]{12}' +p1434 +ag3 +a(lp1435 +(S'abcabcabcabc' +p1436 +S' 0: abcabcabcabc' +p1437 +tp1438 +aaa(lp1439 +S'^[a-c]{12}' +p1440 +ag3 +a(lp1441 +(S'abcabcabcabc' +p1442 +S' 0: abcabcabcabc' +p1443 +tp1444 +aaa(lp1445 +S'^(a|b|c){12}' +p1446 +ag3 +a(lp1447 +(S'abcabcabcabc' +p1448 +S' 0: abcabcabcabc' +p1449 +tp1450 +aaa(lp1451 +S'^[abcdefghijklmnopqrstuvwxy0123456789]' +p1452 +ag3 +a(lp1453 +(S'n' +p1454 +S' 0: n' +p1455 +tp1456 +a(S'*** Failers' +p1457 +S'No match' +p1458 +tp1459 +a(g583 +S'No match' +p1460 +tp1461 +aaa(lp1462 +S'abcde{0,0}' +p1463 +ag3 +a(lp1464 +(S'abcd' +p1465 +S' 0: abcd' +p1466 +tp1467 +a(S'*** Failers' +p1468 +S'No match' +p1469 +tp1470 +a(S'abce' +p1471 +S'No match' +p1472 +tp1473 +aaa(lp1474 +S'ab[cd]{0,0}e' +p1475 +ag3 +a(lp1476 +(S'abe' +p1477 +S' 0: abe' +p1478 +tp1479 +a(S'*** Failers' +p1480 +S'No match' +p1481 +tp1482 +a(S'abcde' +p1483 +S'No match' +p1484 +tp1485 +aaa(lp1486 +S'ab(c){0,0}d' +p1487 +ag3 +a(lp1488 +(S'abd' +p1489 +S' 0: abd' +p1490 +tp1491 +a(S'*** Failers' +p1492 +S'No match' +p1493 +tp1494 +a(S'abcd' +p1495 +S'No match' +p1496 +tp1497 +aaa(lp1498 +S'a(b*)' +p1499 +ag3 +a(lp1500 +(g592 +S' 0: a' +p1501 +tp1502 +a(S'ab' +p1503 +S' 0: ab' +p1504 +tp1505 +a(S'abbbb' +p1506 +S' 0: abbbb' +p1507 +tp1508 +a(S'*** Failers' +p1509 +S' 0: a' +p1510 +tp1511 +a(S'bbbbb' +p1512 +S'No match' +p1513 +tp1514 +aaa(lp1515 +S'ab\\d{0}e' +p1516 +ag3 +a(lp1517 +(S'abe' +p1518 +S' 0: abe' +p1519 +tp1520 +a(S'*** Failers' +p1521 +S'No match' +p1522 +tp1523 +a(S'ab1e' +p1524 +S'No match' +p1525 +tp1526 +aaa(lp1527 +S'"([^\\\\"]+|\\\\.)*"' +p1528 +ag3 +a(lp1529 +(S'the "quick" brown fox' +p1530 +S' 0: "quick"' +p1531 +tp1532 +a(S'"the \\"quick\\" brown fox"' +p1533 +S' 0: "the \\"quick\\" brown fox"' +p1534 +tp1535 +aaa(lp1536 +S'a[^a]b' +p1537 +ag3 +a(lp1538 +(S'acb' +p1539 +S' 0: acb' +p1540 +tp1541 +a(S'a\nb' +p1542 +S' 0: a\nb' +p1543 +tp1544 +aaa(lp1545 +S'a.b' +p1546 +ag3 +a(lp1547 +(S'acb' +p1548 +S' 0: acb' +p1549 +tp1550 +a(S'*** Failers' +p1551 +S'No match' +p1552 +tp1553 +a(S'a\nb' +p1554 +S'No match' +p1555 +tp1556 +aaa(lp1557 +S'\\x0{ab}' +p1558 +ag3 +a(lp1559 +(S'\x00{ab}' +p1560 +S' 0: \x00{ab}' +p1561 +tp1562 +aaa(lp1563 +S'(A|B)*CD' +p1564 +ag3 +a(lp1565 +(S'CD' +p1566 +S' 0: CD' +p1567 +tp1568 +aaa(lp1569 +S'(\\d+)(\\w)' +p1570 +ag3 +a(lp1571 +(S'12345a' +p1572 +S' 0: 12345a' +p1573 +tp1574 +a(S'12345+' +p1575 +S' 0: 12345' +p1576 +tp1577 +aaa(lp1578 +S'(abc|)+' +p1579 +ag3 +a(lp1580 +(S'abc' +p1581 +S' 0: abc' +p1582 +tp1583 +a(S'abcabc' +p1584 +S' 0: abcabc' +p1585 +tp1586 +a(S'abcabcabc' +p1587 +S' 0: abcabcabc' +p1588 +tp1589 +a(S'xyz' +p1590 +S' 0: ' +p1591 +tp1592 +aaa(lp1593 +S'([a]*)*' +p1594 +ag3 +a(lp1595 +(g592 +S' 0: a' +p1596 +tp1597 +a(S'aaaaa' +p1598 +S' 0: aaaaa' +p1599 +tp1600 +aaa(lp1601 +S'([ab]*)*' +p1602 +ag3 +a(lp1603 +(g592 +S' 0: a' +p1604 +tp1605 +a(g835 +S' 0: b' +p1606 +tp1607 +a(S'ababab' +p1608 +S' 0: ababab' +p1609 +tp1610 +a(S'aaaabcde' +p1611 +S' 0: aaaab' +p1612 +tp1613 +a(S'bbbb' +p1614 +S' 0: bbbb' +p1615 +tp1616 +aaa(lp1617 +S'([^a]*)*' +p1618 +ag3 +a(lp1619 +(g835 +S' 0: b' +p1620 +tp1621 +a(S'bbbb' +p1622 +S' 0: bbbb' +p1623 +tp1624 +a(S'aaa' +p1625 +S' 0: ' +p1626 +tp1627 +aaa(lp1628 +S'([^ab]*)*' +p1629 +ag3 +a(lp1630 +(S'cccc' +p1631 +S' 0: cccc' +p1632 +tp1633 +a(S'abab' +p1634 +S' 0: ' +p1635 +tp1636 +aaa(lp1637 +S'The case of aaaaaa is missed out below because I think Perl 5.005_02 gets' +p1638 +ag3 +a(lp1639 +(S'/it wrong; it sets $1 to aaa rather than aa. Compare the following test,/' +p1640 +S'No match' +p1641 +tp1642 +a(S'/where it does set $1 to aa when matching aaaaaa./' +p1643 +S'No match' +p1644 +tp1645 +aaa(lp1646 +S'The following tests are taken from the Perl 5.005 test suite; some of them' +p1647 +ag3 +a(lp1648 +(S"/are compatible with 5.004, but I'd rather not have to sort them out./" +p1649 +S'No match' +p1650 +tp1651 +aaa(lp1652 +S'abc' +p1653 +ag3 +a(lp1654 +(S'abc' +p1655 +S' 0: abc' +p1656 +tp1657 +a(S'xabcy' +p1658 +S' 0: abc' +p1659 +tp1660 +a(S'ababc' +p1661 +S' 0: abc' +p1662 +tp1663 +a(S'*** Failers' +p1664 +S'No match' +p1665 +tp1666 +a(S'xbc' +p1667 +S'No match' +p1668 +tp1669 +a(S'axc' +p1670 +S'No match' +p1671 +tp1672 +a(S'abx' +p1673 +S'No match' +p1674 +tp1675 +aaa(lp1676 +S'ab*c' +p1677 +ag3 +a(lp1678 +(S'abc' +p1679 +S' 0: abc' +p1680 +tp1681 +aaa(lp1682 +S'ab*bc' +p1683 +ag3 +a(lp1684 +(S'abc' +p1685 +S' 0: abc' +p1686 +tp1687 +a(S'abbc' +p1688 +S' 0: abbc' +p1689 +tp1690 +a(S'abbbbc' +p1691 +S' 0: abbbbc' +p1692 +tp1693 +aaa(lp1694 +S'.{1}' +p1695 +ag3 +a(lp1696 +(S'abbbbc' +p1697 +S' 0: a' +p1698 +tp1699 +aaa(lp1700 +S'.{3,4}' +p1701 +ag3 +a(lp1702 +(S'abbbbc' +p1703 +S' 0: abbb' +p1704 +tp1705 +aaa(lp1706 +S'ab{0,}bc' +p1707 +ag3 +a(lp1708 +(S'abbbbc' +p1709 +S' 0: abbbbc' +p1710 +tp1711 +aaa(lp1712 +S'ab+bc' +p1713 +ag3 +a(lp1714 +(S'abbc' +p1715 +S' 0: abbc' +p1716 +tp1717 +a(S'*** Failers' +p1718 +S'No match' +p1719 +tp1720 +a(S'abc' +p1721 +S'No match' +p1722 +tp1723 +a(S'abq' +p1724 +S'No match' +p1725 +tp1726 +aaa(lp1727 +S'ab{1,}bc' +p1728 +ag3 +a(lp1729 +aa(lp1730 +S'ab+bc' +p1731 +ag3 +a(lp1732 +(S'abbbbc' +p1733 +S' 0: abbbbc' +p1734 +tp1735 +aaa(lp1736 +S'ab{1,}bc' +p1737 +ag3 +a(lp1738 +(S'abbbbc' +p1739 +S' 0: abbbbc' +p1740 +tp1741 +aaa(lp1742 +S'ab{1,3}bc' +p1743 +ag3 +a(lp1744 +(S'abbbbc' +p1745 +S' 0: abbbbc' +p1746 +tp1747 +aaa(lp1748 +S'ab{3,4}bc' +p1749 +ag3 +a(lp1750 +(S'abbbbc' +p1751 +S' 0: abbbbc' +p1752 +tp1753 +aaa(lp1754 +S'ab{4,5}bc' +p1755 +ag3 +a(lp1756 +(S'*** Failers' +p1757 +S'No match' +p1758 +tp1759 +a(S'abq' +p1760 +S'No match' +p1761 +tp1762 +a(S'abbbbc' +p1763 +S'No match' +p1764 +tp1765 +aaa(lp1766 +S'ab?bc' +p1767 +ag3 +a(lp1768 +(S'abbc' +p1769 +S' 0: abbc' +p1770 +tp1771 +a(S'abc' +p1772 +S' 0: abc' +p1773 +tp1774 +aaa(lp1775 +S'ab{0,1}bc' +p1776 +ag3 +a(lp1777 +(S'abc' +p1778 +S' 0: abc' +p1779 +tp1780 +aaa(lp1781 +S'ab?bc' +p1782 +ag3 +a(lp1783 +aa(lp1784 +S'ab?c' +p1785 +ag3 +a(lp1786 +(S'abc' +p1787 +S' 0: abc' +p1788 +tp1789 +aaa(lp1790 +S'ab{0,1}c' +p1791 +ag3 +a(lp1792 +(S'abc' +p1793 +S' 0: abc' +p1794 +tp1795 +aaa(lp1796 +S'^abc$' +p1797 +ag3 +a(lp1798 +(S'abc' +p1799 +S' 0: abc' +p1800 +tp1801 +a(S'*** Failers' +p1802 +S'No match' +p1803 +tp1804 +a(S'abbbbc' +p1805 +S'No match' +p1806 +tp1807 +a(S'abcc' +p1808 +S'No match' +p1809 +tp1810 +aaa(lp1811 +S'^abc' +p1812 +ag3 +a(lp1813 +(S'abcc' +p1814 +S' 0: abc' +p1815 +tp1816 +aaa(lp1817 +S'^abc$' +p1818 +ag3 +a(lp1819 +aa(lp1820 +S'abc$' +p1821 +ag3 +a(lp1822 +(S'aabc' +p1823 +S' 0: abc' +p1824 +tp1825 +a(S'*** Failers' +p1826 +S'No match' +p1827 +tp1828 +a(S'aabc' +p1829 +S' 0: abc' +p1830 +tp1831 +a(S'aabcd' +p1832 +S'No match' +p1833 +tp1834 +aaa(lp1835 +S'^' +p1836 +ag3 +a(lp1837 +(S'abc' +p1838 +S' 0: ' +p1839 +tp1840 +aaa(lp1841 +S'$' +p1842 +ag3 +a(lp1843 +(S'abc' +p1844 +S' 0: ' +p1845 +tp1846 +aaa(lp1847 +S'a.c' +p1848 +ag3 +a(lp1849 +(S'abc' +p1850 +S' 0: abc' +p1851 +tp1852 +a(S'axc' +p1853 +S' 0: axc' +p1854 +tp1855 +aaa(lp1856 +S'a.*c' +p1857 +ag3 +a(lp1858 +(S'axyzc' +p1859 +S' 0: axyzc' +p1860 +tp1861 +aaa(lp1862 +S'a[bc]d' +p1863 +ag3 +a(lp1864 +(S'abd' +p1865 +S' 0: abd' +p1866 +tp1867 +a(S'*** Failers' +p1868 +S'No match' +p1869 +tp1870 +a(S'axyzd' +p1871 +S'No match' +p1872 +tp1873 +a(S'abc' +p1874 +S'No match' +p1875 +tp1876 +aaa(lp1877 +S'a[b-d]e' +p1878 +ag3 +a(lp1879 +(S'ace' +p1880 +S' 0: ace' +p1881 +tp1882 +aaa(lp1883 +S'a[b-d]' +p1884 +ag3 +a(lp1885 +(S'aac' +p1886 +S' 0: ac' +p1887 +tp1888 +aaa(lp1889 +S'a[-b]' +p1890 +ag3 +a(lp1891 +(S'a-' +p1892 +S' 0: a-' +p1893 +tp1894 +aaa(lp1895 +S'a[b-]' +p1896 +ag3 +a(lp1897 +(S'a-' +p1898 +S' 0: a-' +p1899 +tp1900 +aaa(lp1901 +S'a]' +p1902 +ag3 +a(lp1903 +(S'a]' +p1904 +S' 0: a]' +p1905 +tp1906 +aaa(lp1907 +S'a[]]b' +p1908 +ag3 +a(lp1909 +(S'a]b' +p1910 +S' 0: a]b' +p1911 +tp1912 +aaa(lp1913 +S'a[^bc]d' +p1914 +ag3 +a(lp1915 +(S'aed' +p1916 +S' 0: aed' +p1917 +tp1918 +a(S'*** Failers' +p1919 +S'No match' +p1920 +tp1921 +a(S'abd' +p1922 +S'No match' +p1923 +tp1924 +a(S'abd' +p1925 +S'No match' +p1926 +tp1927 +aaa(lp1928 +S'a[^-b]c' +p1929 +ag3 +a(lp1930 +(S'adc' +p1931 +S' 0: adc' +p1932 +tp1933 +aaa(lp1934 +S'a[^]b]c' +p1935 +ag3 +a(lp1936 +(S'adc' +p1937 +S' 0: adc' +p1938 +tp1939 +a(S'*** Failers' +p1940 +S'No match' +p1941 +tp1942 +a(S'a-c' +p1943 +S' 0: a-c' +p1944 +tp1945 +a(S'a]c' +p1946 +S'No match' +p1947 +tp1948 +aaa(lp1949 +S'\\ba\\b' +p1950 +ag3 +a(lp1951 +(S'a-' +p1952 +S' 0: a' +p1953 +tp1954 +a(S'-a' +p1955 +S' 0: a' +p1956 +tp1957 +a(S'-a-' +p1958 +S' 0: a' +p1959 +tp1960 +aaa(lp1961 +S'\\by\\b' +p1962 +ag3 +a(lp1963 +(S'*** Failers' +p1964 +S'No match' +p1965 +tp1966 +a(S'xy' +p1967 +S'No match' +p1968 +tp1969 +a(S'yz' +p1970 +S'No match' +p1971 +tp1972 +a(S'xyz' +p1973 +S'No match' +p1974 +tp1975 +aaa(lp1976 +S'\\Ba\\B' +p1977 +ag3 +a(lp1978 +(S'*** Failers' +p1979 +S' 0: a' +p1980 +tp1981 +a(S'a-' +p1982 +S'No match' +p1983 +tp1984 +a(S'-a' +p1985 +S'No match' +p1986 +tp1987 +a(S'-a-' +p1988 +S'No match' +p1989 +tp1990 +aaa(lp1991 +S'\\By\\b' +p1992 +ag3 +a(lp1993 +(S'xy' +p1994 +S' 0: y' +p1995 +tp1996 +aaa(lp1997 +S'\\by\\B' +p1998 +ag3 +a(lp1999 +(S'yz' +p2000 +S' 0: y' +p2001 +tp2002 +aaa(lp2003 +S'\\By\\B' +p2004 +ag3 +a(lp2005 +(S'xyz' +p2006 +S' 0: y' +p2007 +tp2008 +aaa(lp2009 +S'\\w' +p2010 +ag3 +a(lp2011 +(g592 +S' 0: a' +p2012 +tp2013 +aaa(lp2014 +S'\\W' +p2015 +ag3 +a(lp2016 +(S'-' +p2017 +S' 0: -' +p2018 +tp2019 +a(S'*** Failers' +p2020 +S' 0: *' +p2021 +tp2022 +a(g2017 +S' 0: -' +p2023 +tp2024 +a(g592 +S'No match' +p2025 +tp2026 +aaa(lp2027 +S'a\\sb' +p2028 +ag3 +a(lp2029 +(S'a b' +p2030 +S' 0: a b' +p2031 +tp2032 +aaa(lp2033 +S'a\\Sb' +p2034 +ag3 +a(lp2035 +(S'a-b' +p2036 +S' 0: a-b' +p2037 +tp2038 +a(S'*** Failers' +p2039 +S'No match' +p2040 +tp2041 +a(S'a-b' +p2042 +S' 0: a-b' +p2043 +tp2044 +a(S'a b' +p2045 +S'No match' +p2046 +tp2047 +aaa(lp2048 +S'\\d' +p2049 +ag3 +a(lp2050 +(g332 +S' 0: 1' +p2051 +tp2052 +aaa(lp2053 +S'\\D' +p2054 +ag3 +a(lp2055 +(g2017 +S' 0: -' +p2056 +tp2057 +a(S'*** Failers' +p2058 +S' 0: *' +p2059 +tp2060 +a(g2017 +S' 0: -' +p2061 +tp2062 +a(g332 +S'No match' +p2063 +tp2064 +aaa(lp2065 +S'[\\w]' +p2066 +ag3 +a(lp2067 +(g592 +S' 0: a' +p2068 +tp2069 +aaa(lp2070 +S'[\\W]' +p2071 +ag3 +a(lp2072 +(g2017 +S' 0: -' +p2073 +tp2074 +a(S'*** Failers' +p2075 +S' 0: *' +p2076 +tp2077 +a(g2017 +S' 0: -' +p2078 +tp2079 +a(g592 +S'No match' +p2080 +tp2081 +aaa(lp2082 +S'a[\\s]b' +p2083 +ag3 +a(lp2084 +(S'a b' +p2085 +S' 0: a b' +p2086 +tp2087 +aaa(lp2088 +S'a[\\S]b' +p2089 +ag3 +a(lp2090 +(S'a-b' +p2091 +S' 0: a-b' +p2092 +tp2093 +a(S'*** Failers' +p2094 +S'No match' +p2095 +tp2096 +a(S'a-b' +p2097 +S' 0: a-b' +p2098 +tp2099 +a(S'a b' +p2100 +S'No match' +p2101 +tp2102 +aaa(lp2103 +S'[\\d]' +p2104 +ag3 +a(lp2105 +(g332 +S' 0: 1' +p2106 +tp2107 +aaa(lp2108 +S'[\\D]' +p2109 +ag3 +a(lp2110 +(g2017 +S' 0: -' +p2111 +tp2112 +a(S'*** Failers' +p2113 +S' 0: *' +p2114 +tp2115 +a(g2017 +S' 0: -' +p2116 +tp2117 +a(g332 +S'No match' +p2118 +tp2119 +aaa(lp2120 +S'ab|cd' +p2121 +ag3 +a(lp2122 +(S'abc' +p2123 +S' 0: ab' +p2124 +tp2125 +a(S'abcd' +p2126 +S' 0: ab' +p2127 +tp2128 +aaa(lp2129 +S'()ef' +p2130 +ag3 +a(lp2131 +(S'def' +p2132 +S' 0: ef' +p2133 +tp2134 +aaa(lp2135 +S'$b' +p2136 +ag3 +a(lp2137 +aa(lp2138 +S'a\\(b' +p2139 +ag3 +a(lp2140 +(S'a(b' +p2141 +S' 0: a(b' +p2142 +tp2143 +aaa(lp2144 +S'a\\(*b' +p2145 +ag3 +a(lp2146 +(S'ab' +p2147 +S' 0: ab' +p2148 +tp2149 +a(S'a((b' +p2150 +S' 0: a((b' +p2151 +tp2152 +aaa(lp2153 +S'a\\\\b' +p2154 +ag3 +a(lp2155 +(S'a\x08' +p2156 +S'No match' +p2157 +tp2158 +aaa(lp2159 +S'((a))' +p2160 +ag3 +a(lp2161 +(S'abc' +p2162 +S' 0: a' +p2163 +tp2164 +aaa(lp2165 +S'(a)b(c)' +p2166 +ag3 +a(lp2167 +(S'abc' +p2168 +S' 0: abc' +p2169 +tp2170 +aaa(lp2171 +S'a+b+c' +p2172 +ag3 +a(lp2173 +(S'aabbabc' +p2174 +S' 0: abc' +p2175 +tp2176 +aaa(lp2177 +S'a{1,}b{1,}c' +p2178 +ag3 +a(lp2179 +(S'aabbabc' +p2180 +S' 0: abc' +p2181 +tp2182 +aaa(lp2183 +S'(a+|b)*' +p2184 +ag3 +a(lp2185 +(S'ab' +p2186 +S' 0: ab' +p2187 +tp2188 +aaa(lp2189 +S'(a+|b){0,}' +p2190 +ag3 +a(lp2191 +(S'ab' +p2192 +S' 0: ab' +p2193 +tp2194 +aaa(lp2195 +S'(a+|b)+' +p2196 +ag3 +a(lp2197 +(S'ab' +p2198 +S' 0: ab' +p2199 +tp2200 +aaa(lp2201 +S'(a+|b){1,}' +p2202 +ag3 +a(lp2203 +(S'ab' +p2204 +S' 0: ab' +p2205 +tp2206 +aaa(lp2207 +S'(a+|b)?' +p2208 +ag3 +a(lp2209 +(S'ab' +p2210 +S' 0: a' +p2211 +tp2212 +aaa(lp2213 +S'(a+|b){0,1}' +p2214 +ag3 +a(lp2215 +(S'ab' +p2216 +S' 0: a' +p2217 +tp2218 +aaa(lp2219 +S'[^ab]*' +p2220 +ag3 +a(lp2221 +(S'cde' +p2222 +S' 0: cde' +p2223 +tp2224 +aaa(lp2225 +S'abc' +p2226 +ag3 +a(lp2227 +(S'*** Failers' +p2228 +S'No match' +p2229 +tp2230 +a(g835 +S'No match' +p2231 +tp2232 +aaa(lp2233 +S'a*' +p2234 +ag3 +a(lp2235 +aa(lp2236 +S'([abc])*d' +p2237 +ag3 +a(lp2238 +(S'abbbcd' +p2239 +S' 0: abbbcd' +p2240 +tp2241 +aaa(lp2242 +S'([abc])*bcd' +p2243 +ag3 +a(lp2244 +(S'abcd' +p2245 +S' 0: abcd' +p2246 +tp2247 +aaa(lp2248 +S'a|b|c|d|e' +p2249 +ag3 +a(lp2250 +(S'e' +p2251 +S' 0: e' +p2252 +tp2253 +aaa(lp2254 +S'(a|b|c|d|e)f' +p2255 +ag3 +a(lp2256 +(S'ef' +p2257 +S' 0: ef' +p2258 +tp2259 +aaa(lp2260 +S'abcd*efg' +p2261 +ag3 +a(lp2262 +(S'abcdefg' +p2263 +S' 0: abcdefg' +p2264 +tp2265 +aaa(lp2266 +S'ab*' +p2267 +ag3 +a(lp2268 +(S'xabyabbbz' +p2269 +S' 0: ab' +p2270 +tp2271 +a(S'xayabbbz' +p2272 +S' 0: a' +p2273 +tp2274 +aaa(lp2275 +S'(ab|cd)e' +p2276 +ag3 +a(lp2277 +(S'abcde' +p2278 +S' 0: cde' +p2279 +tp2280 +aaa(lp2281 +S'[abhgefdc]ij' +p2282 +ag3 +a(lp2283 +(S'hij' +p2284 +S' 0: hij' +p2285 +tp2286 +aaa(lp2287 +S'^(ab|cd)e' +p2288 +ag3 +a(lp2289 +aa(lp2290 +S'(abc|)ef' +p2291 +ag3 +a(lp2292 +(S'abcdef' +p2293 +S' 0: ef' +p2294 +tp2295 +aaa(lp2296 +S'(a|b)c*d' +p2297 +ag3 +a(lp2298 +(S'abcd' +p2299 +S' 0: bcd' +p2300 +tp2301 +aaa(lp2302 +S'(ab|ab*)bc' +p2303 +ag3 +a(lp2304 +(S'abc' +p2305 +S' 0: abc' +p2306 +tp2307 +aaa(lp2308 +S'a([bc]*)c*' +p2309 +ag3 +a(lp2310 +(S'abc' +p2311 +S' 0: abc' +p2312 +tp2313 +aaa(lp2314 +S'a([bc]*)(c*d)' +p2315 +ag3 +a(lp2316 +(S'abcd' +p2317 +S' 0: abcd' +p2318 +tp2319 +aaa(lp2320 +S'a([bc]+)(c*d)' +p2321 +ag3 +a(lp2322 +(S'abcd' +p2323 +S' 0: abcd' +p2324 +tp2325 +aaa(lp2326 +S'a([bc]*)(c+d)' +p2327 +ag3 +a(lp2328 +(S'abcd' +p2329 +S' 0: abcd' +p2330 +tp2331 +aaa(lp2332 +S'a[bcd]*dcdcde' +p2333 +ag3 +a(lp2334 +(S'adcdcde' +p2335 +S' 0: adcdcde' +p2336 +tp2337 +aaa(lp2338 +S'a[bcd]+dcdcde' +p2339 +ag3 +a(lp2340 +(S'*** Failers' +p2341 +S'No match' +p2342 +tp2343 +a(S'abcde' +p2344 +S'No match' +p2345 +tp2346 +a(S'adcdcde' +p2347 +S'No match' +p2348 +tp2349 +aaa(lp2350 +S'(ab|a)b*c' +p2351 +ag3 +a(lp2352 +(S'abc' +p2353 +S' 0: abc' +p2354 +tp2355 +aaa(lp2356 +S'((a)(b)c)(d)' +p2357 +ag3 +a(lp2358 +(S'abcd' +p2359 +S' 0: abcd' +p2360 +tp2361 +aaa(lp2362 +S'[a-zA-Z_][a-zA-Z0-9_]*' +p2363 +ag3 +a(lp2364 +(S'alpha' +p2365 +S' 0: alpha' +p2366 +tp2367 +aaa(lp2368 +S'^a(bc+|b[eh])g|.h$' +p2369 +ag3 +a(lp2370 +(S'abh' +p2371 +S' 0: bh' +p2372 +tp2373 +aaa(lp2374 +S'(bc+d$|ef*g.|h?i(j|k))' +p2375 +ag3 +a(lp2376 +(S'effgz' +p2377 +S' 0: effgz' +p2378 +tp2379 +a(S'ij' +p2380 +S' 0: ij' +p2381 +tp2382 +a(S'reffgz' +p2383 +S' 0: effgz' +p2384 +tp2385 +a(S'*** Failers' +p2386 +S'No match' +p2387 +tp2388 +a(S'effg' +p2389 +S'No match' +p2390 +tp2391 +a(S'bcdd' +p2392 +S'No match' +p2393 +tp2394 +aaa(lp2395 +S'((((((((((a))))))))))' +p2396 +ag3 +a(lp2397 +(g592 +S' 0: a' +p2398 +tp2399 +aaa(lp2400 +S'(((((((((a)))))))))' +p2401 +ag3 +a(lp2402 +(g592 +S' 0: a' +p2403 +tp2404 +aaa(lp2405 +S'multiple words of text' +p2406 +ag3 +a(lp2407 +(S'*** Failers' +p2408 +S'No match' +p2409 +tp2410 +a(S'aa' +p2411 +S'No match' +p2412 +tp2413 +a(S'uh-uh' +p2414 +S'No match' +p2415 +tp2416 +aaa(lp2417 +S'multiple words' +p2418 +ag3 +a(lp2419 +(S'multiple words, yeah' +p2420 +S' 0: multiple words' +p2421 +tp2422 +aaa(lp2423 +S'(.*)c(.*)' +p2424 +ag3 +a(lp2425 +(S'abcde' +p2426 +S' 0: abcde' +p2427 +tp2428 +aaa(lp2429 +S'\\((.*), (.*)\\)' +p2430 +ag3 +a(lp2431 +(S'(a, b)' +p2432 +S' 0: (a, b)' +p2433 +tp2434 +aaa(lp2435 +S'[k]' +p2436 +ag3 +a(lp2437 +aa(lp2438 +S'abcd' +p2439 +ag3 +a(lp2440 +(S'abcd' +p2441 +S' 0: abcd' +p2442 +tp2443 +aaa(lp2444 +S'a(bc)d' +p2445 +ag3 +a(lp2446 +(S'abcd' +p2447 +S' 0: abcd' +p2448 +tp2449 +aaa(lp2450 +S'a[-]?c' +p2451 +ag3 +a(lp2452 +(S'ac' +p2453 +S' 0: ac' +p2454 +tp2455 +aaa(lp2456 +S'((\\3|b)\\2(a)x)+' +p2457 +ag3 +a(lp2458 +(S'aaaxabaxbaaxbbax' +p2459 +S' 0: bbax' +p2460 +tp2461 +aaa(lp2462 +S'((\\3|b)\\2(a)){2,}' +p2463 +ag3 +a(lp2464 +(S'bbaababbabaaaaabbaaaabba' +p2465 +S' 0: bbaaaabba' +p2466 +tp2467 +aaa(lp2468 +S'((foo)|(bar))*' +p2469 +ag3 +a(lp2470 +(S'foobar' +p2471 +S' 0: foobar' +p2472 +tp2473 +aaa(lp2474 +S'^(.+)?B' +p2475 +ag3 +a(lp2476 +(S'AB' +p2477 +S' 0: AB' +p2478 +tp2479 +aaa(lp2480 +S'^([^a-z])|(\\^)$' +p2481 +ag3 +a(lp2482 +(S'.' +p2483 +S' 0: .' +p2484 +tp2485 +aaa(lp2486 +S'^[<>]&' +p2487 +ag3 +a(lp2488 +(S'<&OUT' +p2489 +S' 0: <&' +p2490 +tp2491 +aaa(lp2492 +S'^(){3,5}' +p2493 +ag3 +a(lp2494 +(S'abc' +p2495 +S' 0: ' +p2496 +tp2497 +aaa(lp2498 +S'^(a+)*ax' +p2499 +ag3 +a(lp2500 +(S'aax' +p2501 +S' 0: aax' +p2502 +tp2503 +aaa(lp2504 +S'^((a|b)+)*ax' +p2505 +ag3 +a(lp2506 +(S'aax' +p2507 +S' 0: aax' +p2508 +tp2509 +aaa(lp2510 +S'^((a|bc)+)*ax' +p2511 +ag3 +a(lp2512 +(S'aax' +p2513 +S' 0: aax' +p2514 +tp2515 +aaa(lp2516 +S'(a|x)*ab' +p2517 +ag3 +a(lp2518 +(S'cab' +p2519 +S' 0: ab' +p2520 +tp2521 +aaa(lp2522 +S'(a)*ab' +p2523 +ag3 +a(lp2524 +(S'cab' +p2525 +S' 0: ab' +p2526 +tp2527 +aaa(lp2528 +S'foo\\w*\\d{4}baz' +p2529 +ag3 +a(lp2530 +(S'foobar1234baz' +p2531 +S' 0: foobar1234baz' +p2532 +tp2533 +aaa(lp2534 +S'^b' +p2535 +ag3 +a(lp2536 +aa(lp2537 +S'()^b' +p2538 +ag3 +a(lp2539 +(S'*** Failers' +p2540 +S'No match' +p2541 +tp2542 +a(S'a\nb\nc\n' +p2543 +S'No match' +p2544 +tp2545 +a(S'a\nb\nc\n' +p2546 +S'No match' +p2547 +tp2548 +aaa(lp2549 +S'(\\w+:)+' +p2550 +ag3 +a(lp2551 +(S'one:' +p2552 +S' 0: one:' +p2553 +tp2554 +aaa(lp2555 +S'([\\w:]+::)?(\\w+)$' +p2556 +ag3 +a(lp2557 +(S'abcd' +p2558 +S' 0: abcd' +p2559 +tp2560 +a(S'xy:z:::abcd' +p2561 +S' 0: xy:z:::abcd' +p2562 +tp2563 +aaa(lp2564 +S'^[^bcd]*(c+)' +p2565 +ag3 +a(lp2566 +(S'aexycd' +p2567 +S' 0: aexyc' +p2568 +tp2569 +aaa(lp2570 +S'(a*)b+' +p2571 +ag3 +a(lp2572 +(S'caab' +p2573 +S' 0: aab' +p2574 +tp2575 +aaa(lp2576 +S'([\\w:]+::)?(\\w+)$' +p2577 +ag3 +a(lp2578 +(S'abcd' +p2579 +S' 0: abcd' +p2580 +tp2581 +a(S'xy:z:::abcd' +p2582 +S' 0: xy:z:::abcd' +p2583 +tp2584 +a(S'*** Failers' +p2585 +S' 0: Failers' +p2586 +tp2587 +a(S'abcd:' +p2588 +S'No match' +p2589 +tp2590 +a(S'abcd:' +p2591 +S'No match' +p2592 +tp2593 +aaa(lp2594 +S'^[^bcd]*(c+)' +p2595 +ag3 +a(lp2596 +(S'aexycd' +p2597 +S' 0: aexyc' +p2598 +tp2599 +aaa(lp2600 +S'(>a+)ab' +p2601 +ag3 +a(lp2602 +aa(lp2603 +S'([[:]+)' +p2604 +ag3 +a(lp2605 +(S'a:[b]:' +p2606 +S' 0: :[' +p2607 +tp2608 +aaa(lp2609 +S'([[=]+)' +p2610 +ag3 +a(lp2611 +(S'a=[b]=' +p2612 +S' 0: =[' +p2613 +tp2614 +aaa(lp2615 +S'([[.]+)' +p2616 +ag3 +a(lp2617 +(S'a.[b].' +p2618 +S' 0: .[' +p2619 +tp2620 +aaa(lp2621 +S'a\\Z' +p2622 +ag3 +a(lp2623 +(S'*** Failers' +p2624 +S'No match' +p2625 +tp2626 +a(S'aaab' +p2627 +S'No match' +p2628 +tp2629 +a(S'a\nb\n' +p2630 +S'No match' +p2631 +tp2632 +aaa(lp2633 +S'b\\Z' +p2634 +ag3 +a(lp2635 +(S'a\nb\n' +p2636 +S' 0: b' +p2637 +tp2638 +aaa(lp2639 +S'b\\z' +p2640 +ag3 +a(lp2641 +aa(lp2642 +S'b\\Z' +p2643 +ag3 +a(lp2644 +(S'a\nb' +p2645 +S' 0: b' +p2646 +tp2647 +aaa(lp2648 +S'b\\z' +p2649 +ag3 +a(lp2650 +(S'a\nb' +p2651 +S' 0: b' +p2652 +tp2653 +a(S'*** Failers' +p2654 +S'No match' +p2655 +tp2656 +aaa(lp2657 +S'((Z)+|A)*' +p2658 +ag3 +a(lp2659 +(S'ZABCDEFG' +p2660 +S' 0: ZA' +p2661 +tp2662 +aaa(lp2663 +S'(Z()|A)*' +p2664 +ag3 +a(lp2665 +(S'ZABCDEFG' +p2666 +S' 0: ZA' +p2667 +tp2668 +aaa(lp2669 +S'(Z(())|A)*' +p2670 +ag3 +a(lp2671 +(S'ZABCDEFG' +p2672 +S' 0: ZA' +p2673 +tp2674 +aaa(lp2675 +S'^[a-\\d]' +p2676 +ag3 +a(lp2677 +(S'abcde' +p2678 +S' 0: a' +p2679 +tp2680 +a(S'-things' +p2681 +S' 0: -' +p2682 +tp2683 +a(S'0digit' +p2684 +S' 0: 0' +p2685 +tp2686 +a(S'*** Failers' +p2687 +S'No match' +p2688 +tp2689 +a(S'bcdef' +p2690 +S'No match' +p2691 +tp2692 +aaa(lp2693 +S'^[\\d-a]' +p2694 +ag3 +a(lp2695 +(S'abcde' +p2696 +S' 0: a' +p2697 +tp2698 +a(S'-things' +p2699 +S' 0: -' +p2700 +tp2701 +a(S'0digit' +p2702 +S' 0: 0' +p2703 +tp2704 +a(S'*** Failers' +p2705 +S'No match' +p2706 +tp2707 +a(S'bcdef' +p2708 +S'No match' +p2709 +tp2710 +aaa(lp2711 +S'[[:space:]]+' +p2712 +ag3 +a(lp2713 +(S'> \t\n\x0c\r\x0b<' +p2714 +S' 0: \t\n\x0c\r\x0b' +p2715 +tp2716 +aaa(lp2717 +S'[[:blank:]]+' +p2718 +ag3 +a(lp2719 +(S'> \t\n\x0c\r\x0b<' +p2720 +S' 0: \t' +p2721 +tp2722 +aaa(lp2723 +S'[\\s]+' +p2724 +ag3 +a(lp2725 +(S'> \t\n\x0c\r\x0b<' +p2726 +S' 0: \t\n\x0c\r' +p2727 +tp2728 +aaa(lp2729 +S'\\s+' +p2730 +ag3 +a(lp2731 +(S'> \t\n\x0c\r\x0b<' +p2732 +S' 0: \t\n\x0c\r' +p2733 +tp2734 +aaa(lp2735 +S'abc\\Qabc\\Eabc' +p2736 +ag3 +a(lp2737 +(S'abcabcabc' +p2738 +S' 0: abcabcabc' +p2739 +tp2740 +aaa(lp2741 +S'abc\\Q(*+|\\Eabc' +p2742 +ag3 +a(lp2743 +(S'abc(*+|abc' +p2744 +S' 0: abc(*+|abc' +p2745 +tp2746 +aaa(lp2747 +S'\\Qabc\\$xyz\\E' +p2748 +ag3 +a(lp2749 +(S'abc\\$xyz' +p2750 +S' 0: abc\\$xyz' +p2751 +tp2752 +aaa(lp2753 +S'\\Qabc\\E\\$\\Qxyz\\E' +p2754 +ag3 +a(lp2755 +(S'abc$xyz' +p2756 +S' 0: abc$xyz' +p2757 +tp2758 +aaa(lp2759 +S'\\Gabc' +p2760 +ag3 +a(lp2761 +(S'abc' +p2762 +S' 0: abc' +p2763 +tp2764 +a(S'*** Failers' +p2765 +S'No match' +p2766 +tp2767 +a(S'xyzabc' +p2768 +S'No match' +p2769 +tp2770 +aaa(lp2771 +S'-- This tests for an IPv6 address in the form where it can have up to --' +p2772 +ag3 +a(lp2773 +(S'/-- eight components, one and only one of which is empty. This must be --/' +p2774 +S'No match' +p2775 +tp2776 +a(S'/-- an internal component. --/' +p2777 +S'No match' +p2778 +tp2779 +aaa(lp2780 +S'[z\\Qa-d]\\E]' +p2781 +ag3 +a(lp2782 +(g583 +S' 0: z' +p2783 +tp2784 +a(g592 +S' 0: a' +p2785 +tp2786 +a(g2017 +S' 0: -' +p2787 +tp2788 +a(S'd' +p2789 +S' 0: d' +p2790 +tp2791 +a(S']' +p2792 +S' 0: ]' +p2793 +tp2794 +a(S'*** Failers' +p2795 +S' 0: a' +p2796 +tp2797 +a(g835 +S'No match' +p2798 +tp2799 +aaa(lp2800 +S'[\\z\\C]' +p2801 +ag3 +a(lp2802 +(g583 +S' 0: z' +p2803 +tp2804 +a(S'C' +p2805 +S' 0: C' +p2806 +tp2807 +aaa(lp2808 +S'\\M' +p2809 +ag3 +a(lp2810 +(S'M' +p2811 +S' 0: M' +p2812 +tp2813 +aaa(lp2814 +S'(a+)*b' +p2815 +ag3 +a(lp2816 +(S'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +p2817 +S'No match' +p2818 +tp2819 +aaa(lp2820 +S'\xc5\xe6\xe5\xe4[\xe0-\xff\xc0-\xdf]+' +p2821 +ag3 +a(lp2822 +(S'\xc5\xe6\xe5\xe4\xe0' +p2823 +S' 0: \xc5\xe6\xe5\xe4\xe0' +p2824 +tp2825 +a(S'\xc5\xe6\xe5\xe4\xff' +p2826 +S' 0: \xc5\xe6\xe5\xe4\xff' +p2827 +tp2828 +a(S'\xc5\xe6\xe5\xe4\xc0' +p2829 +S' 0: \xc5\xe6\xe5\xe4\xc0' +p2830 +tp2831 +a(S'\xc5\xe6\xe5\xe4\xdf' +p2832 +S' 0: \xc5\xe6\xe5\xe4\xdf' +p2833 +tp2834 +aaa(lp2835 +S'[[,abc,]+]' +p2836 +ag3 +a(lp2837 +(S'abc]' +p2838 +S' 0: abc]' +p2839 +tp2840 +a(S'a,b]' +p2841 +S' 0: a,b]' +p2842 +tp2843 +a(S'[a,b,c]' +p2844 +S' 0: [a,b,c]' +p2845 +tp2846 +aaa(lp2847 +S'a*b*\\w' +p2848 +ag3 +a(lp2849 +(S'aaabbbb' +p2850 +S' 0: aaabbbb' +p2851 +tp2852 +a(S'aaaa' +p2853 +S' 0: aaaa' +p2854 +tp2855 +a(g592 +S' 0: a' +p2856 +tp2857 +aaa(lp2858 +S'a*b?\\w' +p2859 +ag3 +a(lp2860 +(S'aaabbbb' +p2861 +S' 0: aaabb' +p2862 +tp2863 +a(S'aaaa' +p2864 +S' 0: aaaa' +p2865 +tp2866 +a(g592 +S' 0: a' +p2867 +tp2868 +aaa(lp2869 +S'a*b{0,4}\\w' +p2870 +ag3 +a(lp2871 +(S'aaabbbb' +p2872 +S' 0: aaabbbb' +p2873 +tp2874 +a(S'aaaa' +p2875 +S' 0: aaaa' +p2876 +tp2877 +a(g592 +S' 0: a' +p2878 +tp2879 +aaa(lp2880 +S'a*b{0,}\\w' +p2881 +ag3 +a(lp2882 +(S'aaabbbb' +p2883 +S' 0: aaabbbb' +p2884 +tp2885 +a(S'aaaa' +p2886 +S' 0: aaaa' +p2887 +tp2888 +a(g592 +S' 0: a' +p2889 +tp2890 +aaa(lp2891 +S'a*\\d*\\w' +p2892 +ag3 +a(lp2893 +(S'0a' +p2894 +S' 0: 0a' +p2895 +tp2896 +a(g592 +S' 0: a' +p2897 +tp2898 +aaa(lp2899 +S'^\\w+=.*(\\\\\\n.*)*' +p2900 +ag3 +a(lp2901 +(S'abc=xyz\\\npqr' +p2902 +S' 0: abc=xyz\\' +p2903 +tp2904 +aaa(lp2905 +S'^\\Eabc' +p2906 +ag3 +a(lp2907 +(S'abc' +p2908 +S' 0: abc' +p2909 +tp2910 +aaa(lp2911 +S'^[\\Eabc]' +p2912 +ag3 +a(lp2913 +(g592 +S' 0: a' +p2914 +tp2915 +a(S'** Failers' +p2916 +S'No match' +p2917 +tp2918 +a(S'E' +p2919 +S'No match' +p2920 +tp2921 +aaa(lp2922 +S'^[a-\\Ec]' +p2923 +ag3 +a(lp2924 +(g835 +S' 0: b' +p2925 +tp2926 +a(S'** Failers' +p2927 +S'No match' +p2928 +tp2929 +a(g2017 +S'No match' +p2930 +tp2931 +a(g2919 +S'No match' +p2932 +tp2933 +aaa(lp2934 +S'^[a\\E\\E-\\Ec]' +p2935 +ag3 +a(lp2936 +(g835 +S' 0: b' +p2937 +tp2938 +a(S'** Failers' +p2939 +S'No match' +p2940 +tp2941 +a(g2017 +S'No match' +p2942 +tp2943 +a(g2919 +S'No match' +p2944 +tp2945 +aaa(lp2946 +S'^[\\E\\Qa\\E-\\Qz\\E]+' +p2947 +ag3 +a(lp2948 +(g835 +S' 0: b' +p2949 +tp2950 +a(S'** Failers' +p2951 +S'No match' +p2952 +tp2953 +a(g2017 +S'No match' +p2954 +tp2955 +aaa(lp2956 +S'^[a\\Q]bc\\E]' +p2957 +ag3 +a(lp2958 +(g592 +S' 0: a' +p2959 +tp2960 +a(g2792 +S' 0: ]' +p2961 +tp2962 +a(S'c' +p2963 +S' 0: c' +p2964 +tp2965 +aaa(lp2966 +S'^[a-\\Q\\E]' +p2967 +ag3 +a(lp2968 +(g592 +S' 0: a' +p2969 +tp2970 +a(g2017 +S' 0: -' +p2971 +tp2972 +aaa(lp2973 +S'^(a()*)*' +p2974 +ag3 +a(lp2975 +(S'aaaa' +p2976 +S' 0: aaaa' +p2977 +tp2978 +aaa(lp2979 +S'^(a()+)+' +p2980 +ag3 +a(lp2981 +(S'aaaa' +p2982 +S' 0: aaaa' +p2983 +tp2984 +aaa(lp2985 +S'(a|)*\\d' +p2986 +ag3 +a(lp2987 +(S'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +p2988 +S'No match' +p2989 +tp2990 +a(S'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4' +p2991 +S' 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4' +p2992 +tp2993 +aaa(lp2994 +S'(.*(.)?)*' +p2995 +ag3 +a(lp2996 +(S'abcd' +p2997 +S' 0: abcd' +p2998 +tp2999 +aaa(lp3000 +S'[[:abcd:xyz]]' +p3001 +ag3 +a(lp3002 +(S'a]' +p3003 +S' 0: a]' +p3004 +tp3005 +a(S':]' +p3006 +S' 0: :]' +p3007 +tp3008 +aaa(lp3009 +S'[abc[:x\\]pqr]' +p3010 +ag3 +a(lp3011 +(g592 +S' 0: a' +p3012 +tp3013 +a(S'[' +p3014 +S' 0: [' +p3015 +tp3016 +a(g441 +S' 0: :' +p3017 +tp3018 +a(g2792 +S' 0: ]' +p3019 +tp3020 +a(S'p' +p3021 +S' 0: p' +p3022 +tp3023 +aaa(lp3024 +S' End of testinput1 ' +p3025 +ag3 +a(lp3026 +aa. \ No newline at end of file From cfbolz at codespeak.net Mon Mar 3 00:06:55 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 00:06:55 +0100 (CET) Subject: [pypy-svn] r52077 - in pypy/branch/jit-refactoring/pypy/jit/tl: . test Message-ID: <20080302230655.4DE6B16853D@codespeak.net> Author: cfbolz Date: Mon Mar 3 00:06:54 2008 New Revision: 52077 Added: pypy/branch/jit-refactoring/pypy/jit/tl/tlopcode.py - copied unchanged from r52074, pypy/branch/jit-refactoring/pypy/jit/tl/opcode.py Removed: pypy/branch/jit-refactoring/pypy/jit/tl/opcode.py Modified: pypy/branch/jit-refactoring/pypy/jit/tl/test/test_tl.py pypy/branch/jit-refactoring/pypy/jit/tl/test/test_tlc.py pypy/branch/jit-refactoring/pypy/jit/tl/tl.py pypy/branch/jit-refactoring/pypy/jit/tl/tlc.py Log: rename the opcode.py file to not clash with a stdlib module Modified: pypy/branch/jit-refactoring/pypy/jit/tl/test/test_tl.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/tl/test/test_tl.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/tl/test/test_tl.py Mon Mar 3 00:06:54 2008 @@ -1,6 +1,6 @@ import py import operator -from pypy.jit.tl.opcode import * +from pypy.jit.tl.tlopcode import * from pypy.jit.conftest import Benchmark from pypy.translator.c.test import test_boehm Modified: pypy/branch/jit-refactoring/pypy/jit/tl/test/test_tlc.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/tl/test/test_tlc.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/tl/test/test_tlc.py Mon Mar 3 00:06:54 2008 @@ -1,5 +1,5 @@ import py -from pypy.jit.tl.opcode import compile +from pypy.jit.tl.tlopcode import compile from pypy.jit.tl.test import test_tl Modified: pypy/branch/jit-refactoring/pypy/jit/tl/tl.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/tl/tl.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/tl/tl.py Mon Mar 3 00:06:54 2008 @@ -1,7 +1,7 @@ '''Toy Language''' import py -from pypy.jit.tl.opcode import * +from pypy.jit.tl.tlopcode import * from pypy.rlib.jit import hint def char2int(c): Modified: pypy/branch/jit-refactoring/pypy/jit/tl/tlc.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/tl/tlc.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/tl/tlc.py Mon Mar 3 00:06:54 2008 @@ -1,8 +1,8 @@ '''Toy Language with Cons Cells''' import py -from pypy.jit.tl.opcode import * -from pypy.jit.tl import opcode as tlopcode +from pypy.jit.tl.tlopcode import * +from pypy.jit.tl import tlopcode from pypy.rlib.jit import hint class Obj(object): From cfbolz at codespeak.net Mon Mar 3 00:24:46 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 00:24:46 +0100 (CET) Subject: [pypy-svn] r52078 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080302232446.14A11168575@codespeak.net> Author: cfbolz Date: Mon Mar 3 00:24:44 2008 New Revision: 52078 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py Log: use recloseblocks instead of setting the exits manually Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py Mon Mar 3 00:24:44 2008 @@ -107,7 +107,8 @@ block.operations[:] = [ flowmodel.SpaceOperation("direct_call", args, result)] block.exitswitch = None - block.exits = [flowmodel.Link([result], self.origportalgraph.returnblock)] + block.recloseblock( + flowmodel.Link([result], self.origportalgraph.returnblock)) self.origportalgraph.exceptblock = None def getportalargdesc(self, lowleveltype): From cfbolz at codespeak.net Mon Mar 3 00:29:00 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 00:29:00 +0100 (CET) Subject: [pypy-svn] r52079 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080302232900.19BD3169E08@codespeak.net> Author: cfbolz Date: Mon Mar 3 00:28:54 2008 New Revision: 52079 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py Log: the exceptblock can just stay Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/portal.py Mon Mar 3 00:28:54 2008 @@ -109,7 +109,6 @@ block.exitswitch = None block.recloseblock( flowmodel.Link([result], self.origportalgraph.returnblock)) - self.origportalgraph.exceptblock = None def getportalargdesc(self, lowleveltype): assert not isinstance(lowleveltype, lltype.ContainerType) From cfbolz at codespeak.net Mon Mar 3 00:32:21 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 00:32:21 +0100 (CET) Subject: [pypy-svn] r52080 - in pypy/branch/jit-refactoring/pypy/translator: . goal Message-ID: <20080302233221.ED577169E13@codespeak.net> Author: cfbolz Date: Mon Mar 3 00:32:19 2008 New Revision: 52080 Modified: pypy/branch/jit-refactoring/pypy/translator/driver.py pypy/branch/jit-refactoring/pypy/translator/goal/translate.py Log: fix the driver and translate.py to use the rainbow interpreter instead of the timeshifter Modified: pypy/branch/jit-refactoring/pypy/translator/driver.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/translator/driver.py (original) +++ pypy/branch/jit-refactoring/pypy/translator/driver.py Mon Mar 3 00:32:19 2008 @@ -135,7 +135,7 @@ task, postfix = parts if task in ('rtype', 'backendopt', 'llinterpret', 'prehannotatebackendopt', 'hintannotate', - 'timeshift'): + 'rainbow'): if ts: if ts == postfix: expose_task(task, explicit_task) @@ -386,14 +386,14 @@ get_portal = self.extra['portal'] PORTAL, POLICY = get_portal(self) t = self.translator - self.portal_graph = graphof(t, PORTAL) + self.orig_portal_graph = graphof(t, PORTAL) hannotator = HintAnnotator(base_translator=t, policy=POLICY) self.hint_translator = hannotator.translator - hs = hannotator.build_types(self.portal_graph, + hs = hannotator.build_types(self.orig_portal_graph, [SomeLLAbstractConstant(v.concretetype, {OriginFlags(): True}) - for v in self.portal_graph.getargs()]) + for v in self.orig_portal_graph.getargs()]) count = hannotator.bookkeeper.nonstuboriggraphcount stubcount = hannotator.bookkeeper.stuboriggraphcount self.log.info("The hint-annotator saw %d graphs" @@ -401,14 +401,16 @@ n = len(list(hannotator.translator.graphs[0].iterblocks())) self.log.info("portal has %d blocks" % n) self.hannotator = hannotator + self.portal_graph = graphof(hannotator.translator, PORTAL) # task_hintannotate_lltype = taskdef(task_hintannotate_lltype, ['prehannotatebackendopt_lltype'], "Hint-annotate") - def task_timeshift_lltype(self): - from pypy.jit.timeshifter.hrtyper import HintRTyper + def task_rainbow_lltype(self): from pypy.jit.codegen import detect_cpu + from pypy.jit.rainbow.codewriter import BytecodeWriter + from pypy.jit.rainbow.portal import PortalRewriter cpu = detect_cpu.autodetect() if cpu == 'i386': from pypy.jit.codegen.i386.rgenop import RI386GenOp as RGenOp @@ -422,13 +424,19 @@ del self.hint_translator ha = self.hannotator t = self.translator - # make the timeshifted graphs - hrtyper = HintRTyper(ha, t.rtyper, RGenOp) - hrtyper.specialize(origportalgraph=self.portal_graph, view=False) + rtyper = t.rtyper + # make the bytecode and the rainbow interp + writer = BytecodeWriter(t, ha, RGenOp) + jitcode = writer.make_bytecode(self.portal_graph) + rewriter = PortalRewriter(self.hannotator, rtyper, RGenOp, + writer, True) + rewriter.rewrite(origportalgraph=self.orig_portal_graph, + portalgraph=self.portal_graph, + view=False) # - task_timeshift_lltype = taskdef(task_timeshift_lltype, + task_rainbow_lltype = taskdef(task_rainbow_lltype, ["hintannotate_lltype"], - "Timeshift") + "Create Rainbow-Interpreter") def task_backendopt_lltype(self): from pypy.translator.backendopt.all import backend_optimizations @@ -436,7 +444,7 @@ # task_backendopt_lltype = taskdef(task_backendopt_lltype, [RTYPE, - '??timeshift_lltype'], + '??rainbow_lltype'], "lltype back-end optimisations") BACKENDOPT = 'backendopt_lltype' Modified: pypy/branch/jit-refactoring/pypy/translator/goal/translate.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/translator/goal/translate.py (original) +++ pypy/branch/jit-refactoring/pypy/translator/goal/translate.py Mon Mar 3 00:32:19 2008 @@ -20,7 +20,7 @@ ("prehannotatebackendopt", "backend optimize before hint-annotating", "--prehannotatebackendopt", ""), ("hintannotate", "hint-annotate", "--hintannotate", ""), - ("timeshift", "timeshift (jit generation)", "--timeshift", ""), + ("rainbow", "rainbow interpreter (jit generation)", "--rainbow", ""), ("backendopt", "do backend optimizations", "--backendopt", ""), ("source", "create source", "-s --source", ""), ("compile", "compile", "-c --compile", " (default goal)"), @@ -259,7 +259,7 @@ if translateconfig.goal_options.jit: if 'portal' not in targetspec_dic: raise Exception('target has no portal defined.') - drv.set_extra_goals(['timeshift']) + drv.set_extra_goals(['rainbow']) log_config(config.translation, "translation configuration") pdb_plus_show.expose({'drv': drv, 'prof': prof}) From cfbolz at codespeak.net Mon Mar 3 10:19:39 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 10:19:39 +0100 (CET) Subject: [pypy-svn] r52081 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080303091939.66EF7169E71@codespeak.net> Author: cfbolz Date: Mon Mar 3 10:19:36 2008 New Revision: 52081 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Log: a great way to confuse yourself: have two copies of the same class around and wonder why your modifications to the upper one don't have any effect. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Mon Mar 3 10:19:36 2008 @@ -43,56 +43,12 @@ k = 0 for ARG in argiter: if ARG == lltype.Void: - arg = voidargs[k] - # XXX terrible hack - if not we_are_translated(): - arg._TYPE = lltype.Void - args += (arg, ) - k += 1 - else: - genconst = greenargs[j] - arg = genconst.revealconst(ARG) - args += (arg, ) - j += 1 - rgenop = interpreter.jitstate.curbuilder.rgenop - try: - result = rgenop.genconst(fnptr(*args)) - except Exception, e: - if not we_are_translated(): - residual_exception_nontranslated(interpreter.jitstate, e, rtyper) - else: - interpreter.jitstate.residual_exception(e) - result = rgenop.genconst(whatever_return_value) - interpreter.green_result(result) - self.green_call = green_call - - def _freeze_(self): - return True - - -class CallDesc: - __metaclass__ = cachedtype - - def __init__(self, RGenOp, rtyper, FUNCTYPE, voidargs=()): - self.sigtoken = RGenOp.sigToken(FUNCTYPE.TO) - self.result_kind = RGenOp.kindToken(FUNCTYPE.TO.RESULT) - # xxx what if the result is virtualizable? - self.redboxbuilder = rvalue.ll_redboxbuilder(FUNCTYPE.TO.RESULT) - whatever_return_value = FUNCTYPE.TO.RESULT._defl() - numargs = len(FUNCTYPE.TO.ARGS) - argiter = unrolling_iterable(FUNCTYPE.TO.ARGS) - def green_call(interpreter, fnptr_gv, greenargs): - fnptr = fnptr_gv.revealconst(FUNCTYPE) - assert len(greenargs) + len(voidargs) == numargs - args = () - j = 0 - k = 0 - for ARG in argiter: - if ARG == lltype.Void: - arg = voidargs[k] # XXX terrible hack if not we_are_translated(): + arg = voidargs[k] arg._TYPE = lltype.Void + else: + arg = None args += (arg, ) k += 1 else: From cfbolz at codespeak.net Mon Mar 3 11:08:45 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 11:08:45 +0100 (CET) Subject: [pypy-svn] r52082 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080303100845.4CF8C169E73@codespeak.net> Author: cfbolz Date: Mon Mar 3 11:08:43 2008 New Revision: 52082 Added: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_2tl.py (contents, props changed) Log: test for tiny2, not working right now Added: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_2tl.py ============================================================================== --- (empty file) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_2tl.py Mon Mar 3 11:08:43 2008 @@ -0,0 +1,28 @@ +from pypy.rpython.module.support import LLSupport +from pypy.jit.rainbow.test.test_portal import PortalTest +from pypy.jit.rainbow.test.test_vlist import P_OOPSPEC +from pypy.tool.sourcetools import func_with_new_name +from pypy.jit.conftest import Benchmark + +from pypy.jit.tl import tiny2 +from pypy.jit.tl.targettiny2 import MyHintAnnotatorPolicy + + +class TestTL(PortalTest): + type_system = "lltype" + + def test_tl(self): + def main(bytecode, arg1, arg2, arg3): + if bytecode == 0: + bytecode = "{ #1 #1 1 SUB ->#1 #1 }" + elif bytecode == 1: + bytecode = "{ #1 #2 #1 #2 ADD ->#2 ->#1 #3 1 SUB ->#3 #3 }" + else: + assert 0 + bytecode = [s for s in bytecode.split(' ') if s != ''] + args = [tiny2.StrBox(str(arg1)), tiny2.StrBox(str(arg2)), tiny2.StrBox(str(arg3))] + return tiny2.repr(tiny2.interpret(bytecode, args)) + + res = self.timeshift_from_portal(main, tiny2.interpret, [0, 5, 0, 0], + policy=MyHintAnnotatorPolicy()) + assert res == "5 4 3 2 1" From arigo at codespeak.net Mon Mar 3 11:18:24 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 11:18:24 +0100 (CET) Subject: [pypy-svn] r52083 - in pypy/branch/jit-refactoring/pypy/rpython: . lltypesystem Message-ID: <20080303101824.72226169E71@codespeak.net> Author: arigo Date: Mon Mar 3 11:18:23 2008 New Revision: 52083 Modified: pypy/branch/jit-refactoring/pypy/rpython/llinterp.py pypy/branch/jit-refactoring/pypy/rpython/lltypesystem/opimpl.py Log: Move the special-casing of ComputedIntSymbolic into opimpl.py. Allows the llop.int_xxx() operations to operate on them. Modified: pypy/branch/jit-refactoring/pypy/rpython/llinterp.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/rpython/llinterp.py (original) +++ pypy/branch/jit-refactoring/pypy/rpython/llinterp.py Mon Mar 3 11:18:23 2008 @@ -4,7 +4,7 @@ from pypy.rpython.lltypesystem import lltype, llmemory, lloperation, llheap from pypy.rpython.lltypesystem import rclass from pypy.rpython.ootypesystem import ootype -from pypy.rlib.objectmodel import ComputedIntSymbolic, CDefinedIntSymbolic +from pypy.rlib.objectmodel import CDefinedIntSymbolic import sys, os import math @@ -218,8 +218,6 @@ val = varorconst.value except AttributeError: val = self.bindings[varorconst] - if isinstance(val, ComputedIntSymbolic): - val = val.compute_fn() if varorconst.concretetype is not lltype.Void: try: val = lltype.enforce(varorconst.concretetype, val) Modified: pypy/branch/jit-refactoring/pypy/rpython/lltypesystem/opimpl.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/rpython/lltypesystem/opimpl.py (original) +++ pypy/branch/jit-refactoring/pypy/rpython/lltypesystem/opimpl.py Mon Mar 3 11:18:23 2008 @@ -1,6 +1,7 @@ import sys import math from pypy.tool.sourcetools import func_with_new_name +from pypy.rlib.objectmodel import ComputedIntSymbolic from pypy.rpython.lltypesystem import lltype, llmemory from pypy.rpython.lltypesystem.lloperation import opimpls @@ -62,17 +63,28 @@ if opname in ops_unary: def op_function(x): if not isinstance(x, argtype): - raise TypeError("%r arg must be %s, got %r instead" % ( - fullopname, typname, type(x).__name__)) + if argtype is int: + x = _compute_int(x) + else: + raise TypeError("%r arg must be %s, got %r instead" % ( + fullopname, typname, type(x).__name__)) return adjust_result(func(x)) else: def op_function(x, y): if not isinstance(x, argtype): - raise TypeError("%r arg 1 must be %s, got %r instead" % ( - fullopname, typname, type(x).__name__)) + if argtype is int: + x = _compute_int(x) + else: + raise TypeError("%r arg 1 must be %s, got %r instead" + % (fullopname, typname, + type(x).__name__)) if not isinstance(y, argtype): - raise TypeError("%r arg 2 must be %s, got %r instead" % ( - fullopname, typname, type(y).__name__)) + if argtype is int: + y = _compute_int(y) + else: + raise TypeError("%r arg 2 must be %s, got %r instead" + % (fullopname, typname, + type(y).__name__)) return adjust_result(func(x, y)) return func_with_new_name(op_function, 'op_' + fullopname) @@ -170,27 +182,35 @@ assert type(b) is bool return not b +def _compute_int(val): + if isinstance(val, ComputedIntSymbolic): + val = val.compute_fn() + assert isinstance(val, int) + return val + def op_int_add(x, y): - assert isinstance(x, (int, llmemory.AddressOffset)) - assert isinstance(y, (int, llmemory.AddressOffset)) + if not (type(x) is int and type(y) is int): + if not isinstance(x, llmemory.AddressOffset): x = _compute_int(x) + if not isinstance(y, llmemory.AddressOffset): y = _compute_int(y) return intmask(x + y) def op_int_mul(x, y): - assert isinstance(x, (int, llmemory.AddressOffset)) - assert isinstance(y, (int, llmemory.AddressOffset)) + if not (type(x) is int and type(y) is int): + if not isinstance(x, llmemory.AddressOffset): x = _compute_int(x) + if not isinstance(y, llmemory.AddressOffset): y = _compute_int(y) return intmask(x * y) def op_int_floordiv(x, y): - assert isinstance(x, int) - assert isinstance(y, int) + x = _compute_int(x) + y = _compute_int(y) r = x//y if x^y < 0 and x%y != 0: r += 1 return r def op_int_mod(x, y): - assert isinstance(x, int) - assert isinstance(y, int) + x = _compute_int(x) + y = _compute_int(y) r = x%y if x^y < 0 and x%y != 0: r -= y From arigo at codespeak.net Mon Mar 3 11:58:01 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 11:58:01 +0100 (CET) Subject: [pypy-svn] r52084 - pypy/dist/pypy/jit/codegen/llgraph Message-ID: <20080303105801.C32601683ED@codespeak.net> Author: arigo Date: Mon Mar 3 11:58:00 2008 New Revision: 52084 Modified: pypy/dist/pypy/jit/codegen/llgraph/llimpl.py Log: Fix typo Modified: pypy/dist/pypy/jit/codegen/llgraph/llimpl.py ============================================================================== --- pypy/dist/pypy/jit/codegen/llgraph/llimpl.py (original) +++ pypy/dist/pypy/jit/codegen/llgraph/llimpl.py Mon Mar 3 11:58:00 2008 @@ -46,7 +46,7 @@ def functionptr_general(TYPE, name, **attrs): if isinstance(TYPE, lltype.FuncType): - return functionptr(TYPE, name, **attrs) + return lltype.functionptr(TYPE, name, **attrs) else: assert isinstance(TYPE, ootype.StaticMethod) return ootype.static_meth(TYPE, name, **attrs) From arigo at codespeak.net Mon Mar 3 11:58:27 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 11:58:27 +0100 (CET) Subject: [pypy-svn] r52085 - pypy/dist/pypy/jit/timeshifter/test Message-ID: <20080303105827.2794D1683F2@codespeak.net> Author: arigo Date: Mon Mar 3 11:58:26 2008 New Revision: 52085 Modified: pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py Log: Fix for various tests, e.g. module/pypyjit/test/test_newbool Modified: pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py ============================================================================== --- pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py (original) +++ pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py Mon Mar 3 11:58:26 2008 @@ -53,6 +53,9 @@ small = True type_system = 'lltype' # because a lot of tests inherits from this class + def Ptr(self, T): + return lltype.Ptr(T) + def setup_class(cls): from pypy.jit.timeshifter.test.conftest import option cls.on_llgraph = cls.RGenOp is LLRGenOp @@ -1796,9 +1799,6 @@ class TestLLType(BaseTestTimeshift): type_system = 'lltype' - def Ptr(self, T): - return lltype.Ptr(T) - passing_ootype_tests = set([ 'test_very_simple', 'test_convert_const_to_redbox', From cfbolz at codespeak.net Mon Mar 3 12:29:51 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 12:29:51 +0100 (CET) Subject: [pypy-svn] r52086 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080303112951.2A366169E49@codespeak.net> Author: cfbolz Date: Mon Mar 3 12:29:50 2008 New Revision: 52086 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Log: this is the right thing to do, the assertion fails with the tiny2 test, however Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Mon Mar 3 12:29:50 2008 @@ -534,7 +534,9 @@ newjitstate = rtimeshift.collect_split( self.jitstate, self.frame.pc, self.frame.local_green) - assert newjitstate is self.jitstate + assert newjitstate.frame.bytecode is self.frame.bytecode + assert newjitstate.frame.pc == self.frame.pc + self.newjitstate(newjitstate) @arguments("green_varargs", "red_varargs") def opimpl_portal_call(self, greenargs, redargs): From niko at codespeak.net Mon Mar 3 12:47:13 2008 From: niko at codespeak.net (niko at codespeak.net) Date: Mon, 3 Mar 2008 12:47:13 +0100 (CET) Subject: [pypy-svn] r52087 - in pypy/branch/fixed-list-ootype/pypy/translator/jvm: . src/pypy test Message-ID: <20080303114713.65720169E8D@codespeak.net> Author: niko Date: Mon Mar 3 12:47:12 2008 New Revision: 52087 Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/constant.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/generator.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/src/pypy/PyPy.java pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/runtest.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/test_builtin.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/typesystem.py Log: all tests pass now: only sig change was the return type of ll_split_chr became Object[] not ArrayList Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/constant.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/constant.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/constant.py Mon Mar 3 12:47:12 2008 @@ -188,7 +188,7 @@ PRIORITY = 200 def jtype(self): - return jPyPyWeakRef + return jvm.jPyPyWeakRef def create_pointer(self, gen): if not self.value: Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py Mon Mar 3 12:47:12 2008 @@ -499,7 +499,6 @@ def lltype_to_cts(self, OOT): import sys res = self._lltype_to_cts(OOT) - print >> sys.stderr, "lltype_to_cts(%r) -> %r" % (OOT, res) return res def _lltype_to_cts(self, OOT): @@ -531,7 +530,7 @@ # handle externals if isinstance(OOT, ExternalType): - return JvmNativeClass(self, OOT) + return jvm.JvmNativeClass(self, OOT) assert False, "Untranslatable type %s!" % OOT Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/generator.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/generator.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/generator.py Mon Mar 3 12:47:12 2008 @@ -493,7 +493,6 @@ # Determine java type: jty = self.db.lltype_to_cts(v.concretetype) import sys - print >> sys.stderr, "_var_data(%s) -> %r" % (v.name, jty) # Determine index in stack frame slots: # note that arguments and locals can be treated the same here return jty, self.curfunc.var_offset(v, jty) @@ -842,7 +841,7 @@ greater_equals = lambda self: self._compare_op(jvm.IF_ICMPGE) def _uint_compare_op(self, cmpopcode): - PYPYUINTCMP.invoke(self) + jvm.PYPYUINTCMP.invoke(self) self._compare_op(cmpopcode) u_equals = equals @@ -876,7 +875,7 @@ long_greater_equals = lambda self: self._long_compare_op(jvm.IFGE) def _ulong_compare_op(self, cmpopcode): - PYPYULONGCMP.invoke(self) + jvm.PYPYULONGCMP.invoke(self) self._compare_op(cmpopcode) ulong_equals = long_equals Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/src/pypy/PyPy.java ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/src/pypy/PyPy.java (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/src/pypy/PyPy.java Mon Mar 3 12:47:12 2008 @@ -724,7 +724,7 @@ return str.substring(start, end); } - public static ArrayList ll_split_chr(String str, char c) { + public static Object[] ll_split_chr(String str, char c) { ArrayList list = new ArrayList(); int lastidx = 0, idx = 0; while ((idx = str.indexOf(c, lastidx)) != -1) @@ -734,7 +734,7 @@ lastidx = idx+1; } list.add(str.substring(lastidx)); - return list; + return list.toArray(new String[list.size()]); } public static String ll_substring(String str, int start, int cnt) { Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/runtest.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/runtest.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/runtest.py Mon Mar 3 12:47:12 2008 @@ -118,11 +118,11 @@ return JvmGeneratedSourceWrapper(self._jvm_src) def _skip_win(self, reason): - if platform.system() == 'Windows': + if hasattr(platform, 'system') and platform.system() == 'Windows': py.test.skip('Windows --> %s' % reason) def _skip_powerpc(self, reason): - if platform.processor() == 'powerpc': + if hasattr(platform, 'processor') and platform.processor() == 'powerpc': py.test.skip('PowerPC --> %s' % reason) def _skip_llinterpreter(self, reason, skipLL=True, skipOO=True): Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/test_builtin.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/test_builtin.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/test_builtin.py Mon Mar 3 12:47:12 2008 @@ -3,15 +3,10 @@ from pypy.translator.oosupport.test_template.builtin import BaseTestBuiltin, BaseTestTime from pypy.translator.jvm.test.runtest import JvmTest -def skip_win(): - import platform - if platform.system() == 'Windows': - py.test.skip("Doesn't work on Windows, yet") - class TestJavaBuiltin(JvmTest, BaseTestBuiltin): def test_os_write_magic(self): - skip_win() + self._skip_win('Not yet') BaseTestBuiltin.test_os_write_magic(self) def test_os_path_exists(self): Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/typesystem.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/typesystem.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/typesystem.py Mon Mar 3 12:47:12 2008 @@ -345,7 +345,6 @@ return self.methods[methname] def _add_methods(self): - from pypy.translator.jvm.generator import Method for methname, methspec in self.OOTYPE._class_._methods.items(): argtypes = [self.db.annotation_to_cts(arg._type) for arg in methspec.args] @@ -384,7 +383,7 @@ def lookup_method(self, methodnm): jargtypes, jrettype = self.method_types[methodnm] - return jvmgen.Method.v(self, methodnm, jargtypes, jrettype) + return Method.v(self, methodnm, jargtypes, jrettype) class JvmArrayType(JvmType): """ From arigo at codespeak.net Mon Mar 3 14:10:06 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 14:10:06 +0100 (CET) Subject: [pypy-svn] r52088 - in pypy/branch/jit-refactoring/pypy/jit: codegen/i386/test rainbow/test Message-ID: <20080303131006.CC349169EA0@codespeak.net> Author: arigo Date: Mon Mar 3 14:10:00 2008 New Revision: 52088 Modified: pypy/branch/jit-refactoring/pypy/jit/codegen/i386/test/test_genc_portal.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py Log: Adapt the portal test for the i386 backend. Most or all tests pass. Modified: pypy/branch/jit-refactoring/pypy/jit/codegen/i386/test/test_genc_portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/codegen/i386/test/test_genc_portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/codegen/i386/test/test_genc_portal.py Mon Mar 3 14:10:00 2008 @@ -1,33 +1,63 @@ -import py, os +import py, os, sys from pypy.annotation import model as annmodel -from pypy.annotation.listdef import s_list_of_strings from pypy.rlib.unroll import unrolling_iterable from pypy.translator.c.genc import CStandaloneBuilder -from pypy.jit.timeshifter.test import test_portal +from pypy.jit.rainbow.test import test_portal from pypy.jit.codegen.i386.rgenop import RI386GenOp from pypy.rpython.annlowlevel import PseudoHighLevelCallable class I386PortalTestMixin(object): RGenOp = RI386GenOp + translate_support_code = True - def postprocess_timeshifting(self): - annhelper = self.hrtyper.annhelper - convert_result = getattr(self.main, 'convert_result', str) - annotator = self.rtyper.annotator - args_s = [annmodel.lltype_to_annotation(v.concretetype) - for v in self.maingraph.getargs()] - retvar = self.maingraph.getreturnvar() - s_result = annmodel.lltype_to_annotation(retvar.concretetype) - main_fnptr = self.rtyper.type_system.getcallable(self.maingraph) - main = PseudoHighLevelCallable(main_fnptr, args_s, s_result) - - if hasattr(self.main, 'convert_arguments'): - decoders = self.main.convert_arguments - assert len(decoders) == len(args_s) + def timeshift_from_portal(self, main, portal, main_args, + inline=None, policy=None, + backendoptimize=False): + self.testname = sys._getframe(1).f_code.co_name + + # ---------- translate main() and the support code ---------- + self._timeshift_from_portal(main, portal=portal, main_args=main_args, + inline=inline, policy=policy, + backendoptimize=backendoptimize) + + # ---------- run the stand-alone executable ---------- + cmdargs = ' '.join([str(arg) for arg in main_args]) + output = self.cbuilder.cmdexec(cmdargs) + lines = output.split() + lastline = lines[-1] + assert not lastline.startswith('EXCEPTION:') + if hasattr(main, 'convert_result'): + return lastline + else: + return int(lastline) # assume an int + + + # The following function is called by _timeshift_from_portal() unless + # its results are already in the cache from a previous call + def _serialize(self, main, main_args, portal, + policy=None, inline=None, + backendoptimize=False): + + # ---------- prepare a stand-alone main() function ---------- + convert_result = getattr(main, 'convert_result', str) + if hasattr(main, 'convert_arguments'): + decoders = main.convert_arguments + assert len(decoders) == len(main_args) else: - decoders = [int] * len(args_s) + decoders = [int] * len(main_args) decoders = unrolling_iterable(decoders) + numargs = len(main_args) + USAGE = '%s: %d arguments expected\n' % (self.testname, numargs) + + def usage(): + os.write(2, USAGE) + return 2 + def ll_main(argv): + if len(argv) != 1 + numargs: + return usage() + if len(argv) > 1 and argv[1] == '--help': + return usage() args = () i = 1 for decoder in decoders: @@ -41,38 +71,30 @@ os.write(1, convert_result(res) + '\n') return 0 - annhelper.getgraph(ll_main, [s_list_of_strings], - annmodel.SomeInteger()) - annhelper.finish() + # ---------- rewire portal and translate everything ---------- + super(I386PortalTestMixin, self)._serialize( + ll_main, None, portal=portal, + inline=inline, policy=policy, + backendoptimize=backendoptimize) + + # ---------- generate a stand-alone executable ---------- t = self.rtyper.annotator.translator t.config.translation.gc = 'boehm' self.cbuilder = CStandaloneBuilder(t, ll_main, config=t.config) self.cbuilder.generate_source() - self.cbuilder.compile() - - def timeshift_from_portal(self, main, portal, main_args, - inline=None, policy=None, - backendoptimize=False): - self.main = main - self._timeshift_from_portal(main, portal, main_args, - inline=inline, policy=policy, - backendoptimize=backendoptimize) - cmdargs = ' '.join([str(arg) for arg in main_args]) - output = self.cbuilder.cmdexec(cmdargs) - lines = output.split() - lastline = lines[-1] - assert not lastline.startswith('EXCEPTION:') - if hasattr(main, 'convert_result'): - return lastline - else: - return int(lastline) # assume an int - + exename = self.cbuilder.compile() + print '-'*60 + print 'Generated executable for %s: %s', (self.testname, exename) + print '-'*60 + + def check_insns(self, expected=None, **counts): "Cannot check instructions in the generated assembler." - + + class TestPortal(I386PortalTestMixin, test_portal.TestPortal): # for the individual tests see - # ====> ../../../timeshifter/test/test_portal.py + # ====> ../../../rainbow/test/test_portal.py pass Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Mon Mar 3 14:10:00 2008 @@ -29,6 +29,9 @@ entrypoint_returns_red=False) def getargtypes(annotator, values): + if values is None: # for backend tests producing stand-alone exe's + from pypy.annotation.listdef import s_list_of_strings + return [s_list_of_strings] return [annotation(annotator, x) for x in values] def annotation(a, x): Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py Mon Mar 3 14:10:00 2008 @@ -2,9 +2,9 @@ from pypy import conftest from pypy.translator.translator import graphof -from pypy.jit.timeshifter.test.test_timeshift import TestLLType as TSTestLLType, getargtypes from pypy.jit.rainbow.test.test_interpreter import P_NOVIRTUAL, StopAtXPolicy from pypy.jit.rainbow.test.test_interpreter import hannotate, InterpretationTest +from pypy.jit.rainbow.test.test_interpreter import getargtypes from pypy.jit.rainbow.test.test_vlist import P_OOPSPEC from pypy.rpython.llinterp import LLInterpreter from pypy.rpython.lltypesystem import lltype From arigo at codespeak.net Mon Mar 3 14:54:55 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 14:54:55 +0100 (CET) Subject: [pypy-svn] r52089 - pypy/branch/jit-refactoring/pypy/jit/codegen/i386/test Message-ID: <20080303135455.64BBA169EA4@codespeak.net> Author: arigo Date: Mon Mar 3 14:54:53 2008 New Revision: 52089 Modified: pypy/branch/jit-refactoring/pypy/jit/codegen/i386/test/test_genc_portal.py Log: Typo. All these tests pass! Modified: pypy/branch/jit-refactoring/pypy/jit/codegen/i386/test/test_genc_portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/codegen/i386/test/test_genc_portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/codegen/i386/test/test_genc_portal.py Mon Mar 3 14:54:53 2008 @@ -84,7 +84,7 @@ self.cbuilder.generate_source() exename = self.cbuilder.compile() print '-'*60 - print 'Generated executable for %s: %s', (self.testname, exename) + print 'Generated executable for %s: %s' % (self.testname, exename) print '-'*60 From arigo at codespeak.net Mon Mar 3 15:14:34 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 15:14:34 +0100 (CET) Subject: [pypy-svn] r52090 - pypy/dist/pypy/interpreter/pyparser Message-ID: <20080303141434.9C53B169ED4@codespeak.net> Author: arigo Date: Mon Mar 3 15:14:31 2008 New Revision: 52090 Modified: pypy/dist/pypy/interpreter/pyparser/parsestring.py Log: Translation fix. Modified: pypy/dist/pypy/interpreter/pyparser/parsestring.py ============================================================================== --- pypy/dist/pypy/interpreter/pyparser/parsestring.py (original) +++ pypy/dist/pypy/interpreter/pyparser/parsestring.py Mon Mar 3 15:14:31 2008 @@ -130,6 +130,7 @@ ps += 1 if ps == end: raise_app_valueerror(space, 'Trailing \\ in string') + prevps = ps ch = s[ps] ps += 1 # XXX This assumes ASCII! @@ -160,7 +161,7 @@ span = ps span += (span < end) and (s[span] in '01234567') span += (span < end) and (s[span] in '01234567') - lis.append(chr(int(s[ps - 1 : span], 8))) + lis.append(chr(int(s[prevps : span], 8))) ps = span elif ch == 'x': if ps+2 <= end and isxdigit(s[ps]) and isxdigit(s[ps + 1]): From cfbolz at codespeak.net Mon Mar 3 15:27:21 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 15:27:21 +0100 (CET) Subject: [pypy-svn] r52091 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080303142721.8CED9169EC5@codespeak.net> Author: cfbolz Date: Mon Mar 3 15:27:15 2008 New Revision: 52091 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_2tl.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: fix tiny2 tests by moving the collect_split call into the callee. This is more natural anyway and less code. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Mon Mar 3 15:27:15 2008 @@ -835,15 +835,11 @@ self.emit(*emitted_args) setdescindex = self.indirectcalldesc_position(targets) self.emit(fnptrindex, setdescindex) - - if kind == "red": - self.emit("red_after_direct_call") - elif kind == "yellow": - self.emit("yellow_after_direct_call") + if kind == "yellow": self.emit("yellow_retrieve_result_as_red") self.emit(self.type_position(op.result.concretetype)) - elif kind == "gray": - self.emit("red_after_direct_call") + elif kind in ("gray", "red"): + pass else: assert 0, "unknown call kind %s" % (kind, ) @@ -957,7 +953,6 @@ if kind == "red": self.register_redvar(op.result) - self.emit("red_after_direct_call") def handle_gray_call(self, op, withexc): return self.handle_red_call(op, withexc, "gray") @@ -972,7 +967,6 @@ self.emit("yellow_direct_call") self.emit(*emitted_args) self.emit(graphindex) - self.emit("yellow_after_direct_call") self.emit("yellow_retrieve_result") self.register_greenvar(op.result) Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Mon Mar 3 15:27:15 2008 @@ -271,7 +271,14 @@ assert 0, "unknown graph color %s" % (graph_color, ) self.newjitstate(newjitstate) - if self.frame is None: + if self.frame is not None: + newjitstate = rtimeshift.collect_split( + self.jitstate, self.frame.pc, + self.frame.local_green) + assert newjitstate.frame.bytecode is self.frame.bytecode + assert newjitstate.frame.pc == self.frame.pc + self.newjitstate(newjitstate) + else: if frame.backframe is not None: frame = frame.backframe queue = frame.dispatchqueue @@ -526,11 +533,10 @@ def opimpl_red_direct_call(self, greenargs, redargs, targetbytecode): self.run(self.jitstate, targetbytecode, greenargs, redargs, start_bytecode_loop=False) - # this frame will be resumed later in the next bytecode, which is - # red_after_direct_call - @arguments() - def opimpl_red_after_direct_call(self): + @arguments("green_varargs", "red_varargs") + def opimpl_portal_call(self, greenargs, redargs): + self.portalstate.portal_reentry(greenargs, redargs) newjitstate = rtimeshift.collect_split( self.jitstate, self.frame.pc, self.frame.local_green) @@ -538,10 +544,6 @@ assert newjitstate.frame.pc == self.frame.pc self.newjitstate(newjitstate) - @arguments("green_varargs", "red_varargs") - def opimpl_portal_call(self, greenargs, redargs): - self.portalstate.portal_reentry(greenargs, redargs) - @arguments("green", "calldesc", "green_varargs") def opimpl_green_call(self, fnptr_gv, calldesc, greenargs): calldesc.green_call(self, fnptr_gv, greenargs) @@ -550,8 +552,6 @@ def opimpl_yellow_direct_call(self, greenargs, redargs, targetbytecode): self.run(self.jitstate, targetbytecode, greenargs, redargs, start_bytecode_loop=False) - # this frame will be resumed later in the next bytecode, which is - # yellow_after_direct_call @arguments("green_varargs", "red_varargs", "red", "indirectcalldesc") def opimpl_indirect_call_const(self, greenargs, redargs, @@ -562,13 +562,6 @@ self.run(self.jitstate, bytecode, greenargs, redargs, start_bytecode_loop=False) - @arguments() - def opimpl_yellow_after_direct_call(self): - newjitstate = rtimeshift.collect_split( - self.jitstate, self.frame.pc, - self.frame.local_green) - assert newjitstate is self.jitstate - @arguments(returns="green") def opimpl_yellow_retrieve_result(self): # XXX all this jitstate.greens business is a bit messy Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_2tl.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_2tl.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_2tl.py Mon Mar 3 15:27:15 2008 @@ -25,4 +25,4 @@ res = self.timeshift_from_portal(main, tiny2.interpret, [0, 5, 0, 0], policy=MyHintAnnotatorPolicy()) - assert res == "5 4 3 2 1" + assert "".join(res.chars._obj.items) == "5 4 3 2 1" Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Mon Mar 3 15:27:15 2008 @@ -533,6 +533,49 @@ self.check_insns({'int_gt': 1, 'int_add': 1, 'int_sub': 1, 'int_mul': 1}) + def test_call_5(self): + def ll_two(x): + if x > 0: + return x + 5 + else: + return x - 4 + def ll_function(y): + if y > 2: + return ll_two(y) * y + else: + return ll_two(y + 3) * y + + res = self.interpret(ll_function, [3], []) + assert res == 24 + self.check_insns({'int_gt': 3, 'int_add': 3, + 'int_sub': 2, 'int_mul': 2}) + + res = self.interpret(ll_function, [-3], []) + assert res == 12 + self.check_insns({'int_gt': 3, 'int_add': 3, + 'int_sub': 2, 'int_mul': 2}) + + def test_call_6(self): + def ll_two(x): + if x > 0: + return x + 5 + else: + return x - 4 + def ll_function(y): + if y > 2: + y -= 2 + return ll_two(y) * y + + res = self.interpret(ll_function, [3], []) + assert res == 6 + self.check_insns({'int_gt': 2, 'int_add': 1, + 'int_sub': 2, 'int_mul': 1}) + + res = self.interpret(ll_function, [-3], []) + assert res == 21 + self.check_insns({'int_gt': 2, 'int_add': 1, + 'int_sub': 2, 'int_mul': 1}) + def test_void_call(self): def ll_do_nothing(x): pass From arigo at codespeak.net Mon Mar 3 15:52:31 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 15:52:31 +0100 (CET) Subject: [pypy-svn] r52092 - in pypy/branch/jit-refactoring/pypy: jit/timeshifter rpython Message-ID: <20080303145231.8CBC7169EEE@codespeak.net> Author: arigo Date: Mon Mar 3 15:52:30 2008 New Revision: 52092 Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py Log: Whack until exceptions within ll_continue_compilation() no longer give obscure infinite loops when stdout is captured by py.test. Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/rtimeshift.py Mon Mar 3 15:52:30 2008 @@ -776,6 +776,7 @@ lloperation.llop.debug_fatalerror( lltype.Void, "compilation-time error %s" % e) self.ll_continue_compilation = ll_continue_compilation + ll_continue_compilation._debugexc = True FUNCTYPE = lltype.FuncType([base_ptr_lltype(), ERASED], lltype.Void) FUNCPTRTYPE = lltype.Ptr(FUNCTYPE) Modified: pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py (original) +++ pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py Mon Mar 3 15:52:30 2008 @@ -344,7 +344,8 @@ def llhelper(F, f): # implementation for the purpose of direct running only # XXX need more cleverness to support translation of prebuilt llhelper ptr - return lltype.functionptr(F.TO, f.func_name, _callable=f) + return lltype.functionptr(F.TO, f.func_name, _callable=f, + _debugexc = getattr(f, '_debugexc', False)) class LLHelperEntry(extregistry.ExtRegistryEntry): _about_ = llhelper From arigo at codespeak.net Mon Mar 3 15:56:12 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 15:56:12 +0100 (CET) Subject: [pypy-svn] r52093 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080303145612.2D36F169EF1@codespeak.net> Author: arigo Date: Mon Mar 3 15:56:11 2008 New Revision: 52093 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py Log: Fix tests. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py Mon Mar 3 15:56:11 2008 @@ -261,7 +261,6 @@ writer, jitcode = self.serialize(f, [int]) assert jitcode.code == assemble(writer.interpreter, "red_direct_call", 0, 1, 0, 0, - "red_after_direct_call", "make_redbox", -1, 0, "red_int_mul", 1, 2, "make_new_redvars", 1, 3, @@ -311,7 +310,6 @@ writer, jitcode = self.serialize(ll_function, [int]) assert jitcode.code == assemble(writer.interpreter, "yellow_direct_call", 0, 1, 0, 0, - "yellow_after_direct_call", "yellow_retrieve_result", "green_int_add", 0, -1, "make_redbox", 1, 0, From cfbolz at codespeak.net Mon Mar 3 16:15:44 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 16:15:44 +0100 (CET) Subject: [pypy-svn] r52094 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080303151544.2BAC816841F@codespeak.net> Author: cfbolz Date: Mon Mar 3 16:15:43 2008 New Revision: 52094 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Log: resume points and keepalive do nothing in the rainbow interp Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Mon Mar 3 16:15:43 2008 @@ -1008,6 +1008,12 @@ def serialize_op_zero_gc_pointers_inside(self, op): pass # XXX is that right? + def translate_op_resume_point(self, op): + pass + + def translate_op_keepalive(self, op): + pass + def serialize_op_cast_pointer(self, op): color = self.varcolor(op.result) assert color == self.varcolor(op.args[0]) From cfbolz at codespeak.net Mon Mar 3 17:37:49 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 17:37:49 +0100 (CET) Subject: [pypy-svn] r52095 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080303163749.42270169EA0@codespeak.net> Author: cfbolz Date: Mon Mar 3 17:37:47 2008 New Revision: 52095 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Log: bah. copy-pasting is bad Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Mon Mar 3 17:37:47 2008 @@ -1008,10 +1008,10 @@ def serialize_op_zero_gc_pointers_inside(self, op): pass # XXX is that right? - def translate_op_resume_point(self, op): + def serialize_op_resume_point(self, op): pass - def translate_op_keepalive(self, op): + def serialize_op_keepalive(self, op): pass def serialize_op_cast_pointer(self, op): From arigo at codespeak.net Mon Mar 3 18:14:19 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 18:14:19 +0100 (CET) Subject: [pypy-svn] r52096 - pypy/dist/pypy/module/_file/test Message-ID: <20080303171419.D32F7169EB4@codespeak.net> Author: arigo Date: Mon Mar 3 18:14:18 2008 New Revision: 52096 Modified: pypy/dist/pypy/module/_file/test/test_file.py pypy/dist/pypy/module/_file/test/test_large_file.py Log: Fix tests to run with -A too. Modified: pypy/dist/pypy/module/_file/test/test_file.py ============================================================================== --- pypy/dist/pypy/module/_file/test/test_file.py (original) +++ pypy/dist/pypy/module/_file/test/test_file.py Mon Mar 3 18:14:18 2008 @@ -2,18 +2,27 @@ from pypy.conftest import gettestobjspace, option +def getfile(space): + return space.appexec([], """(): + try: + import _file + return _file.file + except ImportError: # when running with py.test -A + return file + """) + class AppTestFile(object): def setup_class(cls): cls.space = gettestobjspace(usemodules=("_file", )) cls.w_temppath = cls.space.wrap( str(py.test.ensuretemp("fileimpl").join("foo.txt"))) + cls.w_file = getfile(cls.space) def test_simple(self): - import _file - f = _file.file(self.temppath, "w") + f = self.file(self.temppath, "w") f.write("foo") f.close() - f = _file.file(self.temppath, "r") + f = self.file(self.temppath, "r") raises(TypeError, f.read, None) try: s = f.read() @@ -22,13 +31,12 @@ f.close() def test_readline(self): - import _file - f = _file.file(self.temppath, "w") + f = self.file(self.temppath, "w") try: f.write("foo\nbar\n") finally: f.close() - f = _file.file(self.temppath, "r") + f = self.file(self.temppath, "r") raises(TypeError, f.readline, None) try: s = f.readline() @@ -39,13 +47,12 @@ f.close() def test_readlines(self): - import _file - f = _file.file(self.temppath, "w") + f = self.file(self.temppath, "w") try: f.write("foo\nbar\n") finally: f.close() - f = _file.file(self.temppath, "r") + f = self.file(self.temppath, "r") raises(TypeError, f.readlines, None) try: s = f.readlines() @@ -55,19 +62,23 @@ def test_fdopen(self): - import _file, os - f = _file.file(self.temppath, "w") + import os + f = self.file(self.temppath, "w") try: f.write("foo") finally: f.close() + try: + fdopen = self.file.fdopen + except AttributeError: + fdopen = os.fdopen # when running with -A fd = os.open(self.temppath, os.O_WRONLY | os.O_CREAT) - f2 = _file.file.fdopen(fd, "a") + f2 = fdopen(fd, "a") f2.seek(0, 2) f2.write("bar") f2.close() # don't close fd, will get a whining __del__ - f = _file.file(self.temppath, "r") + f = self.file(self.temppath, "r") try: s = f.read() assert s == "foobar" @@ -75,16 +86,14 @@ f.close() def test_badmode(self): - import _file - raises(IOError, _file.file, "foo", "bar") + raises(IOError, self.file, "foo", "bar") def test_wraposerror(self): - import _file - raises(IOError, _file.file, "hopefully/not/existant.bar") + raises(IOError, self.file, "hopefully/not/existant.bar") def test_correct_file_mode(self): - import _file, os - f = _file.file(self.temppath, "w") + import os + f = self.file(self.temppath, "w") umask = os.umask(18) os.umask(umask) try: @@ -94,22 +103,22 @@ assert oct(os.stat(self.temppath).st_mode & 0777 | umask) == oct(0666) def test_newlines(self): - import _file, os - f = _file.file(self.temppath, "wb") + import os + f = self.file(self.temppath, "wb") f.write("\r\n") assert f.newlines is None f.close() - f = _file.file(self.temppath, "rU") + f = self.file(self.temppath, "rU") res = f.read() assert res == "\n" assert f.newlines == "\r\n" def test_unicode(self): - import _file, os - f = _file.file(self.temppath, "w") + import os + f = self.file(self.temppath, "w") f.write(u"hello\n") f.close() - f = _file.file(self.temppath, "r") + f = self.file(self.temppath, "r") res = f.read() assert res == "hello\n" assert type(res) is str @@ -125,11 +134,12 @@ cls.space = gettestobjspace(usemodules=("_file", "thread")) cls.w_temppath = cls.space.wrap( str(py.test.ensuretemp("fileimpl").join("concurrency.txt"))) + cls.w_file = getfile(cls.space) def test_concurrent_writes(self): # check that f.write() is atomic - import thread, _file, time - f = _file.file(self.temppath, "w+b") + import thread, time + f = self.file(self.temppath, "w+b") def writer(i): for j in range(150): f.write('%3d %3d\n' % (i, j)) @@ -156,10 +166,15 @@ # http://bugs.python.org/issue1164 # It also deadlocks on py.py because the space GIL is not # released. - import thread, sys, os, _file + import thread, sys, os + try: + fdopen = self.file.fdopen + except AttributeError: + # when running with -A + skip("deadlocks on top of CPython") read_fd, write_fd = os.pipe() - fread = _file.file.fdopen(read_fd, 'rb', 200) - fwrite = _file.file.fdopen(write_fd, 'wb', 200) + fread = fdopen(read_fd, 'rb', 200) + fwrite = fdopen(write_fd, 'wb', 200) run = True readers_done = [0] Modified: pypy/dist/pypy/module/_file/test/test_large_file.py ============================================================================== --- pypy/dist/pypy/module/_file/test/test_large_file.py (original) +++ pypy/dist/pypy/module/_file/test/test_large_file.py Mon Mar 3 18:14:18 2008 @@ -1,12 +1,14 @@ import py from pypy.conftest import gettestobjspace +from pypy.module._file.test.test_file import getfile class AppTestLargeFile(object): def setup_class(cls): cls.space = gettestobjspace(usemodules=("_file", )) cls.w_temppath = cls.space.wrap( str(py.test.ensuretemp("fileimpl").join("large.data"))) + cls.w_file = getfile(cls.space) def setup_method(self, meth): if getattr(meth, 'need_sparse_files', False): @@ -14,9 +16,8 @@ need_sparse_files() def test_large_seek_offsets(self): - import _file FAR = 0x122223333 - f = _file.file(self.temppath, "w+b") + f = self.file(self.temppath, "w+b") f.write("hello world") f.seek(FAR) assert f.tell() == FAR @@ -31,9 +32,8 @@ f.close() def test_large_sparse(self): - import _file FAR = 0x122223333 - f = _file.file(self.temppath, "w+b") + f = self.file(self.temppath, "w+b") f.seek(FAR) f.write('end') f.seek(0) From cfbolz at codespeak.net Mon Mar 3 18:32:47 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 18:32:47 +0100 (CET) Subject: [pypy-svn] r52097 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080303173247.E23A1169ECF@codespeak.net> Author: cfbolz Date: Mon Mar 3 18:32:46 2008 New Revision: 52097 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: passing test for void args Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Mon Mar 3 18:32:46 2008 @@ -1795,5 +1795,39 @@ return g(n) py.test.raises(AssertionError, self.interpret, f, [7], []) + # void tests + def test_void_args(self): + class Space(object): + true = True + false = False + + def is_true(self, x): + if x: + return self.true + return self.false + + def add(self, x, y): + return x + y + + def sub(self, x, y): + return x - y + + def _freeze_(self): + return True + + def f(space, x, y): + if space.is_true(x): + return space.add(x, y) + return space.sub(6, y) + + def main(x, y): + return f(space, x, y) + + space = Space() + res = self.interpret(main, [5, 6]) + assert res == 11 + + class TestLLType(SimpleTests): type_system = "lltype" + From cfbolz at codespeak.net Mon Mar 3 19:06:28 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 19:06:28 +0100 (CET) Subject: [pypy-svn] r52098 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080303180628.6CD43169EA3@codespeak.net> Author: cfbolz Date: Mon Mar 3 19:06:27 2008 New Revision: 52098 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: test and fix for void arguments to residual function calls Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Mon Mar 3 19:06:27 2008 @@ -921,6 +921,8 @@ func = self.serialize_oparg("red", fnptr) emitted_args = [] for v in op.args[1:]: + if v.concretetype == lltype.Void: + continue emitted_args.append(self.serialize_oparg("red", v)) self.emit("red_residual_call") self.emit(func, pos, withexc, has_result, len(emitted_args)) Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Mon Mar 3 19:06:27 2008 @@ -1820,11 +1820,24 @@ return space.add(x, y) return space.sub(6, y) - def main(x, y): + def main1(x, y): return f(space, x, y) space = Space() - res = self.interpret(main, [5, 6]) + res = self.interpret(main1, [5, 6]) + assert res == 11 + + def g(space, x, y): + return space.add(x, y) + + def f(space, x, y): + if space.is_true(x): + return g(space, x, y) + return space.sub(6, y) + + def main2(x, y): + return f(space, x, y) + res = self.interpret(main2, [5, 6], policy=StopAtXPolicy(g)) assert res == 11 From arigo at codespeak.net Mon Mar 3 19:08:57 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 19:08:57 +0100 (CET) Subject: [pypy-svn] r52099 - in pypy/dist/pypy/rpython: lltypesystem test Message-ID: <20080303180857.45F61169EDC@codespeak.net> Author: arigo Date: Mon Mar 3 19:08:56 2008 New Revision: 52099 Modified: pypy/dist/pypy/rpython/lltypesystem/rstr.py pypy/dist/pypy/rpython/test/test_rstr.py Log: Fixes for RPython strings: find(), rfind(), count() now accept endpos arguments that are larger than the length of the string, just like slicing. Modified: pypy/dist/pypy/rpython/lltypesystem/rstr.py ============================================================================== --- pypy/dist/pypy/rpython/lltypesystem/rstr.py (original) +++ pypy/dist/pypy/rpython/lltypesystem/rstr.py Mon Mar 3 19:08:56 2008 @@ -445,6 +445,8 @@ def ll_find_char(s, ch, start, end): i = start + if end > len(s.chars): + end = len(s.chars) while i < end: if s.chars[i] == ch: return i @@ -452,6 +454,8 @@ return -1 def ll_rfind_char(s, ch, start, end): + if end > len(s.chars): + end = len(s.chars) i = end while i > start: i -= 1 @@ -462,6 +466,8 @@ def ll_count_char(s, ch, start, end): count = 0 i = start + if end > len(s.chars): + end = len(s.chars) while i < end: if s.chars[i] == ch: count += 1 @@ -470,12 +476,12 @@ def ll_find(cls, s1, s2, start, end): """Knuth Morris Prath algorithm for substring match""" - len1 = len(s1.chars) - if end > len1: - end = len1 len2 = len(s2.chars) if len2 == 1: return cls.ll_find_char(s1, s2.chars[0], start, end) + len1 = len(s1.chars) + if end > len1: + end = len1 if len2 == 0: if (end-start) < 0: return -1 @@ -507,10 +513,9 @@ len2 = len(s2.chars) if len2 == 1: return cls.ll_rfind_char(s1, s2.chars[0], start, end) + if end > len(s1.chars): + end = len(s1.chars) if len2 == 0: - len1 = len(s1.chars) - if end > len(s1.chars): - return len1 return end # Construct the array of possible restarting positions T = malloc( SIGNED_ARRAY, len2 ) Modified: pypy/dist/pypy/rpython/test/test_rstr.py ============================================================================== --- pypy/dist/pypy/rpython/test/test_rstr.py (original) +++ pypy/dist/pypy/rpython/test/test_rstr.py Mon Mar 3 19:08:56 2008 @@ -265,8 +265,9 @@ def fn(i, j): assert i >= 0 assert j >= 0 - return const('ababcabc').find(const('abc'), i, j) - for (i, j) in [(1,7), (2,6), (3,7), (3,8)]: + return (const('ababcabc').find(const('abc'), i, j) + + const('ababcabc').find('b', i, j) * 100) + for (i, j) in [(1,7), (2,6), (3,7), (3,8), (4,99), (7, 99)]: res = self.interpret(fn, [i, j]) assert res == fn(i, j) @@ -287,9 +288,18 @@ def test_rfind(self): const = self.const def fn(): - return const('aaa').rfind(const('a')) + const('aaa').rfind(const('a'), 1) + const('aaa').rfind(const('a'), 1, 2) + # string-searching versions + return (const('aaa').rfind(const('aa')) + + const('aaa').rfind(const('aa'), 1) * 10 + + const('aaa').rfind(const('aa'), 1, 2) * 100 + + const('aaa').rfind(const('aa'), 3, 42) * 1000 + + # char-searching versions + const('aaa').rfind('a') * 10000 + + const('aaa').rfind('a', 1) * 100000 + + const('aaa').rfind('a', 1, 2) * 1000000 + + const('aaa').rfind('a', 3, 42) * 10000000) res = self.interpret(fn, []) - assert res == 2 + 2 + 1 + assert res == fn() def test_rfind_empty_string(self): const = self.const @@ -680,9 +690,9 @@ def fn(i): s = const("").join([const("abcasd")] * i) return s.count(const("a")) + s.count(const("a"), 2) + \ - s.count(const("b"), 1, 6) + s.count(const("b"), 1, 6) + s.count(const("a"), 5, 99) res = self.interpret(fn, [4]) - assert res == 8 + 7 + 1 + assert res == 8 + 7 + 1 + 6 def test_count(self): const = self.const @@ -690,9 +700,10 @@ s = const("").join([const("abcabsd")] * i) one = i / i # confuse the annotator return (s.count(const("abc")) + const("abcde").count(const("")) + - const("abcda").count(const("a") * one)) + const("abcda").count(const("a") * one) + + s.count(const("ab"), 0, 999)) res = self.interpret(fn, [4]) - assert res == 4 + 6 + 2 + assert res == 4 + 6 + 2 + 8 def test_count_overlapping_occurences(self): const = self.const From fijal at codespeak.net Mon Mar 3 19:23:28 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 3 Mar 2008 19:23:28 +0100 (CET) Subject: [pypy-svn] r52100 - pypy/dist/pypy/translator/c/gcc Message-ID: <20080303182328.03F94168551@codespeak.net> Author: fijal Date: Mon Mar 3 19:23:22 2008 New Revision: 52100 Modified: pypy/dist/pypy/translator/c/gcc/trackgcroot.py Log: add cwtl to list of ignored ops Modified: pypy/dist/pypy/translator/c/gcc/trackgcroot.py ============================================================================== --- pypy/dist/pypy/translator/c/gcc/trackgcroot.py (original) +++ pypy/dist/pypy/translator/c/gcc/trackgcroot.py Mon Mar 3 19:23:22 2008 @@ -417,7 +417,7 @@ IGNORE_OPS_WITH_PREFIXES = dict.fromkeys([ 'cmp', 'test', 'set', 'sahf', 'cltd', 'cld', 'std', - 'rep', 'movs', 'lods', 'stos', 'scas', + 'rep', 'movs', 'lods', 'stos', 'scas', 'cwtl', # floating-point operations cannot produce GC pointers 'f', # arithmetic operations should not produce GC pointers From cfbolz at codespeak.net Mon Mar 3 19:34:56 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 19:34:56 +0100 (CET) Subject: [pypy-svn] r52101 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080303183456.A7C87169EEE@codespeak.net> Author: cfbolz Date: Mon Mar 3 19:34:55 2008 New Revision: 52101 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: indirect call with void arguments Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Mon Mar 3 19:34:55 2008 @@ -815,6 +815,8 @@ emitted_args = [] for v in op.args[1:-1]: + if v.concretetype == lltype.Void: + continue emitted_args.append(self.serialize_oparg("red", v)) self.emit("red_residual_call") calldescindex = self.calldesc_position(op.args[0].concretetype) @@ -1313,8 +1315,12 @@ self.hannotator = hannotator def transform_graph(self, graph): + from pypy.translator.backendopt.constfold import constant_fold_graph self.graph = graph remove_same_as(graph) + # to get rid of the we_are_jitted constant + # XXX not sure this is right, leaving commented out for now + #constant_fold_graph(graph) self.insert_splits() def insert_splits(self): Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Mon Mar 3 19:34:55 2008 @@ -1839,6 +1839,24 @@ return f(space, x, y) res = self.interpret(main2, [5, 6], policy=StopAtXPolicy(g)) assert res == 11 + + def test_indirect_call_voidargs(self): + class Void(object): + def _freeze_(self): + return True + void = Void() + def h1(n, v): + return n*2 + def h2(n, v): + return n*4 + l = [h1, h2] + def f(n, x): + h = l[n&1] + return h(n, void) + x + + res = self.interpret(f, [7, 3]) + assert res == f(7, 3) + self.check_insns(indirect_call=1, direct_call=1) class TestLLType(SimpleTests): From arigo at codespeak.net Mon Mar 3 19:35:12 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 19:35:12 +0100 (CET) Subject: [pypy-svn] r52102 - in pypy/dist/pypy: interpreter objspace/std objspace/std/test Message-ID: <20080303183512.6B5C7169EEF@codespeak.net> Author: arigo Date: Mon Mar 3 19:35:11 2008 New Revision: 52102 Modified: pypy/dist/pypy/interpreter/baseobjspace.py pypy/dist/pypy/objspace/std/test/test_typeobject.py pypy/dist/pypy/objspace/std/typeobject.py Log: issue334 in-progress Give a RuntimeWarning when adding a __del__ method to a new-style class that didn't have one previously. Modified: pypy/dist/pypy/interpreter/baseobjspace.py ============================================================================== --- pypy/dist/pypy/interpreter/baseobjspace.py (original) +++ pypy/dist/pypy/interpreter/baseobjspace.py Mon Mar 3 19:35:11 2008 @@ -916,6 +916,12 @@ self.wrap('cannot convert negative integer ' 'to unsigned int')) + def warn(self, msg, w_warningcls): + self.appexec([self.wrap(msg), w_warningcls], """(msg, warningcls): + import warnings + warnings.warn(msg, warningcls, stacklevel=2) + """) + class AppExecCache(SpaceCache): def build(cache, source): Modified: pypy/dist/pypy/objspace/std/test/test_typeobject.py ============================================================================== --- pypy/dist/pypy/objspace/std/test/test_typeobject.py (original) +++ pypy/dist/pypy/objspace/std/test/test_typeobject.py Mon Mar 3 19:35:11 2008 @@ -76,6 +76,39 @@ raises(TypeError, type, 'sub', (stufftype,), {}) """) + def test_del_warning(self): + warnings = [] + def my_warn(msg, warningscls): + warnings.append(msg) + prev_warn(msg, warningscls) + space = self.space + prev_warn = space.warn + try: + space.warn = my_warn + space.appexec([], """(): + class X(object): + pass + X.__del__ = 5 + X.__del__ = 6 + X.__del__ = 7 + class Y(object): + pass + Y.__del__ = 8 + Y.__del__ = 9 + Y.__del__ = 0 + class Z(object): + pass + Z._foobar_ = 3 + Z._foobar_ = 4 + class U(object): + def __del__(self): + pass + U.__del__ = lambda self: 42 # no warning here + """) + finally: + space.warn = prev_warn + assert len(warnings) == 2 + class AppTestTypeObject: def test_bases(self): Modified: pypy/dist/pypy/objspace/std/typeobject.py ============================================================================== --- pypy/dist/pypy/objspace/std/typeobject.py (original) +++ pypy/dist/pypy/objspace/std/typeobject.py Mon Mar 3 19:35:11 2008 @@ -551,6 +551,9 @@ if not w_type.is_heaptype(): msg = "can't set attributes on type object '%s'" %(w_type.name,) raise OperationError(space.w_TypeError, space.wrap(msg)) + if name == "__del__" and name not in w_type.dict_w: + msg = "a __del__ method added to an existing type will not be called" + space.warn(msg, space.w_RuntimeWarning) w_type.dict_w[name] = w_value def delattr__Type_ANY(space, w_type, w_name): From arigo at codespeak.net Mon Mar 3 20:32:56 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 20:32:56 +0100 (CET) Subject: [pypy-svn] r52118 - in pypy/dist/pypy/module/__builtin__: . test Message-ID: <20080303193256.D9ADA169EE7@codespeak.net> Author: arigo Date: Mon Mar 3 20:32:54 2008 New Revision: 52118 Modified: pypy/dist/pypy/module/__builtin__/interp_classobj.py pypy/dist/pypy/module/__builtin__/test/test_classobj.py Log: issue334 in-progress Warn when adding a __del__ to an old-style class. Modified: pypy/dist/pypy/module/__builtin__/interp_classobj.py ============================================================================== --- pypy/dist/pypy/module/__builtin__/interp_classobj.py (original) +++ pypy/dist/pypy/module/__builtin__/interp_classobj.py Mon Mar 3 20:32:54 2008 @@ -2,7 +2,7 @@ from pypy.interpreter.error import OperationError from pypy.interpreter.gateway import ObjSpace, W_Root, NoneNotWrapped, applevel from pypy.interpreter.gateway import interp2app, ObjSpace -from pypy.interpreter.typedef import TypeDef, GetSetProperty, make_weakref_descr +from pypy.interpreter.typedef import TypeDef, make_weakref_descr from pypy.interpreter.argument import Arguments from pypy.interpreter.baseobjspace import Wrappable from pypy.rlib.rarithmetic import r_uint, intmask @@ -15,6 +15,14 @@ raise OperationError(space.w_TypeError, w_error) +def unwrap_attr(space, w_attr): + try: + return space.str_w(w_attr) + except OperationError, e: + if not e.match(space, space.w_TypeError): + raise + return "" + def descr_classobj_new(space, w_subtype, w_name, w_bases, w_dict): if not space.is_true(space.isinstance(w_bases, space.w_tuple)): raise_type_err(space, 'bases', 'tuple', w_bases) @@ -55,37 +63,14 @@ space.wrap("__dict__ must be a dictionary object")) self.w_dict = w_dict - def fget_dict(space, self): - return self.w_dict - - def fset_dict(space, self, w_dict): - self.setdict(space, w_dict) - - def fdel_dict(space, self): - raise OperationError( - space.w_TypeError, - space.wrap("__dict__ must be a dictionary object")) - - def fget_name(space, self): - return space.wrap(self.name) - - def fset_name(space, self, w_newname): + def setname(self, space, w_newname): if not space.is_true(space.isinstance(w_newname, space.w_str)): raise OperationError( space.w_TypeError, space.wrap("__name__ must be a string object")) self.name = space.str_w(w_newname) - def fdel_name(space, self): - raise OperationError( - space.w_TypeError, - space.wrap("__name__ must be a string object")) - - - def fget_bases(space, self): - return space.newtuple(self.bases_w) - - def fset_bases(space, self, w_bases): + def setbases(self, space, w_bases): # XXX in theory, this misses a check against inheritance cycles # although on pypy we don't get a segfault for infinite # recursion anyway @@ -100,11 +85,6 @@ space.wrap("__bases__ items must be classes")) self.bases_w = bases_w - def fdel_bases(space, self): - raise OperationError( - space.w_TypeError, - space.wrap("__bases__ must be a tuple object")) - def lookup(self, space, w_attr): # returns w_value or interplevel None w_result = space.finditem(self.w_dict, w_attr) @@ -119,12 +99,8 @@ return None def descr_getattribute(self, space, w_attr): - try: - name = space.str_w(w_attr) - except OperationError, e: - if not e.match(space, space.w_TypeError): - raise - else: + name = unwrap_attr(space, w_attr) + if name and name[0] == "_": if name == "__dict__": return self.w_dict elif name == "__name__": @@ -142,7 +118,42 @@ if w_descr_get is None: return w_value return space.call_function(w_descr_get, w_value, space.w_None, self) - + + def descr_setattr(self, space, w_attr, w_value): + name = unwrap_attr(space, w_attr) + if name and name[0] == "_": + if name == "__dict__": + self.setdict(space, w_value) + return + elif name == "__name__": + self.setname(space, w_value) + return + elif name == "__bases__": + self.setbases(space, w_value) + return + elif name == "__del__": + if self.lookup(space, space.wrap('__del__')) is None: + msg = ("a __del__ method added to an existing class " + "will not be called") + space.warn(msg, space.w_RuntimeWarning) + space.setitem(self.w_dict, w_attr, w_value) + + def descr_delattr(self, space, w_attr): + name = unwrap_attr(space, w_attr) + if name in ("__dict__", "__name__", "__bases__"): + raise OperationError( + space.w_TypeError, + space.wrap("cannot delete attribute %s" % (name,))) + try: + space.delitem(self.w_dict, w_attr) + except OperationError, e: + if not e.match(space, space.w_KeyError): + raise + raise OperationError( + space.w_AttributeError, + space.wrap("class %s has no attribute %s" % ( + self.name, space.str_w(space.str(w_attr))))) + def descr_call(self, space, __args__): if self.lookup(space, space.wrap('__del__')) is not None: w_inst = W_InstanceObjectWithDel(space, self) @@ -185,13 +196,6 @@ W_ClassObject.typedef = TypeDef("classobj", __new__ = interp2app(descr_classobj_new), - __dict__ = GetSetProperty(W_ClassObject.fget_dict, W_ClassObject.fset_dict, - W_ClassObject.fdel_dict), - __name__ = GetSetProperty(W_ClassObject.fget_name, W_ClassObject.fset_name, - W_ClassObject.fdel_name), - __bases__ = GetSetProperty(W_ClassObject.fget_bases, - W_ClassObject.fset_bases, - W_ClassObject.fdel_bases), __repr__ = interp2app(W_ClassObject.descr_repr, unwrap_spec=['self', ObjSpace]), __str__ = interp2app(W_ClassObject.descr_str, @@ -200,6 +204,10 @@ unwrap_spec=['self', ObjSpace, Arguments]), __getattribute__ = interp2app(W_ClassObject.descr_getattribute, unwrap_spec=['self', ObjSpace, W_Root]), + __setattr__ = interp2app(W_ClassObject.descr_setattr, + unwrap_spec=['self', ObjSpace, W_Root, W_Root]), + __delattr__ = interp2app(W_ClassObject.descr_delattr, + unwrap_spec=['self', ObjSpace, W_Root]), ) W_ClassObject.typedef.acceptable_as_base_class = False Modified: pypy/dist/pypy/module/__builtin__/test/test_classobj.py ============================================================================== --- pypy/dist/pypy/module/__builtin__/test/test_classobj.py (original) +++ pypy/dist/pypy/module/__builtin__/test/test_classobj.py Mon Mar 3 20:32:54 2008 @@ -687,3 +687,15 @@ assert X() != 5 assert Y() != X() + + def test_assignment_to_del(self): + import warnings + + class X: + pass + + warnings.simplefilter('error', RuntimeWarning) + try: + raises(RuntimeWarning, "X.__del__ = lambda self: None") + finally: + warnings.simplefilter('default', RuntimeWarning) From arigo at codespeak.net Mon Mar 3 20:43:49 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 20:43:49 +0100 (CET) Subject: [pypy-svn] r52119 - in pypy/dist/pypy/module/__builtin__: . test Message-ID: <20080303194349.EC75616853E@codespeak.net> Author: arigo Date: Mon Mar 3 20:43:49 2008 New Revision: 52119 Modified: pypy/dist/pypy/module/__builtin__/interp_classobj.py pypy/dist/pypy/module/__builtin__/test/test_classobj.py Log: issue334 testing Give a RuntimeWarning when attaching a fresh __del__ to an old-style instance. Modified: pypy/dist/pypy/module/__builtin__/interp_classobj.py ============================================================================== --- pypy/dist/pypy/module/__builtin__/interp_classobj.py (original) +++ pypy/dist/pypy/module/__builtin__/interp_classobj.py Mon Mar 3 20:43:49 2008 @@ -132,7 +132,7 @@ self.setbases(space, w_value) return elif name == "__del__": - if self.lookup(space, space.wrap('__del__')) is None: + if self.lookup(space, w_attr) is None: msg = ("a __del__ method added to an existing class " "will not be called") space.warn(msg, space.w_RuntimeWarning) @@ -349,32 +349,42 @@ raise def descr_setattr(self, space, w_name, w_value): - name = space.str_w(w_name) - if name == '__dict__': - self.setdict(space, w_value) - elif name == '__class__': - self.setclass(space, w_value) + name = unwrap_attr(space, w_name) + w_meth = self.getattr(space, space.wrap('__setattr__'), False) + if name and name[0] == "_": + if name == '__dict__': + self.setdict(space, w_value) + return + if name == '__class__': + self.setclass(space, w_value) + return + if name == '__del__' and w_meth is None: + if (not isinstance(self, W_InstanceObjectWithDel) + and space.finditem(self.w_dict, w_name) is None): + msg = ("a __del__ method added to an instance " + "with no __del__ in the class will not be called") + space.warn(msg, space.w_RuntimeWarning) + if w_meth is not None: + space.call_function(w_meth, w_name, w_value) else: - w_meth = self.getattr(space, space.wrap('__setattr__'), False) - if w_meth is not None: - space.call_function(w_meth, w_name, w_value) - else: - self.setdictvalue(space, w_name, w_value) + self.setdictvalue(space, w_name, w_value) def descr_delattr(self, space, w_name): - name = space.str_w(w_name) - if name == '__dict__': - # use setdict to raise the error - self.setdict(space, None) - elif name == '__class__': - # use setclass to raise the error - self.setclass(space, None) + name = unwrap_attr(space, w_name) + if name and name[0] == "_": + if name == '__dict__': + # use setdict to raise the error + self.setdict(space, None) + return + elif name == '__class__': + # use setclass to raise the error + self.setclass(space, None) + return + w_meth = self.getattr(space, space.wrap('__delattr__'), False) + if w_meth is not None: + space.call_function(w_meth, w_name) else: - w_meth = self.getattr(space, space.wrap('__delattr__'), False) - if w_meth is not None: - space.call_function(w_meth, w_name) - else: - self.deldictvalue(space, w_name) + self.deldictvalue(space, w_name) def descr_repr(self, space): w_meth = self.getattr(space, space.wrap('__repr__'), False) Modified: pypy/dist/pypy/module/__builtin__/test/test_classobj.py ============================================================================== --- pypy/dist/pypy/module/__builtin__/test/test_classobj.py (original) +++ pypy/dist/pypy/module/__builtin__/test/test_classobj.py Mon Mar 3 20:43:49 2008 @@ -691,11 +691,18 @@ def test_assignment_to_del(self): import warnings - class X: - pass - warnings.simplefilter('error', RuntimeWarning) try: + class X: + pass raises(RuntimeWarning, "X.__del__ = lambda self: None") + class Y: + pass + raises(RuntimeWarning, "Y().__del__ = lambda self: None") + # but the following works + class Z: + def __del__(self): + pass + Z().__del__ = lambda self: None finally: warnings.simplefilter('default', RuntimeWarning) From arigo at codespeak.net Mon Mar 3 20:53:41 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 20:53:41 +0100 (CET) Subject: [pypy-svn] r52120 - in pypy/dist/pypy/translator/c/gcc: . test Message-ID: <20080303195341.B280E169EE2@codespeak.net> Author: arigo Date: Mon Mar 3 20:53:38 2008 New Revision: 52120 Modified: pypy/dist/pypy/translator/c/gcc/test/track7.s pypy/dist/pypy/translator/c/gcc/trackgcroot.py Log: Regexp fun. Modified: pypy/dist/pypy/translator/c/gcc/test/track7.s ============================================================================== --- pypy/dist/pypy/translator/c/gcc/test/track7.s (original) +++ pypy/dist/pypy/translator/c/gcc/test/track7.s Mon Mar 3 20:53:38 2008 @@ -7,7 +7,8 @@ cmovge 20(%esp), %ebx movl 24(%esp), %eax cmovs %eax, %ebx - call foobar + ;; and an indirect call while we're at it + call *(%eax) ;; expected {4(%esp) | (%esp), %esi, %edi, %ebp | %ebx} #APP /* GCROOT %ebx */ Modified: pypy/dist/pypy/translator/c/gcc/trackgcroot.py ============================================================================== --- pypy/dist/pypy/translator/c/gcc/trackgcroot.py (original) +++ pypy/dist/pypy/translator/c/gcc/trackgcroot.py Mon Mar 3 20:53:38 2008 @@ -8,7 +8,7 @@ r_globl = re.compile(r"\t[.]globl\t(\w+)\s*$") r_insn = re.compile(r"\t([a-z]\w*)\s") r_jump = re.compile(r"\tj\w+\s+([.]?\w+)\s*$") -OPERAND = r"[-\w$%+.:@]+(?:[(][\w%,]+[)])?|[(][\w%,]+[)]" +OPERAND = r"(?:[-\w$%+.:@]+(?:[(][\w%,]+[)])?|[(][\w%,]+[)])" r_unaryinsn = re.compile(r"\t[a-z]\w*\s+("+OPERAND+")\s*$") r_unaryinsn_star= re.compile(r"\t[a-z]\w*\s+([*]"+OPERAND+")\s*$") r_jmp_switch = re.compile(r"\tjmp\t[*]([.]?\w+)[(]") From arigo at codespeak.net Mon Mar 3 20:58:43 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 20:58:43 +0100 (CET) Subject: [pypy-svn] r52121 - pypy/dist/pypy/translator/c/gcc Message-ID: <20080303195843.D8997168549@codespeak.net> Author: arigo Date: Mon Mar 3 20:58:41 2008 New Revision: 52121 Modified: pypy/dist/pypy/translator/c/gcc/trackgcroot.py Log: Remove an XXX - this was already improved. Modified: pypy/dist/pypy/translator/c/gcc/trackgcroot.py ============================================================================== --- pypy/dist/pypy/translator/c/gcc/trackgcroot.py (original) +++ pypy/dist/pypy/translator/c/gcc/trackgcroot.py Mon Mar 3 20:58:41 2008 @@ -62,11 +62,6 @@ ret .size pypy_asm_stackwalk_init, .-pypy_asm_stackwalk_init """ - # XXX the two gcmap tables are a bit largish. They could easily - # be compressed by a factor of 4 or more. I suspect they also - # produce large linker tables which could be seriously reduced - # as well. A key observation is that in practice most functions - # seem to use exactly the same call shape for each call they contain. print >> output, '\t.data' print >> output, '\t.align\t4' print >> output, '\t.globl\t__gcmapstart' From cfbolz at codespeak.net Mon Mar 3 21:17:00 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 21:17:00 +0100 (CET) Subject: [pypy-svn] r52122 - pypy/branch/jit-refactoring/pypy/config Message-ID: <20080303201700.6EEB7169ED6@codespeak.net> Author: cfbolz Date: Mon Mar 3 21:16:57 2008 New Revision: 52122 Modified: pypy/branch/jit-refactoring/pypy/config/translationoption.py Log: add rainbow to the fork-before options Modified: pypy/branch/jit-refactoring/pypy/config/translationoption.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/config/translationoption.py (original) +++ pypy/branch/jit-refactoring/pypy/config/translationoption.py Mon Mar 3 21:16:57 2008 @@ -124,7 +124,7 @@ ChoiceOption("fork_before", "(UNIX) Create restartable checkpoint before step", ["annotate", "rtype", "backendopt", "database", "source", - "hintannotate", "timeshift"], + "hintannotate", "rainbow"], default=None, cmdline="--fork-before"), # options for ootype From arigo at codespeak.net Mon Mar 3 21:20:25 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 21:20:25 +0100 (CET) Subject: [pypy-svn] r52123 - in pypy/dist/pypy/translator/c: . gcc Message-ID: <20080303202025.05637169EEE@codespeak.net> Author: arigo Date: Mon Mar 3 21:20:25 2008 New Revision: 52123 Modified: pypy/dist/pypy/translator/c/gcc/trackgcroot.py pypy/dist/pypy/translator/c/genc.py Log: For fun and profits, make trackgcroot parallelizable in "make -j" builds. Modified: pypy/dist/pypy/translator/c/gcc/trackgcroot.py ============================================================================== --- pypy/dist/pypy/translator/c/gcc/trackgcroot.py (original) +++ pypy/dist/pypy/translator/c/gcc/trackgcroot.py Mon Mar 3 21:20:25 2008 @@ -27,11 +27,28 @@ class GcRootTracker(object): def __init__(self, verbose=0, shuffle=False): - self.gcmaptable = [] self.verbose = verbose + self.shuffle = shuffle # to debug the sorting logic in asmgcroot.py + self.clear() + + def clear(self): + self.gcmaptable = [] self.seen_main = False self.files_seen = 0 - self.shuffle = shuffle # to debug the sorting logic in asmgcroot.py + + def dump_raw_table(self, output): + print >> output, "seen_main = %d" % (self.seen_main,) + for entry in self.gcmaptable: + print >> output, entry + + def reload_raw_table(self, input): + firstline = input.readline() + assert firstline.startswith("seen_main = ") + self.seen_main |= bool(int(firstline[len("seen_main = "):].strip())) + for line in input: + entry = eval(line) + assert type(entry) is tuple + self.gcmaptable.append(entry) def dump(self, output): assert self.seen_main @@ -975,6 +992,7 @@ if __name__ == '__main__': verbose = 1 shuffle = False + output_raw_table = False while len(sys.argv) > 1: if sys.argv[1] == '-v': del sys.argv[1] @@ -982,16 +1000,29 @@ elif sys.argv[1] == '-r': del sys.argv[1] shuffle = True + elif sys.argv[1] == '-t': + del sys.argv[1] + output_raw_table = True else: break tracker = GcRootTracker(verbose=verbose, shuffle=shuffle) for fn in sys.argv[1:]: tmpfn = fn + '.TMP' f = open(fn, 'r') - g = open(tmpfn, 'w') - tracker.process(f, g, filename=fn) - f.close() - g.close() - os.unlink(fn) - os.rename(tmpfn, fn) - tracker.dump(sys.stdout) + firstline = f.readline() + f.seek(0) + if firstline.startswith('seen_main = '): + tracker.reload_raw_table(f) + f.close() + else: + g = open(tmpfn, 'w') + tracker.process(f, g, filename=fn) + f.close() + g.close() + os.unlink(fn) + os.rename(tmpfn, fn) + if output_raw_table: + tracker.dump_raw_table(sys.stdout) + tracker.clear() + if not output_raw_table: + tracker.dump(sys.stdout) Modified: pypy/dist/pypy/translator/c/genc.py ============================================================================== --- pypy/dist/pypy/translator/c/genc.py (original) +++ pypy/dist/pypy/translator/c/genc.py Mon Mar 3 21:20:25 2008 @@ -354,6 +354,7 @@ assert self.config.translation.gcrootfinder != "llvmgc" cfiles = [] ofiles = [] + gcmapfiles = [] for fn in compiler.cfilenames: fn = py.path.local(fn) if fn.dirpath() == targetdir: @@ -364,6 +365,7 @@ cfiles.append(name) if self.config.translation.gcrootfinder == "asmgcc": ofiles.append(name[:-2] + '.s') + gcmapfiles.append(name[:-2] + '.gcmap') else: ofiles.append(name[:-2] + '.o') @@ -387,8 +389,10 @@ print >> f if self.config.translation.gcrootfinder == "asmgcc": write_list(ofiles, 'ASMFILES =') + write_list(gcmapfiles, 'GCMAPFILES =') print >> f, 'OBJECTS = $(ASMFILES) gcmaptable.s' else: + print >> f, 'GCMAPFILES =' write_list(ofiles, 'OBJECTS =') print >> f def makerel(path): @@ -835,11 +839,14 @@ %.s: %.c \t$(CC) $(CFLAGS) -o $@ -S $< $(INCLUDEDIRS) -gcmaptable.s: $(ASMFILES) -\t$(PYPYDIR)/translator/c/gcc/trackgcroot.py $(ASMFILES) > $@ || (rm -f $@ && exit 1) +%.gcmap: %.s +\t$(PYPYDIR)/translator/c/gcc/trackgcroot.py -t $< > $@ || (rm -f $@ && exit 1) + +gcmaptable.s: $(GCMAPFILES) +\t$(PYPYDIR)/translator/c/gcc/trackgcroot.py $(GCMAPFILES) > $@ || (rm -f $@ && exit 1) clean: -\trm -f $(OBJECTS) $(TARGET) +\trm -f $(OBJECTS) $(TARGET) $(GCMAPFILES) debug: \t$(MAKE) CFLAGS="-g -DRPY_ASSERT" @@ -868,6 +875,6 @@ profopt: \t$(MAKE) CFLAGS="-fprofile-generate $(CFLAGS)" LDFLAGS="-fprofile-generate $(LDFLAGS)" \tcd $(PYPYDIR)/translator/goal && $(abspath $(TARGET)) $(PROFOPT) -\trm -f $(OBJECTS) $(TARGET) +\t$(MAKE) clean \t$(MAKE) CFLAGS="-fprofile-use $(CFLAGS)" LDFLAGS="-fprofile-use $(LDFLAGS)" ''' From arigo at codespeak.net Mon Mar 3 22:08:02 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 22:08:02 +0100 (CET) Subject: [pypy-svn] r52125 - in pypy/dist/pypy/module/operator: . test Message-ID: <20080303210802.2D0C7169EF9@codespeak.net> Author: arigo Date: Mon Mar 3 22:08:01 2008 New Revision: 52125 Modified: pypy/dist/pypy/module/operator/__init__.py pypy/dist/pypy/module/operator/app_operator.py pypy/dist/pypy/module/operator/interp_operator.py pypy/dist/pypy/module/operator/test/test_operator.py Log: issue341 testing Move operator.attrgetter() and operator.itemgetter() to interp-level. They now return objects that look like built-in functions, which should fix this issue (test included). Modified: pypy/dist/pypy/module/operator/__init__.py ============================================================================== --- pypy/dist/pypy/module/operator/__init__.py (original) +++ pypy/dist/pypy/module/operator/__init__.py Mon Mar 3 22:08:01 2008 @@ -18,19 +18,19 @@ appleveldefs = {} app_names = ['__delslice__', '__getslice__', '__repeat__', '__setslice__', - 'attrgetter', 'countOf', 'delslice', 'getslice', 'indexOf', + 'countOf', 'delslice', 'getslice', 'indexOf', 'isMappingType', 'isNumberType', 'isSequenceType', - 'itemgetter','repeat', 'setslice', + 'repeat', 'setslice', ] for name in app_names: appleveldefs[name] = 'app_operator.%s' % name - interp_names = ['index', 'abs', 'add', - 'and_', 'concat', 'contains', 'delitem', 'div', 'eq', 'floordiv', + interp_names = ['index', 'abs', 'add', 'and_', 'attrgetter', + 'concat', 'contains', 'delitem', 'div', 'eq', 'floordiv', 'ge', 'getitem', 'gt', 'inv', - 'invert', 'is_', 'is_not', 'isCallable', 'le', - 'lshift', 'lt', 'mod', 'mul', + 'invert', 'is_', 'is_not', 'isCallable', 'itemgetter', + 'le', 'lshift', 'lt', 'mod', 'mul', 'ne', 'neg', 'not_', 'or_', 'pos', 'pow', 'rshift', 'setitem', 'sequenceIncludes', 'sub', 'truediv', 'truth', 'xor'] Modified: pypy/dist/pypy/module/operator/app_operator.py ============================================================================== --- pypy/dist/pypy/module/operator/app_operator.py (original) +++ pypy/dist/pypy/module/operator/app_operator.py Mon Mar 3 22:08:01 2008 @@ -5,11 +5,6 @@ equivalent to x+y. ''' -def attrgetter(attr): - def f(obj): - return getattr(obj, attr) - return f - def countOf(a,b): 'countOf(a, b) -- Return the number of times b occurs in a.' count = 0 @@ -55,11 +50,6 @@ 'isSequenceType(a) -- Return True if a has a sequence type, False otherwise.' return hasattr(obj, '__getitem__') -def itemgetter(idx): - def f(obj): - return obj[idx] - return f - def repeat(obj, num): 'repeat(a, b) -- Return a * b, where a is a sequence, and b is an integer.' if not isinstance(num, (int, long)): Modified: pypy/dist/pypy/module/operator/interp_operator.py ============================================================================== --- pypy/dist/pypy/module/operator/interp_operator.py (original) +++ pypy/dist/pypy/module/operator/interp_operator.py Mon Mar 3 22:08:01 2008 @@ -13,8 +13,6 @@ 'and_(a, b) -- Same as a a & b' return space.and_(w_obj1, w_obj2) -# attrgetter - def concat(space, w_obj1, w_obj2): 'concat(a, b) -- Same as a a + b, for a and b sequences.' return space.add(w_obj1, w_obj2) # XXX cPython only works on types with sequence api @@ -86,8 +84,6 @@ 'is_not(a, b) -- Same as a is not b' return space.not_(space.is_(w_a, w_b)) -# itemgetter - def le(space, w_a, w_b): 'le(a, b) -- Same as a<=b.' return space.le(w_a, w_b) @@ -161,3 +157,51 @@ def xor(space, w_a, w_b): 'xor(a, b) -- Same as a ^ b.' return space.xor(w_a, w_b) + +# ____________________________________________________________ +# attrgetter and itergetter + +from pypy.interpreter import eval, function + +class SimpleClosureBuiltinFunction(function.BuiltinFunction): + + def __init__(self, space, code, w_index): + assert isinstance(code, SimpleClosureCode) + function.Function.__init__(self, space, code) + self.w_index = w_index + + +class SimpleClosureCode(eval.Code): + sig = (['obj'], None, None) + + def __init__(self, co_name, is_attrgetter): + eval.Code.__init__(self, co_name) + self.is_attrgetter = is_attrgetter + + def signature(self): + return self.sig + + def funcrun(self, func, args): + space = func.space + [w_obj] = args.parse(func.name, self.sig) + return self.fastcall_1(space, func, w_obj) + + def fastcall_1(self, space, func, w_obj): + if not isinstance(func, SimpleClosureBuiltinFunction): + raise OperationError(space.w_TypeError, space.wrap("bad call")) + w_index = func.w_index + if self.is_attrgetter: + return space.getattr(w_obj, w_index) + else: + return space.getitem(w_obj, w_index) + +attrgetter_code = SimpleClosureCode("attrgetter", is_attrgetter=True) +itemgetter_code = SimpleClosureCode("itemgetter", is_attrgetter=False) + +def attrgetter(space, w_attr): + func = SimpleClosureBuiltinFunction(space, attrgetter_code, w_attr) + return space.wrap(func) + +def itemgetter(space, w_idx): + func = SimpleClosureBuiltinFunction(space, itemgetter_code, w_idx) + return space.wrap(func) Modified: pypy/dist/pypy/module/operator/test/test_operator.py ============================================================================== --- pypy/dist/pypy/module/operator/test/test_operator.py (original) +++ pypy/dist/pypy/module/operator/test/test_operator.py Mon Mar 3 22:08:01 2008 @@ -3,3 +3,15 @@ def test_equality(self): import operator assert operator.eq == operator.__eq__ + + def test_getters_are_not_regular_functions(self): + import operator + class A: + getx = operator.attrgetter('x') + get3 = operator.itemgetter(3) + a = A() + a.x = 5 + assert a.getx(a) == 5 + assert a.get3("foobar") == "b" + assert a.getx(*(a,)) == 5 + assert a.get3(obj="foobar") == "b" From arigo at codespeak.net Mon Mar 3 22:25:39 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 3 Mar 2008 22:25:39 +0100 (CET) Subject: [pypy-svn] r52126 - pypy/dist/pypy/module/operator Message-ID: <20080303212539.0EF94169EF2@codespeak.net> Author: arigo Date: Mon Mar 3 22:25:36 2008 New Revision: 52126 Modified: pypy/dist/pypy/module/operator/interp_operator.py Log: Missing import. Modified: pypy/dist/pypy/module/operator/interp_operator.py ============================================================================== --- pypy/dist/pypy/module/operator/interp_operator.py (original) +++ pypy/dist/pypy/module/operator/interp_operator.py Mon Mar 3 22:25:36 2008 @@ -162,6 +162,7 @@ # attrgetter and itergetter from pypy.interpreter import eval, function +from pypy.interpreter.error import OperationError class SimpleClosureBuiltinFunction(function.BuiltinFunction): From cfbolz at codespeak.net Mon Mar 3 23:06:43 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 23:06:43 +0100 (CET) Subject: [pypy-svn] r52127 - pypy/branch/jit-refactoring/pypy/translator/backendopt/test Message-ID: <20080303220643.B6129169F25@codespeak.net> Author: cfbolz Date: Mon Mar 3 23:06:42 2008 New Revision: 52127 Modified: pypy/branch/jit-refactoring/pypy/translator/backendopt/test/test_constfold.py Log: failing constfolding test Modified: pypy/branch/jit-refactoring/pypy/translator/backendopt/test/test_constfold.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/translator/backendopt/test/test_constfold.py (original) +++ pypy/branch/jit-refactoring/pypy/translator/backendopt/test/test_constfold.py Mon Mar 3 23:06:42 2008 @@ -317,3 +317,27 @@ check_graph(graph, [2], 0, t) check_graph(graph, [10], 100, t) check_graph(graph, [42], 0, t) + + +def test_switch_constant_folding(): + py.test.skip("fails right now") + def fn(n, x): + if n == 0: + x += 4 + elif n == 1: + x += 5 + elif n == 2: + x -= 1 + return x * n + + graph, t = get_graph(fn, [int, int]) + from pypy.translator.backendopt.merge_if_blocks import merge_if_blocks + from pypy.translator.backendopt import removenoops + removenoops.remove_same_as(graph) + merge_if_blocks(graph) + if conftest.option.view: + t.view() + constant_fold_graph(graph) + if conftest.option.view: + t.view() + check_graph(graph, [6, 2], 12, t) From cfbolz at codespeak.net Mon Mar 3 23:11:24 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 3 Mar 2008 23:11:24 +0100 (CET) Subject: [pypy-svn] r52128 - in pypy/branch/jit-refactoring/pypy/translator/backendopt: . test Message-ID: <20080303221124.84216169F32@codespeak.net> Author: cfbolz Date: Mon Mar 3 23:11:24 2008 New Revision: 52128 Modified: pypy/branch/jit-refactoring/pypy/translator/backendopt/constfold.py pypy/branch/jit-refactoring/pypy/translator/backendopt/test/test_constfold.py Log: fix the problem Modified: pypy/branch/jit-refactoring/pypy/translator/backendopt/constfold.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/translator/backendopt/constfold.py (original) +++ pypy/branch/jit-refactoring/pypy/translator/backendopt/constfold.py Mon Mar 3 23:11:24 2008 @@ -241,6 +241,8 @@ vexit = block.exitswitch if isinstance(vexit, Variable): for link in block.exits: + if link.exitcase == "default": + continue if vexit in link.args: remap = {vexit: Constant(link.llexitcase, vexit.concretetype)} Modified: pypy/branch/jit-refactoring/pypy/translator/backendopt/test/test_constfold.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/translator/backendopt/test/test_constfold.py (original) +++ pypy/branch/jit-refactoring/pypy/translator/backendopt/test/test_constfold.py Mon Mar 3 23:11:24 2008 @@ -320,7 +320,6 @@ def test_switch_constant_folding(): - py.test.skip("fails right now") def fn(n, x): if n == 0: x += 4 From fijal at codespeak.net Tue Mar 4 09:37:34 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 09:37:34 +0100 (CET) Subject: [pypy-svn] r52131 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304083734.AEDCA169F4A@codespeak.net> Author: fijal Date: Tue Mar 4 09:37:31 2008 New Revision: 52131 Added: pypy/extradoc/talk/sfi2008/talk.txt (contents, props changed) Log: First draft of part of the talk Added: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 09:37:31 2008 @@ -0,0 +1,71 @@ + +Title slide +============== + +Author: Maciej Fijalkowski +Title: PyPy - Automatic Generation of VMs for Dynamic Languages + +Writing virtual machine for a dynamic language +============================================== + +* Example - Python + +* Coded in low-level language, like C (or Java or C#) + +* Hard-coded design decisions (garbage collection, threading model) + +XXX Another slide +================== + +* Given m languages, n platforms and o important design decisions, + we've got n*m*o effort, we can do better. + +* We want n+m+o + +Generating virtual machines instead of writing by hand +====================================================== + +* Use high-level language + +* Use statically-analyzable language + +* Have a flexible compiler toolchain to do the job for you + +RPython +======= + +* We use RPython, a proper subset of python + +* More static than Python + +* Designed for speed + +* Still high-level, fully analyzable + +* Meta-programming language for RPython is Python + +Abstract interpretation +======================= + +XXX explain + +Flow graphs +=========== + +XXX show pygame viewer and how does it change over time + +Compilation toolchain +===================== + +* Compiles to a variety of backends (C, LLVM, CLI, JVM, ...) + +* Vowes into so called translation aspects, like gc + +* Optimizes (constant folding, malloc removal, inlining) + +Example of superiority +====================== + +XXX explain how our stack-checking code is far better + than CPython's one + From arigo at codespeak.net Tue Mar 4 10:24:22 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 4 Mar 2008 10:24:22 +0100 (CET) Subject: [pypy-svn] r52132 - pypy/dist/pypy/rpython/test Message-ID: <20080304092422.00C89169F5C@codespeak.net> Author: arigo Date: Tue Mar 4 10:24:21 2008 New Revision: 52132 Modified: pypy/dist/pypy/rpython/test/test_rstr.py Log: Fix tests. Modified: pypy/dist/pypy/rpython/test/test_rstr.py ============================================================================== --- pypy/dist/pypy/rpython/test/test_rstr.py (original) +++ pypy/dist/pypy/rpython/test/test_rstr.py Tue Mar 4 10:24:21 2008 @@ -266,7 +266,7 @@ assert i >= 0 assert j >= 0 return (const('ababcabc').find(const('abc'), i, j) + - const('ababcabc').find('b', i, j) * 100) + const('ababcabc').find(const('b'), i, j) * 100) for (i, j) in [(1,7), (2,6), (3,7), (3,8), (4,99), (7, 99)]: res = self.interpret(fn, [i, j]) assert res == fn(i, j) @@ -294,10 +294,10 @@ const('aaa').rfind(const('aa'), 1, 2) * 100 + const('aaa').rfind(const('aa'), 3, 42) * 1000 + # char-searching versions - const('aaa').rfind('a') * 10000 + - const('aaa').rfind('a', 1) * 100000 + - const('aaa').rfind('a', 1, 2) * 1000000 + - const('aaa').rfind('a', 3, 42) * 10000000) + const('aaa').rfind(const('a')) * 10000 + + const('aaa').rfind(const('a'), 1) * 100000 + + const('aaa').rfind(const('a'), 1, 2) * 1000000 + + const('aaa').rfind(const('a'), 3, 42) * 10000000) res = self.interpret(fn, []) assert res == fn() From fijal at codespeak.net Tue Mar 4 10:32:02 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 10:32:02 +0100 (CET) Subject: [pypy-svn] r52133 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304093202.922D5169F71@codespeak.net> Author: fijal Date: Tue Mar 4 10:32:02 2008 New Revision: 52133 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: More slides. Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 10:32:02 2008 @@ -69,3 +69,23 @@ XXX explain how our stack-checking code is far better than CPython's one +GC framework +============ + +* flexible + +* implemented as a translation aspect + +* things like write barriers are inserted automatically + (programmer have no need to worry about that) + +* different root finding strategies + +* effective (RPython is faster than C when gc is a bottleneck) + +* gcs are written in RPython as well + +JIT stuff +========= + +XXX follows From cfbolz at codespeak.net Tue Mar 4 10:37:52 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 4 Mar 2008 10:37:52 +0100 (CET) Subject: [pypy-svn] r52134 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304093752.66690169F01@codespeak.net> Author: cfbolz Date: Tue Mar 4 10:37:50 2008 New Revision: 52134 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: notes and fixes Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 10:37:50 2008 @@ -42,7 +42,7 @@ * Still high-level, fully analyzable -* Meta-programming language for RPython is Python +* Meta-programming language for RPython is Python (XXX might be confusing?) Abstract interpretation ======================= @@ -59,7 +59,7 @@ * Compiles to a variety of backends (C, LLVM, CLI, JVM, ...) -* Vowes into so called translation aspects, like gc +* Weaves in so called translation aspects, like gc * Optimizes (constant folding, malloc removal, inlining) @@ -81,9 +81,9 @@ * different root finding strategies -* effective (RPython is faster than C when gc is a bottleneck) +* effective (RPython is faster than C when GC is a bottleneck) -* gcs are written in RPython as well +* GCs are written in RPython as well JIT stuff ========= From cfbolz at codespeak.net Tue Mar 4 10:48:04 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 4 Mar 2008 10:48:04 +0100 (CET) Subject: [pypy-svn] r52135 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080304094804.3FCCF169F7D@codespeak.net> Author: cfbolz Date: Tue Mar 4 10:48:02 2008 New Revision: 52135 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py Log: translation issues with void args Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Tue Mar 4 10:48:02 2008 @@ -34,7 +34,14 @@ self.redboxbuilder = rvalue.ll_redboxbuilder(FUNCTYPE.TO.RESULT) whatever_return_value = FUNCTYPE.TO.RESULT._defl() numargs = len(FUNCTYPE.TO.ARGS) + voidargcount = 0 + for ARG in FUNCTYPE.TO.ARGS: + if ARG == lltype.Void: + voidargcount += 1 + if len(voidargs) != voidargcount: + voidargs = (None, ) * voidargcount argiter = unrolling_iterable(FUNCTYPE.TO.ARGS) + RETURN = FUNCTYPE.TO.RESULT def green_call(interpreter, fnptr_gv, greenargs): fnptr = fnptr_gv.revealconst(FUNCTYPE) assert len(greenargs) + len(voidargs) == numargs @@ -58,14 +65,15 @@ j += 1 rgenop = interpreter.jitstate.curbuilder.rgenop try: - result = rgenop.genconst(fnptr(*args)) + result = fnptr(*args) except Exception, e: if not we_are_translated(): residual_exception_nontranslated(interpreter.jitstate, e, rtyper) else: interpreter.jitstate.residual_exception(e) - result = rgenop.genconst(whatever_return_value) - interpreter.green_result(result) + result = whatever_return_value + if RETURN != lltype.Void: + interpreter.green_result(rgenop.genconst(result)) self.green_call = green_call def _freeze_(self): Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Tue Mar 4 10:48:02 2008 @@ -592,12 +592,24 @@ def ll_function(y): z = ll_add_one(y) z = hint(z, concrete=True) - return hint(z, variable=True) + return z res = self.interpret(ll_function, [3], [0]) assert res == 4 self.check_insns({}) + def test_green_call_void_return(self): + def ll_boring(x): + return + def ll_function(y): + z = ll_boring(y) + z = hint(y, concrete=True) + return z + + res = self.interpret(ll_function, [3], [0]) + assert res == 3 + self.check_insns({}) + def test_split_on_green_return(self): def ll_two(x): if x > 0: @@ -1840,23 +1852,6 @@ res = self.interpret(main2, [5, 6], policy=StopAtXPolicy(g)) assert res == 11 - def test_indirect_call_voidargs(self): - class Void(object): - def _freeze_(self): - return True - void = Void() - def h1(n, v): - return n*2 - def h2(n, v): - return n*4 - l = [h1, h2] - def f(n, x): - h = l[n&1] - return h(n, void) + x - - res = self.interpret(f, [7, 3]) - assert res == f(7, 3) - self.check_insns(indirect_call=1, direct_call=1) class TestLLType(SimpleTests): Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py Tue Mar 4 10:48:02 2008 @@ -535,3 +535,22 @@ return indirection(green, red) res = self.timeshift_from_portal(portal, portal, [41, 1], policy=P_NOVIRTUAL) assert res == 0 + + + def test_indirect_call_voidargs(self): + class Void(object): + def _freeze_(self): + return True + void = Void() + def h1(n, v): + return n*2 + def h2(n, v): + return n*4 + l = [h1, h2] + def f(n, x): + h = l[n&1] + return h(n, void) + x + + res = self.timeshift_from_portal(f, f, [7, 3]) + assert res == f(7, 3) + self.check_insns(indirect_call=1, direct_call=1) From fijal at codespeak.net Tue Mar 4 11:01:21 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 11:01:21 +0100 (CET) Subject: [pypy-svn] r52136 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304100121.2CFD8169F64@codespeak.net> Author: fijal Date: Tue Mar 4 11:01:21 2008 New Revision: 52136 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: some update Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 11:01:21 2008 @@ -85,7 +85,40 @@ * GCs are written in RPython as well -JIT stuff -========= +Example of static-analysis related feature +========================================== -XXX follows +* sandboxing + +* very small piece of code to trust + +* changes every call to external function automatically + +XXX demo + +Special translation aspect +========================== + +* generating Just-in-time compilers from interpreters + +XXX JIT STUFF FOLLOWS XXX + +It's not only technical +======================= + +* We use test driven developement extensively + +* We've got test suite which runs on a single processor for ~8 hours + +* Special testing tool, py.test, little hassle a lot of features + +* Sprint-driven developement + +It's not only technical (2) +=========================== + +* EU Framework Programme 6th + +* Actively searching for both grants and commercial support + +... From cfbolz at codespeak.net Tue Mar 4 12:40:21 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 4 Mar 2008 12:40:21 +0100 (CET) Subject: [pypy-svn] r52137 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080304114021.99899169F60@codespeak.net> Author: cfbolz Date: Tue Mar 4 12:40:19 2008 New Revision: 52137 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: fix splitting of raisingops Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Tue Mar 4 12:40:19 2008 @@ -424,11 +424,7 @@ @arguments("exception") def opimpl_split_raisingop(self, ll_evalue): # XXX not sure about passing no green vars - decision = rtimeshift.split_raisingop(self.jitstate, self.frame.pc, - ll_evalue) - if decision: - self.frame.pc = target - + rtimeshift.split_raisingop(self.jitstate, self.frame.pc, ll_evalue) @arguments("jumptarget") Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Tue Mar 4 12:40:19 2008 @@ -1565,16 +1565,24 @@ def test_red_int_add_ovf(self): def f(n, m): try: - return ovfcheck(n + m) + result = ovfcheck(n + m) except OverflowError: - return -42 + return -42 + m + return result + 1 res = self.interpret(f, [100, 20]) - assert res == 120 + assert res == 121 self.check_insns(int_add_ovf=1) + #res = self.interpret(f, [100, 20], [0, 1]) + #assert res == 121 + #self.check_insns() + res = self.interpret(f, [sys.maxint, 1]) - assert res == -42 + assert res == -41 self.check_insns(int_add_ovf=1) + res = self.interpret(f, [sys.maxint, 5], [0, 1]) + assert res == -42 + 5 + self.check_insns() def test_green_int_add_ovf(self): py.test.skip("not working yet") From cfbolz at codespeak.net Tue Mar 4 12:41:06 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 4 Mar 2008 12:41:06 +0100 (CET) Subject: [pypy-svn] r52138 - pypy/branch/jit-refactoring/pypy/jit/timeshifter Message-ID: <20080304114106.D6687169F6C@codespeak.net> Author: cfbolz Date: Tue Mar 4 12:41:06 2008 New Revision: 52138 Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/vdict.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/vlist.py Log: more needed isinstance checks Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/vdict.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/vdict.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/vdict.py Tue Mar 4 12:41:06 2008 @@ -3,7 +3,7 @@ from pypy.rpython.lltypesystem import rdict from pypy.jit.timeshifter.rcontainer import VirtualContainer, FrozenContainer from pypy.jit.timeshifter.rcontainer import cachedtype -from pypy.jit.timeshifter import rvalue +from pypy.jit.timeshifter import rvalue, oop from pypy.rlib.objectmodel import r_dict HASH = lltype.Signed @@ -265,9 +265,11 @@ def oop_newdict(jitstate, oopspecdesc, deepfrozen): + assert isinstance(oopspecdesc, oop.OopSpecDesc_dict) return oopspecdesc.typedesc.factory() def oop_dict_setitem(jitstate, oopspecdesc, deepfrozen, selfbox, keybox, valuebox): + assert isinstance(oopspecdesc, oop.OopSpecDesc_dict) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, AbstractVirtualDict) and keybox.is_constant(): @@ -276,6 +278,7 @@ oopspecdesc.residual_call(jitstate, [selfbox, keybox, valuebox]) def oop_dict_getitem(jitstate, oopspecdesc, deepfrozen, selfbox, keybox): + assert isinstance(oopspecdesc, oop.OopSpecDesc_dict) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, AbstractVirtualDict) and keybox.is_constant(): @@ -289,6 +292,7 @@ oop_dict_getitem.couldfold = True def oop_dict_contains(jitstate, oopspecdesc, deepfrozen, selfbox, keybox): + assert isinstance(oopspecdesc, oop.OopSpecDesc_dict) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, AbstractVirtualDict) and keybox.is_constant(): Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/vlist.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/vlist.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/vlist.py Tue Mar 4 12:41:06 2008 @@ -1,7 +1,7 @@ from pypy.rpython.lltypesystem import lltype, llmemory from pypy.jit.timeshifter.rcontainer import VirtualContainer, FrozenContainer from pypy.jit.timeshifter.rcontainer import cachedtype -from pypy.jit.timeshifter import rvalue, rvirtualizable +from pypy.jit.timeshifter import rvalue, rvirtualizable, oop from pypy.rpython.lltypesystem import lloperation debug_print = lloperation.llop.debug_print @@ -268,12 +268,14 @@ def oop_newlist(jitstate, oopspecdesc, deepfrozen, lengthbox, itembox=None): + assert isinstance(oopspecdesc, oop.OopSpecDesc_list) if lengthbox.is_constant(): length = rvalue.ll_getvalue(lengthbox, lltype.Signed) return oopspecdesc.typedesc.factory(length, itembox) return oopspecdesc.residual_call(jitstate, [lengthbox, itembox]) def oop_list_copy(jitstate, oopspecdesc, deepfrozen, selfbox): + assert isinstance(oopspecdesc, oop.OopSpecDesc_list) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): @@ -286,6 +288,7 @@ return oopspecdesc.residual_call(jitstate, [selfbox]) def oop_list_len(jitstate, oopspecdesc, deepfrozen, selfbox): + assert isinstance(oopspecdesc, oop.OopSpecDesc_list) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): @@ -296,6 +299,7 @@ oop_list_len.couldfold = True def oop_list_nonzero(jitstate, oopspecdesc, deepfrozen, selfbox): + assert isinstance(oopspecdesc, oop.OopSpecDesc_list) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): @@ -306,6 +310,7 @@ oop_list_nonzero.couldfold = True def oop_list_append(jitstate, oopspecdesc, deepfrozen, selfbox, itembox): + assert isinstance(oopspecdesc, oop.OopSpecDesc_list) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): @@ -314,6 +319,7 @@ oopspecdesc.residual_call(jitstate, [selfbox, itembox]) def oop_list_insert(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox, itembox): + assert isinstance(oopspecdesc, oop.OopSpecDesc_list) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList) and indexbox.is_constant(): @@ -325,6 +331,7 @@ oopspecdesc.residual_call(jitstate, [selfbox, indexbox, itembox]) def oop_list_concat(jitstate, oopspecdesc, deepfrozen, selfbox, otherbox): + assert isinstance(oopspecdesc, oop.OopSpecDesc_list) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): @@ -340,6 +347,7 @@ return oopspecdesc.residual_call(jitstate, [selfbox, otherbox]) def oop_list_pop(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox=None): + assert isinstance(oopspecdesc, oop.OopSpecDesc_list) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if indexbox is None: @@ -361,6 +369,7 @@ return oopspecdesc.residual_call(jitstate, [selfbox, indexbox]) def oop_list_reverse(jitstate, oopspecdesc, deepfrozen, selfbox): + assert isinstance(oopspecdesc, oop.OopSpecDesc_list) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): @@ -369,6 +378,7 @@ oopspecdesc.residual_call(jitstate, [selfbox]) def oop_list_getitem(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox): + assert isinstance(oopspecdesc, oop.OopSpecDesc_list) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList) and indexbox.is_constant(): @@ -383,6 +393,7 @@ oop_list_getitem.couldfold = True def oop_list_setitem(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox, itembox): + assert isinstance(oopspecdesc, oop.OopSpecDesc_list) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList) and indexbox.is_constant(): @@ -395,6 +406,7 @@ oopspecdesc.residual_call(jitstate, [selfbox, indexbox, itembox]) def oop_list_delitem(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox): + assert isinstance(oopspecdesc, oop.OopSpecDesc_list) assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList) and indexbox.is_constant(): From fijal at codespeak.net Tue Mar 4 13:02:28 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 13:02:28 +0100 (CET) Subject: [pypy-svn] r52139 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304120228.6555D169F8F@codespeak.net> Author: fijal Date: Tue Mar 4 13:02:27 2008 New Revision: 52139 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: a bit of jit update Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 13:02:27 2008 @@ -101,6 +101,55 @@ * generating Just-in-time compilers from interpreters +JIT - motivation +================ + +* Interpreters are way easier to write than compilers + +* One cannot achieve C-level performance with static analyzis + +* Theoretically, dynamic compilation can be a lot faster + than static one + +Traditional JIT approach +======================== + +* Written by hand + +* Carefully encoded language semantics + +* Hard to maintain as language evolves + +* We can do better! + +PyPy approach for jit +========================= + +XXX include overview2.png + +JIT - basics +============ + +* partial evaluation + +* automatic move from interpreter to compiler +XXX futamura link + +* relatively little practical applications so far + +JIT - general idea +=================== + +* constant-propagate python bytecode into an interpreter + +* may not yield good performance (our experiments show + about 2x for removing intepretation overhead) + +* things like types still are not known + +Solution: promotion +=================== + XXX JIT STUFF FOLLOWS XXX It's not only technical From cfbolz at codespeak.net Tue Mar 4 13:12:28 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 4 Mar 2008 13:12:28 +0100 (CET) Subject: [pypy-svn] r52140 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304121228.2AA05169FA6@codespeak.net> Author: cfbolz Date: Tue Mar 4 13:12:27 2008 New Revision: 52140 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: small stuff Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 13:12:27 2008 @@ -108,8 +108,8 @@ * One cannot achieve C-level performance with static analyzis -* Theoretically, dynamic compilation can be a lot faster - than static one +* Theoretically, dynamic compilation can produce faster results + than static compilation Traditional JIT approach ======================== @@ -168,6 +168,6 @@ * EU Framework Programme 6th -* Actively searching for both grants and commercial support +* Actively searching for both grants and consultancy contracts ... From fijal at codespeak.net Tue Mar 4 14:14:09 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 14:14:09 +0100 (CET) Subject: [pypy-svn] r52141 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304131409.271E4169F71@codespeak.net> Author: fijal Date: Tue Mar 4 14:14:07 2008 New Revision: 52141 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: update Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 14:14:07 2008 @@ -14,14 +14,20 @@ * Hard-coded design decisions (garbage collection, threading model) -XXX Another slide -================== +Motivation - we can do better +============================= * Given m languages, n platforms and o important design decisions, we've got n*m*o effort, we can do better. * We want n+m+o +* Primary example - CPython. + + - refcounting fixed hard to change + + - psyco, jit for python hard to maintain + Generating virtual machines instead of writing by hand ====================================================== @@ -42,17 +48,25 @@ * Still high-level, fully analyzable -* Meta-programming language for RPython is Python (XXX might be confusing?) - Abstract interpretation ======================= -XXX explain +* We start from importing python module + +* Next step is to change bytecode into the forest of flow graphs + +* We call this abstract interpretation of bytecode + +* Bytecode can be prepared dynamically (meta-programming) Flow graphs =========== -XXX show pygame viewer and how does it change over time +* Intermediate representation + +* Can encode different layers of abstraction + +XXX demo Compilation toolchain ===================== From fijal at codespeak.net Tue Mar 4 15:10:30 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 15:10:30 +0100 (CET) Subject: [pypy-svn] r52142 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304141030.4A69F169F73@codespeak.net> Author: fijal Date: Tue Mar 4 15:10:28 2008 New Revision: 52142 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: Try to clarify Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 15:10:28 2008 @@ -40,7 +40,8 @@ RPython ======= -* We use RPython, a proper subset of python +* We use RPython, a proper subset of python to implement + a Python interpreter * More static than Python @@ -48,6 +49,9 @@ * Still high-level, fully analyzable +* Interpreter itself (written in RPython) interprets + normal python. + Abstract interpretation ======================= @@ -164,6 +168,11 @@ Solution: promotion =================== +* Enhance partial evaluation to be able to *promote* run-time + value into compile-time + + + XXX JIT STUFF FOLLOWS XXX It's not only technical From fijal at codespeak.net Tue Mar 4 15:22:18 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 15:22:18 +0100 (CET) Subject: [pypy-svn] r52143 - in pypy/dist/pypy/module/posix: . test Message-ID: <20080304142218.04F9A169F4F@codespeak.net> Author: fijal Date: Tue Mar 4 15:22:18 2008 New Revision: 52143 Modified: pypy/dist/pypy/module/posix/__init__.py pypy/dist/pypy/module/posix/test/test_posix2.py Log: seems to work these days, will try translation. Modified: pypy/dist/pypy/module/posix/__init__.py ============================================================================== --- pypy/dist/pypy/module/posix/__init__.py (original) +++ pypy/dist/pypy/module/posix/__init__.py Tue Mar 4 15:22:18 2008 @@ -77,7 +77,7 @@ interpleveldefs['execv'] = 'interp_posix.execv' if hasattr(os, 'execve'): interpleveldefs['execve'] = 'interp_posix.execve' - if False and hasattr(os, 'uname'): + if hasattr(os, 'uname'): interpleveldefs['uname'] = 'interp_posix.uname' if hasattr(os, 'ttyname'): interpleveldefs['ttyname'] = 'interp_posix.ttyname' Modified: pypy/dist/pypy/module/posix/test/test_posix2.py ============================================================================== --- pypy/dist/pypy/module/posix/test/test_posix2.py (original) +++ pypy/dist/pypy/module/posix/test/test_posix2.py Tue Mar 4 15:22:18 2008 @@ -285,7 +285,6 @@ assert os.WIFSIGNALED(1) == True def test_os_uname(self): - skip("Uname broken") os = self.posix res = os.uname() assert len(res) == 5 From fijal at codespeak.net Tue Mar 4 15:40:06 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 15:40:06 +0100 (CET) Subject: [pypy-svn] r52145 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304144006.1A01D169F63@codespeak.net> Author: fijal Date: Tue Mar 4 15:40:04 2008 New Revision: 52145 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: Elaborate more on translation steps Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 15:40:04 2008 @@ -72,14 +72,57 @@ XXX demo -Compilation toolchain -===================== +Annotation +========== -* Compiles to a variety of backends (C, LLVM, CLI, JVM, ...) +* A part which does the type inference over existing + graphs -* Weaves in so called translation aspects, like gc +* Powerful type system, yet not nearly as rich as + say haskell -* Optimizes (constant folding, malloc removal, inlining) +RTyper +====== + +* Translates high-level graphs into lower-levels + +* Two type systems: + + - lltype, for backends that understand pointers, + structures etc. + + - ootype, for backends that have notion of objects + +* lltype has more details, like implementation of strings + (ootype assumes strings built-in) + +Translation aspects +=================== + +* Optimizations (inlining, malloc removal) + +* Different GCs + +* ... + +Backends +======== + +* lltype-based - C, LLVM + +* ootype-based - CLI, JVM, ... + +* for example, things like .NET bindings are + backend specific + +Interpreters +============ + +* We've got more than just Python + +* There is prolog, smalltalk, javascript... + +* Hence we can compile different possible combinations Example of superiority ====================== @@ -112,6 +155,9 @@ * changes every call to external function automatically +* build your own library (in python) which implements + your own security policy + XXX demo Special translation aspect @@ -171,8 +217,6 @@ * Enhance partial evaluation to be able to *promote* run-time value into compile-time - - XXX JIT STUFF FOLLOWS XXX It's not only technical @@ -193,4 +237,9 @@ * Actively searching for both grants and consultancy contracts +Project future +=============== + +XXX + ... From fijal at codespeak.net Tue Mar 4 15:58:30 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 15:58:30 +0100 (CET) Subject: [pypy-svn] r52147 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304145830.F2650169F12@codespeak.net> Author: fijal Date: Tue Mar 4 15:58:29 2008 New Revision: 52147 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: Jit update Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 15:58:29 2008 @@ -112,6 +112,9 @@ * ootype-based - CLI, JVM, ... +* llinterpreter - a virtual backend for running flow graphs + directly, useful for testing + * for example, things like .NET bindings are backend specific @@ -217,20 +220,118 @@ * Enhance partial evaluation to be able to *promote* run-time value into compile-time -XXX JIT STUFF FOLLOWS XXX +XXX put slide about virtualizables somewhere -It's not only technical +Concrete ingredients +==================== + +* Variety of hints to guide partial evaluation + +* Promotion on certain paths to achieve + "static-enough" parts + +* Lazy allocation of objects (when they escape) + +* Use CPU stack and registers (we're not very good at it) + +Irrelevant to program written +============================== + +* Those techniques can be relatively easily applied + to different interpreters, just by hints + +* Or to any other programs written in RPython + (say templating language with templates being constant) + +JIT details - hint annotator +================================== + +* Annotator is very similiar to normal one, it + adds color propagation + +* Green - compile-time, can be constant-folded + +* Red - runtime + +* Some rules about the color propagation + +XXX demo + +JIT details - the rainbow interpreter +===================================== + +* Very very experimental, lives on a branch right now + +* We dump colored graphs as a bytecode and interpret them + +* We could compile it, but interpreting dynamic + languages is easier than compiling (XXX???) + +XXX demo + +JIT details - backends +====================== + +* JIT backends care for assembler generation + +* As usual, we plan to have many (PPC, i386, JVM, + dummy one...) + +* They're very rudimentary right now + +* It's relatively pleasant job to write python generating + assembler code + +* We would definitely benefit from help from an assembler + expert + +Example +======== + +XXX demo of compilation of DFA or NFA or toy language + +JIT conclusion +============== + +* We're able to run carefully crafted examples ~60x faster + than CPython + +* About the same as gcc -O0 + +* We can definitely do better, for example by enhancing backends + +* There is a lot of work to be done in JIT area + +JIT plans +========= + +* Faster than C! + +* For long-enough running programs that's theoretically + possible + +* We have more information at runtime that one might have + at compile-time + +JIT short term plans +===================== + +* Compile just hotspots (not everything) + +XXX finish + +Developement technology ======================= * We use test driven developement extensively * We've got test suite which runs on a single processor for ~8 hours -* Special testing tool, py.test, little hassle a lot of features +* Special testing tool, py.test, little hassle and a lot of features * Sprint-driven developement -It's not only technical (2) +It's not only technical =========================== * EU Framework Programme 6th From fijal at codespeak.net Tue Mar 4 17:12:51 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 17:12:51 +0100 (CET) Subject: [pypy-svn] r52151 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304161251.E549B169F74@codespeak.net> Author: fijal Date: Tue Mar 4 17:12:50 2008 New Revision: 52151 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: Try to reshuffle slides. Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 17:12:50 2008 @@ -37,6 +37,49 @@ * Have a flexible compiler toolchain to do the job for you +General idea +============ + +XXX overview1.png + +Even more +========= + +* Take any interpreter, python, javascript, smalltalk... + +* Make some decisions (whether to use jit, which gc) + +* Compile it to your platform (C/POSIX, .NET, ...) + +How we benefit from general architecture +======================================== + +* Python has complicated semantics + +* Python guarantees that it won't segfault on + stack exhaustion + +* CPython includes few stack checks along the source + +XXX segfault example + +* We include it automatically searching for all cycles + in all graphs + +Another example of static-analyzis of interpreter source +======================================================== + +* sandboxing + +* very small piece of code to trust + +* changes every call to external function automatically + +* build your own library (in python) which implements + your own security policy + +XXX demo + RPython ======= @@ -105,34 +148,6 @@ * ... -Backends -======== - -* lltype-based - C, LLVM - -* ootype-based - CLI, JVM, ... - -* llinterpreter - a virtual backend for running flow graphs - directly, useful for testing - -* for example, things like .NET bindings are - backend specific - -Interpreters -============ - -* We've got more than just Python - -* There is prolog, smalltalk, javascript... - -* Hence we can compile different possible combinations - -Example of superiority -====================== - -XXX explain how our stack-checking code is far better - than CPython's one - GC framework ============ @@ -149,19 +164,18 @@ * GCs are written in RPython as well -Example of static-analysis related feature -========================================== - -* sandboxing +Backends +======== -* very small piece of code to trust +* lltype-based - C, LLVM -* changes every call to external function automatically +* ootype-based - CLI, JVM, ... -* build your own library (in python) which implements - your own security policy +* llinterpreter - a virtual backend for running flow graphs + directly, useful for testing -XXX demo +* for example, things like .NET bindings are + backend specific Special translation aspect ========================== From arigo at codespeak.net Tue Mar 4 18:00:25 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 4 Mar 2008 18:00:25 +0100 (CET) Subject: [pypy-svn] r52155 - pypy/branch/asmgcc-exceptions Message-ID: <20080304170025.925A5169F63@codespeak.net> Author: arigo Date: Tue Mar 4 18:00:24 2008 New Revision: 52155 Added: pypy/branch/asmgcc-exceptions/ - copied from r52154, pypy/dist/ Log: A branch to try out obscure gcc-asm-based hacks to speed up exceptions. (Will probably be trashed but I'm interested in knowing how much time is spent in the checks after each call) From arigo at codespeak.net Tue Mar 4 18:01:58 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 4 Mar 2008 18:01:58 +0100 (CET) Subject: [pypy-svn] r52156 - in pypy/branch/asmgcc-exceptions/pypy/translator: . c c/src goal Message-ID: <20080304170158.2B712169F63@codespeak.net> Author: arigo Date: Tue Mar 4 18:01:57 2008 New Revision: 52156 Modified: pypy/branch/asmgcc-exceptions/pypy/translator/c/extfunc.py pypy/branch/asmgcc-exceptions/pypy/translator/c/src/exception.h pypy/branch/asmgcc-exceptions/pypy/translator/c/src/main.h pypy/branch/asmgcc-exceptions/pypy/translator/exceptiontransform.py pypy/branch/asmgcc-exceptions/pypy/translator/goal/targetnopstandalone.py Log: Hack hack hack, 100% unclean. This version gives a slow-down with the framework GCs because of all the int_add_ovf and int_mul_ovf which need to set up an exception catching block. Modified: pypy/branch/asmgcc-exceptions/pypy/translator/c/extfunc.py ============================================================================== --- pypy/branch/asmgcc-exceptions/pypy/translator/c/extfunc.py (original) +++ pypy/branch/asmgcc-exceptions/pypy/translator/c/extfunc.py Tue Mar 4 18:01:57 2008 @@ -109,12 +109,6 @@ if not db.standalone: yield ('RPYTHON_PYEXCCLASS2EXC', exceptiondata.fn_pyexcclass2exc) - yield ('RPyExceptionOccurred1', exctransformer.rpyexc_occured_ptr.value) - yield ('RPyFetchExceptionType', exctransformer.rpyexc_fetch_type_ptr.value) - yield ('RPyFetchExceptionValue', exctransformer.rpyexc_fetch_value_ptr.value) - yield ('RPyClearException', exctransformer.rpyexc_clear_ptr.value) - yield ('RPyRaiseException', exctransformer.rpyexc_raise_ptr.value) - for pyexccls in exceptiondata.standardexceptions: exc_llvalue = exceptiondata.fn_pyexcclass2exc( lltype.pyobjectptr(pyexccls)) Modified: pypy/branch/asmgcc-exceptions/pypy/translator/c/src/exception.h ============================================================================== --- pypy/branch/asmgcc-exceptions/pypy/translator/c/src/exception.h (original) +++ pypy/branch/asmgcc-exceptions/pypy/translator/c/src/exception.h Tue Mar 4 18:01:57 2008 @@ -7,9 +7,9 @@ #endif /* just a renaming, unless DO_LOG_EXC is set */ -#define RPyExceptionOccurred RPyExceptionOccurred1 #define RPY_DEBUG_RETURN() /* nothing */ + #ifndef PyExceptionClass_Check /* Python < 2.5 */ # define PyExceptionClass_Check(x) PyClass_Check(x) # define PyExceptionInstance_Check(x) PyInstance_Check(x) @@ -22,6 +22,63 @@ #ifdef HAVE_RTYPER /* RPython version of exceptions */ /******************************************************************/ + +#define OP_RPYEXC_TRY(tag, result_evalue) \ + ; \ + struct rpyjmpbuf_s rpyjmpbuf##tag; \ + rpyjmpbuf##tag.prev = rpyjmp_head; \ + rpyjmp_head = &rpyjmpbuf##tag; \ + asm volatile("xorl %%ebx, %%ebx\n\ + movl %%esp, %1\n\ + movl %%ebp, %2\n\ + movl $0f, %3\n\ +0:" : \ + "=b"(result_evalue) : \ + "m"(rpyjmpbuf##tag.esp), \ + "m"(rpyjmpbuf##tag.ebp), \ + "m"(rpyjmpbuf##tag.resumeaddr) : \ + "eax", "edx", "ecx", "esi", "edi", "memory", "cc") + +#define OP_RPYEXC_ENDTRY(tag, r) rpyjmp_head = rpyjmpbuf##tag.prev + +#define OP_RPYEXC_RAISE(evalue, r) rpyexc_raise(evalue, __FUNCTION__) +#define RPyRaiseException(etype, evalue) rpyexc_raise(evalue, __FUNCTION__) + +struct rpyjmpbuf_s { + struct rpyjmpbuf_s* prev; + void* esp; + void* ebp; + void* resumeaddr; +}; + +extern struct rpyjmpbuf_s *rpyjmp_head; +void rpyexc_raise(RPYTHON_EXCEPTION evalue, const char* funcname) + __attribute__ ((noreturn)); + +#ifndef PYPY_NOT_MAIN_FILE +struct rpyjmpbuf_s *rpyjmp_head = NULL; +void rpyexc_raise(RPYTHON_EXCEPTION evalue, const char *funcname) +{ + if (rpyjmp_head == NULL) + { + fprintf(stderr, "Fatal RPython error in %s: %s\n", + funcname, RPYTHON_TYPE_OF_EXC_INST(evalue)->ov_name->items); + exit(1); + } + asm volatile("movl %0, %%esp\n\ + movl %1, %%ebp\n\ + jmp *%2" : : + "g"(rpyjmp_head->esp), + "g"(rpyjmp_head->ebp), + "g"(rpyjmp_head->resumeaddr), + "b"(evalue)); + abort(); +} +#endif + + + + #ifdef DO_LOG_EXC #undef RPyExceptionOccurred #undef RPY_DEBUG_RETURN Modified: pypy/branch/asmgcc-exceptions/pypy/translator/c/src/main.h ============================================================================== --- pypy/branch/asmgcc-exceptions/pypy/translator/c/src/main.h (original) +++ pypy/branch/asmgcc-exceptions/pypy/translator/c/src/main.h Tue Mar 4 18:01:57 2008 @@ -27,22 +27,14 @@ if (errmsg) goto error; list = _RPyListOfString_New(argc); - if (RPyExceptionOccurred()) goto memory_out; + //if (RPyExceptionOccurred()) goto memory_out; for (i=0; iov_name->items); -#endif - exitcode = 1; - } return exitcode; memory_out: Modified: pypy/branch/asmgcc-exceptions/pypy/translator/exceptiontransform.py ============================================================================== --- pypy/branch/asmgcc-exceptions/pypy/translator/exceptiontransform.py (original) +++ pypy/branch/asmgcc-exceptions/pypy/translator/exceptiontransform.py Tue Mar 4 18:01:57 2008 @@ -52,89 +52,12 @@ edata = translator.rtyper.getexceptiondata() self.lltype_of_exception_value = edata.lltype_of_exception_value self.lltype_of_exception_type = edata.lltype_of_exception_type - self.mixlevelannotator = MixLevelHelperAnnotator(translator.rtyper) - exc_data, null_type, null_value = self.setup_excdata() + self.lltype_to_classdef = translator.rtyper.lltype_to_classdef_mapping() - rclass = translator.rtyper.type_system.rclass runtime_error_def = translator.annotator.bookkeeper.getuniqueclassdef(RuntimeError) runtime_error_ll_exc = edata.get_standard_ll_exc_instance(translator.rtyper, runtime_error_def) - runtime_error_ll_exc_type = rclass.ll_inst_type(runtime_error_ll_exc) - - def rpyexc_occured(): - exc_type = exc_data.exc_type - return bool(exc_type) - - def rpyexc_fetch_type(): - return exc_data.exc_type - - def rpyexc_fetch_value(): - return exc_data.exc_value - - def rpyexc_clear(): - exc_data.exc_type = null_type - exc_data.exc_value = null_value - - def rpyexc_raise(etype, evalue): - # assert(!RPyExceptionOccurred()); - exc_data.exc_type = etype - exc_data.exc_value = evalue - - def rpyexc_fetch_exception(): - evalue = rpyexc_fetch_value() - rpyexc_clear() - return evalue - - def rpyexc_restore_exception(evalue): - if evalue: - rpyexc_raise(rclass.ll_inst_type(evalue), evalue) - - def rpyexc_raise_runtime_error(): - rpyexc_raise(runtime_error_ll_exc_type, runtime_error_ll_exc) - - self.rpyexc_occured_ptr = self.build_func( - "RPyExceptionOccurred", - rpyexc_occured, - [], lltype.Bool) - - self.rpyexc_fetch_type_ptr = self.build_func( - "RPyFetchExceptionType", - rpyexc_fetch_type, - [], self.lltype_of_exception_type) - - self.rpyexc_fetch_value_ptr = self.build_func( - "RPyFetchExceptionValue", - rpyexc_fetch_value, - [], self.lltype_of_exception_value) - - self.rpyexc_clear_ptr = self.build_func( - "RPyClearException", - rpyexc_clear, - [], lltype.Void) - - self.rpyexc_raise_ptr = self.build_func( - "RPyRaiseException", - rpyexc_raise, - [self.lltype_of_exception_type, self.lltype_of_exception_value], - lltype.Void, - jitcallkind='rpyexc_raise') # for the JIT - - self.rpyexc_raise_runtime_error_ptr = self.build_func( - "RPyRaiseRuntimeError", - rpyexc_raise_runtime_error, - [], lltype.Void) - - self.rpyexc_fetch_exception_ptr = self.build_func( - "RPyFetchException", - rpyexc_fetch_exception, - [], self.lltype_of_exception_value) - - self.rpyexc_restore_exception_ptr = self.build_func( - "RPyRestoreException", - rpyexc_restore_exception, - [self.lltype_of_exception_value], lltype.Void) - - self.mixlevelannotator.finish() - self.lltype_to_classdef = translator.rtyper.lltype_to_classdef_mapping() + self.c_runtime_error = ( + Constant(runtime_error_ll_exc, self.lltype_of_exception_value)) def build_func(self, name, fn, inputtypes, rettype, **kwds): l2a = annmodel.lltype_to_annotation @@ -159,7 +82,7 @@ return else: self.raise_analyzer.analyze_direct_call(graph) - graph.exceptiontransformed = self.exc_data_ptr + graph.exceptiontransformed = True self.always_exc_clear = always_exc_clear join_blocks(graph) @@ -184,8 +107,8 @@ # the graph was not stackless-transformed # so we need to raise a RuntimeError in any # case - block.operations[i].opname = "direct_call" - block.operations[i].args = [self.rpyexc_raise_runtime_error_ptr] + block.operations[i].opname = "rpyexc_raise" + block.operations[i].args = [self.c_runtime_error] def replace_fetch_restore_operations(self, block): # the gctransformer will create these operations. It looks as if the @@ -193,12 +116,9 @@ # put them in a new graph, so all transformations will run again. for i in range(len(block.operations)): if block.operations[i].opname == 'gc_fetch_exception': - block.operations[i].opname = "direct_call" - block.operations[i].args = [self.rpyexc_fetch_exception_ptr] - + XXX if block.operations[i].opname == 'gc_restore_exception': - block.operations[i].opname = "direct_call" - block.operations[i].args.insert(0, self.rpyexc_restore_exception_ptr) + XXX def transform_block(self, graph, block): need_exc_matching = False @@ -223,13 +143,13 @@ if not self.raise_analyzer.can_raise(op): continue - splitlink = split_block(None, block, i+1) - afterblock = splitlink.target - if lastblock is block: - lastblock = afterblock - - self.gen_exc_check(block, graph.returnblock, afterblock) - n_gen_exc_checks += 1 + #splitlink = split_block(None, block, i+1) + #afterblock = splitlink.target + #if lastblock is block: + # lastblock = afterblock + # + #self.gen_exc_check(block, graph.returnblock, afterblock) + #n_gen_exc_checks += 1 if need_exc_matching: assert lastblock.exitswitch == c_last_exception if not self.raise_analyzer.can_raise(lastblock.operations[-1]): @@ -253,7 +173,7 @@ result = Variable() result.concretetype = lltype.Void block.operations = [SpaceOperation( - "direct_call", [self.rpyexc_raise_ptr] + block.inputargs, result)] + "rpyexc_raise", [block.inputargs[1]], result)] l = Link([error_constant(graph.returnblock.inputargs[0].concretetype)], graph.returnblock) block.recloseblock(l) @@ -270,6 +190,8 @@ inliner.inline_once(block, len(block.operations)-1) #block.exits[0].exitcase = block.exits[0].llexitcase = False + try_counter = 0 + def create_proxy_graph(self, op): """ creates a graph which calls the original function, checks for raised exceptions, fetches and then raises them again. If this graph is @@ -279,6 +201,7 @@ result = copyvar(None, op.result) opargs = [] inputargs = [] + noexcinputargs = [] callargs = [] ARGTYPES = [] for var in op.args: @@ -286,35 +209,62 @@ v = Variable() v.concretetype = var.concretetype inputargs.append(v) - opargs.append(v) + v2 = Variable() + v2.concretetype = var.concretetype + noexcinputargs.append(v2) + opargs.append(v2) callargs.append(var) ARGTYPES.append(var.concretetype) else: opargs.append(var) - newop = SpaceOperation(op.opname, opargs, result) + + c_tag = Constant(self.try_counter, lltype.Signed) + self.try_counter += 1 + + llops = rtyper.LowLevelOpList(None) + v_excvalue = llops.genop('rpyexc_try', [c_tag], + resulttype = self.lltype_of_exception_value) + v_isnull = llops.genop('ptr_iszero', [v_excvalue], + resulttype = lltype.Bool) + var_value = copyvar(None, v_excvalue) + startblock = Block(inputargs) - startblock.operations.append(newop) + startblock.operations[:] = llops + startblock.exitswitch = v_isnull + + noexcblock = Block(noexcinputargs) + excblock = Block([var_value]) + + noexclink = Link(list(inputargs), noexcblock) + exclink = Link([v_excvalue], excblock) + + noexclink.llexitcase = noexclink.exitcase = True + exclink .llexitcase = exclink .exitcase = False + newgraph = FunctionGraph("dummy_exc1", startblock) - startblock.closeblock(Link([result], newgraph.returnblock)) + startblock.closeblock(exclink, noexclink) newgraph.returnblock.inputargs[0].concretetype = op.result.concretetype - self.gen_exc_check(startblock, newgraph.returnblock) - excblock = Block([]) + + newop = SpaceOperation(op.opname, opargs, result) + noexcblock.operations.append(newop) + llops = rtyper.LowLevelOpList(None) + llops.genop('rpyexc_endtry', [c_tag]) + noexcblock.operations.extend(llops) + noexcblock.closeblock(Link([result], newgraph.returnblock)) llops = rtyper.LowLevelOpList(None) - var_value = self.gen_getfield('exc_value', llops) - var_type = self.gen_getfield('exc_type' , llops) - self.gen_setfield('exc_value', self.c_null_evalue, llops) - self.gen_setfield('exc_type', self.c_null_etype, llops) + c_typeptr = Constant("typeptr", lltype.Void) + var_type = llops.genop("getfield", [var_value, c_typeptr], + resulttype = self.lltype_of_exception_type) excblock.operations[:] = llops newgraph.exceptblock.inputargs[0].concretetype = self.lltype_of_exception_type newgraph.exceptblock.inputargs[1].concretetype = self.lltype_of_exception_value excblock.closeblock(Link([var_type, var_value], newgraph.exceptblock)) - startblock.exits[True].target = excblock - startblock.exits[True].args = [] fptr = self.constant_func("dummy_exc1", ARGTYPES, op.result.concretetype, newgraph) return newgraph, SpaceOperation("direct_call", [fptr] + callargs, op.result) def gen_exc_check(self, block, returnblock, normalafterblock=None): + XXX #var_exc_occured = Variable() #var_exc_occured.concretetype = lltype.Bool #block.operations.append(SpaceOperation("safe_call", [self.rpyexc_occured_ptr], var_exc_occured)) @@ -379,37 +329,11 @@ class LLTypeExceptionTransformer(BaseExceptionTransformer): - def setup_excdata(self): - EXCDATA = lltype.Struct('ExcData', - ('exc_type', self.lltype_of_exception_type), - ('exc_value', self.lltype_of_exception_value)) - self.EXCDATA = EXCDATA - - exc_data = lltype.malloc(EXCDATA, immortal=True) - null_type = lltype.nullptr(self.lltype_of_exception_type.TO) - null_value = lltype.nullptr(self.lltype_of_exception_value.TO) - - self.exc_data_ptr = exc_data - self.cexcdata = Constant(exc_data, lltype.Ptr(self.EXCDATA)) - self.c_null_etype = Constant(null_type, self.lltype_of_exception_type) - self.c_null_evalue = Constant(null_value, self.lltype_of_exception_value) - - return exc_data, null_type, null_value - def constant_func(self, name, inputtypes, rettype, graph, **kwds): FUNC_TYPE = lltype.FuncType(inputtypes, rettype) fn_ptr = lltype.functionptr(FUNC_TYPE, name, graph=graph, **kwds) return Constant(fn_ptr, lltype.Ptr(FUNC_TYPE)) - def gen_getfield(self, name, llops): - c_name = inputconst(lltype.Void, name) - return llops.genop('getfield', [self.cexcdata, c_name], - resulttype = getattr(self.EXCDATA, name)) - - def gen_setfield(self, name, v_value, llops): - c_name = inputconst(lltype.Void, name) - llops.genop('setfield', [self.cexcdata, c_name, v_value]) - def gen_isnull(self, v, llops): return llops.genop('ptr_iszero', [v], lltype.Bool) Modified: pypy/branch/asmgcc-exceptions/pypy/translator/goal/targetnopstandalone.py ============================================================================== --- pypy/branch/asmgcc-exceptions/pypy/translator/goal/targetnopstandalone.py (original) +++ pypy/branch/asmgcc-exceptions/pypy/translator/goal/targetnopstandalone.py Tue Mar 4 18:01:57 2008 @@ -14,8 +14,18 @@ # __________ Entry point __________ +def foobar(n): + if n > 0: + return foobar(n-1)+n + else: + return 0 + def entry_point(argv): - debug("hello world") + try: + foobar(5000000) + except RuntimeError: + debug("bigbig") + debug("hello world: %d" % foobar(5)) return 0 # _____ Define and setup target ___ From fijal at codespeak.net Tue Mar 4 18:16:32 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 18:16:32 +0100 (CET) Subject: [pypy-svn] r52157 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304171632.9E679169F19@codespeak.net> Author: fijal Date: Tue Mar 4 18:16:31 2008 New Revision: 52157 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: Change slide title Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 18:16:31 2008 @@ -51,7 +51,7 @@ * Compile it to your platform (C/POSIX, .NET, ...) -How we benefit from general architecture +Example of benefit from our architecture ======================================== * Python has complicated semantics From arigo at codespeak.net Tue Mar 4 19:09:46 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 4 Mar 2008 19:09:46 +0100 (CET) Subject: [pypy-svn] r52159 - pypy/branch/asmgcc-exceptions Message-ID: <20080304180946.947A0169F99@codespeak.net> Author: arigo Date: Tue Mar 4 19:09:46 2008 New Revision: 52159 Added: pypy/branch/asmgcc-exceptions/idea.c (contents, props changed) Log: The demo .c file I played with, showing the idea. Added: pypy/branch/asmgcc-exceptions/idea.c ============================================================================== --- (empty file) +++ pypy/branch/asmgcc-exceptions/idea.c Tue Mar 4 19:09:46 2008 @@ -0,0 +1,69 @@ +#include + + +struct myjmpbuf { + struct myjmpbuf *prev; + void *esp; + void *ebp; + void *resumeaddr; +}; + +struct myjmpbuf *jmp_head; + + +void go_back(char *excdata) __attribute__ ((noreturn)); +void go_back(char *excdata) +{ + asm volatile("movl %0, %%esp\n\ + movl %1, %%ebp\n\ + jmp *%2" : : + "g"(jmp_head->esp), + "g"(jmp_head->ebp), + "g"(jmp_head->resumeaddr), + "b"(excdata)); + abort(); +} + +int h(int z) +{ + if (z > 0) + go_back("some text"); + return 42; +} + +int(*hptr)(int) = h; + + +int g(int x, int y) +{ + int z = x + y, u = x * y; + struct myjmpbuf buf; + char *excdata; + buf.prev = jmp_head; + jmp_head = &buf; + asm volatile("xorl %%ebx, %%ebx\n\ + movl %%esp, %1\n\ + movl %%ebp, %2\n\ + movl $0f, %3\n\ +0:" : + "=b"(excdata) : + "m"(buf.esp), "m"(buf.ebp), "m"(buf.resumeaddr) : + "eax", "edx", "ecx", "esi", "edi", "memory", "cc"); + if (excdata != NULL) + { + printf("back to the setjmp point with excdata=%s\n", + excdata); + } + else + { + printf("direct run\n"); + hptr(z+u); + printf("done\n"); + } + printf("x=%d, y=%d, z=%d, u=%d\n", x, y, z, u); +} + +int main() +{ + g(4, 7); +} From cfbolz at codespeak.net Tue Mar 4 19:27:39 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 4 Mar 2008 19:27:39 +0100 (CET) Subject: [pypy-svn] r52165 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304182739.6E63F169FA0@codespeak.net> Author: cfbolz Date: Tue Mar 4 19:27:39 2008 New Revision: 52165 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: small notes Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 19:27:39 2008 @@ -57,14 +57,14 @@ * Python has complicated semantics * Python guarantees that it won't segfault on - stack exhaustion + C stack exhaustion -* CPython includes few stack checks along the source +* CPython includes some stack checks in the source, but they don't catch all + cases XXX segfault example -* We include it automatically searching for all cycles - in all graphs +* We include it automatically so all cases are guaranteed to be covered Another example of static-analyzis of interpreter source ======================================================== @@ -93,14 +93,15 @@ * Still high-level, fully analyzable * Interpreter itself (written in RPython) interprets - normal python. + normal Python. Abstract interpretation ======================= +XXX I would leave out the term abstract interpretation completely. just call it flow graph buildin * We start from importing python module -* Next step is to change bytecode into the forest of flow graphs +* Next step is to analyze the bytecode and to producet a forest of flow graphs * We call this abstract interpretation of bytecode @@ -121,8 +122,8 @@ * A part which does the type inference over existing graphs -* Powerful type system, yet not nearly as rich as - say haskell +* Powerful but practical type system, not nearly as rich as + say haskell (XXX comparison makes no real sense, it's very different) RTyper ====== @@ -221,7 +222,7 @@ JIT - general idea =================== -* constant-propagate python bytecode into an interpreter +* constant-propagate python bytecode through the interpreter * may not yield good performance (our experiments show about 2x for removing intepretation overhead) @@ -244,7 +245,7 @@ * Promotion on certain paths to achieve "static-enough" parts -* Lazy allocation of objects (when they escape) +* Lazy allocation of objects (allocation only happens when the object escapes) * Use CPU stack and registers (we're not very good at it) @@ -279,7 +280,7 @@ * We dump colored graphs as a bytecode and interpret them * We could compile it, but interpreting dynamic - languages is easier than compiling (XXX???) + languages is easier than compiling (XXX??? (cfbolz: kill this)) XXX demo From arigo at codespeak.net Tue Mar 4 19:31:07 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 4 Mar 2008 19:31:07 +0100 (CET) Subject: [pypy-svn] r52167 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304183107.9B6EF169F61@codespeak.net> Author: arigo Date: Tue Mar 4 19:31:07 2008 New Revision: 52167 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: RPython is really designed to write interpreters in. Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 19:31:07 2008 @@ -88,7 +88,7 @@ * More static than Python -* Designed for speed +* Designed for speed, and designed for writing interpreters * Still high-level, fully analyzable From arigo at codespeak.net Tue Mar 4 19:39:00 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 4 Mar 2008 19:39:00 +0100 (CET) Subject: [pypy-svn] r52171 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304183900.41B6D169F79@codespeak.net> Author: arigo Date: Tue Mar 4 19:38:59 2008 New Revision: 52171 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: A couple of comments. Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 19:38:59 2008 @@ -101,7 +101,7 @@ XXX I would leave out the term abstract interpretation completely. just call it flow graph buildin * We start from importing python module -* Next step is to analyze the bytecode and to producet a forest of flow graphs +* Next step is to analyze the bytecode and to produce a forest of flow graphs * We call this abstract interpretation of bytecode @@ -190,8 +190,8 @@ * One cannot achieve C-level performance with static analyzis -* Theoretically, dynamic compilation can produce faster results - than static compilation +* Dynamic compilation can produce faster results + than static compilation (e.g. a good Java VM versus gcj) Traditional JIT approach ======================== @@ -235,6 +235,9 @@ * Enhance partial evaluation to be able to *promote* run-time value into compile-time +* Implementation-wise this is a generalization of polymorphic + in-line caches used in Java VM JITs + XXX put slide about virtualizables somewhere Concrete ingredients From lac at codespeak.net Tue Mar 4 21:43:57 2008 From: lac at codespeak.net (lac at codespeak.net) Date: Tue, 4 Mar 2008 21:43:57 +0100 (CET) Subject: [pypy-svn] r52172 - pypy/extradoc/talk/sfi2008 Message-ID: <20080304204357.AADBB169F52@codespeak.net> Author: lac Date: Tue Mar 4 21:43:55 2008 New Revision: 52172 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: lots of changes for reasons of grammar and good english sense. 2 things to remember. One 'like' should not be used in formal writing when you mean 'such as'. (Saying Laura lies Maciek is ok.) 2, even if you want to use the American spelling of analyze, analysis still has the S. Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Tue Mar 4 21:43:55 2008 @@ -10,7 +10,7 @@ * Example - Python -* Coded in low-level language, like C (or Java or C#) +* Coded in a low-level language, such as C (or Java or C#) * Hard-coded design decisions (garbage collection, threading model) @@ -31,9 +31,9 @@ Generating virtual machines instead of writing by hand ====================================================== -* Use high-level language +* Use a high-level language -* Use statically-analyzable language +* Use a statically analyzable language * Have a flexible compiler toolchain to do the job for you @@ -51,29 +51,29 @@ * Compile it to your platform (C/POSIX, .NET, ...) -Example of benefit from our architecture -======================================== +An Example of benefit from our architecture +=========================================== * Python has complicated semantics * Python guarantees that it won't segfault on C stack exhaustion -* CPython includes some stack checks in the source, but they don't catch all - cases +* CPython includes some stack checks in the source, but they don't catch every + case XXX segfault example * We include it automatically so all cases are guaranteed to be covered -Another example of static-analyzis of interpreter source +Another example of static analysis of interpreter source ======================================================== * sandboxing -* very small piece of code to trust +* a very small piece of code to trust -* changes every call to external function automatically +* changes every call to an external function automatically * build your own library (in python) which implements your own security policy @@ -83,7 +83,7 @@ RPython ======= -* We use RPython, a proper subset of python to implement +* We use RPython, a proper subset of Python to implement a Python interpreter * More static than Python @@ -92,20 +92,20 @@ * Still high-level, fully analyzable -* Interpreter itself (written in RPython) interprets - normal Python. +* The Interpreter itself (written in RPython) interprets + normal Python. XXX I would say the user's code does not have to be written inRPython as its own bullet here Abstract interpretation ======================= XXX I would leave out the term abstract interpretation completely. just call it flow graph buildin -* We start from importing python module +* We start by importing a python module -* Next step is to analyze the bytecode and to produce a forest of flow graphs +* Next we analyze the bytecode and produce a forest of flow graphs -* We call this abstract interpretation of bytecode +* We call this the abstract interpretation of bytecode -* Bytecode can be prepared dynamically (meta-programming) +* The bytecode can be prepared dynamically (meta-programming) Flow graphs =========== @@ -119,10 +119,10 @@ Annotation ========== -* A part which does the type inference over existing +* The part which does the type inference over existing graphs -* Powerful but practical type system, not nearly as rich as +* A Powerful but practical type system, not nearly as rich as say haskell (XXX comparison makes no real sense, it's very different) RTyper @@ -133,11 +133,11 @@ * Two type systems: - lltype, for backends that understand pointers, - structures etc. + structures etc. XXX its what they _don't understand that is important - ootype, for backends that have notion of objects -* lltype has more details, like implementation of strings +* lltype has more low-level details, such as an implementation of strings (ootype assumes strings built-in) Translation aspects @@ -157,7 +157,8 @@ * implemented as a translation aspect * things like write barriers are inserted automatically - (programmer have no need to worry about that) + (programmers have no need to worry about that) XXX you need to get rid of + that 'like'. What do we call them? Rewording the whole thing better. * different root finding strategies @@ -175,20 +176,19 @@ * llinterpreter - a virtual backend for running flow graphs directly, useful for testing -* for example, things like .NET bindings are - backend specific +* .NET bindings, for example, are backend specific -Special translation aspect -========================== +One Special translation aspect +============================== * generating Just-in-time compilers from interpreters JIT - motivation ================ -* Interpreters are way easier to write than compilers +* Interpreters are much easier to write than compilers -* One cannot achieve C-level performance with static analyzis +* One cannot achieve C-level performance with static analysis * Dynamic compilation can produce faster results than static compilation (e.g. a good Java VM versus gcj) @@ -204,8 +204,8 @@ * We can do better! -PyPy approach for jit -========================= +PyPy approach for JIT +===================== XXX include overview2.png @@ -214,10 +214,14 @@ * partial evaluation -* automatic move from interpreter to compiler -XXX futamura link - -* relatively little practical applications so far +* automatic move from the interpreter to the compiler +XXX futamura link XXX what does 'move' mean here? If it means what +I think it does, you need 'the interpreter' and 'the compiler' -- but +if it doesn't then this could be wrong. + +* relatively few practical applications so far XXX you mean 'there are +hardly any people using this technique', and not 'hardly any people +would find it useful to use this technique, correct? JIT - general idea =================== @@ -225,17 +229,17 @@ * constant-propagate python bytecode through the interpreter * may not yield good performance (our experiments show - about 2x for removing intepretation overhead) + about 2x for removing intepretation overhead) XXX slide? -* things like types still are not known +* things such as the types are still not known Solution: promotion =================== * Enhance partial evaluation to be able to *promote* run-time - value into compile-time + values into compile-time values -* Implementation-wise this is a generalization of polymorphic +* Implementation-wise this is a generalization of the polymorphic in-line caches used in Java VM JITs XXX put slide about virtualizables somewhere @@ -255,16 +259,16 @@ Irrelevant to program written ============================== -* Those techniques can be relatively easily applied - to different interpreters, just by hints +* These techniques can be applied relatively easily + to other interpreters, just by (XXX changing the ?) hints -* Or to any other programs written in RPython - (say templating language with templates being constant) +* Or to any other program written in RPython + (for instance a templating language where the templates are constant) JIT details - hint annotator -================================== +============================ -* Annotator is very similiar to normal one, it +* This annotator is very similiar to the normal one; it adds color propagation * Green - compile-time, can be constant-folded @@ -290,14 +294,14 @@ JIT details - backends ====================== -* JIT backends care for assembler generation +* JIT backends take care of (XXX is that what you meant?) assembler generation XXX I like 'JIT backends produce assembly code' lac * As usual, we plan to have many (PPC, i386, JVM, dummy one...) * They're very rudimentary right now -* It's relatively pleasant job to write python generating +* It's a relatively pleasant job to write Python that generates assembler code * We would definitely benefit from help from an assembler @@ -316,7 +320,7 @@ * About the same as gcc -O0 -* We can definitely do better, for example by enhancing backends +* We can definitely do better, for example by enhancing the backends * There is a lot of work to be done in JIT area @@ -328,7 +332,7 @@ * For long-enough running programs that's theoretically possible -* We have more information at runtime that one might have +* We have more information at runtime than one can have at compile-time JIT short term plans @@ -343,16 +347,17 @@ * We use test driven developement extensively -* We've got test suite which runs on a single processor for ~8 hours +* We've got a test suite which runs on a single processor for ~8 hours -* Special testing tool, py.test, little hassle and a lot of features +* Our special testing tool, py.test, little hassle and a lot of features +XXX add written by us? lac -* Sprint-driven developement +* Sprint-driven development It's not only technical =========================== -* EU Framework Programme 6th +* EU 6th Framework Programme * Actively searching for both grants and consultancy contracts From fijal at codespeak.net Tue Mar 4 23:20:04 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 23:20:04 +0100 (CET) Subject: [pypy-svn] r52174 - pypy/dist/lib-python/modified-2.4.1 Message-ID: <20080304222004.D445D169F7F@codespeak.net> Author: fijal Date: Tue Mar 4 23:20:03 2008 New Revision: 52174 Added: pypy/dist/lib-python/modified-2.4.1/locale.py - copied unchanged from r49005, pypy/dist/lib-python/2.4.1/locale.py Log: copy locale from 2.4.1 to modified From fijal at codespeak.net Tue Mar 4 23:21:59 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 23:21:59 +0100 (CET) Subject: [pypy-svn] r52175 - pypy/dist/lib-python/modified-2.4.1 Message-ID: <20080304222159.3DD8E168424@codespeak.net> Author: fijal Date: Tue Mar 4 23:21:58 2008 New Revision: 52175 Modified: pypy/dist/lib-python/modified-2.4.1/locale.py Log: (haypo) a modification of locale, from bugfix patch Modified: pypy/dist/lib-python/modified-2.4.1/locale.py ============================================================================== --- pypy/dist/lib-python/modified-2.4.1/locale.py (original) +++ pypy/dist/lib-python/modified-2.4.1/locale.py Tue Mar 4 23:21:58 2008 @@ -293,7 +293,7 @@ else: return language + '.' + encoding -def getdefaultlocale(envvars=('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG')): +def getdefaultlocale(envvars=('LC_ALL', 'LC_CTYPE', 'LANG', 'LANGUAGE')): """ Tries to determine the default locale settings and returns them as tuple (language code, encoding). @@ -338,6 +338,8 @@ for variable in envvars: localename = lookup(variable,None) if localename: + if variable == 'LANGUAGE': + localename = localename.split(':')[0] break else: localename = 'C' From fijal at codespeak.net Tue Mar 4 23:26:36 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 23:26:36 +0100 (CET) Subject: [pypy-svn] r52176 - pypy/dist/pypy/rlib Message-ID: <20080304222636.B190C169F5D@codespeak.net> Author: fijal Date: Tue Mar 4 23:26:36 2008 New Revision: 52176 Modified: pypy/dist/pypy/rlib/rstack.py Log: I would say this is sandboxsafe Modified: pypy/dist/pypy/rlib/rstack.py ============================================================================== --- pypy/dist/pypy/rlib/rstack.py (original) +++ pypy/dist/pypy/rlib/rstack.py Tue Mar 4 23:26:36 2008 @@ -38,7 +38,8 @@ stack_too_big = rffi.llexternal('LL_stack_too_big', [], rffi.INT, compilation_info=compilation_info, _nowrapper=True, - _callable=lambda: 0) + _callable=lambda: 0, + sandboxsafe=True) def stack_check(): if rffi.cast(lltype.Signed, stack_too_big()): From fijal at codespeak.net Tue Mar 4 23:34:28 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 23:34:28 +0100 (CET) Subject: [pypy-svn] r52177 - in pypy/dist/pypy/rpython/module: . test Message-ID: <20080304223428.69332169F5D@codespeak.net> Author: fijal Date: Tue Mar 4 23:34:28 2008 New Revision: 52177 Modified: pypy/dist/pypy/rpython/module/ll_os.py pypy/dist/pypy/rpython/module/test/test_posix.py Log: os.sysconf, rpython-level implementation Modified: pypy/dist/pypy/rpython/module/ll_os.py ============================================================================== --- pypy/dist/pypy/rpython/module/ll_os.py (original) +++ pypy/dist/pypy/rpython/module/ll_os.py Tue Mar 4 23:34:28 2008 @@ -416,6 +416,14 @@ return extdef([], (str, str, str, str, str), "ll_os.ll_uname", llimpl=uname_llimpl) + @registering_if(os, 'sysconf') + def register_os_sysconf(self): + c_sysconf = self.llexternal('sysconf', [rffi.INT], rffi.LONG) + + def sysconf_llimpl(i): + return c_sysconf(i) + return extdef([int], int, "ll_os.ll_sysconf", llimpl=sysconf_llimpl) + @registering_if(os, 'getuid') def register_os_getuid(self): return self.extdef_for_os_function_returning_int('getuid') Modified: pypy/dist/pypy/rpython/module/test/test_posix.py ============================================================================== --- pypy/dist/pypy/rpython/module/test/test_posix.py (original) +++ pypy/dist/pypy/rpython/module/test/test_posix.py Tue Mar 4 23:34:28 2008 @@ -130,7 +130,11 @@ return os.getuid() assert self.interpret(f, []) == f() - + if hasattr(os, 'sysconf'): + def test_os_sysconf(self): + def f(i): + return os.sysconf(i) + assert self.interpret(f, [13]) == f(13) def test_os_wstar(self): from pypy.rpython.module.ll_os import RegisterOs @@ -144,7 +148,6 @@ res = self.interpret(fun, [value]) assert res == fun(value) - class TestLLtype(BaseTestPosix, LLRtypeMixin): pass From fijal at codespeak.net Tue Mar 4 23:43:47 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 4 Mar 2008 23:43:47 +0100 (CET) Subject: [pypy-svn] r52178 - in pypy/dist/pypy/module/posix: . test Message-ID: <20080304224347.1235D169F6F@codespeak.net> Author: fijal Date: Tue Mar 4 23:43:45 2008 New Revision: 52178 Modified: pypy/dist/pypy/module/posix/__init__.py pypy/dist/pypy/module/posix/interp_posix.py pypy/dist/pypy/module/posix/test/test_posix2.py Log: Implement os.sysconf, applevel Modified: pypy/dist/pypy/module/posix/__init__.py ============================================================================== --- pypy/dist/pypy/module/posix/__init__.py (original) +++ pypy/dist/pypy/module/posix/__init__.py Tue Mar 4 23:43:45 2008 @@ -79,6 +79,9 @@ interpleveldefs['execve'] = 'interp_posix.execve' if hasattr(os, 'uname'): interpleveldefs['uname'] = 'interp_posix.uname' + if hasattr(os, 'sysconf'): + interpleveldefs['sysconf'] = 'interp_posix.sysconf' + interpleveldefs['sysconf_names'] = 'space.wrap(os.sysconf_names)' if hasattr(os, 'ttyname'): interpleveldefs['ttyname'] = 'interp_posix.ttyname' if hasattr(os, 'setsid'): Modified: pypy/dist/pypy/module/posix/interp_posix.py ============================================================================== --- pypy/dist/pypy/module/posix/interp_posix.py (original) +++ pypy/dist/pypy/module/posix/interp_posix.py Tue Mar 4 23:43:45 2008 @@ -609,3 +609,11 @@ except OSError, e: raise wrap_oserror(space, e) ttyname.unwrap_spec = [ObjSpace, int] + +def sysconf(space, w_num_or_name): + if space.is_true(space.isinstance(w_num_or_name, space.w_basestring)): + num = os.sysconf_names[space.str_w(w_num_or_name)] + else: + num = space.int_w(w_num_or_name) + return space.wrap(os.sysconf(num)) +sysconf.unwrap_spec = [ObjSpace, W_Root] Modified: pypy/dist/pypy/module/posix/test/test_posix2.py ============================================================================== --- pypy/dist/pypy/module/posix/test/test_posix2.py (original) +++ pypy/dist/pypy/module/posix/test/test_posix2.py Tue Mar 4 23:43:45 2008 @@ -37,6 +37,11 @@ cls.w_geteuid = space.wrap(os.geteuid()) if hasattr(os, 'getgid'): cls.w_getgid = space.wrap(os.getgid()) + if hasattr(os, 'sysconf'): + sysconf_name = os.sysconf_names.keys()[0] + cls.w_sysconf_name = space.wrap(sysconf_name) + cls.w_sysconf_value = space.wrap(os.sysconf_names[sysconf_name]) + cls.w_sysconf_result = space.wrap(os.sysconf(sysconf_name)) def setup_method(self, meth): if getattr(meth, 'need_sparse_files', False): @@ -303,6 +308,13 @@ os = self.posix assert os.getgid() == self.getgid + if hasattr(os, 'sysconf'): + def test_os_sysconf(self): + os = self.posix + assert os.sysconf(self.sysconf_value) == self.sysconf_result + assert os.sysconf(self.sysconf_name) == self.sysconf_result + assert os.sysconf_names[self.sysconf_name] == self.sysconf_value + def test_largefile(self): os = self.posix fd = os.open(self.path2, os.O_RDWR | os.O_CREAT, 0666) From fijal at codespeak.net Wed Mar 5 09:18:10 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 5 Mar 2008 09:18:10 +0100 (CET) Subject: [pypy-svn] r52180 - pypy/dist/pypy/translator/c Message-ID: <20080305081810.BEBED169F4B@codespeak.net> Author: fijal Date: Wed Mar 5 09:18:08 2008 New Revision: 52180 Modified: pypy/dist/pypy/translator/c/node.py Log: Leave comment. Modified: pypy/dist/pypy/translator/c/node.py ============================================================================== --- pypy/dist/pypy/translator/c/node.py (original) +++ pypy/dist/pypy/translator/c/node.py Wed Mar 5 09:18:08 2008 @@ -794,6 +794,8 @@ return [FunctionCodeGenerator(graph, db)] def select_function_code_generators(fnobj, db, functionname): + # XXX this logic is completely broken nowadays + # _external_name does not mean that this is done oldstyle sandbox = db.need_sandboxing(fnobj) if hasattr(fnobj, '_external_name'): if sandbox: From fijal at codespeak.net Wed Mar 5 10:57:37 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 5 Mar 2008 10:57:37 +0100 (CET) Subject: [pypy-svn] r52182 - in pypy/extradoc/talk/sfi2008: . ui Message-ID: <20080305095737.D3E1B169F57@codespeak.net> Author: fijal Date: Wed Mar 5 10:57:35 2008 New Revision: 52182 Added: pypy/extradoc/talk/sfi2008/overview1.png - copied unchanged from r52095, pypy/extradoc/talk/roadshow-google/overview1.png pypy/extradoc/talk/sfi2008/overview2.png - copied unchanged from r52095, pypy/extradoc/talk/roadshow-google/overview2.png pypy/extradoc/talk/sfi2008/ui/ - copied from r52095, pypy/extradoc/talk/roadshow-google/ui/ Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: * Add ui and pics * Update beginning of the talk a bit Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Wed Mar 5 10:57:35 2008 @@ -1,12 +1,14 @@ -Title slide +============== +PyPy ============== -Author: Maciej Fijalkowski -Title: PyPy - Automatic Generation of VMs for Dynamic Languages +:Author: Maciej Fijalkowski +:Title: PyPy - Automatic Generation of VMs for Dynamic Languages +:Date: 6th March 2008 -Writing virtual machine for a dynamic language -============================================== +VMs for dynamic languages +=================================== * Example - Python @@ -14,33 +16,50 @@ * Hard-coded design decisions (garbage collection, threading model) -Motivation - we can do better -============================= - -* Given m languages, n platforms and o important design decisions, - we've got n*m*o effort, we can do better. - -* We want n+m+o - * Primary example - CPython. - refcounting fixed hard to change - psyco, jit for python hard to maintain -Generating virtual machines instead of writing by hand -====================================================== +Ideally, we would... +==================== * Use a high-level language * Use a statically analyzable language -* Have a flexible compiler toolchain to do the job for you +* Have a flexible compiler toolchain to do part of the job for you + +Generating VMs +============== + +* Writing by hand is a lot of trouble + +* We want to perform each of the following once: + + - encode the language semantics + + - encode language-agnostic design decisions (ie threading model) + + - encode platform details + +PyPy Motivation +=============== + +* Create highly-flexible compiler toolchain + +* Use high-level language for encoding semantics + +* Use compiler toolchain to make things like JIT orthogonal to + language semantics encoding General idea ============ -XXX overview1.png +.. raw:: html + + Even more ========= @@ -92,13 +111,11 @@ * Still high-level, fully analyzable -* The Interpreter itself (written in RPython) interprets - normal Python. XXX I would say the user's code does not have to be written inRPython as its own bullet here +* User code (executed by the interpreter) is full python (not restricted) Abstract interpretation ======================= -XXX I would leave out the term abstract interpretation completely. just call it flow graph buildin * We start by importing a python module * Next we analyze the bytecode and produce a forest of flow graphs @@ -156,9 +173,7 @@ * implemented as a translation aspect -* things like write barriers are inserted automatically - (programmers have no need to worry about that) XXX you need to get rid of - that 'like'. What do we call them? Rewording the whole thing better. +* gc-specific things, such as write barriers, are inserted automatically * different root finding strategies @@ -166,6 +181,8 @@ * GCs are written in RPython as well +* Motivation: MMtk + Backends ======== @@ -207,21 +224,20 @@ PyPy approach for JIT ===================== -XXX include overview2.png +.. raw:: html + +
+ +
JIT - basics ============ * partial evaluation -* automatic move from the interpreter to the compiler -XXX futamura link XXX what does 'move' mean here? If it means what -I think it does, you need 'the interpreter' and 'the compiler' -- but -if it doesn't then this could be wrong. - -* relatively few practical applications so far XXX you mean 'there are -hardly any people using this technique', and not 'hardly any people -would find it useful to use this technique, correct? +* automatic generation of a compiler from an interpreter + +* relatively few practical applications so far JIT - general idea =================== @@ -229,7 +245,7 @@ * constant-propagate python bytecode through the interpreter * may not yield good performance (our experiments show - about 2x for removing intepretation overhead) XXX slide? + about 2x for removing intepretation overhead) * things such as the types are still not known @@ -260,7 +276,7 @@ ============================== * These techniques can be applied relatively easily - to other interpreters, just by (XXX changing the ?) hints + to other interpreters, just by adding a few hints * Or to any other program written in RPython (for instance a templating language where the templates are constant) @@ -286,15 +302,12 @@ * We dump colored graphs as a bytecode and interpret them -* We could compile it, but interpreting dynamic - languages is easier than compiling (XXX??? (cfbolz: kill this)) - XXX demo JIT details - backends ====================== -* JIT backends take care of (XXX is that what you meant?) assembler generation XXX I like 'JIT backends produce assembly code' lac +* JIT backends produce assembly code from coloured graphs * As usual, we plan to have many (PPC, i386, JVM, dummy one...) @@ -340,7 +353,11 @@ * Compile just hotspots (not everything) -XXX finish +* Extend backends and make them smarter + +* Make generating assembly code faster + +* Benchmark bottlenecks Developement technology ======================= @@ -350,7 +367,6 @@ * We've got a test suite which runs on a single processor for ~8 hours * Our special testing tool, py.test, little hassle and a lot of features -XXX add written by us? lac * Sprint-driven development @@ -364,6 +380,11 @@ Project future =============== -XXX +* More JIT work + +* Making PyPy's python interpreter run existing + applications + +* Interfacing with external libraries -... +* We're very friendly for newcomers From fijal at codespeak.net Wed Mar 5 11:08:50 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 5 Mar 2008 11:08:50 +0100 (CET) Subject: [pypy-svn] r52183 - pypy/extradoc/talk/sfi2008 Message-ID: <20080305100850.492F6169F75@codespeak.net> Author: fijal Date: Wed Mar 5 11:08:49 2008 New Revision: 52183 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: * Change wording * Affiliation Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Wed Mar 5 11:08:49 2008 @@ -3,7 +3,7 @@ PyPy ============== -:Author: Maciej Fijalkowski +:Author: Maciej Fijalkowski, merlinux GmbH :Title: PyPy - Automatic Generation of VMs for Dynamic Languages :Date: 6th March 2008 @@ -51,8 +51,9 @@ * Use high-level language for encoding semantics -* Use compiler toolchain to make things like JIT orthogonal to - language semantics encoding +* Use compiler toolchain to try hard to make + performance decisions orthogonal to language semantics + encoding General idea ============ @@ -66,7 +67,7 @@ * Take any interpreter, python, javascript, smalltalk... -* Make some decisions (whether to use jit, which gc) +* Make some decisions (which gc to use...) * Compile it to your platform (C/POSIX, .NET, ...) From fijal at codespeak.net Wed Mar 5 11:10:19 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 5 Mar 2008 11:10:19 +0100 (CET) Subject: [pypy-svn] r52184 - pypy/extradoc/talk/sfi2008 Message-ID: <20080305101019.F30C8169F75@codespeak.net> Author: fijal Date: Wed Mar 5 11:10:19 2008 New Revision: 52184 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: Change wording once again Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Wed Mar 5 11:10:19 2008 @@ -52,7 +52,7 @@ * Use high-level language for encoding semantics * Use compiler toolchain to try hard to make - performance decisions orthogonal to language semantics + things such as object model orthogonal to language semantics encoding General idea From arigo at codespeak.net Wed Mar 5 11:32:00 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 5 Mar 2008 11:32:00 +0100 (CET) Subject: [pypy-svn] r52185 - pypy/extradoc/talk/sfi2008/demo Message-ID: <20080305103200.9BD0C169F7F@codespeak.net> Author: arigo Date: Wed Mar 5 11:32:00 2008 New Revision: 52185 Added: pypy/extradoc/talk/sfi2008/demo/ pypy/extradoc/talk/sfi2008/demo/rainbow-view-jit-graphs (contents, props changed) pypy/extradoc/talk/sfi2008/demo/rpn.c (contents, props changed) pypy/extradoc/talk/sfi2008/demo/rpn.j pypy/extradoc/talk/sfi2008/demo/rpn.js pypy/extradoc/talk/sfi2008/demo/rpn.py (contents, props changed) pypy/extradoc/talk/sfi2008/demo/targetrpn.py (contents, props changed) pypy/extradoc/talk/sfi2008/demo/view-jit-graphs (contents, props changed) Log: * Add the rpn demo from the roadshow. * Port some stuff to the jit-refactoring branch. Added: pypy/extradoc/talk/sfi2008/demo/rainbow-view-jit-graphs ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/demo/rainbow-view-jit-graphs Wed Mar 5 11:32:00 2008 @@ -0,0 +1,23 @@ +#! /usr/bin/env python + +import rpn +from pypy.conftest import option +option.view = True +from pypy.rpython.module.support import LLSupport +from pypy.jit.rainbow.test.test_portal import P_OOPSPEC, TestPortal + +TestPortal.setup_class.im_func(TestPortal) +self = TestPortal() + +def main(example, arg): + if example == 1: + code = "24++3+" + elif example == 2: + code = "1+2+3+4+5+" + else: + raise ValueError + + return rpn.interpret(code, arg) + +self.timeshift_from_portal(main, rpn.interpret, + [1, 100], policy=P_OOPSPEC) Added: pypy/extradoc/talk/sfi2008/demo/rpn.c ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/demo/rpn.c Wed Mar 5 11:32:00 2008 @@ -0,0 +1,1926 @@ +/***********************************************************/ +/*** Implementations ***/ + +#define PYPY_NOT_MAIN_FILE +#include "common_header.h" +#include "structdef.h" +#include "forwarddecl.h" + +#define HAVE_RTYPER +typedef struct pypy_rpy_string0 RPyString; +typedef struct pypy_list0 RPyListOfString; +typedef struct pypy_tuple2_0 RPyFREXP_RESULT; +typedef struct pypy_tuple2_1 RPyMODF_RESULT; +typedef struct pypy_tuple10_0 RPySTAT_RESULT; +typedef struct pypy_tuple2_2 RPyPIPE_RESULT; +typedef struct pypy_tuple2_2 RPyWAITPID_RESULT; +#define _RPyListOfString_SetItem pypy_g__RPyListOfString_SetItem__listPtr_Signed_rpy_str +#define _RPyListOfString_GetItem pypy_g__RPyListOfString_GetItem__listPtr_Signed +#define RPyString_New pypy_g_RPyString_New__Signed +#define _RPyListOfString_New pypy_g__RPyListOfString_New__Signed +#define _RPyListOfString_Length pypy_g__RPyListOfString_Length__listPtr +typedef struct pypy_object_vtable0 *RPYTHON_EXCEPTION_VTABLE; +typedef struct pypy_object0 *RPYTHON_EXCEPTION; +#define RPYTHON_EXCEPTION_MATCH pypy_g_ll_issubclass__object_vtablePtr_object_vtablePtr +#define RPYTHON_TYPE_OF_EXC_INST pypy_g_ll_type__objectPtr +#define RPYTHON_RAISE_OSERROR pypy_g_ll_raise_OSError__Signed +#define _RPyExceptionOccurred pypy_g__RPyExceptionOccurred +#define RPyExceptionOccurred1 pypy_g_RPyExceptionOccurred +#define RPyFetchExceptionType pypy_g_RPyFetchExceptionType +#define RPyFetchExceptionValue pypy_g_RPyFetchExceptionValue +#define RPyClearException pypy_g_RPyClearException +#define RPyRaiseException pypy_g_RPyRaiseException +#define RPyExc_KeyError (&pypy_g_exceptions_KeyError.ke_super.le_super.se_super.e_super) +#define RPyExc_RuntimeError (&pypy_g_exceptions_RuntimeError.re_super.se_super.e_super) +#define RPyExc_MemoryError (&pypy_g_exceptions_MemoryError.me_super.se_super.e_super) +#define RPyExc_ZeroDivisionError (&pypy_g_exceptions_ZeroDivisionError.zde_super.ae_super.se_super.e_super) +#define RPyExc_IOError (&pypy_g_exceptions_IOError.ioe_super.ee_super.se_super.e_super) +#define RPyExc_StopIteration (&pypy_g_exceptions_StopIteration.si_super.e_super) +#define RPyExc_OverflowError (&pypy_g_exceptions_OverflowError.oe_super.ae_super.se_super.e_super) +#define RPyExc_TypeError (&pypy_g_exceptions_TypeError.te_super.se_super.e_super) +#define RPyExc_OSError (&pypy_g_exceptions_EnvironmentError.ee_super.se_super.e_super) +#define RPyExc_thread_error (&pypy_g_object) +#define RPyExc_AssertionError (&pypy_g_exceptions_AssertionError.ae_super.se_super.e_super) +#define RPyExc_ValueError (&pypy_g_exceptions_ValueError.ve_super.se_super.e_super) +#define RPyExc_IndexError (&pypy_g_exceptions_IndexError.ie_super.le_super.se_super.e_super) + +#include "src/g_include.h" + +/*/*/ +long pypy_g_entry_point(struct pypy_list0 *l_argv_0) { + bool_t l_v12; bool_t l_v17; bool_t l_v20; bool_t l_v26; bool_t l_v28; + bool_t l_v30; bool_t l_v33; bool_t l_v36; bool_t l_v39; bool_t l_v42; + bool_t l_v5; bool_t l_v9; long l_v0; long l_v11; long l_v16; + long l_v19; long l_v2; long l_v43; long l_v4; long l_v8; + struct pypy_array0 *l_v14; struct pypy_array0 *l_v22; + struct pypy_object_vtable0 *l_v25; struct pypy_object_vtable0 *l_v27; + struct pypy_object_vtable0 *l_v29; struct pypy_object_vtable0 *l_v32; + struct pypy_object_vtable0 *l_v35; struct pypy_object_vtable0 *l_v38; + struct pypy_object_vtable0 *l_v41; struct pypy_rpy_string0 *l_v1; + struct pypy_rpy_string0 *l_v23; struct pypy_rpy_string0 *l_v3; + + block0: + l_v4 = l_argv_0->l_length; + OP_INT_NE(l_v4, 3L, l_v5); + /* kept alive: l_argv_0 */ ; + if (l_v5) { + goto block7; + } + goto block1; + + block1: + RPyAssert(1, "unexpectedly negative list getitem index"); + l_v8 = l_argv_0->l_length; + OP_INT_LT(1L, l_v8, l_v9); + RPyAssert(l_v9, "list getitem index out of bound"); + l_v11 = l_argv_0->l_length; + OP_INT_LT(1L, l_v11, l_v12); + RPyAssert(l_v12, "getitem out of bounds"); + l_v14 = l_argv_0->l_items; + l_v3 = l_v14->items[1L]; + RPyAssert(1, "unexpectedly negative list getitem index"); + l_v16 = l_argv_0->l_length; + OP_INT_LT(2L, l_v16, l_v17); + RPyAssert(l_v17, "list getitem index out of bound"); + l_v19 = l_argv_0->l_length; + OP_INT_LT(2L, l_v19, l_v20); + RPyAssert(l_v20, "getitem out of bounds"); + l_v22 = l_argv_0->l_items; + l_v23 = l_v22->items[2L]; + /* kept alive: l_argv_0 */ ; + l_v2 = pypy_g_ll_int__rpy_stringPtr_Signed(l_v23, 10L); + l_v25 = (&pypy_g_ExcData)->ed_exc_type; + l_v26 = (l_v25 == NULL); + if (!l_v26) { + l_v43 = -1L; + goto block6; + } + goto block2; + + block2: + l_v0 = pypy_g_interpret(l_v3, l_v2); + l_v27 = (&pypy_g_ExcData)->ed_exc_type; + l_v28 = (l_v27 == NULL); + if (!l_v28) { + l_v43 = -1L; + goto block6; + } + goto block3; + + block3: + l_v1 = pypy_g_ll_int2dec__Signed(l_v0); + l_v29 = (&pypy_g_ExcData)->ed_exc_type; + l_v30 = (l_v29 == NULL); + if (!l_v30) { + l_v43 = -1L; + goto block6; + } + goto block4; + + block4: + pypy_g_rpython_print_item(l_v1); + l_v32 = (&pypy_g_ExcData)->ed_exc_type; + l_v33 = (l_v32 == NULL); + if (!l_v33) { + l_v43 = -1L; + goto block6; + } + goto block5; + + block5: + pypy_g_rpython_print_newline(); + l_v35 = (&pypy_g_ExcData)->ed_exc_type; + l_v36 = (l_v35 == NULL); + if (!l_v36) { + l_v43 = -1L; + goto block6; + } + l_v43 = 0L; + goto block6; + + block6: + RPY_DEBUG_RETURN(); + return l_v43; + + block7: + pypy_g_rpython_print_item(((struct pypy_rpy_string0 *)(void*)(&pypy_g_rpy_string))); + l_v38 = (&pypy_g_ExcData)->ed_exc_type; + l_v39 = (l_v38 == NULL); + if (!l_v39) { + l_v43 = -1L; + goto block6; + } + goto block8; + + block8: + pypy_g_rpython_print_newline(); + l_v41 = (&pypy_g_ExcData)->ed_exc_type; + l_v42 = (l_v41 == NULL); + if (!l_v42) { + l_v43 = -1L; + goto block6; + } + l_v43 = 2L; + goto block6; +} +/*/*/ +void pypy_g__RPyListOfString_SetItem__listPtr_Signed_rpy_str(struct pypy_list0 *l_l_0, long l_index_0, struct pypy_rpy_string0 *l_newstring_0) { + + block0: + pypy_g_ll_setitem_nonneg__dum_nocheckConst_listPtr_Sign(l_l_0, l_index_0, l_newstring_0); + goto block1; + + block1: + RPY_DEBUG_RETURN(); + return /* nothing */; +} +/*/*/ +struct pypy_rpy_string0 *pypy_g__RPyListOfString_GetItem__listPtr_Signed(struct pypy_list0 *l_l_1, long l_index_1) { + struct pypy_rpy_string0 *l_v46; + + block0: + l_v46 = pypy_g_ll_getitem_fast__listPtr_Signed(l_l_1, l_index_1); + goto block1; + + block1: + RPY_DEBUG_RETURN(); + return l_v46; +} +/*/*/ +struct pypy_rpy_string0 *pypy_g_RPyString_New__Signed(long l_length_0) { + struct pypy_rpy_string0 *l_v47; + + block0: + l_v47 = pypy_g_mallocstr__Signed(l_length_0); + goto block1; + + block1: + RPY_DEBUG_RETURN(); + return l_v47; +} +/*/*/ +struct pypy_list0 *pypy_g__RPyListOfString_New__Signed(long l_length_1) { + struct pypy_list0 *l_v48; + + block0: + l_v48 = pypy_g_ll_newlist__GcStruct_listLlT_Signed(l_length_1); + goto block1; + + block1: + RPY_DEBUG_RETURN(); + return l_v48; +} +/*/*/ +long pypy_g__RPyListOfString_Length__listPtr(struct pypy_list0 *l_l_2) { + long l_v49; + + block0: + l_v49 = pypy_g_ll_length__listPtr(l_l_2); + goto block1; + + block1: + RPY_DEBUG_RETURN(); + return l_v49; +} +/*/*/ +bool_t pypy_g_ll_issubclass__object_vtablePtr_object_vtablePtr(struct pypy_object_vtable0 *l_subcls_0, struct pypy_object_vtable0 *l_cls_0) { + bool_t l_v52; bool_t l_v54; bool_t l_v55; long l_v50; long l_v51; + long l_v53; + + block0: + l_v51 = l_cls_0->ov_subclassrange_min; + l_v50 = l_subcls_0->ov_subclassrange_min; + OP_INT_LE(l_v51, l_v50, l_v52); + if (l_v52) { + goto block2; + } + l_v55 = l_v52; + goto block1; + + block1: + RPY_DEBUG_RETURN(); + return l_v55; + + block2: + l_v53 = l_cls_0->ov_subclassrange_max; + OP_INT_LE(l_v50, l_v53, l_v54); + l_v55 = l_v54; + goto block1; +} +/*/*/ +struct pypy_object_vtable0 *pypy_g_ll_type__objectPtr(struct pypy_object0 *l_obj_0) { + struct pypy_object0 *l_v57; struct pypy_object_vtable0 *l_v56; + + block0: + l_v57 = (struct pypy_object0 *)l_obj_0; + l_v56 = l_v57->o_typeptr; + goto block1; + + block1: + RPY_DEBUG_RETURN(); + return l_v56; +} +/*/*/ +void pypy_g_ll_raise_OSError__Signed(long l_errno_0) { + bool_t l_v60; struct pypy_exceptions_OSError0 *l_v58; + struct pypy_object0 *l_v61; struct pypy_object_vtable0 *l_v64; + void* l_v59; + + block0: + l_v59 = pypy_g_ll_malloc_fixedsize_atomic__Signed_funcPtr((sizeof(struct pypy_exceptions_OSError0) * 1), ((void (*)(void*)) NULL)); + l_v58 = (struct pypy_exceptions_OSError0 *)l_v59; + l_v60 = (l_v58 != NULL); + if (!l_v60) { + goto block2; + } + goto block1; + + block1: + l_v61 = (struct pypy_object0 *)l_v58; + l_v61->o_typeptr = (&pypy_g_exceptions_OSError_vtable.ose_super.ee_super.se_super.e_super); + l_v58->ose_inst_errno = l_errno_0; + l_v64 = l_v61->o_typeptr; + pypy_g_RPyRaiseException(l_v64, l_v61); + goto block2; + + block2: + RPY_DEBUG_RETURN(); + return /* nothing */; +} +/*/*/ +long pypy_g__RPyExceptionOccurred(void) { + bool_t l_v69; long l_v67; struct pypy_object_vtable0 *l_v68; + + block0: + l_v68 = (&pypy_g_ExcData)->ed_exc_type; + l_v69 = (l_v68 != NULL); + OP_CAST_BOOL_TO_INT(l_v69, l_v67); + goto block1; + + block1: + return l_v67; +} +/*/*/ +bool_t pypy_g_RPyExceptionOccurred(void) { + bool_t l_v70; struct pypy_object_vtable0 *l_v71; + + block0: + l_v71 = (&pypy_g_ExcData)->ed_exc_type; + l_v70 = (l_v71 != NULL); + goto block1; + + block1: + return l_v70; +} +/*/*/ +struct pypy_object_vtable0 *pypy_g_RPyFetchExceptionType(void) { + struct pypy_object_vtable0 *l_v72; + + block0: + l_v72 = (&pypy_g_ExcData)->ed_exc_type; + goto block1; + + block1: + return l_v72; +} +/*/*/ +struct pypy_object0 *pypy_g_RPyFetchExceptionValue(void) { + struct pypy_object0 *l_v73; + + block0: + l_v73 = (&pypy_g_ExcData)->ed_exc_value; + goto block1; + + block1: + return l_v73; +} +/*/*/ +void pypy_g_RPyClearException(void) { + + block0: + (&pypy_g_ExcData)->ed_exc_type = ((struct pypy_object_vtable0 *) NULL); + (&pypy_g_ExcData)->ed_exc_value = ((struct pypy_object0 *) NULL); + goto block1; + + block1: + return /* nothing */; +} +/*/*/ +void pypy_g_RPyRaiseException(struct pypy_object_vtable0 *l_etype_0, struct pypy_object0 *l_evalue_0) { + + block0: + (&pypy_g_ExcData)->ed_exc_type = l_etype_0; + (&pypy_g_ExcData)->ed_exc_value = l_evalue_0; + goto block1; + + block1: + return /* nothing */; +} +/*/*/ +long pypy_g_ll_int__rpy_stringPtr_Signed(struct pypy_rpy_string0 *l_s_2, long l_base_1) { + long l_c_0; struct pypy_array1 *l_chars_0; long l_digit_0; + struct pypy_object_vtable0 *l_etype_1; + struct pypy_object0 *l_evalue_1; long l_i_1; long l_i_2; long l_i_3; + long l_oldpos_0; long l_sign_0; long l_strlen_0; bool_t l_v100; + bool_t l_v101; bool_t l_v102; bool_t l_v104; bool_t l_v108; + bool_t l_v111; bool_t l_v115; bool_t l_v120; bool_t l_v80; + bool_t l_v82; bool_t l_v83; bool_t l_v84; bool_t l_v86; bool_t l_v88; + bool_t l_v89; bool_t l_v90; bool_t l_v91; bool_t l_v92; bool_t l_v93; + bool_t l_v96; bool_t l_v99; char l_v114; char l_v119; char l_v85; + char l_v87; char l_v95; char l_v98; long l_v103; long l_v105; + long l_v106; long l_v107; long l_v109; long l_v110; long l_v112; + long l_v113; long l_v116; long l_v117; long l_v118; long l_v121; + long l_v122; long l_v94; long l_v97; long l_val_0; + + block0: + OP_INT_LE(2L, l_base_1, l_v80); + if (l_v80) { + goto block3; + } + l_etype_1 = (&pypy_g_exceptions_ValueError_vtable.ve_super.se_super.e_super); + l_evalue_1 = (&pypy_g_exceptions_ValueError.ve_super.se_super.e_super); + goto block1; + + block1: + pypy_g_RPyRaiseException(l_etype_1, l_evalue_1); + l_v122 = -1L; + goto block2; + + block2: + RPY_DEBUG_RETURN(); + return l_v122; + + block3: + OP_INT_LE(l_base_1, 36L, l_v82); + if (l_v82) { + goto block4; + } + l_etype_1 = (&pypy_g_exceptions_ValueError_vtable.ve_super.se_super.e_super); + l_evalue_1 = (&pypy_g_exceptions_ValueError.ve_super.se_super.e_super); + goto block1; + + block4: + l_chars_0 = &l_s_2->rs_chars; + l_strlen_0 = l_chars_0->length; + l_i_1 = 0L; + goto block5; + + block5: + OP_INT_LT(l_i_1, l_strlen_0, l_v83); + if (l_v83) { + goto block32; + } + goto block6; + + block6: + OP_INT_LT(l_i_1, l_strlen_0, l_v84); + if (l_v84) { + goto block7; + } + l_etype_1 = (&pypy_g_exceptions_ValueError_vtable.ve_super.se_super.e_super); + l_evalue_1 = (&pypy_g_exceptions_ValueError.ve_super.se_super.e_super); + goto block1; + + block7: + l_v85 = l_chars_0->items[l_i_1]; + OP_CHAR_EQ(l_v85, '-', l_v86); + if (l_v86) { + goto block31; + } + goto block8; + + block8: + l_v87 = l_chars_0->items[l_i_1]; + OP_CHAR_EQ(l_v87, '+', l_v88); + if (l_v88) { + goto block30; + } + l_sign_0 = 1L; + l_oldpos_0 = l_i_1; + goto block9; + + block9: + OP_INT_LT(l_oldpos_0, l_strlen_0, l_v89); + if (l_v89) { + goto block28; + } + l_val_0 = 0L; + l_i_2 = l_oldpos_0; + goto block10; + + block10: + OP_INT_LT(l_i_2, l_strlen_0, l_v90); + if (l_v90) { + goto block17; + } + goto block11; + + block11: + OP_INT_EQ(l_i_2, l_oldpos_0, l_v91); + if (l_v91) { + l_etype_1 = (&pypy_g_exceptions_ValueError_vtable.ve_super.se_super.e_super); + l_evalue_1 = (&pypy_g_exceptions_ValueError.ve_super.se_super.e_super); + goto block1; + } + l_i_3 = l_i_2; + goto block12; + + block12: + OP_INT_LT(l_i_3, l_strlen_0, l_v92); + if (l_v92) { + goto block15; + } + goto block13; + + block13: + OP_INT_EQ(l_i_3, l_strlen_0, l_v93); + if (l_v93) { + goto block14; + } + l_etype_1 = (&pypy_g_exceptions_ValueError_vtable.ve_super.se_super.e_super); + l_evalue_1 = (&pypy_g_exceptions_ValueError.ve_super.se_super.e_super); + goto block1; + + block14: + OP_INT_MUL(l_sign_0, l_val_0, l_v94); + l_v122 = l_v94; + goto block2; + + block15: + l_v95 = l_chars_0->items[l_i_3]; + OP_CHAR_EQ(l_v95, ' ', l_v96); + if (l_v96) { + goto block16; + } + goto block13; + + block16: + OP_INT_ADD(l_i_3, 1L, l_v97); + l_i_3 = l_v97; + goto block12; + + block17: + l_v98 = l_chars_0->items[l_i_2]; + OP_CAST_CHAR_TO_INT(l_v98, l_c_0); + OP_INT_LE(97L, l_c_0, l_v99); + if (l_v99) { + goto block26; + } + goto block18; + + block18: + OP_INT_LE(65L, l_c_0, l_v100); + if (l_v100) { + goto block24; + } + goto block19; + + block19: + OP_INT_LE(48L, l_c_0, l_v101); + if (l_v101) { + goto block20; + } + goto block11; + + block20: + OP_INT_LE(l_c_0, 57L, l_v102); + if (l_v102) { + goto block21; + } + goto block11; + + block21: + OP_INT_SUB(l_c_0, 48L, l_v103); + l_digit_0 = l_v103; + goto block22; + + block22: + OP_INT_GE(l_digit_0, l_base_1, l_v104); + if (l_v104) { + goto block11; + } + goto block23; + + block23: + OP_INT_MUL(l_val_0, l_base_1, l_v105); + OP_INT_ADD(l_v105, l_digit_0, l_v106); + OP_INT_ADD(l_i_2, 1L, l_v107); + l_val_0 = l_v106; + l_i_2 = l_v107; + goto block10; + + block24: + OP_INT_LE(l_c_0, 90L, l_v108); + if (l_v108) { + goto block25; + } + goto block19; + + block25: + OP_INT_SUB(l_c_0, 65L, l_v109); + OP_INT_ADD(l_v109, 10L, l_v110); + l_digit_0 = l_v110; + goto block22; + + block26: + OP_INT_LE(l_c_0, 122L, l_v111); + if (l_v111) { + goto block27; + } + goto block18; + + block27: + OP_INT_SUB(l_c_0, 97L, l_v112); + OP_INT_ADD(l_v112, 10L, l_v113); + l_digit_0 = l_v113; + goto block22; + + block28: + l_v114 = l_chars_0->items[l_oldpos_0]; + OP_CHAR_EQ(l_v114, ' ', l_v115); + if (l_v115) { + goto block29; + } + l_val_0 = 0L; + l_i_2 = l_oldpos_0; + goto block10; + + block29: + OP_INT_ADD(l_oldpos_0, 1L, l_v116); + l_oldpos_0 = l_v116; + goto block9; + + block30: + OP_INT_ADD(l_i_1, 1L, l_v117); + l_sign_0 = 1L; + l_oldpos_0 = l_v117; + goto block9; + + block31: + OP_INT_ADD(l_i_1, 1L, l_v118); + l_sign_0 = -1L; + l_oldpos_0 = l_v118; + goto block9; + + block32: + l_v119 = l_chars_0->items[l_i_1]; + OP_CHAR_EQ(l_v119, ' ', l_v120); + if (l_v120) { + goto block33; + } + goto block6; + + block33: + OP_INT_ADD(l_i_1, 1L, l_v121); + l_i_1 = l_v121; + goto block5; +} +/*/*/ +long pypy_g_interpret(struct pypy_rpy_string0 *l_v123, long l_arg_0) { + char l_c_1; struct pypy_rpn_State0 *l_state_0; bool_t l_v137; + bool_t l_v142; bool_t l_v145; bool_t l_v152; bool_t l_v155; + bool_t l_v157; bool_t l_v165; bool_t l_v167; bool_t l_v169; + bool_t l_v172; bool_t l_v173; bool_t l_v177; bool_t l_v181; + bool_t l_v183; bool_t l_v194; bool_t l_v196; bool_t l_v199; + long l_v124; long l_v126; long l_v129; long l_v130; long l_v131; + long l_v132; long l_v133; long l_v151; long l_v156; long l_v164; + long l_v174; long l_v176; long l_v182; long l_v191; long l_v193; + long l_v198; long l_v202; long l_v206; struct pypy_array1 *l_v127; + struct pypy_array3 *l_v135; struct pypy_array3 *l_v150; + struct pypy_array3 *l_v159; struct pypy_array3 *l_v175; + struct pypy_array3 *l_v185; struct pypy_array3 *l_v201; + struct pypy_list1 *l_v125; struct pypy_list1 *l_v128; + struct pypy_list1 *l_v134; struct pypy_list1 *l_v190; + struct pypy_object0 *l_v138; struct pypy_object_vtable0 *l_v154; + struct pypy_object_vtable0 *l_v171; + struct pypy_object_vtable0 *l_v180; void* l_v136; void* l_v141; + void* l_v144; + + block0: + l_v136 = pypy_g_ll_malloc_fixedsize__Signed_funcPtr((sizeof(struct pypy_rpn_State0) * 1), ((void (*)(void*)) NULL)); + l_state_0 = (struct pypy_rpn_State0 *)l_v136; + l_v137 = (l_state_0 != NULL); + if (!l_v137) { + l_v206 = -1L; + goto block10; + } + goto block1; + + block1: + l_v138 = (struct pypy_object0 *)l_state_0; + l_v138->o_typeptr = (&pypy_g_rpn_State_vtable.s_super); + RPyAssert(1, "negative list length"); + l_v141 = pypy_g_ll_malloc_fixedsize__Signed_funcPtr((sizeof(struct pypy_list1) * 1), ((void (*)(void*)) NULL)); + l_v134 = (struct pypy_list1 *)l_v141; + l_v142 = (l_v134 != NULL); + if (!l_v142) { + l_v206 = -1L; + goto block10; + } + goto block2; + + block2: + l_v134->l_length = 0L; + l_v144 = pypy_g_ll_malloc_varsize__Signed_Signed_Signed_Signed(0L, (offsetof(struct pypy_array3, items) + (sizeof(long) * 0)), (sizeof(long) * 1), offsetof(struct pypy_array3, length)); + l_v135 = (struct pypy_array3 *)l_v144; + l_v145 = (l_v135 != NULL); + if (!l_v145) { + l_v206 = -1L; + goto block10; + } + goto block3; + + block3: + l_v134->l_items = l_v135; + l_state_0->s_inst_stack = l_v134; + /* kept alive: l_state_0 */ ; + l_v125 = l_state_0->s_inst_stack; + l_v131 = l_v125->l_length; + /* kept alive: l_v125 */ ; + OP_INT_ADD(l_v131, 1L, l_v132); + l_v150 = l_v125->l_items; + l_v151 = l_v150->length; + OP_INT_GE(l_v151, l_v132, l_v152); + if (l_v152) { + goto block17; + } + goto block4; + + block4: + pypy_g__ll_list_resize_really__listPtr_Signed(l_v125, l_v132); + l_v154 = (&pypy_g_ExcData)->ed_exc_type; + l_v155 = (l_v154 == NULL); + if (!l_v155) { + l_v206 = -1L; + goto block10; + } + goto block5; + + block5: + l_v156 = l_v125->l_length; + OP_INT_LT(l_v131, l_v156, l_v157); + RPyAssert(l_v157, "setitem out of bounds"); + l_v159 = l_v125->l_items; + l_v159->items[l_v131] = l_arg_0; + /* kept alive: l_v125 */ ; + /* kept alive: l_state_0 */ ; + /* kept alive: l_v123 */ ; + l_v133 = 0L; + goto block6; + + block6: + l_v127 = &l_v123->rs_chars; + l_v164 = l_v127->length; + OP_INT_GE(l_v133, l_v164, l_v165); + /* kept alive: l_v123 */ ; + if (l_v165) { + goto block16; + } + goto block7; + + block7: + OP_INT_ADD(l_v133, 1L, l_v129); + l_c_1 = l_v127->items[l_v133]; + OP_CHAR_LE('0', l_c_1, l_v167); + /* kept alive: l_v123 */ ; + if (l_v167) { + goto block11; + } + goto block8; + + block8: + OP_CHAR_EQ(l_c_1, '+', l_v169); + if (l_v169) { + goto block9; + } + l_v133 = l_v129; + goto block6; + + block9: + pypy_g_State_add(l_state_0); + l_v171 = (&pypy_g_ExcData)->ed_exc_type; + l_v172 = (l_v171 == NULL); + if (!l_v172) { + l_v206 = -1L; + goto block10; + } + l_v133 = l_v129; + goto block6; + + block10: + RPY_DEBUG_RETURN(); + return l_v206; + + block11: + OP_CHAR_LE(l_c_1, '9', l_v173); + if (l_v173) { + goto block12; + } + goto block8; + + block12: + OP_CAST_CHAR_TO_INT(l_c_1, l_v174); + OP_INT_SUB(l_v174, 48L, l_v124); + l_v128 = l_state_0->s_inst_stack; + l_v126 = l_v128->l_length; + OP_INT_ADD(l_v126, 1L, l_v130); + l_v175 = l_v128->l_items; + l_v176 = l_v175->length; + OP_INT_GE(l_v176, l_v130, l_v177); + /* kept alive: l_v128 */ ; + if (l_v177) { + goto block15; + } + goto block13; + + block13: + pypy_g__ll_list_resize_really__listPtr_Signed(l_v128, l_v130); + l_v180 = (&pypy_g_ExcData)->ed_exc_type; + l_v181 = (l_v180 == NULL); + if (!l_v181) { + l_v206 = -1L; + goto block10; + } + goto block14; + + block14: + l_v182 = l_v128->l_length; + OP_INT_LT(l_v126, l_v182, l_v183); + RPyAssert(l_v183, "setitem out of bounds"); + l_v185 = l_v128->l_items; + l_v185->items[l_v126] = l_v124; + /* kept alive: l_v128 */ ; + /* kept alive: l_state_0 */ ; + l_v133 = l_v129; + goto block6; + + block15: + l_v128->l_length = l_v130; + goto block14; + + block16: + l_v190 = l_state_0->s_inst_stack; + l_v191 = l_v190->l_length; + /* kept alive: l_v123 */ ; + OP_INT_ADD(-1L, l_v191, l_v193); + OP_INT_GE(l_v193, 0L, l_v194); + RPyAssert(l_v194, "negative list getitem index out of bound"); + OP_INT_LT(l_v193, l_v191, l_v196); + RPyAssert(l_v196, "list getitem index out of bound"); + l_v198 = l_v190->l_length; + OP_INT_LT(l_v193, l_v198, l_v199); + RPyAssert(l_v199, "getitem out of bounds"); + l_v201 = l_v190->l_items; + l_v202 = l_v201->items[l_v193]; + /* kept alive: l_v190 */ ; + /* kept alive: l_state_0 */ ; + l_v206 = l_v202; + goto block10; + + block17: + l_v125->l_length = l_v132; + goto block5; +} +/*/*/ +struct pypy_rpy_string0 *pypy_g_ll_int2dec__Signed(long l_i_0) { + unsigned long l_i_4; unsigned long l_i_5; long l_j_0; long l_len_0; + long l_sign_1; bool_t l_v211; bool_t l_v212; bool_t l_v214; + bool_t l_v215; bool_t l_v216; bool_t l_v219; bool_t l_v220; + bool_t l_v223; bool_t l_v224; char l_v227; char l_v236; long l_v209; + long l_v225; long l_v226; long l_v230; long l_v235; long l_v239; + long l_v241; long l_v244; struct pypy_array1 *l_v228; + struct pypy_array1 *l_v231; struct pypy_array4 *l_v207; + struct pypy_rpy_string0 *l_v208; struct pypy_rpy_string0 *l_v243; + unsigned long l_v213; unsigned long l_v233; unsigned long l_v234; + unsigned long l_v238; unsigned long l_v242; void* l_v210; + void* l_v218; + + block0: + l_v210 = pypy_g_ll_malloc_varsize__Signed_Signed_Signed_Signed(20L, (offsetof(struct pypy_array4, items) + (sizeof(char) * 0)), (sizeof(char) * 1), offsetof(struct pypy_array4, length)); + l_v207 = (struct pypy_array4 *)l_v210; + l_v211 = (l_v207 != NULL); + if (!l_v211) { + l_v243 = ((struct pypy_rpy_string0 *) NULL); + goto block10; + } + goto block1; + + block1: + OP_INT_LT(l_i_0, 0L, l_v212); + if (l_v212) { + goto block15; + } + goto block2; + + block2: + OP_CAST_INT_TO_UINT(l_i_0, l_v213); + l_sign_1 = 0L; + l_i_5 = l_v213; + goto block3; + + block3: + OP_UINT_EQ(l_i_5, 0UL, l_v214); + if (l_v214) { + goto block14; + } + l_len_0 = 0L; + l_i_4 = l_i_5; + goto block4; + + block4: + OP_UINT_IS_TRUE(l_i_4, l_v215); + if (l_v215) { + goto block13; + } + l_v244 = l_len_0; + goto block5; + + block5: + OP_INT_ADD(l_v244, l_sign_1, l_v209); + OP_INT_GE(l_v209, 0L, l_v216); + RPyAssert(l_v216, "negative string length"); + l_v218 = pypy_g_ll_malloc_varsize__Signed_Signed_Signed_Signed(l_v209, (offsetof(struct pypy_rpy_string0, rs_chars) + offsetof(struct pypy_array1, items) + (sizeof(char) * 1)), (sizeof(char) * 1), (offsetof(struct pypy_rpy_string0, rs_chars) + offsetof(struct pypy_array1, length))); + l_v208 = (struct pypy_rpy_string0 *)l_v218; + l_v219 = (l_v208 != NULL); + if (!l_v219) { + l_v243 = ((struct pypy_rpy_string0 *) NULL); + goto block10; + } + goto block6; + + block6: + OP_INT_IS_TRUE(MALLOC_ZERO_FILLED, l_v220); + if (l_v220) { + goto block8; + } + goto block7; + + block7: + l_v208->rs_hash = 0L; + goto block8; + + block8: + l_v208->rs_hash = 0L; + OP_INT_IS_TRUE(l_sign_1, l_v223); + if (l_v223) { + goto block12; + } + l_j_0 = 0L; + goto block9; + + block9: + OP_INT_LT(l_j_0, l_v209, l_v224); + if (l_v224) { + goto block11; + } + l_v243 = l_v208; + goto block10; + + block10: + RPY_DEBUG_RETURN(); + return l_v243; + + block11: + OP_INT_SUB(l_v209, l_j_0, l_v225); + OP_INT_SUB(l_v225, 1L, l_v226); + l_v227 = l_v207->items[l_v226]; + l_v228 = &l_v208->rs_chars; + l_v228->items[l_j_0] = l_v227; + OP_INT_ADD(l_j_0, 1L, l_v230); + l_j_0 = l_v230; + goto block9; + + block12: + l_v231 = &l_v208->rs_chars; + l_v231->items[0L] = '-'; + l_j_0 = 1L; + goto block9; + + block13: + OP_UINT_MOD(l_i_4, 10UL, l_v233); + OP_UINT_ADD(l_v233, 48UL, l_v234); + OP_CAST_UINT_TO_INT(l_v234, l_v235); + OP_CAST_INT_TO_CHAR(l_v235, l_v236); + l_v207->items[l_len_0] = l_v236; + OP_UINT_FLOORDIV(l_i_4, 10UL, l_v238); + OP_INT_ADD(l_len_0, 1L, l_v239); + l_len_0 = l_v239; + l_i_4 = l_v238; + goto block4; + + block14: + l_v207->items[0L] = '0'; + l_v244 = 1L; + goto block5; + + block15: + OP_INT_NEG(l_i_0, l_v241); + OP_CAST_INT_TO_UINT(l_v241, l_v242); + l_sign_1 = 1L; + l_i_5 = l_v242; + goto block3; +} +/*/*/ +void pypy_g_rpython_print_item(struct pypy_rpy_string0 *l_v247) { + bool_t l_v256; bool_t l_v260; bool_t l_v265; bool_t l_v267; + bool_t l_v275; bool_t l_v280; bool_t l_v282; char l_v245; + long l_v246; long l_v248; long l_v249; long l_v251; long l_v252; + long l_v253; long l_v255; long l_v259; long l_v266; long l_v274; + long l_v281; struct pypy_array1 *l_v250; struct pypy_array5 *l_v258; + struct pypy_array5 *l_v269; struct pypy_array5 *l_v273; + struct pypy_array5 *l_v284; struct pypy_object_vtable0 *l_v264; + struct pypy_object_vtable0 *l_v279; + + block0: + /* kept alive: l_v247 */ ; + l_v251 = 0L; + goto block1; + + block1: + l_v250 = &l_v247->rs_chars; + l_v255 = l_v250->length; + OP_INT_GE(l_v251, l_v255, l_v256); + /* kept alive: l_v247 */ ; + if (l_v256) { + goto block7; + } + goto block2; + + block2: + OP_INT_ADD(l_v251, 1L, l_v246); + l_v245 = l_v250->items[l_v251]; + l_v248 = (&pypy_g_list)->l_length; + OP_INT_ADD(l_v248, 1L, l_v252); + l_v258 = (&pypy_g_list)->l_items; + l_v259 = l_v258->length; + OP_INT_GE(l_v259, l_v252, l_v260); + /* kept alive: l_v247 */ ; + /* kept alive: (&pypy_g_list) */ ; + if (l_v260) { + goto block6; + } + goto block3; + + block3: + pypy_g__ll_list_resize_really__listPtr_Signed_1((&pypy_g_list), l_v252); + l_v264 = (&pypy_g_ExcData)->ed_exc_type; + l_v265 = (l_v264 == NULL); + if (!l_v265) { + goto block5; + } + goto block4; + + block4: + l_v266 = (&pypy_g_list)->l_length; + OP_INT_LT(l_v248, l_v266, l_v267); + RPyAssert(l_v267, "setitem out of bounds"); + l_v269 = (&pypy_g_list)->l_items; + l_v269->items[l_v248] = l_v245; + /* kept alive: (&pypy_g_list) */ ; + l_v251 = l_v246; + goto block1; + + block5: + RPY_DEBUG_RETURN(); + return /* nothing */; + + block6: + (&pypy_g_list)->l_length = l_v252; + goto block4; + + block7: + l_v249 = (&pypy_g_list)->l_length; + OP_INT_ADD(l_v249, 1L, l_v253); + l_v273 = (&pypy_g_list)->l_items; + l_v274 = l_v273->length; + OP_INT_GE(l_v274, l_v253, l_v275); + /* kept alive: l_v247 */ ; + /* kept alive: (&pypy_g_list) */ ; + if (l_v275) { + goto block10; + } + goto block8; + + block8: + pypy_g__ll_list_resize_really__listPtr_Signed_1((&pypy_g_list), l_v253); + l_v279 = (&pypy_g_ExcData)->ed_exc_type; + l_v280 = (l_v279 == NULL); + if (!l_v280) { + goto block5; + } + goto block9; + + block9: + l_v281 = (&pypy_g_list)->l_length; + OP_INT_LT(l_v249, l_v281, l_v282); + RPyAssert(l_v282, "setitem out of bounds"); + l_v284 = (&pypy_g_list)->l_items; + l_v284->items[l_v249] = ' '; + /* kept alive: (&pypy_g_list) */ ; + goto block5; + + block10: + (&pypy_g_list)->l_length = l_v253; + goto block9; +} +/*/*/ +void pypy_g_rpython_print_newline(void) { + long l_i_6; struct pypy_array1 *l_res_chars_0; bool_t l_v293; + bool_t l_v297; bool_t l_v299; bool_t l_v302; bool_t l_v307; + bool_t l_v310; bool_t l_v311; bool_t l_v313; bool_t l_v318; + bool_t l_v324; bool_t l_v327; char l_v329; long l_v291; long l_v292; + long l_v294; long l_v295; long l_v296; long l_v301; long l_v316; + long l_v321; long l_v322; long l_v323; long l_v331; + struct pypy_array5 *l_v289; struct pypy_array5 *l_v304; + struct pypy_array5 *l_v320; struct pypy_object_vtable0 *l_v326; + struct pypy_rpy_string0 *l_v290; struct pypy_rpy_string0 *l_v333; + void* l_v309; + + block0: + l_v292 = (&pypy_g_list)->l_length; + OP_INT_NE(l_v292, 0L, l_v293); + if (l_v293) { + goto block3; + } + l_v333 = (&pypy_g_rpy_string_1); + goto block1; + + block1: + l_v294 = pypy_g_os_write_lltypeimpl(1L, l_v333); + goto block2; + + block2: + RPY_DEBUG_RETURN(); + return /* nothing */; + + block3: + l_v295 = (&pypy_g_list)->l_length; + OP_INT_ADD(-1L, l_v295, l_v296); + OP_INT_GE(l_v296, 0L, l_v297); + RPyAssert(l_v297, "negative list setitem index out of bound"); + OP_INT_LT(l_v296, l_v295, l_v299); + RPyAssert(l_v299, "list setitem index out of bound"); + l_v301 = (&pypy_g_list)->l_length; + OP_INT_LT(l_v296, l_v301, l_v302); + RPyAssert(l_v302, "setitem out of bounds"); + l_v304 = (&pypy_g_list)->l_items; + l_v304->items[l_v296] = 10; + /* kept alive: (&pypy_g_list) */ ; + l_v291 = (&pypy_g_list)->l_length; + l_v289 = (&pypy_g_list)->l_items; + OP_INT_GE(l_v291, 0L, l_v307); + RPyAssert(l_v307, "negative string length"); + l_v309 = pypy_g_ll_malloc_varsize__Signed_Signed_Signed_Signed(l_v291, (offsetof(struct pypy_rpy_string0, rs_chars) + offsetof(struct pypy_array1, items) + (sizeof(char) * 1)), (sizeof(char) * 1), (offsetof(struct pypy_rpy_string0, rs_chars) + offsetof(struct pypy_array1, length))); + l_v290 = (struct pypy_rpy_string0 *)l_v309; + l_v310 = (l_v290 != NULL); + if (!l_v310) { + goto block2; + } + goto block4; + + block4: + OP_INT_IS_TRUE(MALLOC_ZERO_FILLED, l_v311); + if (l_v311) { + goto block6; + } + goto block5; + + block5: + l_v290->rs_hash = 0L; + goto block6; + + block6: + l_res_chars_0 = &l_v290->rs_chars; + l_i_6 = 0L; + goto block7; + + block7: + OP_INT_LT(l_i_6, l_v291, l_v313); + if (l_v313) { + goto block11; + } + goto block8; + + block8: + /* kept alive: l_v289 */ ; + RPyAssert(1, "del l[start:] with unexpectedly negative start"); + l_v316 = (&pypy_g_list)->l_length; + /* kept alive: (&pypy_g_list) */ ; + OP_INT_LE(0L, l_v316, l_v318); + RPyAssert(l_v318, "del l[start:] with start > len(l)"); + l_v320 = (&pypy_g_list)->l_items; + l_v321 = l_v320->length; + OP_INT_RSHIFT(l_v321, 1L, l_v322); + OP_INT_SUB(l_v322, 5L, l_v323); + OP_INT_GE(0L, l_v323, l_v324); + if (l_v324) { + goto block10; + } + goto block9; + + block9: + pypy_g__ll_list_resize_really__listPtr_Signed_1((&pypy_g_list), 0L); + l_v326 = (&pypy_g_ExcData)->ed_exc_type; + l_v327 = (l_v326 == NULL); + if (!l_v327) { + goto block2; + } + l_v333 = l_v290; + goto block1; + + block10: + (&pypy_g_list)->l_length = 0L; + l_v333 = l_v290; + goto block1; + + block11: + l_v329 = l_v289->items[l_i_6]; + l_res_chars_0->items[l_i_6] = l_v329; + OP_INT_ADD(l_i_6, 1L, l_v331); + l_i_6 = l_v331; + goto block7; +} +/*/*/ +void pypy_g_ll_setitem_nonneg__dum_nocheckConst_listPtr_Sign(struct pypy_list0 *l_l_3, long l_index_2, struct pypy_rpy_string0 *l_newitem_0) { + bool_t l_v334; bool_t l_v338; long l_v337; struct pypy_list0 *l_v336; + struct pypy_list0 *l_v340; + + block0: + OP_INT_GE(l_index_2, 0L, l_v334); + RPyAssert(l_v334, "unexpectedly negative list setitem index"); + l_v336 = l_l_3; + l_v337 = pypy_g_ll_length__listPtr(l_v336); + OP_INT_LT(l_index_2, l_v337, l_v338); + RPyAssert(l_v338, "list setitem index out of bound"); + l_v340 = l_l_3; + pypy_g_ll_setitem_fast__listPtr_Signed_rpy_stringPtr(l_v340, l_index_2, l_newitem_0); + goto block1; + + block1: + RPY_DEBUG_RETURN(); + return /* nothing */; +} +/*/*/ +struct pypy_rpy_string0 *pypy_g_ll_getitem_fast__listPtr_Signed(struct pypy_list0 *l_l_4, long l_index_3) { + bool_t l_v345; long l_v344; struct pypy_array0 *l_v347; + struct pypy_rpy_string0 *l_v343; + + block0: + l_v344 = l_l_4->l_length; + OP_INT_LT(l_index_3, l_v344, l_v345); + RPyAssert(l_v345, "getitem out of bounds"); + l_v347 = l_l_4->l_items; + /* kept alive: l_l_4 */ ; + l_v343 = l_v347->items[l_index_3]; + goto block1; + + block1: + RPY_DEBUG_RETURN(); + return l_v343; +} +/*/*/ +struct pypy_rpy_string0 *pypy_g_mallocstr__Signed(long l_length_2) { + bool_t l_v350; bool_t l_v353; bool_t l_v354; + struct pypy_rpy_string0 *l_v349; struct pypy_rpy_string0 *l_v356; + void* l_v352; + + block0: + OP_INT_GE(l_length_2, 0L, l_v350); + RPyAssert(l_v350, "negative string length"); + l_v352 = pypy_g_ll_malloc_varsize__Signed_Signed_Signed_Signed(l_length_2, (offsetof(struct pypy_rpy_string0, rs_chars) + offsetof(struct pypy_array1, items) + (sizeof(char) * 1)), (sizeof(char) * 1), (offsetof(struct pypy_rpy_string0, rs_chars) + offsetof(struct pypy_array1, length))); + l_v349 = (struct pypy_rpy_string0 *)l_v352; + l_v353 = (l_v349 != NULL); + if (!l_v353) { + l_v356 = ((struct pypy_rpy_string0 *) NULL); + goto block3; + } + goto block1; + + block1: + OP_INT_IS_TRUE(MALLOC_ZERO_FILLED, l_v354); + if (l_v354) { + l_v356 = l_v349; + goto block3; + } + goto block2; + + block2: + l_v349->rs_hash = 0L; + l_v356 = l_v349; + goto block3; + + block3: + RPY_DEBUG_RETURN(); + return l_v356; +} +/*/*/ +struct pypy_list0 *pypy_g_ll_newlist__GcStruct_listLlT_Signed(long l_length_3) { + bool_t l_v359; bool_t l_v362; bool_t l_v367; + struct pypy_array0 *l_v358; struct pypy_list0 *l_v357; + struct pypy_list0 *l_v369; void* l_v361; void* l_v366; + + block0: + OP_INT_GE(l_length_3, 0L, l_v359); + RPyAssert(l_v359, "negative list length"); + l_v361 = pypy_g_ll_malloc_fixedsize__Signed_funcPtr((sizeof(struct pypy_list0) * 1), ((void (*)(void*)) NULL)); + l_v357 = (struct pypy_list0 *)l_v361; + l_v362 = (l_v357 != NULL); + if (!l_v362) { + l_v369 = ((struct pypy_list0 *) NULL); + goto block3; + } + goto block1; + + block1: + l_v357->l_length = l_length_3; + + + l_v366 = pypy_g_ll_malloc_varsize__Signed_Signed_Signed_Signed(l_length_3, (offsetof(struct pypy_array0, items) + (sizeof(struct pypy_rpy_string0 *) * 0)), (sizeof(struct pypy_rpy_string0 *) * 1), offsetof(struct pypy_array0, length)); + l_v358 = (struct pypy_array0 *)l_v366; + l_v367 = (l_v358 != NULL); + if (!l_v367) { + l_v369 = ((struct pypy_list0 *) NULL); + goto block3; + } + goto block2; + + block2: + l_v357->l_items = l_v358; + l_v369 = l_v357; + goto block3; + + block3: + RPY_DEBUG_RETURN(); + return l_v369; +} +/*/*/ +long pypy_g_ll_length__listPtr(struct pypy_list0 *l_l_5) { + long l_v370; + + block0: + l_v370 = l_l_5->l_length; + goto block1; + + block1: + RPY_DEBUG_RETURN(); + return l_v370; +} +/*/*/ +void* pypy_g_ll_malloc_fixedsize_atomic__Signed_funcPtr(long l_size_0, void (*l_finalizer_2)(void*)) { + struct pypy_object_vtable0 *l_etype_2; + struct pypy_object0 *l_evalue_2; void* l_result_0; bool_t l_v371; + bool_t l_v373; void* l_v375; + + block0: + OP_BOEHM_ZERO_MALLOC(l_size_0, l_result_0, void*, 1, 0); + OP_ADR_NE(l_result_0, NULL, l_v371); + if (l_v371) { + goto block3; + } + l_etype_2 = (&pypy_g_exceptions_MemoryError_vtable.me_super.se_super.e_super); + l_evalue_2 = (&pypy_g_exceptions_MemoryError_1.me_super.se_super.e_super); + goto block1; + + block1: + pypy_g_RPyRaiseException(l_etype_2, l_evalue_2); + l_v375 = NULL; + goto block2; + + block2: + RPY_DEBUG_RETURN(); + return l_v375; + + block3: + l_v373 = (l_finalizer_2 != NULL); + if (l_v373) { + goto block4; + } + l_v375 = l_result_0; + goto block2; + + block4: + GC_REGISTER_FINALIZER(l_result_0, (GC_finalization_proc)l_finalizer_2, NULL, NULL, NULL); + l_v375 = l_result_0; + goto block2; +} +/*/*/ +void* pypy_g_ll_malloc_fixedsize__Signed_funcPtr(long l_size_1, void (*l_finalizer_1)(void*)) { + struct pypy_object_vtable0 *l_etype_3; + struct pypy_object0 *l_evalue_3; bool_t l_v377; bool_t l_v379; + void* l_v376; void* l_v381; + + block0: + OP_BOEHM_ZERO_MALLOC(l_size_1, l_v376, void*, 0, 0); + OP_ADR_NE(l_v376, NULL, l_v377); + if (l_v377) { + goto block3; + } + l_etype_3 = (&pypy_g_exceptions_MemoryError_vtable.me_super.se_super.e_super); + l_evalue_3 = (&pypy_g_exceptions_MemoryError_1.me_super.se_super.e_super); + goto block1; + + block1: + pypy_g_RPyRaiseException(l_etype_3, l_evalue_3); + l_v381 = NULL; + goto block2; + + block2: + RPY_DEBUG_RETURN(); + return l_v381; + + block3: + l_v379 = (l_finalizer_1 != NULL); + if (l_v379) { + goto block4; + } + l_v381 = l_v376; + goto block2; + + block4: + GC_REGISTER_FINALIZER(l_v376, (GC_finalization_proc)l_finalizer_1, NULL, NULL, NULL); + l_v381 = l_v376; + goto block2; +} +/*/*/ +void* pypy_g_ll_malloc_varsize__Signed_Signed_Signed_Signed(long l_length_4, long l_size_2, long l_itemsize_0, long l_lengthoffset_0) { + struct pypy_object_vtable0 *l_etype_4; + struct pypy_object0 *l_evalue_4; bool_t l_v386; bool_t l_v388; + bool_t l_v389; long l_v382; long l_v383; struct pypy_object0 *l_v393; + struct pypy_object0 *l_v398; struct pypy_object_vtable0 *l_v385; + struct pypy_object_vtable0 *l_v387; + struct pypy_object_vtable0 *l_v394; + struct pypy_object_vtable0 *l_v399; void* l_v384; void* l_v391; + void* l_v403; + + block0: + OP_INT_MUL_OVF(l_itemsize_0, l_length_4, l_v382); + l_v385 = (&pypy_g_ExcData)->ed_exc_type; + l_v386 = (l_v385 == NULL); + if (!l_v386) { + goto block7; + } + goto block1; + + block1: + OP_INT_ADD_OVF(l_size_2, l_v382, l_v383); + l_v387 = (&pypy_g_ExcData)->ed_exc_type; + l_v388 = (l_v387 == NULL); + if (!l_v388) { + goto block6; + } + goto block2; + + block2: + OP_BOEHM_ZERO_MALLOC(l_v383, l_v384, void*, 0, 0); + OP_ADR_NE(l_v384, NULL, l_v389); + if (l_v389) { + goto block5; + } + l_evalue_4 = (&pypy_g_exceptions_MemoryError_1.me_super.se_super.e_super); + l_etype_4 = (&pypy_g_exceptions_MemoryError_vtable.me_super.se_super.e_super); + goto block3; + + block3: + pypy_g_RPyRaiseException(l_etype_4, l_evalue_4); + l_v403 = NULL; + goto block4; + + block4: + RPY_DEBUG_RETURN(); + return l_v403; + + block5: + OP_ADR_ADD(l_v384, l_lengthoffset_0, l_v391); + *(((long *) l_v391 ) + 0L) = l_length_4; + l_v403 = l_v384; + goto block4; + + block6: + l_v393 = (&pypy_g_ExcData)->ed_exc_value; + l_v394 = (&pypy_g_ExcData)->ed_exc_type; + (&pypy_g_ExcData)->ed_exc_value = ((struct pypy_object0 *) NULL); + (&pypy_g_ExcData)->ed_exc_type = ((struct pypy_object_vtable0 *) NULL); + /* kept alive: l_v393 */ ; + l_evalue_4 = (&pypy_g_exceptions_MemoryError_1.me_super.se_super.e_super); + l_etype_4 = (&pypy_g_exceptions_MemoryError_vtable.me_super.se_super.e_super); + goto block3; + + block7: + l_v398 = (&pypy_g_ExcData)->ed_exc_value; + l_v399 = (&pypy_g_ExcData)->ed_exc_type; + (&pypy_g_ExcData)->ed_exc_value = ((struct pypy_object0 *) NULL); + (&pypy_g_ExcData)->ed_exc_type = ((struct pypy_object_vtable0 *) NULL); + /* kept alive: l_v398 */ ; + l_evalue_4 = (&pypy_g_exceptions_MemoryError_1.me_super.se_super.e_super); + l_etype_4 = (&pypy_g_exceptions_MemoryError_vtable.me_super.se_super.e_super); + goto block3; +} +/*/*/ +void pypy_g__ll_list_resize_really__listPtr_Signed(struct pypy_list1 *l_l_10, long l_newsize_2) { + long l_new_allocated_0; long l_p_0; long l_some_0; bool_t l_v407; + bool_t l_v411; bool_t l_v413; bool_t l_v414; bool_t l_v416; + long l_v404; long l_v408; long l_v409; long l_v410; long l_v415; + long l_v419; long l_v421; long l_v422; struct pypy_array3 *l_v405; + struct pypy_array3 *l_v406; void* l_v412; + + block0: + OP_INT_LT(l_newsize_2, 9L, l_v407); + if (l_v407) { + l_some_0 = 3L; + goto block1; + } + l_some_0 = 6L; + goto block1; + + block1: + OP_INT_RSHIFT(l_newsize_2, 3L, l_v408); + OP_INT_ADD(l_v408, l_some_0, l_v409); + OP_INT_ADD(l_v409, l_newsize_2, l_v410); + OP_INT_EQ(l_newsize_2, 0L, l_v411); + if (l_v411) { + l_new_allocated_0 = 0L; + goto block2; + } + l_new_allocated_0 = l_v410; + goto block2; + + block2: + l_v405 = l_l_10->l_items; + l_v412 = pypy_g_ll_malloc_varsize__Signed_Signed_Signed_Signed(l_new_allocated_0, (offsetof(struct pypy_array3, items) + (sizeof(long) * 0)), (sizeof(long) * 1), offsetof(struct pypy_array3, length)); + l_v406 = (struct pypy_array3 *)l_v412; + l_v413 = (l_v406 != NULL); + if (!l_v413) { + goto block7; + } + goto block3; + + block3: + l_v404 = l_l_10->l_length; + OP_INT_LT(l_v404, l_new_allocated_0, l_v414); + if (l_v414) { + goto block9; + } + goto block4; + + block4: + OP_INT_SUB(l_new_allocated_0, 1L, l_v415); + l_p_0 = l_v415; + goto block5; + + block5: + OP_INT_GE(l_p_0, 0L, l_v416); + if (l_v416) { + goto block8; + } + goto block6; + + block6: + l_l_10->l_length = l_newsize_2; + l_l_10->l_items = l_v406; + goto block7; + + block7: + RPY_DEBUG_RETURN(); + return /* nothing */; + + block8: + l_v419 = l_v405->items[l_p_0]; + l_v406->items[l_p_0] = l_v419; + OP_INT_SUB(l_p_0, 1L, l_v421); + l_p_0 = l_v421; + goto block5; + + block9: + OP_INT_SUB(l_v404, 1L, l_v422); + l_p_0 = l_v422; + goto block5; +} +/*/*/ +void pypy_g_State_add(struct pypy_rpn_State0 *l_self_1) { + bool_t l_v435; bool_t l_v438; bool_t l_v446; bool_t l_v449; + bool_t l_v451; bool_t l_v455; bool_t l_v463; bool_t l_v466; + bool_t l_v469; bool_t l_v474; bool_t l_v476; long l_v425; + long l_v426; long l_v428; long l_v429; long l_v430; long l_v432; + long l_v433; long l_v434; long l_v437; long l_v443; long l_v444; + long l_v445; long l_v450; long l_v454; long l_v460; long l_v461; + long l_v462; long l_v468; long l_v475; struct pypy_array3 *l_v440; + struct pypy_array3 *l_v442; struct pypy_array3 *l_v457; + struct pypy_array3 *l_v459; struct pypy_array3 *l_v467; + struct pypy_array3 *l_v478; struct pypy_list1 *l_v424; + struct pypy_list1 *l_v427; struct pypy_list1 *l_v431; + struct pypy_object_vtable0 *l_v448; + struct pypy_object_vtable0 *l_v465; + struct pypy_object_vtable0 *l_v473; + + block0: + l_v431 = l_self_1->s_inst_stack; + l_v434 = l_v431->l_length; + OP_INT_GT(l_v434, 0L, l_v435); + RPyAssert(l_v435, "pop from empty list"); + OP_INT_SUB(l_v434, 1L, l_v429); + l_v437 = l_v431->l_length; + OP_INT_LT(l_v429, l_v437, l_v438); + RPyAssert(l_v438, "getitem out of bounds"); + l_v440 = l_v431->l_items; + l_v433 = l_v440->items[l_v429]; + /* kept alive: l_v431 */ ; + l_v442 = l_v431->l_items; + l_v443 = l_v442->length; + OP_INT_RSHIFT(l_v443, 1L, l_v444); + OP_INT_SUB(l_v444, 5L, l_v445); + OP_INT_GE(l_v429, l_v445, l_v446); + if (l_v446) { + goto block10; + } + goto block1; + + block1: + pypy_g__ll_list_resize_really__listPtr_Signed(l_v431, l_v429); + l_v448 = (&pypy_g_ExcData)->ed_exc_type; + l_v449 = (l_v448 == NULL); + if (!l_v449) { + goto block7; + } + goto block2; + + block2: + l_v427 = l_self_1->s_inst_stack; + l_v450 = l_v427->l_length; + OP_INT_GT(l_v450, 0L, l_v451); + /* kept alive: l_v431 */ ; + RPyAssert(l_v451, "pop from empty list"); + OP_INT_SUB(l_v450, 1L, l_v432); + l_v454 = l_v427->l_length; + OP_INT_LT(l_v432, l_v454, l_v455); + RPyAssert(l_v455, "getitem out of bounds"); + l_v457 = l_v427->l_items; + l_v430 = l_v457->items[l_v432]; + /* kept alive: l_v427 */ ; + l_v459 = l_v427->l_items; + l_v460 = l_v459->length; + OP_INT_RSHIFT(l_v460, 1L, l_v461); + OP_INT_SUB(l_v461, 5L, l_v462); + OP_INT_GE(l_v432, l_v462, l_v463); + if (l_v463) { + goto block9; + } + goto block3; + + block3: + pypy_g__ll_list_resize_really__listPtr_Signed(l_v427, l_v432); + l_v465 = (&pypy_g_ExcData)->ed_exc_type; + l_v466 = (l_v465 == NULL); + if (!l_v466) { + goto block7; + } + goto block4; + + block4: + l_v424 = l_self_1->s_inst_stack; + OP_INT_ADD(l_v430, l_v433, l_v426); + l_v428 = l_v424->l_length; + OP_INT_ADD(l_v428, 1L, l_v425); + l_v467 = l_v424->l_items; + l_v468 = l_v467->length; + OP_INT_GE(l_v468, l_v425, l_v469); + /* kept alive: l_v427 */ ; + /* kept alive: l_v424 */ ; + if (l_v469) { + goto block8; + } + goto block5; + + block5: + pypy_g__ll_list_resize_really__listPtr_Signed(l_v424, l_v425); + l_v473 = (&pypy_g_ExcData)->ed_exc_type; + l_v474 = (l_v473 == NULL); + if (!l_v474) { + goto block7; + } + goto block6; + + block6: + l_v475 = l_v424->l_length; + OP_INT_LT(l_v428, l_v475, l_v476); + RPyAssert(l_v476, "setitem out of bounds"); + l_v478 = l_v424->l_items; + l_v478->items[l_v428] = l_v426; + /* kept alive: l_v424 */ ; + goto block7; + + block7: + RPY_DEBUG_RETURN(); + return /* nothing */; + + block8: + l_v424->l_length = l_v425; + goto block6; + + block9: + l_v427->l_length = l_v432; + goto block4; + + block10: + l_v431->l_length = l_v429; + goto block2; +} +/*/*/ +void pypy_g__ll_list_resize_really__listPtr_Signed_1(struct pypy_list2 *l_l_11, long l_newsize_3) { + long l_new_allocated_1; long l_p_1; long l_some_1; bool_t l_v488; + bool_t l_v492; bool_t l_v494; bool_t l_v495; bool_t l_v497; + char l_v500; long l_v486; long l_v489; long l_v490; long l_v491; + long l_v496; long l_v502; long l_v503; struct pypy_array5 *l_v485; + struct pypy_array5 *l_v487; void* l_v493; + + block0: + OP_INT_LT(l_newsize_3, 9L, l_v488); + if (l_v488) { + l_some_1 = 3L; + goto block1; + } + l_some_1 = 6L; + goto block1; + + block1: + OP_INT_RSHIFT(l_newsize_3, 3L, l_v489); + OP_INT_ADD(l_v489, l_some_1, l_v490); + OP_INT_ADD(l_v490, l_newsize_3, l_v491); + OP_INT_EQ(l_newsize_3, 0L, l_v492); + if (l_v492) { + l_new_allocated_1 = 0L; + goto block2; + } + l_new_allocated_1 = l_v491; + goto block2; + + block2: + l_v487 = l_l_11->l_items; + l_v493 = pypy_g_ll_malloc_varsize__Signed_Signed_Signed_Signed(l_new_allocated_1, (offsetof(struct pypy_array5, items) + (sizeof(char) * 0)), (sizeof(char) * 1), offsetof(struct pypy_array5, length)); + l_v485 = (struct pypy_array5 *)l_v493; + l_v494 = (l_v485 != NULL); + if (!l_v494) { + goto block7; + } + goto block3; + + block3: + l_v486 = l_l_11->l_length; + OP_INT_LT(l_v486, l_new_allocated_1, l_v495); + if (l_v495) { + goto block9; + } + goto block4; + + block4: + OP_INT_SUB(l_new_allocated_1, 1L, l_v496); + l_p_1 = l_v496; + goto block5; + + block5: + OP_INT_GE(l_p_1, 0L, l_v497); + if (l_v497) { + goto block8; + } + goto block6; + + block6: + l_l_11->l_length = l_newsize_3; + l_l_11->l_items = l_v485; + goto block7; + + block7: + RPY_DEBUG_RETURN(); + return /* nothing */; + + block8: + l_v500 = l_v487->items[l_p_1]; + l_v485->items[l_p_1] = l_v500; + OP_INT_SUB(l_p_1, 1L, l_v502); + l_p_1 = l_v502; + goto block5; + + block9: + OP_INT_SUB(l_v486, 1L, l_v503); + l_p_1 = l_v503; + goto block5; +} +/*/*/ +long pypy_g_os_write_lltypeimpl(long l_fd_1, struct pypy_rpy_string0 *l_data_1) { + struct pypy_array6 *l_outbuf_0; bool_t l_v514; bool_t l_v516; + bool_t l_v519; bool_t l_v522; bool_t l_v525; bool_t l_v536; + bool_t l_v538; bool_t l_v541; char l_v527; long l_v505; long l_v509; + long l_v510; long l_v511; long l_v518; long l_v524; long l_v555; + struct pypy_array1 *l_v512; struct pypy_array1 *l_v517; + struct pypy_array1 *l_v521; + struct pypy_exceptions_Exception0 *l_v546; + struct pypy_exceptions_Exception0 *l_v554; + struct pypy_exceptions_Exception0 *l_v557; + struct pypy_exceptions_OSError0 *l_v508; struct pypy_object0 *l_v532; + struct pypy_object0 *l_v542; struct pypy_object0 *l_v548; + struct pypy_object_vtable0 *l_v513; + struct pypy_object_vtable0 *l_v535; + struct pypy_object_vtable0 *l_v545; + struct pypy_object_vtable0 *l_v549; + struct pypy_object_vtable0 *l_v556; unsigned long l_v506; + unsigned long l_v507; void* l_v540; + + block0: + l_v512 = &l_data_1->rs_chars; + l_v509 = l_v512->length; + IF_VARSIZE_OVERFLOW(l_v509, char, l_outbuf_0) + else { + OP_RAW_MALLOC(sizeof(struct pypy_array6)-sizeof(char)+l_v509*sizeof(char), l_outbuf_0, struct pypy_array6 *); + } + l_v513 = (&pypy_g_ExcData)->ed_exc_type; + l_v514 = (l_v513 == NULL); + if (!l_v514) { + l_v555 = -1L; + goto block7; + } + goto block1; + + block1: + /* kept alive: l_data_1 */ ; + l_v505 = 0L; + goto block2; + + block2: + OP_INT_GE(l_v505, l_v509, l_v516); + if (l_v516) { + goto block8; + } + goto block3; + + block3: + OP_INT_ADD(l_v505, 1L, l_v510); + l_v517 = &l_data_1->rs_chars; + l_v518 = l_v517->length; + OP_INT_GE(l_v505, l_v518, l_v519); + /* kept alive: l_data_1 */ ; + if (l_v519) { + goto block5; + } + goto block4; + + block4: + l_v521 = &l_data_1->rs_chars; + OP_INT_GE(l_v505, 0L, l_v522); + RPyAssert(l_v522, "negative str getitem index"); + l_v524 = l_v521->length; + OP_INT_LT(l_v505, l_v524, l_v525); + RPyAssert(l_v525, "str getitem index out of bound"); + l_v527 = l_v521->items[l_v505]; + /* kept alive: l_data_1 */ ; + l_outbuf_0->items[l_v505] = l_v527; + l_v505 = l_v510; + goto block2; + + block5: + /* kept alive: l_data_1 */ ; + l_v557 = (&pypy_g_exceptions_IndexError.ie_super.le_super.se_super); + l_v556 = (&pypy_g_exceptions_IndexError_vtable.ie_super.le_super.se_super.e_super); + goto block6; + + block6: + OP_RAW_FREE(l_outbuf_0, /* nothing */) + l_v532 = (struct pypy_object0 *)l_v557; + pypy_g_RPyRaiseException(l_v556, l_v532); + l_v555 = -1L; + goto block7; + + block7: + RPY_DEBUG_RETURN(); + return l_v555; + + block8: + OP_CAST_INT_TO_UINT(l_v509, l_v506); + /* kept alive: l_data_1 */ ; + l_v507 = write(l_fd_1, l_outbuf_0, l_v506); + l_v535 = (&pypy_g_ExcData)->ed_exc_type; + l_v536 = (l_v535 == NULL); + if (!l_v536) { + goto block13; + } + goto block9; + + block9: + /* kept alive: l_data_1 */ ; + OP_CAST_UINT_TO_INT(l_v507, l_v511); + OP_INT_LT(l_v511, 0L, l_v538); + if (l_v538) { + goto block11; + } + goto block10; + + block10: + OP_RAW_FREE(l_outbuf_0, /* nothing */) + l_v555 = l_v511; + goto block7; + + block11: + l_v540 = pypy_g_ll_malloc_fixedsize_atomic__Signed_funcPtr((sizeof(struct pypy_exceptions_OSError0) * 1), ((void (*)(void*)) NULL)); + l_v508 = (struct pypy_exceptions_OSError0 *)l_v540; + l_v541 = (l_v508 != NULL); + if (!l_v541) { + l_v555 = -1L; + goto block7; + } + goto block12; + + block12: + l_v542 = (struct pypy_object0 *)l_v508; + l_v542->o_typeptr = (&pypy_g_exceptions_OSError_vtable.ose_super.ee_super.se_super.e_super); + l_v508->ose_inst_errno = errno; + l_v545 = l_v542->o_typeptr; + l_v546 = (struct pypy_exceptions_Exception0 *)l_v508; + /* kept alive: l_v508 */ ; + l_v557 = l_v546; + l_v556 = l_v545; + goto block6; + + block13: + l_v548 = (&pypy_g_ExcData)->ed_exc_value; + l_v549 = (&pypy_g_ExcData)->ed_exc_type; + (&pypy_g_ExcData)->ed_exc_value = ((struct pypy_object0 *) NULL); + (&pypy_g_ExcData)->ed_exc_type = ((struct pypy_object_vtable0 *) NULL); + /* kept alive: l_v548 */ ; + /* kept alive: l_data_1 */ ; + l_v554 = (struct pypy_exceptions_Exception0 *)l_v548; + l_v557 = l_v554; + l_v556 = l_v549; + goto block6; +} +/*/*/ +void pypy_g_ll_setitem_fast__listPtr_Signed_rpy_stringPtr(struct pypy_list0 *l_l_8, long l_index_4, struct pypy_rpy_string0 *l_item_0) { + bool_t l_v559; long l_v558; struct pypy_array0 *l_v562; + struct pypy_list0 *l_v561; + + block0: + l_v558 = l_l_8->l_length; + OP_INT_LT(l_index_4, l_v558, l_v559); + RPyAssert(l_v559, "setitem out of bounds"); + l_v561 = l_l_8; + l_v562 = pypy_g_ll_items__listPtr(l_v561); + l_v562->items[l_index_4] = l_item_0; + goto block1; + + block1: + RPY_DEBUG_RETURN(); + return /* nothing */; +} +/*/*/ + +/*/*/ +struct pypy_array0 *pypy_g_ll_items__listPtr(struct pypy_list0 *l_l_9) { + struct pypy_array0 *l_v565; + + block0: + l_v565 = l_l_9->l_items; + goto block1; + + block1: + RPY_DEBUG_RETURN(); + return l_v565; +} +/*/*/ +/***********************************************************/ Added: pypy/extradoc/talk/sfi2008/demo/rpn.j ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/demo/rpn.j Wed Mar 5 11:32:00 2008 @@ -0,0 +1,786 @@ +.class public pypy/interpret_35 +.super java/lang/Object +.method public ()V + ; load_jvm_jar: jvartype=Class varidx=0 + .line 0 + aload_0 + .line 1 + invokespecial java/lang/Object/()V + .line 2 + return +.limit stack 100 +.limit locals 1 +.end method +.method public static invoke(Ljava/lang/String;I)I + BasicBlock_16: + ; v24 = new(()) + .line 1 + new pypy/rpn/State_36 + .line 2 + dup + .line 3 + invokespecial pypy/rpn/State_36/()V + ; store_jvm_jar: vartype=Class varidx=2 + .line 4 + astore_2 + ; v25 = oosetfield(v24, ('meta'), (<'Object_meta' view of...6726ec>)) + ; load_jvm_jar: jvartype=Class varidx=2 + .line 5 + aload_2 + .line 6 + getstatic pypy/Constant/pypy_rpn_State_meta_38__37 Lpypy/rpn/State_meta_38; + .line 7 + checkcast pypy/Object_meta_12 + .line 8 + putfield pypy/Object_10/meta Lpypy/Object_meta_12; + ; v26 = new(()) + .line 9 + new java/util/ArrayList + .line 10 + dup + .line 11 + invokespecial java/util/ArrayList/()V + ; store_jvm_jar: vartype=JvmBuiltInType varidx=3 + .line 12 + astore_3 + ; v27 = oosend(('_ll_resize'), v26, (0)) + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=3 + .line 13 + aload_3 + .line 14 + iconst_0 + .line 15 + invokestatic pypy/PyPy/_ll_resize(Ljava/util/ArrayList;I)V + ; v28 = oosetfield(v24, ('ostack'), v26) + ; load_jvm_jar: jvartype=Class varidx=2 + .line 16 + aload_2 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=3 + .line 17 + aload_3 + .line 18 + putfield pypy/rpn/State_36/ostack Ljava/util/ArrayList; + ; v29 = oogetfield(v24, ('ostack')) + ; load_jvm_jar: jvartype=Class varidx=2 + .line 19 + aload_2 + .line 20 + getfield pypy/rpn/State_36/ostack Ljava/util/ArrayList; + ; store_jvm_jar: vartype=JvmBuiltInType varidx=4 + .line 21 + astore 4 + ; v30 = oosend(('ll_length'), v29) + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=4 + .line 22 + aload 4 + .line 23 + invokevirtual java/util/ArrayList/size()I + ; store_jvm_jar: vartype=JvmScalarType varidx=5 + .line 24 + istore 5 + ; v31 = int_add(v30, (1)) + ; load_jvm_jar: jvartype=JvmScalarType varidx=5 + .line 25 + iload 5 + .line 26 + iconst_1 + .line 27 + iadd + ; store_jvm_jar: vartype=JvmScalarType varidx=6 + .line 28 + istore 6 + ; v32 = oosend(('_ll_resize_ge'), v29, v31) + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=4 + .line 29 + aload 4 + ; load_jvm_jar: jvartype=JvmScalarType varidx=6 + .line 30 + iload 6 + .line 31 + invokestatic pypy/PyPy/_ll_resize_ge(Ljava/util/ArrayList;I)V + ; v33 = oosend(('ll_setitem_fast'), v29, v30, arg_0) + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=4 + .line 32 + aload 4 + ; load_jvm_jar: jvartype=JvmScalarType varidx=5 + .line 33 + iload 5 + ; load_jvm_jar: jvartype=JvmScalarType varidx=1 + .line 34 + iload_1 + .line 35 + invokestatic java/lang/Integer/valueOf(I)Ljava/lang/Integer; + .line 36 + invokestatic pypy/PyPy/ll_setitem_fast(Ljava/util/ArrayList;ILjava/lang/Object;)V + ; (0) --> v34 + .line 37 + iconst_0 + ; store_jvm_jar: vartype=JvmScalarType varidx=7 + .line 38 + istore 7 + ; code_0 --> v35 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=0 + .line 39 + aload_0 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=8 + .line 40 + astore 8 + ; v24 --> state_0 + ; load_jvm_jar: jvartype=Class varidx=2 + .line 41 + aload_2 + ; store_jvm_jar: vartype=Class varidx=9 + .line 42 + astore 9 + .line 43 + goto BasicBlock_17 + BasicBlock_17: + ; v36 = oosend(('ll_strlen'), v35) + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=8 + .line 45 + aload 8 + .line 46 + invokevirtual java/lang/String/length()I + ; store_jvm_jar: vartype=JvmScalarType varidx=10 + .line 47 + istore 10 + ; v37 = int_ge(v34, v36) + ; load_jvm_jar: jvartype=JvmScalarType varidx=7 + .line 48 + iload 7 + ; load_jvm_jar: jvartype=JvmScalarType varidx=10 + .line 49 + iload 10 + .line 50 + if_icmpge cmpop_18 + .line 51 + iconst_0 + .line 52 + goto cmpop_19 + cmpop_18: + .line 54 + iconst_1 + cmpop_19: + ; store_jvm_jar: vartype=JvmScalarType varidx=11 + .line 56 + istore 11 + ; v35 --> v38 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=8 + .line 57 + aload 8 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=12 + .line 58 + astore 12 + ; v34 --> index_0 + ; load_jvm_jar: jvartype=JvmScalarType varidx=7 + .line 59 + iload 7 + ; store_jvm_jar: vartype=JvmScalarType varidx=13 + .line 60 + istore 13 + ; v35 --> string_0 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=8 + .line 61 + aload 8 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=14 + .line 62 + astore 14 + ; state_0 --> state_1 + ; load_jvm_jar: jvartype=Class varidx=9 + .line 63 + aload 9 + ; store_jvm_jar: vartype=Class varidx=15 + .line 64 + astore 15 + ; load_jvm_jar: jvartype=JvmScalarType varidx=11 + .line 65 + iload 11 + .line 66 + ifeq BasicBlock_20 + ; state_0 --> state_2 + ; load_jvm_jar: jvartype=Class varidx=9 + .line 67 + aload 9 + ; store_jvm_jar: vartype=Class varidx=16 + .line 68 + astore 16 + .line 69 + goto BasicBlock_21 + BasicBlock_20: + ; v39 = int_add(index_0, (1)) + ; load_jvm_jar: jvartype=JvmScalarType varidx=13 + .line 71 + iload 13 + .line 72 + iconst_1 + .line 73 + iadd + ; store_jvm_jar: vartype=JvmScalarType varidx=17 + .line 74 + istore 17 + ; v40 = oosend(('ll_stritem_nonneg'), string_0, index_0) + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=14 + .line 75 + aload 14 + ; load_jvm_jar: jvartype=JvmScalarType varidx=13 + .line 76 + iload 13 + .line 77 + invokevirtual java/lang/String/charAt(I)C + ; store_jvm_jar: vartype=JvmScalarType varidx=18 + .line 78 + istore 18 + ; v41 = char_le(('0'), v40) + .line 79 + ldc 48 + ; load_jvm_jar: jvartype=JvmScalarType varidx=18 + .line 80 + iload 18 + .line 81 + if_icmple cmpop_22 + .line 82 + iconst_0 + .line 83 + goto cmpop_23 + cmpop_22: + .line 85 + iconst_1 + cmpop_23: + ; store_jvm_jar: vartype=JvmScalarType varidx=19 + .line 87 + istore 19 + ; state_1 --> state_3 + ; load_jvm_jar: jvartype=Class varidx=15 + .line 88 + aload 15 + ; store_jvm_jar: vartype=Class varidx=20 + .line 89 + astore 20 + ; v39 --> v42 + ; load_jvm_jar: jvartype=JvmScalarType varidx=17 + .line 90 + iload 17 + ; store_jvm_jar: vartype=JvmScalarType varidx=21 + .line 91 + istore 21 + ; v38 --> v43 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=12 + .line 92 + aload 12 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=22 + .line 93 + astore 22 + ; v40 --> v44 + ; load_jvm_jar: jvartype=JvmScalarType varidx=18 + .line 94 + iload 18 + ; store_jvm_jar: vartype=JvmScalarType varidx=23 + .line 95 + istore 23 + ; load_jvm_jar: jvartype=JvmScalarType varidx=19 + .line 96 + iload 19 + .line 97 + ifeq BasicBlock_24 + ; v40 --> c_0 + ; load_jvm_jar: jvartype=JvmScalarType varidx=18 + .line 98 + iload 18 + ; store_jvm_jar: vartype=JvmScalarType varidx=24 + .line 99 + istore 24 + ; state_1 --> state_4 + ; load_jvm_jar: jvartype=Class varidx=15 + .line 100 + aload 15 + ; store_jvm_jar: vartype=Class varidx=25 + .line 101 + astore 25 + ; v39 --> v45 + ; load_jvm_jar: jvartype=JvmScalarType varidx=17 + .line 102 + iload 17 + ; store_jvm_jar: vartype=JvmScalarType varidx=26 + .line 103 + istore 26 + ; v38 --> v46 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=12 + .line 104 + aload 12 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=27 + .line 105 + astore 27 + .line 106 + goto BasicBlock_25 + BasicBlock_24: + ; v47 = char_eq(v44, ('+')) + ; load_jvm_jar: jvartype=JvmScalarType varidx=23 + .line 108 + iload 23 + .line 109 + ldc 43 + .line 110 + if_icmpeq cmpop_26 + .line 111 + iconst_0 + .line 112 + goto cmpop_27 + cmpop_26: + .line 114 + iconst_1 + cmpop_27: + ; store_jvm_jar: vartype=JvmScalarType varidx=28 + .line 116 + istore 28 + ; v42 --> v34 + ; load_jvm_jar: jvartype=JvmScalarType varidx=21 + .line 117 + iload 21 + ; store_jvm_jar: vartype=JvmScalarType varidx=7 + .line 118 + istore 7 + ; v43 --> v35 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=22 + .line 119 + aload 22 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=8 + .line 120 + astore 8 + ; state_3 --> state_0 + ; load_jvm_jar: jvartype=Class varidx=20 + .line 121 + aload 20 + ; store_jvm_jar: vartype=Class varidx=9 + .line 122 + astore 9 + ; load_jvm_jar: jvartype=JvmScalarType varidx=28 + .line 123 + iload 28 + .line 124 + ifeq BasicBlock_17 + ; state_3 --> state_5 + ; load_jvm_jar: jvartype=Class varidx=20 + .line 125 + aload 20 + ; store_jvm_jar: vartype=Class varidx=29 + .line 126 + astore 29 + ; v42 --> v48 + ; load_jvm_jar: jvartype=JvmScalarType varidx=21 + .line 127 + iload 21 + ; store_jvm_jar: vartype=JvmScalarType varidx=30 + .line 128 + istore 30 + ; v43 --> v49 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=22 + .line 129 + aload 22 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=31 + .line 130 + astore 31 + .line 131 + goto BasicBlock_28 + BasicBlock_28: + ; v50 = oosend(('oadd'), state_5) + ; load_jvm_jar: jvartype=Class varidx=29 + .line 133 + aload 29 + .line 134 + invokevirtual pypy/rpn/State_36/oadd()V + ; v48 --> v34 + ; load_jvm_jar: jvartype=JvmScalarType varidx=30 + .line 135 + iload 30 + ; store_jvm_jar: vartype=JvmScalarType varidx=7 + .line 136 + istore 7 + ; v49 --> v35 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=31 + .line 137 + aload 31 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=8 + .line 138 + astore 8 + ; state_5 --> state_0 + ; load_jvm_jar: jvartype=Class varidx=29 + .line 139 + aload 29 + ; store_jvm_jar: vartype=Class varidx=9 + .line 140 + astore 9 + .line 141 + goto BasicBlock_17 + BasicBlock_25: + ; v51 = char_le(c_0, ('9')) + ; load_jvm_jar: jvartype=JvmScalarType varidx=24 + .line 143 + iload 24 + .line 144 + ldc 57 + .line 145 + if_icmple cmpop_29 + .line 146 + iconst_0 + .line 147 + goto cmpop_30 + cmpop_29: + .line 149 + iconst_1 + cmpop_30: + ; store_jvm_jar: vartype=JvmScalarType varidx=32 + .line 151 + istore 32 + ; state_4 --> state_3 + ; load_jvm_jar: jvartype=Class varidx=25 + .line 152 + aload 25 + ; store_jvm_jar: vartype=Class varidx=20 + .line 153 + astore 20 + ; v45 --> v42 + ; load_jvm_jar: jvartype=JvmScalarType varidx=26 + .line 154 + iload 26 + ; store_jvm_jar: vartype=JvmScalarType varidx=21 + .line 155 + istore 21 + ; v46 --> v43 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=27 + .line 156 + aload 27 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=22 + .line 157 + astore 22 + ; c_0 --> v44 + ; load_jvm_jar: jvartype=JvmScalarType varidx=24 + .line 158 + iload 24 + ; store_jvm_jar: vartype=JvmScalarType varidx=23 + .line 159 + istore 23 + ; load_jvm_jar: jvartype=JvmScalarType varidx=32 + .line 160 + iload 32 + .line 161 + ifeq BasicBlock_24 + ; c_0 --> c_1 + ; load_jvm_jar: jvartype=JvmScalarType varidx=24 + .line 162 + iload 24 + ; store_jvm_jar: vartype=JvmScalarType varidx=33 + .line 163 + istore 33 + ; state_4 --> state_6 + ; load_jvm_jar: jvartype=Class varidx=25 + .line 164 + aload 25 + ; store_jvm_jar: vartype=Class varidx=34 + .line 165 + astore 34 + ; v45 --> v52 + ; load_jvm_jar: jvartype=JvmScalarType varidx=26 + .line 166 + iload 26 + ; store_jvm_jar: vartype=JvmScalarType varidx=35 + .line 167 + istore 35 + ; v46 --> v53 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=27 + .line 168 + aload 27 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=36 + .line 169 + astore 36 + .line 170 + goto BasicBlock_31 + BasicBlock_31: + ; v54 = cast_char_to_int(c_1) + ; load_jvm_jar: jvartype=JvmScalarType varidx=33 + .line 172 + iload 33 + ; store_jvm_jar: vartype=JvmScalarType varidx=37 + .line 173 + istore 37 + ; v55 = int_sub(v54, (48)) + ; load_jvm_jar: jvartype=JvmScalarType varidx=37 + .line 174 + iload 37 + .line 175 + ldc 48 + .line 176 + isub + ; store_jvm_jar: vartype=JvmScalarType varidx=38 + .line 177 + istore 38 + ; v56 = oogetfield(state_6, ('ostack')) + ; load_jvm_jar: jvartype=Class varidx=34 + .line 178 + aload 34 + .line 179 + getfield pypy/rpn/State_36/ostack Ljava/util/ArrayList; + ; store_jvm_jar: vartype=JvmBuiltInType varidx=39 + .line 180 + astore 39 + ; v57 = oosend(('ll_length'), v56) + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=39 + .line 181 + aload 39 + .line 182 + invokevirtual java/util/ArrayList/size()I + ; store_jvm_jar: vartype=JvmScalarType varidx=40 + .line 183 + istore 40 + ; v58 = int_add(v57, (1)) + ; load_jvm_jar: jvartype=JvmScalarType varidx=40 + .line 184 + iload 40 + .line 185 + iconst_1 + .line 186 + iadd + ; store_jvm_jar: vartype=JvmScalarType varidx=41 + .line 187 + istore 41 + ; v59 = oosend(('_ll_resize_ge'), v56, v58) + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=39 + .line 188 + aload 39 + ; load_jvm_jar: jvartype=JvmScalarType varidx=41 + .line 189 + iload 41 + .line 190 + invokestatic pypy/PyPy/_ll_resize_ge(Ljava/util/ArrayList;I)V + ; v60 = oosend(('ll_setitem_fast'), v56, v57, v55) + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=39 + .line 191 + aload 39 + ; load_jvm_jar: jvartype=JvmScalarType varidx=40 + .line 192 + iload 40 + ; load_jvm_jar: jvartype=JvmScalarType varidx=38 + .line 193 + iload 38 + .line 194 + invokestatic java/lang/Integer/valueOf(I)Ljava/lang/Integer; + .line 195 + invokestatic pypy/PyPy/ll_setitem_fast(Ljava/util/ArrayList;ILjava/lang/Object;)V + ; v52 --> v34 + ; load_jvm_jar: jvartype=JvmScalarType varidx=35 + .line 196 + iload 35 + ; store_jvm_jar: vartype=JvmScalarType varidx=7 + .line 197 + istore 7 + ; v53 --> v35 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=36 + .line 198 + aload 36 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=8 + .line 199 + astore 8 + ; state_6 --> state_0 + ; load_jvm_jar: jvartype=Class varidx=34 + .line 200 + aload 34 + ; store_jvm_jar: vartype=Class varidx=9 + .line 201 + astore 9 + .line 202 + goto BasicBlock_17 + BasicBlock_21: + ; v61 = oogetfield(state_2, ('ostack')) + ; load_jvm_jar: jvartype=Class varidx=16 + .line 204 + aload 16 + .line 205 + getfield pypy/rpn/State_36/ostack Ljava/util/ArrayList; + ; store_jvm_jar: vartype=JvmBuiltInType varidx=42 + .line 206 + astore 42 + ; v62 = oosend(('ll_length'), v61) + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=42 + .line 207 + aload 42 + .line 208 + invokevirtual java/util/ArrayList/size()I + ; store_jvm_jar: vartype=JvmScalarType varidx=43 + .line 209 + istore 43 + ; v63 = int_lt((-1), (0)) + .line 210 + iconst_m1 + .line 211 + iconst_0 + .line 212 + if_icmplt cmpop_32 + .line 213 + iconst_0 + .line 214 + goto cmpop_33 + cmpop_32: + .line 216 + iconst_1 + cmpop_33: + ; store_jvm_jar: vartype=JvmScalarType varidx=44 + .line 218 + istore 44 + ; v61 --> l_0 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=42 + .line 219 + aload 42 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=45 + .line 220 + astore 45 + ; (-1) --> index_1 + .line 221 + iconst_m1 + ; store_jvm_jar: vartype=JvmScalarType varidx=46 + .line 222 + istore 46 + ; v62 --> length_0 + ; load_jvm_jar: jvartype=JvmScalarType varidx=43 + .line 223 + iload 43 + ; store_jvm_jar: vartype=JvmScalarType varidx=47 + .line 224 + istore 47 + ; load_jvm_jar: jvartype=JvmScalarType varidx=44 + .line 225 + iload 44 + .line 226 + ifeq BasicBlock_34 + ; v61 --> l_1 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=42 + .line 227 + aload 42 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=48 + .line 228 + astore 48 + ; v62 --> length_1 + ; load_jvm_jar: jvartype=JvmScalarType varidx=43 + .line 229 + iload 43 + ; store_jvm_jar: vartype=JvmScalarType varidx=49 + .line 230 + istore 49 + ; (-1) --> v64 + .line 231 + iconst_m1 + ; store_jvm_jar: vartype=JvmScalarType varidx=50 + .line 232 + istore 50 + .line 233 + goto BasicBlock_35 + BasicBlock_34: + ; v65 = int_ge(index_1, (0)) + ; load_jvm_jar: jvartype=JvmScalarType varidx=46 + .line 235 + iload 46 + .line 236 + iconst_0 + .line 237 + if_icmpge cmpop_36 + .line 238 + iconst_0 + .line 239 + goto cmpop_37 + cmpop_36: + .line 241 + iconst_1 + cmpop_37: + ; store_jvm_jar: vartype=JvmScalarType varidx=51 + .line 243 + istore 51 + ; v66 = debug_assert(v65, ('negative list getitem index out of bound')) + ; v67 = int_lt(index_1, length_0) + ; load_jvm_jar: jvartype=JvmScalarType varidx=46 + .line 244 + iload 46 + ; load_jvm_jar: jvartype=JvmScalarType varidx=47 + .line 245 + iload 47 + .line 246 + if_icmplt cmpop_38 + .line 247 + iconst_0 + .line 248 + goto cmpop_39 + cmpop_38: + .line 250 + iconst_1 + cmpop_39: + ; store_jvm_jar: vartype=JvmScalarType varidx=52 + .line 252 + istore 52 + ; v68 = debug_assert(v67, ('list getitem index out of bound')) + ; v69 = oosend(('ll_getitem_fast'), l_0, index_1) + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=45 + .line 253 + aload 45 + ; load_jvm_jar: jvartype=JvmScalarType varidx=46 + .line 254 + iload 46 + .line 255 + invokevirtual java/util/ArrayList/get(I)Ljava/lang/Object; + .line 256 + checkcast java/lang/Integer + .line 257 + invokevirtual java/lang/Integer/intValue()I + ; store_jvm_jar: vartype=JvmScalarType varidx=53 + .line 258 + istore 53 + ; v69 --> v70 + ; load_jvm_jar: jvartype=JvmScalarType varidx=53 + .line 259 + iload 53 + ; store_jvm_jar: vartype=JvmScalarType varidx=54 + .line 260 + istore 54 + .line 261 + goto BasicBlock_40 + BasicBlock_35: + ; v71 = int_add(v64, length_1) + ; load_jvm_jar: jvartype=JvmScalarType varidx=50 + .line 263 + iload 50 + ; load_jvm_jar: jvartype=JvmScalarType varidx=49 + .line 264 + iload 49 + .line 265 + iadd + ; store_jvm_jar: vartype=JvmScalarType varidx=55 + .line 266 + istore 55 + ; l_1 --> l_0 + ; load_jvm_jar: jvartype=JvmBuiltInType varidx=48 + .line 267 + aload 48 + ; store_jvm_jar: vartype=JvmBuiltInType varidx=45 + .line 268 + astore 45 + ; v71 --> index_1 + ; load_jvm_jar: jvartype=JvmScalarType varidx=55 + .line 269 + iload 55 + ; store_jvm_jar: vartype=JvmScalarType varidx=46 + .line 270 + istore 46 + ; length_1 --> length_0 + ; load_jvm_jar: jvartype=JvmScalarType varidx=49 + .line 271 + iload 49 + ; store_jvm_jar: vartype=JvmScalarType varidx=47 + .line 272 + istore 47 + .line 273 + goto BasicBlock_34 + BasicBlock_40: + ; load_jvm_jar: jvartype=JvmScalarType varidx=54 + .line 275 + iload 54 + .line 276 + ireturn +.limit stack 100 +.limit locals 56 +.end method Added: pypy/extradoc/talk/sfi2008/demo/rpn.js ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/demo/rpn.js Wed Mar 5 11:32:00 2008 @@ -0,0 +1,1343 @@ +// starts hand written code +MALLOC_ZERO_FILLED = 0 + +try { + log; + print = log; +} catch(e) { +} + +Function.prototype.method = function (name, func) { + this.prototype[name] = func; + return this; +}; + +function inherits(child, parent) { + child.parent = parent; + for (i in parent.prototype) { + if (!child.prototype[i]) { + child.prototype[i] = parent.prototype[i]; + } + } +} + +function isinstanceof(self, what) { + if (!self) { + return (false); + } + t = self.constructor; + while ( t ) { + if (t == what) { + return (true); + } + t = t.parent; + } + return (false); +} + +/*function delitem(fn, l, i) { + for(j = i; j < l.length-1; ++j) { + l[j] = l[j+1]; + } + l.length--; +}*/ + +function strcmp(s1, s2) { + if ( s1 < s2 ) { + return ( -1 ); + } else if ( s1 == s2 ) { + return ( 0 ); + } + return (1); +} + +function startswith(s1, s2) { + if (s1.length < s2.length) { + return(false); + } + for (i = 0; i < s2.length; ++i){ + if (s1.charAt(i) != s2.charAt(i)) { + return(false); + } + } + return(true); +} + +function endswith(s1, s2) { + if (s2.length > s1.length) { + return(false); + } + for (i = s1.length-s2.length; i < s1.length; ++i) { + if (s1.charAt(i) != s2.charAt(i - s1.length + s2.length)) { + return(false); + } + } + return(true); +} + +function splitchr(s, ch) { + var i, lst, next; + lst = []; + next = ""; + for (i = 0; i end || start > s1.length) { + return -1; + } + s1 = s1.substr(start, end-start); + res = s1.indexOf(s2); + if (res == -1) { + return -1; + } + return res + start; +} + +function findIndexOfTrue(s1, s2) { + return findIndexOf(s1, s2, 0, s1.length) != -1; +} + +function countCharOf(s, c, start, end) { + s = s.substring(start, end); + var i = 0; + for (c1 in s) { + if (s[c1] == c) { + i++; + } + } + return(i); +} + +function countOf(s, s1, start, end) { + var ret = findIndexOf(s, s1, start, end); + var i = 0; + var lgt = 1; + if (s1.length > 0) { + lgt = s1.length; + } + while (ret != -1) { + i++; + ret = findIndexOf(s, s1, ret + lgt, end); + } + return (i); +} + +function convertToString(stuff) { + if (stuff === undefined) { + return ("undefined"); + } + return (stuff.toString()); +} +// ends hand written code +function entry_point (argv_0) { + var v0,v1,v2,v3,v4; + var block = 0; + for(;;){ + switch(block){ + case 0: + v1 = ll_getitem_nonneg__dum_nocheckConst_List_String__Signed ( argv_0,1 ); + v2 = ll_getitem_nonneg__dum_nocheckConst_List_String__Signed ( argv_0,2 ); + v3 = ll_int__String_Signed ( v2,10 ); + v4 = interpret ( v1,v3 ); + v0 = 0; + block = 1; + break; + case 1: + return ( v0 ); + } + } +} + +function interpret (code_0,arg_0) { + var v117,v118,v121,v123,state_0,v124,v125,last_exc_value_0,c_8,state_1,v126,v127,v128,state_2,v129,v130,v131,v132,state_3,v133,v134,c_9,state_4,v136,v137,c_10,state_5,v138,v139,v140,c_11,state_6,v141,v142,v143,v144,v146,v147,v148; + var block = 0; + for(;;){ + switch(block){ + case 0: + v118 = new rpn_State(); + v118.meta = __consts_0.rpn_State_meta; + State___init__ ( v118 ); + v118.opush(arg_0); + v123 = ll_striter__String ( code_0 ); + state_0 = v118; + v124 = v123; + block = 1; + break; + case 1: + try { + v125 = ll_strnext__Record_index__Signed__string__ ( v124 ); + c_8 = v125; + state_1 = state_0; + v126 = v124; + block = 2; + break; + } + catch (exc){ + if (isinstanceof(exc, exceptions_StopIteration)) + { + v146 = state_0; + block = 8; + break; + } + throw(exc); + } + case 2: + v127 = ('0'<=c_8); + state_2 = state_1; + v129 = v126; + v130 = c_8; + if (v127 == false) + { + block = 3; + break; + } + c_9 = c_8; + state_4 = state_1; + v136 = v126; + block = 5; + break; + case 3: + v131 = (v130=='+'); + state_0 = state_2; + v124 = v129; + if (v131 == false) + { + block = 1; + break; + } + state_3 = state_2; + v133 = v129; + block = 4; + break; + case 4: + state_3.oadd(); + state_0 = state_3; + v124 = v133; + block = 1; + break; + case 5: + v137 = (c_9<='9'); + c_10 = c_9; + state_5 = state_4; + v138 = v136; + v139 = v137; + block = 6; + break; + case 6: + state_2 = state_5; + v129 = v138; + v130 = c_10; + if (v139 == false) + { + block = 3; + break; + } + c_11 = c_10; + state_6 = state_5; + v141 = v138; + block = 7; + break; + case 7: + v143 = c_11.charCodeAt(0); + v144 = (v143-48); + state_6.opush(v144); + state_0 = state_6; + v124 = v141; + block = 1; + break; + case 8: + v148 = v146.ogetresult(); + v117 = v148; + block = 9; + break; + case 9: + return ( v117 ); + } + } +} + +function ll_strnext__Record_index__Signed__string__ (iter_0) { + var v157,v158,v159,v160,v161,v162,v163,iter_1,index_3,string_1,v164,v166,v167,v168,v169,v170,etype_1,evalue_1; + var block = 0; + for(;;){ + switch(block){ + case 0: + v158 = iter_0.string; + v159 = iter_0.index; + v161 = v158.length; + v162 = (v159>=v161); + iter_1 = iter_0; + index_3 = v159; + string_1 = v158; + if (v162 == false) + { + block = 1; + break; + } + block = 3; + break; + case 1: + v164 = (index_3+1); + iter_1.index = v164; + v167 = string_1.charAt(index_3); + v157 = v167; + block = 2; + break; + case 3: + v168 = __consts_0.exceptions_StopIteration; + v169 = v168.meta; + etype_1 = v169; + evalue_1 = v168; + block = 4; + break; + case 4: + throw(evalue_1); + case 2: + return ( v157 ); + } + } +} + +function rpn_State () { + this.ostack = __consts_0.const_list; +} + +rpn_State.prototype.toString = function (){ + return ( '' ); +} + +inherits(rpn_State,Object); +rpn_State.prototype.oadd = function (){ + var v172,v173,v174,v175,v176,v177,v178,v179,v180; + var block = 0; + for(;;){ + switch(block){ + case 0: + v172 = this.ostack; + v174 = ll_pop_default__dum_nocheckConst_List_Signed_ ( v172 ); + v175 = this.ostack; + v177 = ll_pop_default__dum_nocheckConst_List_Signed_ ( v175 ); + v178 = this.ostack; + v180 = (v177+v174); + ll_append__List_Signed__Signed ( v178,v180 ); + block = 1; + break; + case 1: + return ( undefined ); + } + } +} + +rpn_State.prototype.ogetresult = function (){ + var v202,v203,v204; + var block = 0; + for(;;){ + switch(block){ + case 0: + v203 = this.ostack; + v204 = ll_getitem__dum_nocheckConst_List_Signed__Signed ( v203,-1 ); + v202 = v204; + block = 1; + break; + case 1: + return ( v202 ); + } + } +} + +rpn_State.prototype.opush = function (value_0){ + var v220,v221; + var block = 0; + for(;;){ + switch(block){ + case 0: + v220 = this.ostack; + ll_append__List_Signed__Signed ( v220,value_0 ); + block = 1; + break; + case 1: + return ( undefined ); + } + } +} + +rpn_State.prototype.o__init__ = function (){ + var v150; + var block = 0; + for(;;){ + switch(block){ + case 0: + v150 = new Array(); + v150.length = 0; + this.ostack = v150; + block = 1; + break; + case 1: + return ( undefined ); + } + } +} + +function ll_getitem_nonneg__dum_nocheckConst_List_String__Signed (l_0,index_0) { + var v5,v6,l_1,index_1,v8,v9,v10,index_2,v12,v13,v14; + var block = 0; + for(;;){ + switch(block){ + case 0: + v6 = (index_0>=0); + l_1 = l_0; + index_1 = index_0; + block = 1; + break; + case 1: + v9 = l_1.length; + v10 = (index_1' ); +} + +function rpn_State_meta () { +} + +rpn_State_meta.prototype.toString = function (){ + return ( '' ); +} + +inherits(rpn_State_meta,Object_meta); +function ll_pop_default__dum_nocheckConst_List_Signed_ (l_2) { + var v182,v183,v184,l_3,length_0,v185,v187,v188,v189,res_0,newlength_0,v191,v192; + var block = 0; + for(;;){ + switch(block){ + case 0: + v184 = l_2.length; + l_3 = l_2; + length_0 = v184; + block = 1; + break; + case 1: + v185 = (length_0>0); + v187 = (length_0-1); + v189 = l_3[v187]; + ll_null_item__List_Signed_ ( l_3 ); + res_0 = v189; + newlength_0 = v187; + v191 = l_3; + block = 2; + break; + case 2: + v191.length = newlength_0; + v182 = res_0; + block = 3; + break; + case 3: + return ( v182 ); + } + } +} + +function exceptions_Exception () { +} + +exceptions_Exception.prototype.toString = function (){ + return ( '' ); +} + +inherits(exceptions_Exception,Object); +function ll_getitem__dum_nocheckConst_List_Signed__Signed (l_5,index_4) { + var v205,v206,v207,v208,v209,l_6,index_5,length_1,v210,v212,index_6,v214,v215,v216,l_7,length_2,v217,v218; + var block = 0; + for(;;){ + switch(block){ + case 0: + v207 = l_5.length; + v208 = (index_4<0); + l_6 = l_5; + index_5 = index_4; + length_1 = v207; + if (v208 == false) + { + block = 1; + break; + } + l_7 = l_5; + length_2 = v207; + v217 = index_4; + block = 4; + break; + case 1: + v210 = (index_5>=0); + v212 = (index_5=base_16); + s_21 = s_20; + base_17 = base_16; + i_16 = i_15; + digit_1 = digit_0; + sign_14 = sign_13; + oldpos_8 = oldpos_7; + strlen_17 = strlen_16; + v85 = val_12; + if (v83 == false) + { + block = 29; + break; + } + s_10 = s_20; + val_1 = val_12; + i_6 = i_15; + sign_2 = sign_13; + strlen_6 = strlen_16; + v45 = oldpos_7; + block = 13; + break; + case 29: + v86 = (v85*base_17); + v87 = (v86+digit_1); + v88 = (i_16+1); + s_9 = s_21; + base_9 = base_17; + val_0 = v87; + i_5 = v88; + sign_1 = sign_14; + oldpos_0 = oldpos_8; + strlen_5 = strlen_17; + block = 12; + break; + case 30: + v89 = (c_4<=90); + s_23 = s_22; + base_19 = base_18; + c_5 = c_4; + val_14 = val_13; + i_18 = i_17; + sign_16 = sign_15; + oldpos_10 = oldpos_9; + strlen_19 = strlen_18; + v90 = v89; + block = 31; + break; + case 31: + s_16 = s_23; + base_12 = base_19; + c_1 = c_5; + val_8 = val_14; + i_11 = i_18; + sign_9 = sign_16; + oldpos_3 = oldpos_10; + strlen_12 = strlen_19; + if (v90 == false) + { + block = 24; + break; + } + s_24 = s_23; + base_20 = base_19; + val_15 = val_14; + i_19 = i_18; + sign_17 = sign_16; + oldpos_11 = oldpos_10; + strlen_20 = strlen_19; + v92 = c_5; + block = 32; + break; + case 32: + v93 = (v92-65); + v94 = (v93+10); + s_20 = s_24; + base_16 = base_20; + val_12 = val_15; + i_15 = i_19; + digit_0 = v94; + sign_13 = sign_17; + oldpos_7 = oldpos_11; + strlen_16 = strlen_20; + block = 28; + break; + case 33: + v95 = (c_6<=122); + s_26 = s_25; + base_22 = base_21; + c_7 = c_6; + val_17 = val_16; + i_21 = i_20; + sign_19 = sign_18; + oldpos_13 = oldpos_12; + strlen_22 = strlen_21; + v96 = v95; + block = 34; + break; + case 34: + s_15 = s_26; + base_11 = base_22; + c_0 = c_7; + val_7 = val_17; + i_10 = i_21; + sign_8 = sign_19; + oldpos_2 = oldpos_13; + strlen_11 = strlen_22; + if (v96 == false) + { + block = 23; + break; + } + s_27 = s_26; + base_23 = base_22; + val_18 = val_17; + i_22 = i_21; + sign_20 = sign_19; + oldpos_14 = oldpos_13; + strlen_23 = strlen_22; + v98 = c_7; + block = 35; + break; + case 35: + v99 = (v98-97); + v100 = (v99+10); + s_20 = s_27; + base_16 = base_23; + val_12 = val_18; + i_15 = i_22; + digit_0 = v100; + sign_13 = sign_20; + oldpos_7 = oldpos_14; + strlen_16 = strlen_23; + block = 28; + break; + case 36: + v102 = s_28.charAt(i_23); + v103 = (v102==' '); + s_9 = s_28; + base_9 = base_24; + val_0 = 0; + i_5 = i_23; + sign_1 = sign_21; + oldpos_0 = i_23; + strlen_5 = strlen_24; + if (v103 == false) + { + block = 12; + break; + } + s_29 = s_28; + base_25 = base_24; + sign_22 = sign_21; + strlen_25 = strlen_24; + v105 = i_23; + block = 37; + break; + case 37: + v106 = (v105+1); + s_8 = s_29; + base_8 = base_25; + i_4 = v106; + sign_0 = sign_22; + strlen_4 = strlen_25; + block = 11; + break; + case 38: + v108 = (v107+1); + s_8 = s_30; + base_8 = base_26; + i_4 = v108; + sign_0 = 1; + strlen_4 = strlen_26; + block = 11; + break; + case 39: + v110 = (v109+1); + s_8 = s_31; + base_8 = base_27; + i_4 = v110; + sign_0 = -1; + strlen_4 = strlen_27; + block = 11; + break; + case 40: + v112 = s_32.charAt(i_24); + v113 = (v112==' '); + s_5 = s_32; + base_5 = base_28; + i_1 = i_24; + strlen_1 = strlen_28; + if (v113 == false) + { + block = 7; + break; + } + s_33 = s_32; + base_29 = base_28; + strlen_29 = strlen_28; + v115 = i_24; + block = 41; + break; + case 41: + v116 = (v115+1); + s_4 = s_33; + base_4 = base_29; + i_0 = v116; + strlen_0 = strlen_29; + block = 6; + break; + case 2: + throw(evalue_0); + case 18: + return ( v15 ); + } + } +} + +function ll_null_item__List_Signed_ (lst_0) { + var block = 0; + for(;;){ + switch(block){ + case 0: + undefined; + block = 1; + break; + case 1: + return ( undefined ); + } + } +} + +function exceptions_StandardError () { +} + +exceptions_StandardError.prototype.toString = function (){ + return ( '' ); +} + +inherits(exceptions_StandardError,exceptions_Exception); +function exceptions_ValueError () { +} + +exceptions_ValueError.prototype.toString = function (){ + return ( '' ); +} + +inherits(exceptions_ValueError,exceptions_StandardError); +function State___init__ (self_0) { + var v150; + var block = 0; + for(;;){ + switch(block){ + case 0: + v150 = new Array(); + v150.length = 0; + self_0.ostack = v150; + block = 1; + break; + case 1: + return ( undefined ); + } + } +} + +function ll_striter__String (string_0) { + var v153,v154; + var block = 0; + for(;;){ + switch(block){ + case 0: + v154 = new Object(); + v154.string = string_0; + v154.index = 0; + v153 = v154; + block = 1; + break; + case 1: + return ( v153 ); + } + } +} + +function exceptions_StopIteration () { +} + +exceptions_StopIteration.prototype.toString = function (){ + return ( '' ); +} + +inherits(exceptions_StopIteration,exceptions_Exception); +function exceptions_Exception_meta () { +} + +exceptions_Exception_meta.prototype.toString = function (){ + return ( '' ); +} + +inherits(exceptions_Exception_meta,Object_meta); +function exceptions_StandardError_meta () { +} + +exceptions_StandardError_meta.prototype.toString = function (){ + return ( '' ); +} + +inherits(exceptions_StandardError_meta,exceptions_Exception_meta); +function exceptions_StopIteration_meta () { +} + +exceptions_StopIteration_meta.prototype.toString = function (){ + return ( '' ); +} + +inherits(exceptions_StopIteration_meta,exceptions_Exception_meta); +function exceptions_ValueError_meta () { +} + +exceptions_ValueError_meta.prototype.toString = function (){ + return ( '' ); +} + +inherits(exceptions_ValueError_meta,exceptions_StandardError_meta); +__consts_0 = {}; +__consts_0.exceptions_ValueError__5 = exceptions_ValueError; +__consts_0.exceptions_ValueError_meta = new exceptions_ValueError_meta(); +__consts_0.exceptions_ValueError = new exceptions_ValueError(); +__consts_0.exceptions_StopIteration__7 = exceptions_StopIteration; +__consts_0.rpn_State = rpn_State; +__consts_0.rpn_State_meta = new rpn_State_meta(); +__consts_0.exceptions_StopIteration_meta = new exceptions_StopIteration_meta(); +__consts_0.exceptions_StopIteration = new exceptions_StopIteration(); +__consts_0.const_list = undefined; +__consts_0.exceptions_ValueError_meta.class_ = __consts_0.exceptions_ValueError__5; +__consts_0.exceptions_ValueError.meta = __consts_0.exceptions_ValueError_meta; +__consts_0.rpn_State_meta.class_ = __consts_0.rpn_State; +__consts_0.exceptions_StopIteration_meta.class_ = __consts_0.exceptions_StopIteration__7; +__consts_0.exceptions_StopIteration.meta = __consts_0.exceptions_StopIteration_meta; Added: pypy/extradoc/talk/sfi2008/demo/rpn.py ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/demo/rpn.py Wed Mar 5 11:32:00 2008 @@ -0,0 +1,47 @@ +from pypy.rlib.jit import hint + +# ____________________________________________________________ + +class State: + + def __init__(self): + self.stack = [] + + def push(self, value): + self.stack.append(value) + + def add(self): + y = self.stack.pop() + x = self.stack.pop() + self.stack.append(x + y) + + def getresult(self): + return self.stack[-1] + + +def interpret(code, arg): + state = State() + state.push(arg) + i = 0 + while i < len(code): + c = code[i] + i = i + 1 + c = hint(c, concrete=True) # hint for the JIT + if '0' <= c <= '9': + state.push(ord(c) - ord('0')) + elif c == '+': + state.add() + return state.getresult() + +# ____________________________________________________________ + +def test_run(): + assert interpret("2 4 + + 3 +", 100) == 109 + +def test_lltype(): + from pypy.translator.interactive import Translation + t = Translation(interpret) + t.annotate([str, int]) + t.viewcg() + t.rtype(type_system="lltype") + t.viewcg() Added: pypy/extradoc/talk/sfi2008/demo/targetrpn.py ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/demo/targetrpn.py Wed Mar 5 11:32:00 2008 @@ -0,0 +1,14 @@ +import rpn + +# __________ Entry point __________ + +def entry_point(argv): + code = argv[1] + arg = int(argv[2]) + res = rpn.interpret(code, arg) + return 0 + +# _____ Define and setup target ___ + +def target(*args): + return entry_point, None Added: pypy/extradoc/talk/sfi2008/demo/view-jit-graphs ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/demo/view-jit-graphs Wed Mar 5 11:32:00 2008 @@ -0,0 +1,16 @@ +#! /usr/bin/env python + +import rpn +from pypy.conftest import option +option.view = True +from pypy.rpython.module.support import LLSupport +from pypy.jit.timeshifter.test.test_vlist import P_OOPSPEC +from pypy.jit.timeshifter.test.test_timeshift import TimeshiftingTests +from pypy.jit.codegen.i386.test.test_genc_ts import I386TimeshiftingTestMixin +class Test(I386TimeshiftingTestMixin, TimeshiftingTests): + pass +Test.setup_class.im_func(Test) +self = Test() + +rpn.interpret.convert_arguments = [LLSupport.to_rstr, int] +self.timeshift(rpn.interpret, ["24++3+", 100], [0], policy=P_OOPSPEC) From cami at codespeak.net Wed Mar 5 11:37:36 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Wed, 5 Mar 2008 11:37:36 +0100 (CET) Subject: [pypy-svn] r52186 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . rom tool Message-ID: <20080305103736.2EEAC169F4F@codespeak.net> Author: cami Date: Wed Mar 5 11:37:35 2008 New Revision: 52186 Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/interpreter.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/rom/ pypy/branch/gameboy-emulator/pypy/lang/gameboy/romimage.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/tool/ pypy/branch/gameboy-emulator/pypy/lang/gameboy/tool/__init__.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/tool/autopath.py Log: Initial commit. Created directory and file structre. Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py ============================================================================== Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/interpreter.py ============================================================================== Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/romimage.py ============================================================================== Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/tool/__init__.py ============================================================================== Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/tool/autopath.py ============================================================================== --- (empty file) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/tool/autopath.py Wed Mar 5 11:37:35 2008 @@ -0,0 +1,114 @@ +""" +self cloning, automatic path configuration + +copy this into any subdirectory of pypy from which scripts need +to be run, typically all of the test subdirs. +The idea is that any such script simply issues + + import autopath + +and this will make sure that the parent directory containing "pypy" +is in sys.path. + +If you modify the master "autopath.py" version (in pypy/tool/autopath.py) +you can directly run it which will copy itself on all autopath.py files +it finds under the pypy root directory. + +This module always provides these attributes: + + pypydir pypy root directory path + this_dir directory where this autopath.py resides + +""" + + +def __dirinfo(part): + """ return (partdir, this_dir) and insert parent of partdir + into sys.path. If the parent directories don't have the part + an EnvironmentError is raised.""" + + import sys, os + try: + head = this_dir = os.path.realpath(os.path.dirname(__file__)) + except NameError: + head = this_dir = os.path.realpath(os.path.dirname(sys.argv[0])) + + while head: + partdir = head + head, tail = os.path.split(head) + if tail == part: + break + else: + raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir) + + pypy_root = os.path.join(head, '') + try: + sys.path.remove(head) + except ValueError: + pass + sys.path.insert(0, head) + + munged = {} + for name, mod in sys.modules.items(): + if '.' in name: + continue + fn = getattr(mod, '__file__', None) + if not isinstance(fn, str): + continue + newname = os.path.splitext(os.path.basename(fn))[0] + if not newname.startswith(part + '.'): + continue + path = os.path.join(os.path.dirname(os.path.realpath(fn)), '') + if path.startswith(pypy_root) and newname != part: + modpaths = os.path.normpath(path[len(pypy_root):]).split(os.sep) + if newname != '__init__': + modpaths.append(newname) + modpath = '.'.join(modpaths) + if modpath not in sys.modules: + munged[modpath] = mod + + for name, mod in munged.iteritems(): + if name not in sys.modules: + sys.modules[name] = mod + if '.' in name: + prename = name[:name.rfind('.')] + postname = name[len(prename)+1:] + if prename not in sys.modules: + __import__(prename) + if not hasattr(sys.modules[prename], postname): + setattr(sys.modules[prename], postname, mod) + + return partdir, this_dir + +def __clone(): + """ clone master version of autopath.py into all subdirs """ + from os.path import join, walk + if not this_dir.endswith(join('pypy','tool')): + raise EnvironmentError("can only clone master version " + "'%s'" % join(pypydir, 'tool',_myname)) + + + def sync_walker(arg, dirname, fnames): + if _myname in fnames: + fn = join(dirname, _myname) + f = open(fn, 'rwb+') + try: + if f.read() == arg: + print "checkok", fn + else: + print "syncing", fn + f = open(fn, 'w') + f.write(arg) + finally: + f.close() + s = open(join(pypydir, 'tool', _myname), 'rb').read() + walk(pypydir, sync_walker, s) + +_myname = 'autopath.py' + +# set guaranteed attributes + +pypydir, this_dir = __dirinfo('pypy') + +if __name__ == '__main__': + __clone() From fijal at codespeak.net Wed Mar 5 12:52:08 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 5 Mar 2008 12:52:08 +0100 (CET) Subject: [pypy-svn] r52188 - in pypy/extradoc/talk/sfi2008: . demo Message-ID: <20080305115208.3AB3A169EFD@codespeak.net> Author: fijal Date: Wed Mar 5 12:52:06 2008 New Revision: 52188 Added: pypy/extradoc/talk/sfi2008/demo/infinite_rec_1.py (contents, props changed) pypy/extradoc/talk/sfi2008/demo/infinite_rec_2.py (contents, props changed) pypy/extradoc/talk/sfi2008/demo/infinite_rec_4.py (contents, props changed) pypy/extradoc/talk/sfi2008/demo/infinite_rec_5.py (contents, props changed) Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: * clarify * add infinite_rec demos Added: pypy/extradoc/talk/sfi2008/demo/infinite_rec_1.py ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/demo/infinite_rec_1.py Wed Mar 5 12:52:06 2008 @@ -0,0 +1,11 @@ + +# http://python.org/sf/1202533 + +import new, operator + +class A: + pass +A.__mul__ = new.instancemethod(operator.mul, None, A) + +if __name__ == '__main__': + A()*2 # segfault: infinite recursion in C Added: pypy/extradoc/talk/sfi2008/demo/infinite_rec_2.py ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/demo/infinite_rec_2.py Wed Mar 5 12:52:06 2008 @@ -0,0 +1,10 @@ + +# http://python.org/sf/1202533 + +class A(str): + __get__ = getattr + +if __name__ == '__main__': + a = A('a') + A.a = a + a.a # segfault: infinite recursion in C Added: pypy/extradoc/talk/sfi2008/demo/infinite_rec_4.py ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/demo/infinite_rec_4.py Wed Mar 5 12:52:06 2008 @@ -0,0 +1,7 @@ + +# http://python.org/sf/1202533 + +if __name__ == '__main__': + lst = [apply] + lst.append(lst) + apply(*lst) # segfault: infinite recursion in C Added: pypy/extradoc/talk/sfi2008/demo/infinite_rec_5.py ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/demo/infinite_rec_5.py Wed Mar 5 12:52:06 2008 @@ -0,0 +1,10 @@ + +# http://python.org/sf/1267884 + +import types + +class C: + __str__ = types.InstanceType.__str__ + +if __name__ == '__main__': + str(C()) # segfault: infinite recursion in C Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Wed Mar 5 12:52:06 2008 @@ -27,7 +27,7 @@ * Use a high-level language -* Use a statically analyzable language +* Use a statically analyzable implementation language * Have a flexible compiler toolchain to do part of the job for you @@ -82,8 +82,6 @@ * CPython includes some stack checks in the source, but they don't catch every case -XXX segfault example - * We include it automatically so all cases are guaranteed to be covered Another example of static analysis of interpreter source From fijal at codespeak.net Wed Mar 5 12:53:11 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 5 Mar 2008 12:53:11 +0100 (CET) Subject: [pypy-svn] r52189 - in pypy/extradoc/talk/sfi2008: . demo Message-ID: <20080305115311.8CC3E169EB7@codespeak.net> Author: fijal Date: Wed Mar 5 12:53:09 2008 New Revision: 52189 Modified: pypy/extradoc/talk/sfi2008/ (props changed) pypy/extradoc/talk/sfi2008/demo/ (props changed) Log: fixeol From fijal at codespeak.net Wed Mar 5 13:00:27 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 5 Mar 2008 13:00:27 +0100 (CET) Subject: [pypy-svn] r52190 - pypy/extradoc/talk/sfi2008/demo Message-ID: <20080305120027.17D1D169ECB@codespeak.net> Author: fijal Date: Wed Mar 5 13:00:26 2008 New Revision: 52190 Added: pypy/extradoc/talk/sfi2008/demo/ctypes.c Log: Part of ctypes module to showcase refcounting happening Added: pypy/extradoc/talk/sfi2008/demo/ctypes.c ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/demo/ctypes.c Wed Mar 5 13:00:26 2008 @@ -0,0 +1,28 @@ +static int +KeepRef(CDataObject *target, Py_ssize_t index, PyObject *keep) +{ + int result; + CDataObject *ob; + PyObject *key; + +/* Optimization: no need to store None */ + if (keep == Py_None) { + Py_DECREF(Py_None); + return 0; + } + ob = CData_GetContainer(target); + if (ob->b_objects == NULL || !PyDict_Check(ob->b_objects)) { + Py_XDECREF(ob->b_objects); + ob->b_objects = keep; /* refcount consumed */ + return 0; + } + key = unique_key(target, index); + if (key == NULL) { + Py_DECREF(keep); + return -1; + } + result = PyDict_SetItem(ob->b_objects, key, keep); + Py_DECREF(key); + Py_DECREF(keep); + return result; +} From fijal at codespeak.net Wed Mar 5 13:09:37 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 5 Mar 2008 13:09:37 +0100 (CET) Subject: [pypy-svn] r52191 - pypy/extradoc/talk/sfi2008/demo Message-ID: <20080305120937.BE1AB169EE0@codespeak.net> Author: fijal Date: Wed Mar 5 13:09:37 2008 New Revision: 52191 Added: pypy/extradoc/talk/sfi2008/demo/mmgc.cc Log: Add a sample of code from avm flash Added: pypy/extradoc/talk/sfi2008/demo/mmgc.cc ============================================================================== --- (empty file) +++ pypy/extradoc/talk/sfi2008/demo/mmgc.cc Wed Mar 5 13:09:37 2008 @@ -0,0 +1,16 @@ + static const int NATIVE_COOKIE = 0x10000000; + /*@}*/ + + DWB(Traits*) declaringTraits; + DWB(Traits*) activationTraits; + DWB(PoolObject*) pool; + + AvmCore* core() const + { + return pool->core; + } + + uintptr iid() const + { + return ((uintptr)this)>>3; + } From fijal at codespeak.net Wed Mar 5 14:53:14 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 5 Mar 2008 14:53:14 +0100 (CET) Subject: [pypy-svn] r52192 - in pypy/dist/pypy/translator/sandbox: . test Message-ID: <20080305135314.42BB8169FA0@codespeak.net> Author: fijal Date: Wed Mar 5 14:53:13 2008 New Revision: 52192 Modified: pypy/dist/pypy/translator/sandbox/sandlib.py pypy/dist/pypy/translator/sandbox/test/test_sandlib.py Log: Some fun with sandlib. Allow tcp:// to be available as os.open argument Modified: pypy/dist/pypy/translator/sandbox/sandlib.py ============================================================================== --- pypy/dist/pypy/translator/sandbox/sandlib.py (original) +++ pypy/dist/pypy/translator/sandbox/sandlib.py Wed Mar 5 14:53:13 2008 @@ -377,6 +377,39 @@ starttime = self.starttime = time.time() return time.time() - starttime +class SocketIOSandboxedProc(SimpleIOSandboxedProc): + sock = None + + def do_ll_os__ll_os_open(self, name, flags, mode): + if not name.startswith("tcp://"): + raise OSError("Wrong filename, should start with tcp://") + # XXX don't care about details of error reporting + import socket + host, port = name[6:].split(":") + self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.sock.connect((host, int(port))) + return 3 + + def do_ll_os__ll_os_read(self, fd, lgt): + if fd == 3: + if self.sock is None: + raise OSError("Socket not opened") + return self.sock.recv(lgt) + return SimpleIOSandboxedProc.do_ll_os__ll_os_read(self, fd, lgt) + + def do_ll_os__ll_os_write(self, fd, data): + if fd == 3: + if self.sock is None: + raise OSError("Socket not opened") + return self.sock.send(data) + return SimpleIOSandboxedProc.do_ll_os__ll_os_write(self, fd, data) + + def do_ll_os__ll_os_close(self, fd): + if fd == 3: + self.sock.close() + self.sock = None + else: + raise OSError("Wrong fd %d" % (fd,)) class VirtualizedSandboxedProc(SandboxedProc): """Control a virtualized sandboxed process, which is given a custom Modified: pypy/dist/pypy/translator/sandbox/test/test_sandlib.py ============================================================================== --- pypy/dist/pypy/translator/sandbox/test/test_sandlib.py (original) +++ pypy/dist/pypy/translator/sandbox/test/test_sandlib.py Wed Mar 5 14:53:13 2008 @@ -4,6 +4,7 @@ from pypy.rpython.lltypesystem import rffi from pypy.translator.sandbox.sandlib import SandboxedProc from pypy.translator.sandbox.sandlib import SimpleIOSandboxedProc +from pypy.translator.sandbox.sandlib import SocketIOSandboxedProc from pypy.translator.interactive import Translation @@ -99,6 +100,26 @@ assert output == "Please enter a number:\nThe double is: 42\n" assert error == "" +def test_socketio(): + def entry_point(argv): + try: + os.open("stuff", os.O_RDONLY, 0777) + except OSError: + pass + else: + print "Not working" + return 1 + fd = os.open("tcp://google.com:80", os.O_RDONLY, 0777) + os.write(fd, 'GET /\n') + print os.read(fd, 30) + return 0 + t = Translation(entry_point, backend='c', standalone=True, sandbox=True) + exe = t.compile() + + proc = SocketIOSandboxedProc([exe]) + output, error = proc.communicate("") + assert output.startswith('') + def test_oserror(): def entry_point(argv): try: From fijal at codespeak.net Wed Mar 5 14:56:12 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 5 Mar 2008 14:56:12 +0100 (CET) Subject: [pypy-svn] r52193 - pypy/dist/pypy/translator/sandbox Message-ID: <20080305135612.84699169ECA@codespeak.net> Author: fijal Date: Wed Mar 5 14:56:11 2008 New Revision: 52193 Modified: pypy/dist/pypy/translator/sandbox/sandlib.py Log: The fd management sucks here, but don't care for a moment, make it fixed Modified: pypy/dist/pypy/translator/sandbox/sandlib.py ============================================================================== --- pypy/dist/pypy/translator/sandbox/sandlib.py (original) +++ pypy/dist/pypy/translator/sandbox/sandlib.py Wed Mar 5 14:56:11 2008 @@ -388,24 +388,24 @@ host, port = name[6:].split(":") self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock.connect((host, int(port))) - return 3 + return 13 def do_ll_os__ll_os_read(self, fd, lgt): - if fd == 3: + if fd == 13: if self.sock is None: raise OSError("Socket not opened") return self.sock.recv(lgt) return SimpleIOSandboxedProc.do_ll_os__ll_os_read(self, fd, lgt) def do_ll_os__ll_os_write(self, fd, data): - if fd == 3: + if fd == 13: if self.sock is None: raise OSError("Socket not opened") return self.sock.send(data) return SimpleIOSandboxedProc.do_ll_os__ll_os_write(self, fd, data) def do_ll_os__ll_os_close(self, fd): - if fd == 3: + if fd == 13: self.sock.close() self.sock = None else: From fijal at codespeak.net Wed Mar 5 15:59:00 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 5 Mar 2008 15:59:00 +0100 (CET) Subject: [pypy-svn] r52194 - in pypy/dist/pypy/translator/sandbox: . test Message-ID: <20080305145900.633C8169FBC@codespeak.net> Author: fijal Date: Wed Mar 5 15:58:58 2008 New Revision: 52194 Modified: pypy/dist/pypy/translator/sandbox/sandlib.py pypy/dist/pypy/translator/sandbox/test/test_sandlib.py Log: Actually doing the right thing here was easier than doing a hack Modified: pypy/dist/pypy/translator/sandbox/sandlib.py ============================================================================== --- pypy/dist/pypy/translator/sandbox/sandlib.py (original) +++ pypy/dist/pypy/translator/sandbox/sandlib.py Wed Mar 5 15:58:58 2008 @@ -377,40 +377,6 @@ starttime = self.starttime = time.time() return time.time() - starttime -class SocketIOSandboxedProc(SimpleIOSandboxedProc): - sock = None - - def do_ll_os__ll_os_open(self, name, flags, mode): - if not name.startswith("tcp://"): - raise OSError("Wrong filename, should start with tcp://") - # XXX don't care about details of error reporting - import socket - host, port = name[6:].split(":") - self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self.sock.connect((host, int(port))) - return 13 - - def do_ll_os__ll_os_read(self, fd, lgt): - if fd == 13: - if self.sock is None: - raise OSError("Socket not opened") - return self.sock.recv(lgt) - return SimpleIOSandboxedProc.do_ll_os__ll_os_read(self, fd, lgt) - - def do_ll_os__ll_os_write(self, fd, data): - if fd == 13: - if self.sock is None: - raise OSError("Socket not opened") - return self.sock.send(data) - return SimpleIOSandboxedProc.do_ll_os__ll_os_write(self, fd, data) - - def do_ll_os__ll_os_close(self, fd): - if fd == 13: - self.sock.close() - self.sock = None - else: - raise OSError("Wrong fd %d" % (fd,)) - class VirtualizedSandboxedProc(SandboxedProc): """Control a virtualized sandboxed process, which is given a custom view on the filesystem and a custom environment. @@ -520,3 +486,37 @@ def do_ll_os__ll_os_listdir(self, vpathname): node = self.get_node(vpathname) return node.keys() + + +class VirtualizedSocketProc(VirtualizedSandboxedProc): + """ Extends VirtualizedSandboxProc with socket + options, ie tcp://host:port as args to os.open + """ + def __init__(self, *args, **kwds): + super(VirtualizedSocketProc, self).__init__(*args, **kwds) + self.sockets = {} + + def do_ll_os__ll_os_open(self, name, flags, mode): + if not name.startswith("tcp://"): + return super(VirtualizedSocketProc, self).do_ll_os__ll_os_open( + name, flags, mode) + import socket + host, port = name[6:].split(":") + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.connect((host, int(port))) + fd = self.allocate_fd(sock) + self.sockets[fd] = True + return fd + + def do_ll_os__ll_os_read(self, fd, size): + if fd in self.sockets: + return self.open_fds[fd].recv(size) + return super(VirtualizedSocketProc, self).do_ll_os__ll_os_read( + fd, size) + + def do_ll_os__ll_os_write(self, fd, data): + if fd in self.sockets: + return self.open_fds[fd].send(data) + return super(VirtualizedSocketProc, self).do_ll_os__ll_os_write( + fd, data) + Modified: pypy/dist/pypy/translator/sandbox/test/test_sandlib.py ============================================================================== --- pypy/dist/pypy/translator/sandbox/test/test_sandlib.py (original) +++ pypy/dist/pypy/translator/sandbox/test/test_sandlib.py Wed Mar 5 15:58:58 2008 @@ -4,7 +4,7 @@ from pypy.rpython.lltypesystem import rffi from pypy.translator.sandbox.sandlib import SandboxedProc from pypy.translator.sandbox.sandlib import SimpleIOSandboxedProc -from pypy.translator.sandbox.sandlib import SocketIOSandboxedProc +from pypy.translator.sandbox.sandlib import VirtualizedSocketProc from pypy.translator.interactive import Translation @@ -101,14 +101,11 @@ assert error == "" def test_socketio(): - def entry_point(argv): - try: - os.open("stuff", os.O_RDONLY, 0777) - except OSError: + class SocketProc(VirtualizedSocketProc, SimpleIOSandboxedProc): + def build_virtual_root(self): pass - else: - print "Not working" - return 1 + + def entry_point(argv): fd = os.open("tcp://google.com:80", os.O_RDONLY, 0777) os.write(fd, 'GET /\n') print os.read(fd, 30) @@ -116,7 +113,7 @@ t = Translation(entry_point, backend='c', standalone=True, sandbox=True) exe = t.compile() - proc = SocketIOSandboxedProc([exe]) + proc = SocketProc([exe]) output, error = proc.communicate("") assert output.startswith('') From cfbolz at codespeak.net Wed Mar 5 22:45:35 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 5 Mar 2008 22:45:35 +0100 (CET) Subject: [pypy-svn] r52202 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080305214535.584C7169F10@codespeak.net> Author: cfbolz Date: Wed Mar 5 22:45:33 2008 New Revision: 52202 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py Log: show the current pypy-c-jit problem Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py Wed Mar 5 22:45:33 2008 @@ -12,3 +12,19 @@ # for the individual tests see # ====> test_portal.py + + + def test_vdict_and_vlist(self): + py.test.skip("XXX") + def ll_function(): + dic = {} + lst = [12] * 3 + lst += [] + lst.append(13) + lst.reverse() + dic[12] = 34 + dic[lst[0]] = 35 + return dic[lst.pop()] + res = self.timeshift_from_portal(ll_function, ll_function, []) + assert res == ll_function() + self.check_insns({}) From arigo at codespeak.net Wed Mar 5 23:28:04 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 5 Mar 2008 23:28:04 +0100 (CET) Subject: [pypy-svn] r52203 - in pypy/branch/jit-refactoring/pypy/jit: rainbow timeshifter Message-ID: <20080305222804.DFC73169F10@codespeak.net> Author: arigo Date: Wed Mar 5 23:28:03 2008 New Revision: 52203 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py Log: Move the RPython magic around. This is still a bit of a simplification, I think. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Wed Mar 5 23:28:03 2008 @@ -872,15 +872,6 @@ args_v.append(v) args.append(self.serialize_oparg("red", v)) - ll_handler = oopspecdesc.ll_handler - couldfold = oopspecdesc.couldfold - missing_args = ((ll_handler.func_code.co_argcount - 3) - - len(oopspecdesc.argtuple)) - assert missing_args >= 0 - if missing_args > 0: - assert (ll_handler.func_defaults[-missing_args:] == - (None,) * missing_args) - if oopspecdesc.is_method: hs_self = self.hannotator.binding( opargs[oopspecdesc.argtuple[0].n]) Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Wed Mar 5 23:28:03 2008 @@ -572,35 +572,35 @@ @arguments("oopspec", "bool", returns="red") def opimpl_red_oopspec_call_0(self, oopspec, deepfrozen): - return oopspec.ll_handler_0(self.jitstate, oopspec, deepfrozen) + return oopspec.ll_handler(self.jitstate, oopspec, deepfrozen) @arguments("oopspec", "bool", "red", returns="red") def opimpl_red_oopspec_call_1(self, oopspec, deepfrozen, arg1): - return oopspec.ll_handler_1(self.jitstate, oopspec, deepfrozen, arg1) + return oopspec.ll_handler(self.jitstate, oopspec, deepfrozen, arg1) @arguments("oopspec", "bool", "red", "red", returns="red") def opimpl_red_oopspec_call_2(self, oopspec, deepfrozen, arg1, arg2): - return oopspec.ll_handler_2(self.jitstate, oopspec, deepfrozen, arg1, arg2) + return oopspec.ll_handler(self.jitstate, oopspec, deepfrozen, arg1, arg2) @arguments("oopspec", "bool", "red", "red", "red", returns="red") def opimpl_red_oopspec_call_3(self, oopspec, deepfrozen, arg1, arg2, arg3): - return oopspec.ll_handler_3(self.jitstate, oopspec, deepfrozen, arg1, arg2, arg3) + return oopspec.ll_handler(self.jitstate, oopspec, deepfrozen, arg1, arg2, arg3) @arguments("oopspec", "bool") def opimpl_red_oopspec_call_noresult_0(self, oopspec, deepfrozen): - oopspec.ll_handler_0(self.jitstate, oopspec, deepfrozen) + oopspec.ll_handler(self.jitstate, oopspec, deepfrozen) @arguments("oopspec", "bool", "red") def opimpl_red_oopspec_call_noresult_1(self, oopspec, deepfrozen, arg1): - oopspec.ll_handler_1(self.jitstate, oopspec, deepfrozen, arg1) + oopspec.ll_handler(self.jitstate, oopspec, deepfrozen, arg1) @arguments("oopspec", "bool", "red", "red") def opimpl_red_oopspec_call_noresult_2(self, oopspec, deepfrozen, arg1, arg2): - oopspec.ll_handler_2(self.jitstate, oopspec, deepfrozen, arg1, arg2) + oopspec.ll_handler(self.jitstate, oopspec, deepfrozen, arg1, arg2) @arguments("oopspec", "bool", "red", "red", "red") def opimpl_red_oopspec_call_noresult_3(self, oopspec, deepfrozen, arg1, arg2, arg3): - oopspec.ll_handler_3(self.jitstate, oopspec, deepfrozen, arg1, arg2, arg3) + oopspec.ll_handler(self.jitstate, oopspec, deepfrozen, arg1, arg2, arg3) @arguments("promotiondesc") def opimpl_after_oop_residual_call(self, promotiondesc): Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py Wed Mar 5 23:28:03 2008 @@ -89,9 +89,26 @@ None, None, [method]) self.typedesc = vmodule.TypeDesc(RGenOp, rtyper, SELFTYPE) handler = getattr(vmodule, method) - setattr(self, "ll_handler_%s" % (len(OOPARGTYPES), ), handler) - self.ll_handler = handler + argcount_max = handler.func_code.co_argcount + argcount_min = argcount_max - len(handler.func_defaults or ()) + + def ll_handler(*args): + # an indirection to support the fact that the handler() can + # take default arguments. This is an RPython trick to let + # a family of ll_handler()s be called with a constant number + # of arguments. If we tried to call directly the handler()s + # in a family, the fact that some have extra default arguments + # and others not causes trouble in normalizecalls.py. + assert argcount_min <= len(args) <= argcount_max + # ^^^ 'assert' is because each call family contains all + # oopspecs with the rainbow interpreter. The number of + # arguments is wrong for many of the oopspecs in the + # call family, though, so the assert prevents the actual + # call below from being seen. + return handler(*args) + + self.ll_handler = ll_handler self.couldfold = getattr(handler, 'couldfold', False) if self.couldfold: From arigo at codespeak.net Wed Mar 5 23:39:23 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 5 Mar 2008 23:39:23 +0100 (CET) Subject: [pypy-svn] r52204 - pypy/branch/jit-refactoring/pypy/jit/timeshifter Message-ID: <20080305223923.422FB169F03@codespeak.net> Author: arigo Date: Wed Mar 5 23:39:22 2008 New Revision: 52204 Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/vdict.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/vlist.py Log: Try to move all the assert isinstance() inside the generic ll_handler(). I hope I'm not breaking translation of larger examples again... Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py Wed Mar 5 23:39:22 2008 @@ -74,16 +74,22 @@ if operation_name == 'newlist': typename, method = 'list', 'oop_newlist' SELFTYPE = FUNCTYPE.RESULT.TO - self.is_method = False + is_method = False elif operation_name == 'newdict': typename, method = 'dict', 'oop_newdict' SELFTYPE = FUNCTYPE.RESULT.TO - self.is_method = False + is_method = False else: typename, method = operation_name.split('.') method = 'oop_%s_%s' % (typename, method) SELFTYPE = FUNCTYPE.ARGS[self.argtuple[0].n].TO - self.is_method = True + is_method = True + self.is_method = is_method + + # hack! to avoid confusion between the .typedesc attribute + # of oopspecdescs of different types (lists, dicts, etc.) + # let's use different subclasses for the oopspecdesc too. + self.__class__ = myrealclass = globals()['OopSpecDesc_%s' % typename] vmodule = __import__('pypy.jit.timeshifter.v%s' % (typename,), None, None, [method]) @@ -93,20 +99,27 @@ argcount_max = handler.func_code.co_argcount argcount_min = argcount_max - len(handler.func_defaults or ()) - def ll_handler(*args): + def ll_handler(jitstate, oopspecdesc, deepfrozen, *args): # an indirection to support the fact that the handler() can # take default arguments. This is an RPython trick to let # a family of ll_handler()s be called with a constant number # of arguments. If we tried to call directly the handler()s # in a family, the fact that some have extra default arguments # and others not causes trouble in normalizecalls.py. - assert argcount_min <= len(args) <= argcount_max + assert argcount_min <= 3 + len(args) <= argcount_max # ^^^ 'assert' is because each call family contains all # oopspecs with the rainbow interpreter. The number of # arguments is wrong for many of the oopspecs in the # call family, though, so the assert prevents the actual # call below from being seen. - return handler(*args) + assert isinstance(oopspecdesc, myrealclass) + if is_method: + selfbox = args[0] + assert isinstance(selfbox, rvalue.PtrRedBox) + return handler(jitstate, oopspecdesc, deepfrozen, selfbox, + *args[1:]) + else: + return handler(jitstate, oopspecdesc, deepfrozen, *args) self.ll_handler = ll_handler self.couldfold = getattr(handler, 'couldfold', False) @@ -145,11 +158,6 @@ self.do_call = do_call - # hack! to avoid confusion between the .typedesc attribute - # of oopspecdescs of different types (lists, dicts, etc.) - # let's use different subclasses for the oopspecdesc too. - self.__class__ = globals()['OopSpecDesc_%s' % typename] - def residual_call(self, jitstate, argboxes, deepfrozen=False): builder = jitstate.curbuilder args_gv = [] Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/vdict.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/vdict.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/vdict.py Wed Mar 5 23:39:22 2008 @@ -265,12 +265,9 @@ def oop_newdict(jitstate, oopspecdesc, deepfrozen): - assert isinstance(oopspecdesc, oop.OopSpecDesc_dict) return oopspecdesc.typedesc.factory() def oop_dict_setitem(jitstate, oopspecdesc, deepfrozen, selfbox, keybox, valuebox): - assert isinstance(oopspecdesc, oop.OopSpecDesc_dict) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, AbstractVirtualDict) and keybox.is_constant(): content.setitem(keybox, valuebox) @@ -278,8 +275,6 @@ oopspecdesc.residual_call(jitstate, [selfbox, keybox, valuebox]) def oop_dict_getitem(jitstate, oopspecdesc, deepfrozen, selfbox, keybox): - assert isinstance(oopspecdesc, oop.OopSpecDesc_dict) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, AbstractVirtualDict) and keybox.is_constant(): try: @@ -292,8 +287,6 @@ oop_dict_getitem.couldfold = True def oop_dict_contains(jitstate, oopspecdesc, deepfrozen, selfbox, keybox): - assert isinstance(oopspecdesc, oop.OopSpecDesc_dict) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, AbstractVirtualDict) and keybox.is_constant(): try: Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/vlist.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/vlist.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/vlist.py Wed Mar 5 23:39:22 2008 @@ -268,15 +268,12 @@ def oop_newlist(jitstate, oopspecdesc, deepfrozen, lengthbox, itembox=None): - assert isinstance(oopspecdesc, oop.OopSpecDesc_list) if lengthbox.is_constant(): length = rvalue.ll_getvalue(lengthbox, lltype.Signed) return oopspecdesc.typedesc.factory(length, itembox) return oopspecdesc.residual_call(jitstate, [lengthbox, itembox]) def oop_list_copy(jitstate, oopspecdesc, deepfrozen, selfbox): - assert isinstance(oopspecdesc, oop.OopSpecDesc_list) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): copybox = oopspecdesc.typedesc.factory(0, None) @@ -288,8 +285,6 @@ return oopspecdesc.residual_call(jitstate, [selfbox]) def oop_list_len(jitstate, oopspecdesc, deepfrozen, selfbox): - assert isinstance(oopspecdesc, oop.OopSpecDesc_list) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): return rvalue.ll_fromvalue(jitstate, len(content.item_boxes)) @@ -299,8 +294,6 @@ oop_list_len.couldfold = True def oop_list_nonzero(jitstate, oopspecdesc, deepfrozen, selfbox): - assert isinstance(oopspecdesc, oop.OopSpecDesc_list) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): return rvalue.ll_fromvalue(jitstate, bool(content.item_boxes)) @@ -310,8 +303,6 @@ oop_list_nonzero.couldfold = True def oop_list_append(jitstate, oopspecdesc, deepfrozen, selfbox, itembox): - assert isinstance(oopspecdesc, oop.OopSpecDesc_list) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): content.item_boxes.append(itembox) @@ -319,8 +310,6 @@ oopspecdesc.residual_call(jitstate, [selfbox, itembox]) def oop_list_insert(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox, itembox): - assert isinstance(oopspecdesc, oop.OopSpecDesc_list) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList) and indexbox.is_constant(): index = rvalue.ll_getvalue(indexbox, lltype.Signed) @@ -331,8 +320,6 @@ oopspecdesc.residual_call(jitstate, [selfbox, indexbox, itembox]) def oop_list_concat(jitstate, oopspecdesc, deepfrozen, selfbox, otherbox): - assert isinstance(oopspecdesc, oop.OopSpecDesc_list) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): assert isinstance(otherbox, rvalue.PtrRedBox) @@ -347,8 +334,6 @@ return oopspecdesc.residual_call(jitstate, [selfbox, otherbox]) def oop_list_pop(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox=None): - assert isinstance(oopspecdesc, oop.OopSpecDesc_list) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if indexbox is None: if isinstance(content, VirtualList): @@ -369,8 +354,6 @@ return oopspecdesc.residual_call(jitstate, [selfbox, indexbox]) def oop_list_reverse(jitstate, oopspecdesc, deepfrozen, selfbox): - assert isinstance(oopspecdesc, oop.OopSpecDesc_list) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList): content.item_boxes.reverse() @@ -378,8 +361,6 @@ oopspecdesc.residual_call(jitstate, [selfbox]) def oop_list_getitem(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox): - assert isinstance(oopspecdesc, oop.OopSpecDesc_list) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList) and indexbox.is_constant(): index = rvalue.ll_getvalue(indexbox, lltype.Signed) @@ -393,8 +374,6 @@ oop_list_getitem.couldfold = True def oop_list_setitem(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox, itembox): - assert isinstance(oopspecdesc, oop.OopSpecDesc_list) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList) and indexbox.is_constant(): index = rvalue.ll_getvalue(indexbox, lltype.Signed) @@ -406,8 +385,6 @@ oopspecdesc.residual_call(jitstate, [selfbox, indexbox, itembox]) def oop_list_delitem(jitstate, oopspecdesc, deepfrozen, selfbox, indexbox): - assert isinstance(oopspecdesc, oop.OopSpecDesc_list) - assert isinstance(selfbox, rvalue.PtrRedBox) content = selfbox.content if isinstance(content, VirtualList) and indexbox.is_constant(): index = rvalue.ll_getvalue(indexbox, lltype.Signed) From fijal at codespeak.net Wed Mar 5 23:51:39 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 5 Mar 2008 23:51:39 +0100 (CET) Subject: [pypy-svn] r52205 - in pypy/extradoc/talk/sfi2008: . demo Message-ID: <20080305225139.2ED00169EF4@codespeak.net> Author: fijal Date: Wed Mar 5 23:51:37 2008 New Revision: 52205 Added: pypy/extradoc/talk/sfi2008/demo/f.py - copied unchanged from r52188, pypy/extradoc/talk/rupy2007/demos/f.py Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: Uh, forgotten commit Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Wed Mar 5 23:51:37 2008 @@ -55,6 +55,17 @@ things such as object model orthogonal to language semantics encoding +Developement technology +======================= + +* We use test driven developement extensively + +* We've got a test suite which runs on a single processor for ~8 hours + +* Our special testing tool, py.test, little hassle and a lot of features + +* Sprint-driven development + General idea ============ @@ -71,32 +82,32 @@ * Compile it to your platform (C/POSIX, .NET, ...) -An Example of benefit from our architecture -=========================================== +An example of benefit +===================== * Python has complicated semantics * Python guarantees that it won't segfault on - C stack exhaustion + a stack exhaustion -* CPython includes some stack checks in the source, but they don't catch every - case +* CPython includes some stack checks in the source, but they + don't catch every case * We include it automatically so all cases are guaranteed to be covered -Another example of static analysis of interpreter source +Example of static analysis ======================================================== -* sandboxing +* we analyze interpreter source, not user code! -* a very small piece of code to trust +* replace all external calls with stubs -* changes every call to an external function automatically +* a very small piece of code to trust * build your own library (in python) which implements your own security policy -XXX demo +* no need to worry about third party modules RPython ======= @@ -130,16 +141,15 @@ * Can encode different layers of abstraction -XXX demo - Annotation ========== * The part which does the type inference over existing graphs -* A Powerful but practical type system, not nearly as rich as - say haskell (XXX comparison makes no real sense, it's very different) +* A Powerful but practical type system + +* Still very high-level RTyper ====== @@ -149,7 +159,7 @@ * Two type systems: - lltype, for backends that understand pointers, - structures etc. XXX its what they _don't understand that is important + structures etc. - ootype, for backends that have notion of objects @@ -194,7 +204,7 @@ * .NET bindings, for example, are backend specific -One Special translation aspect +Special translation aspect ============================== * generating Just-in-time compilers from interpreters @@ -271,7 +281,7 @@ * Use CPU stack and registers (we're not very good at it) -Irrelevant to program written +Irrelevant to interpreter ============================== * These techniques can be applied relatively easily @@ -280,7 +290,7 @@ * Or to any other program written in RPython (for instance a templating language where the templates are constant) -JIT details - hint annotator +The hint annotator ============================ * This annotator is very similiar to the normal one; it @@ -294,7 +304,7 @@ XXX demo -JIT details - the rainbow interpreter +The rainbow interpreter ===================================== * Very very experimental, lives on a branch right now @@ -319,11 +329,6 @@ * We would definitely benefit from help from an assembler expert -Example -======== - -XXX demo of compilation of DFA or NFA or toy language - JIT conclusion ============== @@ -358,17 +363,6 @@ * Benchmark bottlenecks -Developement technology -======================= - -* We use test driven developement extensively - -* We've got a test suite which runs on a single processor for ~8 hours - -* Our special testing tool, py.test, little hassle and a lot of features - -* Sprint-driven development - It's not only technical =========================== From fijal at codespeak.net Thu Mar 6 09:21:39 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 6 Mar 2008 09:21:39 +0100 (CET) Subject: [pypy-svn] r52207 - pypy/extradoc/talk/sfi2008 Message-ID: <20080306082139.9195B169FAC@codespeak.net> Author: fijal Date: Thu Mar 6 09:21:38 2008 New Revision: 52207 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: Last-minute changes Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Thu Mar 6 09:21:38 2008 @@ -20,7 +20,7 @@ - refcounting fixed hard to change - - psyco, jit for python hard to maintain + - global interpreter lock hard to change Ideally, we would... ==================== From arigo at codespeak.net Thu Mar 6 09:42:25 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 09:42:25 +0100 (CET) Subject: [pypy-svn] r52208 - pypy/extradoc/talk/sfi2008 Message-ID: <20080306084225.08AC5169FAD@codespeak.net> Author: arigo Date: Thu Mar 6 09:42:24 2008 New Revision: 52208 Modified: pypy/extradoc/talk/sfi2008/talk.txt Log: Typos, minor clarifications Modified: pypy/extradoc/talk/sfi2008/talk.txt ============================================================================== --- pypy/extradoc/talk/sfi2008/talk.txt (original) +++ pypy/extradoc/talk/sfi2008/talk.txt Thu Mar 6 09:42:24 2008 @@ -55,12 +55,12 @@ things such as object model orthogonal to language semantics encoding -Developement technology +Development technology ======================= -* We use test driven developement extensively +* We use test driven development extensively -* We've got a test suite which runs on a single processor for ~8 hours +* We've got a test suite which would need ~8 hours to run on a single processor * Our special testing tool, py.test, little hassle and a lot of features @@ -126,7 +126,7 @@ Abstract interpretation ======================= -* We start by importing a python module +* We start by importing the RPython modules on top of CPython * Next we analyze the bytecode and produce a forest of flow graphs @@ -214,7 +214,8 @@ * Interpreters are much easier to write than compilers -* One cannot achieve C-level performance with static analysis +* For many languages, one cannot achieve C-level performance + with static analysis * Dynamic compilation can produce faster results than static compilation (e.g. a good Java VM versus gcj) @@ -230,7 +231,7 @@ * We can do better! -PyPy approach for JIT +PyPy approach to JIT ===================== .. raw:: html @@ -246,7 +247,7 @@ * automatic generation of a compiler from an interpreter -* relatively few practical applications so far +* an old idea with relatively few practical applications so far JIT - general idea =================== @@ -256,7 +257,7 @@ * may not yield good performance (our experiments show about 2x for removing intepretation overhead) -* things such as the types are still not known +* things such as the types of Python objects are still not known Solution: promotion =================== @@ -279,7 +280,8 @@ * Lazy allocation of objects (allocation only happens when the object escapes) -* Use CPU stack and registers (we're not very good at it) +* Use CPU stack and registers as a cache for Python frame + objects that live in the heap Irrelevant to interpreter ============================== From arigo at codespeak.net Thu Mar 6 10:29:05 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 10:29:05 +0100 (CET) Subject: [pypy-svn] r52209 - pypy/branch/jit-refactoring/pypy/jit/timeshifter Message-ID: <20080306092905.5530B169EC3@codespeak.net> Author: arigo Date: Thu Mar 6 10:29:03 2008 New Revision: 52209 Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py Log: Workaround: "3+len(args)" was not constant-folded... Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/oop.py Thu Mar 6 10:29:03 2008 @@ -96,17 +96,17 @@ self.typedesc = vmodule.TypeDesc(RGenOp, rtyper, SELFTYPE) handler = getattr(vmodule, method) - argcount_max = handler.func_code.co_argcount - argcount_min = argcount_max - len(handler.func_defaults or ()) + boxargcount_max = handler.func_code.co_argcount - 3 + boxargcount_min = boxargcount_max - len(handler.func_defaults or ()) - def ll_handler(jitstate, oopspecdesc, deepfrozen, *args): + def ll_handler(jitstate, oopspecdesc, deepfrozen, *argboxes): # an indirection to support the fact that the handler() can # take default arguments. This is an RPython trick to let # a family of ll_handler()s be called with a constant number # of arguments. If we tried to call directly the handler()s # in a family, the fact that some have extra default arguments # and others not causes trouble in normalizecalls.py. - assert argcount_min <= 3 + len(args) <= argcount_max + assert boxargcount_min <= len(argboxes) <= boxargcount_max # ^^^ 'assert' is because each call family contains all # oopspecs with the rainbow interpreter. The number of # arguments is wrong for many of the oopspecs in the @@ -114,12 +114,12 @@ # call below from being seen. assert isinstance(oopspecdesc, myrealclass) if is_method: - selfbox = args[0] + selfbox = argboxes[0] assert isinstance(selfbox, rvalue.PtrRedBox) return handler(jitstate, oopspecdesc, deepfrozen, selfbox, - *args[1:]) + *argboxes[1:]) else: - return handler(jitstate, oopspecdesc, deepfrozen, *args) + return handler(jitstate, oopspecdesc, deepfrozen, *argboxes) self.ll_handler = ll_handler self.couldfold = getattr(handler, 'couldfold', False) From arigo at codespeak.net Thu Mar 6 12:08:26 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 12:08:26 +0100 (CET) Subject: [pypy-svn] r52210 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080306110826.A900C169F7F@codespeak.net> Author: arigo Date: Thu Mar 6 12:08:25 2008 New Revision: 52210 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py Log: Move and shorten a bit test_vdict_and_vlist; passes. Add tests for virtualizable on top of the llinterp (skipped for now). Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py Thu Mar 6 12:08:25 2008 @@ -1,6 +1,6 @@ import py from pypy.jit.conftest import option -from pypy.jit.rainbow.test import test_portal +from pypy.jit.rainbow.test import test_portal, test_virtualizable if option.quicktest: py.test.skip("slow") @@ -14,17 +14,11 @@ # ====> test_portal.py - def test_vdict_and_vlist(self): - py.test.skip("XXX") - def ll_function(): - dic = {} - lst = [12] * 3 - lst += [] - lst.append(13) - lst.reverse() - dic[12] = 34 - dic[lst[0]] = 35 - return dic[lst.pop()] - res = self.timeshift_from_portal(ll_function, ll_function, []) - assert res == ll_function() - self.check_insns({}) +class TestLLVirtualizable(test_virtualizable.TestVirtualizableImplicit): + translate_support_code = True + + def setup_method(self, meth): + py.test.skip("in-progress") + + # for the individual tests see + # ====> test_virtualizable.py Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py Thu Mar 6 12:08:25 2008 @@ -554,3 +554,17 @@ res = self.timeshift_from_portal(f, f, [7, 3]) assert res == f(7, 3) self.check_insns(indirect_call=1, direct_call=1) + + + def test_vdict_and_vlist(self): + def ll_function(): + dic = {} + lst = [12] * 3 + lst.append(13) + lst.reverse() + dic[12] = 34 + dic[lst[0]] = 35 + return dic[lst.pop()] + res = self.timeshift_from_portal(ll_function, ll_function, []) + assert res == ll_function() + self.check_insns({}) From arigo at codespeak.net Thu Mar 6 13:05:19 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 13:05:19 +0100 (CET) Subject: [pypy-svn] r52212 - pypy/branch/jit-refactoring/pypy/rpython Message-ID: <20080306120519.0DF08169FA7@codespeak.net> Author: arigo Date: Thu Mar 6 13:05:13 2008 New Revision: 52212 Modified: pypy/branch/jit-refactoring/pypy/rpython/llinterp.py Log: Avoids an obscure way to hide bugs. Modified: pypy/branch/jit-refactoring/pypy/rpython/llinterp.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/rpython/llinterp.py (original) +++ pypy/branch/jit-refactoring/pypy/rpython/llinterp.py Thu Mar 6 13:05:13 2008 @@ -421,6 +421,13 @@ if exc is None: original = sys.exc_info() exc = original[1] + # it makes no sense to convert some exception classes that + # just mean something buggy crashed + if isinstance(exc, (AssertionError, AttributeError, + TypeError, NameError, + KeyboardInterrupt, SystemExit, + ImportError, SyntaxError)): + raise original[0], original[1], original[2] # re-raise it extraargs = (original,) else: extraargs = () From arigo at codespeak.net Thu Mar 6 13:32:33 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 13:32:33 +0100 (CET) Subject: [pypy-svn] r52213 - in pypy/branch/jit-refactoring/pypy/rpython: . test Message-ID: <20080306123233.E52CF169FAC@codespeak.net> Author: arigo Date: Thu Mar 6 13:32:33 2008 New Revision: 52213 Modified: pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py pypy/branch/jit-refactoring/pypy/rpython/test/test_llann.py Log: A skipped test documenting what doesn't work with llhelper(). Modified: pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py (original) +++ pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py Thu Mar 6 13:32:33 2008 @@ -344,6 +344,7 @@ def llhelper(F, f): # implementation for the purpose of direct running only # XXX need more cleverness to support translation of prebuilt llhelper ptr + # (see test_prebuilt_llhelper) return lltype.functionptr(F.TO, f.func_name, _callable=f, _debugexc = getattr(f, '_debugexc', False)) Modified: pypy/branch/jit-refactoring/pypy/rpython/test/test_llann.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/rpython/test/test_llann.py (original) +++ pypy/branch/jit-refactoring/pypy/rpython/test/test_llann.py Thu Mar 6 13:32:33 2008 @@ -1,3 +1,4 @@ +import py from pypy.rpython.lltypesystem.lltype import * from pypy.rpython.lltypesystem.rclass import OBJECTPTR from pypy.rpython.rclass import fishllattr @@ -10,6 +11,7 @@ from pypy.rpython.annlowlevel import base_ptr_lltype from pypy.rpython.llinterp import LLInterpreter from pypy.rpython.test.test_llinterp import interpret +from pypy.rlib.objectmodel import we_are_translated from pypy.objspace.flow.objspace import FlowObjSpace from pypy.conftest import option @@ -426,9 +428,11 @@ def test_llhelper(): S = GcStruct('S', ('x', Signed), ('y', Signed)) def f(s,z): + assert we_are_translated() return s.x*s.y+z def g(s): + assert we_are_translated() return s.x+s.y F = Ptr(FuncType([Ptr(S), Signed], Signed)) @@ -447,6 +451,33 @@ assert res == 99 +def test_prebuilt_llhelper(): + py.test.skip("does not work") + S = GcStruct('S', ('x', Signed), ('y', Signed)) + def f(s,z): + assert we_are_translated() + return s.x*s.y+z + + def g(s): + assert we_are_translated() + return s.x+s.y + + F = Ptr(FuncType([Ptr(S), Signed], Signed)) + G = Ptr(FuncType([Ptr(S)], Signed)) + fptr = llhelper(F, f) + gptr = llhelper(G, g) + + def h(x, y, z): + s = malloc(S) + s.x = x + s.y = y + assert typeOf(fptr) == F + return fptr(s, z)+fptr(s, z*2)+gptr(s) + + res = interpret(h, [8, 5, 2]) + assert res == 99 + + def test_cast_instance_to_base_ptr(): class A: def __init__(self, x, y): From arigo at codespeak.net Thu Mar 6 15:28:49 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 15:28:49 +0100 (CET) Subject: [pypy-svn] r52214 - in pypy/branch/jit-refactoring/pypy/rpython: . test Message-ID: <20080306142849.0916516844E@codespeak.net> Author: arigo Date: Thu Mar 6 15:28:48 2008 New Revision: 52214 Modified: pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py pypy/branch/jit-refactoring/pypy/rpython/test/test_llann.py Log: Oh well. Very ad hoc function to support the JIT... Modified: pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py (original) +++ pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py Thu Mar 6 15:28:48 2008 @@ -367,6 +367,56 @@ # ____________________________________________________________ +def llstructofhelpers(P, initdata): + """Ad hoc. Returns an immortal structure of type P.TO whose fields + are low-level function pointers, initialized according to the + constant dict 'initdata'.""" + # implementation for the purpose of direct running only + # XXX this is a workaround for the fact that prebuilt llhelpers cannot + # be translated + # XXX this is all happy hacking :-/ + result = lltype.malloc(P.TO, immortal=True, zero=True) + for name, callable in initdata.items(): + F = eval('P.TO.%s' % name) + fnptr = llhelper(F, callable) + exec 'result.%s = fnptr' % name + return result + +class LLStructOfHelpersEntry(extregistry.ExtRegistryEntry): + _about_ = llstructofhelpers + + def compute_result_annotation(self, s_P, s_initdata): + assert s_P.is_constant() + assert s_initdata.is_constant() + P = s_P.const + initdata = s_initdata.const + for name, callable in initdata.items(): + F = eval('P.TO.%s' % name) + s_callable = self.bookkeeper.immutablevalue(callable) + args_s = [annmodel.lltype_to_annotation(T) for T in F.TO.ARGS] + key = (name, llhelper, s_callable.const) + s_res = self.bookkeeper.emulate_pbc_call(name, s_callable, args_s) + assert annmodel.lltype_to_annotation(F.TO.RESULT).contains(s_res) + return annmodel.SomePtr(P) + + def specialize_call(self, hop): + bk = hop.rtyper.annotator.bookkeeper + P = hop.args_s[0].const + initdata = hop.args_s[1].const + result = lltype.malloc(P.TO, immortal=True, zero=True) + for name, callable in initdata.items(): + F = eval('P.TO.%s' % name) + s_callable = bk.immutablevalue(callable) + r_callable = hop.rtyper.getrepr(s_callable) + c_fnptr = r_callable.get_unique_llfn() + assert isinstance(c_fnptr, Constant) + fnptr = c_fnptr.value + exec 'result.%s = fnptr' % name + hop.exception_cannot_occur() + return hop.inputconst(P, result) + +# ____________________________________________________________ + def hlstr(ll_s): if hasattr(ll_s, 'items'): return ''.join(items) Modified: pypy/branch/jit-refactoring/pypy/rpython/test/test_llann.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/rpython/test/test_llann.py (original) +++ pypy/branch/jit-refactoring/pypy/rpython/test/test_llann.py Thu Mar 6 15:28:48 2008 @@ -8,6 +8,7 @@ from pypy.rpython.annlowlevel import MixLevelHelperAnnotator from pypy.rpython.annlowlevel import PseudoHighLevelCallable from pypy.rpython.annlowlevel import llhelper, cast_instance_to_base_ptr +from pypy.rpython.annlowlevel import llstructofhelpers from pypy.rpython.annlowlevel import base_ptr_lltype from pypy.rpython.llinterp import LLInterpreter from pypy.rpython.test.test_llinterp import interpret @@ -478,6 +479,30 @@ assert res == 99 +def test_llstructofhelpers(): + F = Ptr(FuncType([], Signed)) + S1 = Struct('S1', ('f1', F)) + S2 = Struct('S2', ('parent', S1), ('f2', F)) + + def myf1(): + return 401 + we_are_translated() + + def myf2(): + return 602 + we_are_translated() + + initdata = {'parent.f1': myf1, + 'f2': myf2} + + def h(): + s2 = llstructofhelpers(Ptr(S2), initdata) + assert typeOf(s2) == Ptr(S2) + return s2.parent.f1() + s2.f2() + + assert h() == 401 + 602 + res = interpret(h, []) + assert res == 401 + 602 + 2 + + def test_cast_instance_to_base_ptr(): class A: def __init__(self, x, y): From arigo at codespeak.net Thu Mar 6 15:59:00 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 15:59:00 +0100 (CET) Subject: [pypy-svn] r52215 - pypy/branch/jit-refactoring/pypy/rpython Message-ID: <20080306145900.356DE169E91@codespeak.net> Author: arigo Date: Thu Mar 6 15:58:49 2008 New Revision: 52215 Modified: pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py Log: Typo Modified: pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py (original) +++ pypy/branch/jit-refactoring/pypy/rpython/annlowlevel.py Thu Mar 6 15:58:49 2008 @@ -394,8 +394,8 @@ F = eval('P.TO.%s' % name) s_callable = self.bookkeeper.immutablevalue(callable) args_s = [annmodel.lltype_to_annotation(T) for T in F.TO.ARGS] - key = (name, llhelper, s_callable.const) - s_res = self.bookkeeper.emulate_pbc_call(name, s_callable, args_s) + key = (llhelper, s_callable.const) + s_res = self.bookkeeper.emulate_pbc_call(key, s_callable, args_s) assert annmodel.lltype_to_annotation(F.TO.RESULT).contains(s_res) return annmodel.SomePtr(P) From arigo at codespeak.net Thu Mar 6 16:01:40 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 16:01:40 +0100 (CET) Subject: [pypy-svn] r52216 - in pypy/branch/jit-refactoring/pypy/jit: rainbow/test timeshifter Message-ID: <20080306150140.8D714169E9A@codespeak.net> Author: arigo Date: Thu Mar 6 16:01:38 2008 New Revision: 52216 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/rvirtualizable.py Log: Move the llhelper() calls to be in RPython code. Likely still in progress. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py Thu Mar 6 16:01:38 2008 @@ -17,8 +17,5 @@ class TestLLVirtualizable(test_virtualizable.TestVirtualizableImplicit): translate_support_code = True - def setup_method(self, meth): - py.test.skip("in-progress") - # for the individual tests see # ====> test_virtualizable.py Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/rcontainer.py Thu Mar 6 16:01:38 2008 @@ -205,9 +205,9 @@ _attrs_ = """redirected_fielddescs redirected base_desc rti_desc access_desc - gv_access + get_gv_access touch_update - gv_access_is_null_ptr access_is_null_token + get_gv_access_is_null access_is_null_token get_rti set_rti """.split() @@ -230,8 +230,20 @@ self.STRUCTTYPE = TOPPTR self.s_structtype = annmodel.lltype_to_annotation(TOPPTR) - self.my_redirected_getsetters_untouched = {} - self.my_redirected_getsetters_touched = {} + firstsubstructdesc = self.firstsubstructdesc + if (firstsubstructdesc is not None and + isinstance(firstsubstructdesc, VirtualizableStructTypeDesc)): + p_untouched = firstsubstructdesc.my_redirected_getsetters_untouched + p_touched = firstsubstructdesc.my_redirected_getsetters_touched + else: + p_untouched = None + p_touched = None + gs_untouched = rvirtualizable.GetSetters(ACCESS, p_untouched) + gs_touched = rvirtualizable.GetSetters(ACCESS, p_untouched) + self.get_gv_access = gs_untouched.get_gv_access + + self.my_redirected_getsetters_untouched = gs_untouched + self.my_redirected_getsetters_touched = gs_touched self.my_redirected_names = my_redirected_names = [] j = -1 for fielddesc, _ in self.redirected_fielddescs: @@ -241,16 +253,9 @@ my_redirected_names.append(fielddesc.fieldname) self._define_getset_field_ptr(RGenOp, fielddesc, j) - - access_untouched = lltype.malloc(ACCESS, immortal=True) - access_touched = lltype.malloc(ACCESS, immortal=True) - self._fill_access('untouched', access_untouched) - self._fill_access('touched', access_touched) - self.gv_access = RGenOp.constPrebuiltGlobal(access_untouched) - self.touch_update = rvirtualizable.define_touch_update(TOPPTR, self.redirected_fielddescs, - access_touched) + gs_touched.get_access) self._define_collect_residual_args() @@ -269,28 +274,9 @@ name = fielddesc.fieldname for getsetters, (get_field, set_field) in zip((untouched, touched), fnpairs): + getsetters.define('get_' + name, get_field) + getsetters.define('set_' + name, set_field) - TYPE = lltype.Ptr(lltype.FuncType([self.STRUCTTYPE], - fielddesc.RESTYPE)) - get_field_ptr = llhelper(TYPE, get_field) - TYPE = lltype.Ptr(lltype.FuncType( - [self.STRUCTTYPE, fielddesc.RESTYPE], lltype.Void)) - set_field_ptr = llhelper(TYPE, set_field) - - getsetters[name] = get_field_ptr, set_field_ptr - - def _fill_access(self, which, access): - firstsubstructdesc = self.firstsubstructdesc - if (firstsubstructdesc is not None and - isinstance(firstsubstructdesc, VirtualizableStructTypeDesc)): - firstsubstructdesc._fill_access(which, access.parent) - - getsetters = getattr(self, 'my_redirected_getsetters_'+which) - - for name, (get_field_ptr, set_field_ptr) in getsetters.iteritems(): - setattr(access, 'get_'+name, get_field_ptr) - setattr(access, 'set_'+name, set_field_ptr) - def _define_collect_residual_args(self): my_redirected_names = unrolling_iterable(self.my_redirected_names) TOPPTR = self.access_desc.PTRTYPE @@ -323,12 +309,11 @@ def access_is_null(struc): assert not struc.vable_access TYPE = lltype.Ptr(lltype.FuncType([self.STRUCTTYPE], lltype.Void)) - access_is_null_ptr = llhelper(TYPE, access_is_null) - self.gv_access_is_null_ptr = RGenOp.constPrebuiltGlobal( - access_is_null_ptr) - self.access_is_null_token = RGenOp.sigToken( - lltype.typeOf(access_is_null_ptr).TO) - + def get_gv_access_is_null(builder): + access_is_null_ptr = llhelper(TYPE, access_is_null) + return builder.rgenop.genconst(access_is_null_ptr) + self.get_gv_access_is_null = get_gv_access_is_null + self.access_is_null_token = RGenOp.sigToken(TYPE.TO) def factory(self): vstructbox = StructTypeDesc.factory(self) @@ -859,7 +844,7 @@ known_nonzero=True) builder = jitstate.curbuilder builder.genop_call(typedesc.access_is_null_token, - typedesc.gv_access_is_null_ptr, + typedesc.get_gv_access_is_null(builder), [gv_outside]) for fielddesc, i in typedesc.redirected_fielddescs: boxes[i] = fielddesc.generate_get(jitstate, gv_outside) @@ -925,7 +910,8 @@ rti_token = typedesc.rti_desc.fieldtoken builder.genop_setfield(rti_token, gv_outside, gv_vable_rti) access_token = typedesc.access_desc.fieldtoken - builder.genop_setfield(access_token, gv_outside, typedesc.gv_access) + builder.genop_setfield(access_token, gv_outside, + typedesc.get_gv_access(builder)) def check_forced_after_residual_call(self, jitstate): typedesc = self.typedesc Modified: pypy/branch/jit-refactoring/pypy/jit/timeshifter/rvirtualizable.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/timeshifter/rvirtualizable.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/timeshifter/rvirtualizable.py Thu Mar 6 16:01:38 2008 @@ -2,13 +2,14 @@ from pypy.rpython.annlowlevel import cachedtype, base_ptr_lltype from pypy.rpython.annlowlevel import cast_base_ptr_to_instance from pypy.rpython.annlowlevel import cast_instance_to_base_ptr +from pypy.rpython.annlowlevel import llstructofhelpers from pypy.rlib.objectmodel import we_are_translated from pypy.rlib.unroll import unrolling_iterable debug_print = lloperation.llop.debug_print debug_pdb = lloperation.llop.debug_pdb -def define_touch_update(TOPPTR, redirected_fielddescs, access_touched): +def define_touch_update(TOPPTR, redirected_fielddescs, get_access_touched): redirected_fielddescs = unrolling_iterable(redirected_fielddescs) def touch_update(strucref): @@ -29,6 +30,7 @@ tgt = lltype.cast_pointer(fielddesc.PTRTYPE, struc) setattr(tgt, fielddesc.fieldname, v) ACCESSPTR = TOPPTR.TO.vable_access + access_touched = get_access_touched() struc.vable_access = lltype.cast_pointer(ACCESSPTR, access_touched) return touch_update @@ -171,3 +173,25 @@ return bool(self.bitmask & shapemask) +class GetSetters: + """A convenient place to put the set of getter/setter functions + that needs to be converted to a low-level ACCESS structure.""" + + def __init__(self, ACCESS, parent=None): + functions = {} + # initialize 'functions' with everything from the parent + if parent is not None: + for key, value in parent.functions.items(): + functions['parent.' + key] = value + self.functions = functions + + def get_access(): + return llstructofhelpers(lltype.Ptr(ACCESS), functions) + self.get_access = get_access + + def get_gv_access(builder): + return builder.rgenop.genconst(get_access()) + self.get_gv_access = get_gv_access + + def define(self, name, func): + self.functions[name] = func From pypy-svn at codespeak.net Thu Mar 6 17:16:55 2008 From: pypy-svn at codespeak.net (pypy-svn at codespeak.net) Date: Thu, 6 Mar 2008 17:16:55 +0100 (CET) Subject: [pypy-svn] Pharmacy Online March 70% OFF Message-ID: <20080306-11747.29824.qmail@adsl-pool-222.123.241-135.tttmaxnet.com> An HTML attachment was scrubbed... URL: From arigo at codespeak.net Thu Mar 6 17:37:29 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 17:37:29 +0100 (CET) Subject: [pypy-svn] r52222 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080306163729.18D0D169E7F@codespeak.net> Author: arigo Date: Thu Mar 6 17:37:28 2008 New Revision: 52222 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_exception.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py Log: Two more tests that pass. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_exception.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_exception.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_exception.py Thu Mar 6 17:37:28 2008 @@ -51,7 +51,6 @@ self.check_insns({'setfield': 1}) def test_catch(self): - py.test.skip("not implemented yet") def ll_two(x): if x == 0: raise ValueError Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py Thu Mar 6 17:37:28 2008 @@ -401,6 +401,15 @@ policy=StopAtXPolicy(w)) res == 1 + def test_exception_after_promotion(self): + def ll_function(n, m): + hint(None, global_merge_point=True) + hint(m, promote=True) + if m == 0: + raise ValueError + return n + self.interpret_raises(ValueError, ll_function, [1, 0], []) + def test_promote_in_yellow_call(self): def ll_two(n): n = hint(n, promote=True) From arigo at codespeak.net Thu Mar 6 17:45:36 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 17:45:36 +0100 (CET) Subject: [pypy-svn] r52223 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080306164536.1B7C8169E88@codespeak.net> Author: arigo Date: Thu Mar 6 17:45:34 2008 New Revision: 52223 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py Log: This test passes. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py Thu Mar 6 17:45:34 2008 @@ -180,7 +180,6 @@ self.check_insns(int_add=0, int_mul=0) def test_more_promotes(self): - py.test.skip("not working yet") S = lltype.GcStruct('S', ('x', lltype.Signed), ('y', lltype.Signed)) def ll_two(s, i, m): if i > 4: From arigo at codespeak.net Thu Mar 6 18:39:37 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 18:39:37 +0100 (CET) Subject: [pypy-svn] r52224 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080306173937.04F7F169F89@codespeak.net> Author: arigo Date: Thu Mar 6 18:39:37 2008 New Revision: 52224 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Log: The 'resumepoint' value is not really needed any more, as this shows (tests still pass). Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Thu Mar 6 18:39:37 2008 @@ -285,7 +285,8 @@ continue return STOP else: - self.frame.pc = resumepoint + # XXX the 'resumepoint' value is not really needed any more + assert self.frame.pc == resumepoint return # operation helper functions From arigo at codespeak.net Thu Mar 6 18:44:33 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 18:44:33 +0100 (CET) Subject: [pypy-svn] r52225 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080306174433.32200169E45@codespeak.net> Author: arigo Date: Thu Mar 6 18:44:31 2008 New Revision: 52225 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py Log: Test and fix. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Thu Mar 6 18:44:31 2008 @@ -248,8 +248,6 @@ assert result is None def dispatch(self): - is_portal = self.frame.bytecode.is_portal - graph_color = self.frame.bytecode.graph_color frame = self.frame queue = self.queue while 1: @@ -257,6 +255,8 @@ resumepoint = rtimeshift.getresumepoint(newjitstate) self.newjitstate(newjitstate) if resumepoint == -1: + is_portal = frame.bytecode.is_portal + graph_color = frame.bytecode.graph_color if graph_color == "gray": assert not is_portal newjitstate = rtimeshift.leave_graph_gray(queue) Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_promotion.py Thu Mar 6 18:44:31 2008 @@ -423,6 +423,23 @@ assert res == 6 self.check_insns(int_add=0) + def test_more_promote_in_yellow_call(self): + def ll_two(n): + n = hint(n, promote=True) + return n + 2 + + def ll_function(n): + hint(None, global_merge_point=True) + if n > 5: + c = n + else: + c = ll_two(n) + return hint(c, variable=True) + + res = self.interpret(ll_function, [4], [], policy=P_NOVIRTUAL) + assert res == 6 + self.check_insns(int_add=0) + def test_two_promotions_in_call(self): def ll_two(n, m): if n < 1: From arigo at codespeak.net Thu Mar 6 19:03:30 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 19:03:30 +0100 (CET) Subject: [pypy-svn] r52226 - in pypy/branch/jit-refactoring/pypy/rpython: . lltypesystem ootypesystem Message-ID: <20080306180330.B8251169F00@codespeak.net> Author: arigo Date: Thu Mar 6 19:03:29 2008 New Revision: 52226 Modified: pypy/branch/jit-refactoring/pypy/rpython/lltypesystem/rpbc.py pypy/branch/jit-refactoring/pypy/rpython/ootypesystem/rpbc.py pypy/branch/jit-refactoring/pypy/rpython/rpbc.py Log: Give these Structs a better name than just 'pbc' if possible. Modified: pypy/branch/jit-refactoring/pypy/rpython/lltypesystem/rpbc.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/rpython/lltypesystem/rpbc.py (original) +++ pypy/branch/jit-refactoring/pypy/rpython/lltypesystem/rpbc.py Thu Mar 6 19:03:29 2008 @@ -51,9 +51,12 @@ self.pbc_cache = {} def _setup_repr(self): + # try to find a name for the Struct, arbitrarily using the longest + # common prefix or suffix of the classes of the objects + name = self.guess_type_name() llfields = self._setup_repr_fields() kwds = {'hints': {'immutable': True}} - self.pbc_type.become(Struct('pbc', *llfields, **kwds)) + self.pbc_type.become(Struct(name, *llfields, **kwds)) def create_instance(self): return malloc(self.pbc_type, immortal=True) Modified: pypy/branch/jit-refactoring/pypy/rpython/ootypesystem/rpbc.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/rpython/ootypesystem/rpbc.py (original) +++ pypy/branch/jit-refactoring/pypy/rpython/ootypesystem/rpbc.py Thu Mar 6 19:03:29 2008 @@ -175,7 +175,7 @@ def __init__(self, rtyper, access_set): self.rtyper = rtyper self.access_set = access_set - self.lowleveltype = ootype.Instance('pbc', PBCROOT) + self.lowleveltype = ootype.Instance(self.guess_type_name(), PBCROOT) self.pbc_cache = {} def _setup_repr(self): Modified: pypy/branch/jit-refactoring/pypy/rpython/rpbc.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/rpython/rpbc.py (original) +++ pypy/branch/jit-refactoring/pypy/rpython/rpbc.py Thu Mar 6 19:03:29 2008 @@ -466,6 +466,31 @@ self.fieldmap[attr] = mangled_name, r_value return fields + def guess_type_name(self): + # try to find a name for the Struct, arbitrarily using the longest + # common prefix of the classes of the objects + names = [] + if self.access_set is not None: + for desc in self.access_set.descs: + x = desc.pyobj + if x is not None: + names.append(x.__class__.__name__) + if not names: + name = '' + else: + s1 = min(names) + s2 = max(names) + n = min(len(s1), len(s2)) + name = s1[:n] + for i in xrange(n): + if s1[i] != s2[i]: + name = s1[:i] + break + if name: + return 'pbc_' + name + else: + return 'pbc' + def convert_desc(self, frozendesc): if (self.access_set is not None and frozendesc not in self.access_set.descs): From arigo at codespeak.net Thu Mar 6 19:05:59 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 19:05:59 +0100 (CET) Subject: [pypy-svn] r52227 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080306180559.B64F6169EE7@codespeak.net> Author: arigo Date: Thu Mar 6 19:05:59 2008 New Revision: 52227 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Log: Comment. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Thu Mar 6 19:05:59 2008 @@ -25,6 +25,13 @@ promotiondescs, called_bytecodes, num_mergepoints, graph_color, calldescs, metacalldescs, indirectcalldescs, is_portal): + # XXX quite a lot of lists of descs here... We should at least + # try to share the empty lists between the numberous prebuilt + # JitCode instances. A better approach memory-wise could be + # to have a single list of descs and use 'assert isinstance' + # checks; or move these lists to the Interpreter class and + # do something about the fact that some of these lists could + # then have more than 65536 items. self.name = name self.code = code self.constants = constants From arigo at codespeak.net Thu Mar 6 19:27:16 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 19:27:16 +0100 (CET) Subject: [pypy-svn] r52228 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080306182716.497B9169E93@codespeak.net> Author: arigo Date: Thu Mar 6 19:27:15 2008 New Revision: 52228 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Log: Catching this problem early looks like an excellent idea. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Thu Mar 6 19:27:15 2008 @@ -1482,6 +1482,7 @@ def assemble_labelpos(labelpos, interpreter, *args): result = [] def emit_2byte(index): + assert -32768 <= index < 32767 result.append(chr((index >> 8) & 0xff)) result.append(chr(index & 0xff)) for arg in args: From arigo at codespeak.net Thu Mar 6 19:28:56 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 19:28:56 +0100 (CET) Subject: [pypy-svn] r52229 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080306182856.B4640169EE7@codespeak.net> Author: arigo Date: Thu Mar 6 19:28:54 2008 New Revision: 52229 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Log: We need to enable this, as cfbolz pointed out Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Thu Mar 6 19:28:54 2008 @@ -1317,9 +1317,10 @@ from pypy.translator.backendopt.constfold import constant_fold_graph self.graph = graph remove_same_as(graph) - # to get rid of the we_are_jitted constant - # XXX not sure this is right, leaving commented out for now - #constant_fold_graph(graph) + # to get rid of the usages of the we_are_jitted constant + # (turned to '1' by the hintannotator) + # XXX is this the best way to deal with it? + constant_fold_graph(graph) self.insert_splits() def insert_splits(self): From arigo at codespeak.net Thu Mar 6 19:31:32 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 19:31:32 +0100 (CET) Subject: [pypy-svn] r52230 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080306183132.BB82F169E93@codespeak.net> Author: arigo Date: Thu Mar 6 19:31:32 2008 New Revision: 52230 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Log: Typo. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Thu Mar 6 19:31:32 2008 @@ -1483,7 +1483,7 @@ def assemble_labelpos(labelpos, interpreter, *args): result = [] def emit_2byte(index): - assert -32768 <= index < 32767 + assert -32768 <= index < 32768 result.append(chr((index >> 8) & 0xff)) result.append(chr(index & 0xff)) for arg in args: From arigo at codespeak.net Thu Mar 6 22:04:00 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 6 Mar 2008 22:04:00 +0100 (CET) Subject: [pypy-svn] r52231 - pypy/branch/jit-refactoring/pypy/jit/rainbow/test Message-ID: <20080306210400.9F662169E93@codespeak.net> Author: arigo Date: Thu Mar 6 22:03:59 2008 New Revision: 52231 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: This failing test shows the next pypy-c-jit failure that I encoutered. Sleeping now, feel free to fix :-) Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Thu Mar 6 22:03:59 2008 @@ -1470,21 +1470,23 @@ self.check_insns(indirect_call=1) def test_constant_indirect_red_call(self): - def h1(x): + py.test.skip("XXX fix me") + def h1(m, n, x): return x-2 - def h2(x): + def h2(m, n, x): return x*4 l = [h1, h2] - def f(n, x): + def f(m, n, x): + m = hint(m, concrete=True) frozenl = hint(l, deepfreeze=True) h = frozenl[n&1] - return h(x) + return h(m, 5, x) P = StopAtXPolicy() - res = self.interpret(f, [7, 3], [0], policy=P) + res = self.interpret(f, [1, 7, 3], [0, 1], policy=P) assert res == f(7,3) self.check_insns({'int_mul': 1}) - res = self.interpret(f, [4, 113], [0], policy=P) + res = self.interpret(f, [1, 4, 113], [0, 1], policy=P) assert res == f(4,113) self.check_insns({'int_sub': 1}) From pedronis at codespeak.net Fri Mar 7 09:46:38 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 7 Mar 2008 09:46:38 +0100 (CET) Subject: [pypy-svn] r52235 - pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test Message-ID: <20080307084638.25599169E0A@codespeak.net> Author: pedronis Date: Fri Mar 7 09:46:36 2008 New Revision: 52235 Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py Log: array in structure test Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py Fri Mar 7 09:46:36 2008 @@ -84,4 +84,27 @@ assert rawbuf[7] == 17 a.free() - # xxx missing array in structure + def test_array_in_structures(self): + import _rawffi, struct + A = _rawffi.Array('i') + S = _rawffi.Structure([('x', 'c'), ('ar', A.gettypecode(5))]) + A5size, A5alignment = A.gettypecode(5) + assert S.size == A5alignment + A5size + assert S.alignment == A5alignment + assert S.fieldoffset('x') == 0 + assert S.fieldoffset('ar') == A5alignment + s = S() + s = S() + s.x = 'G' + raises(TypeError, 's.ar') + assert s.fieldaddress('ar') == s.buffer + S.fieldoffset('ar') + a1 = A.fromaddress(s.fieldaddress('ar'), 5) + a1[4] = 33 + rawbuf = _rawffi.Array('c').fromaddress(s.buffer, S.size) + assert rawbuf[0] == 'G' + sizeofint = struct.calcsize("i") + v = 0 + for i in range(sizeofint): + v += ord(rawbuf[A5alignment + sizeofint*4+i]) + assert v == 33 + s.free() From pedronis at codespeak.net Fri Mar 7 10:14:59 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 7 Mar 2008 10:14:59 +0100 (CET) Subject: [pypy-svn] r52236 - in pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi: . test Message-ID: <20080307091459.6500E169E29@codespeak.net> Author: pedronis Date: Fri Mar 7 10:14:58 2008 New Revision: 52236 Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/array.py pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/structure.py pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py Log: gettypecode -> size_aligment([n]) Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/array.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/array.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/array.py Fri Mar 7 10:14:58 2008 @@ -60,11 +60,9 @@ return space.wrap(W_ArrayInstance(space, self, length, address)) fromaddress.unwrap_spec = ['self', ObjSpace, r_uint, int] - def descr_gettypecode(self, space, length): + def _size_alignment(self): _, itemsize, alignment = self.itemtp - return space.newtuple([space.wrap(itemsize * length), - space.wrap(alignment)]) - descr_gettypecode.unwrap_spec = ['self', ObjSpace, int] + return itemsize, alignment class ArrayCache: def __init__(self, space): @@ -96,7 +94,7 @@ unwrap_spec=['self', ObjSpace, int, W_Root, int]), __repr__ = interp2app(W_Array.descr_repr), fromaddress = interp2app(W_Array.fromaddress), - gettypecode = interp2app(W_Array.descr_gettypecode), + size_alignment = interp2app(W_Array.descr_size_alignment) ) W_Array.typedef.acceptable_as_base_class = False Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py Fri Mar 7 10:14:58 2008 @@ -129,18 +129,6 @@ self.w_cache = space.newdict() self.space = space - # xxx refactor away ! - def get_arg_type(self, letter, argsize, argalignment): - space = self.space - if letter == 'V': # xxx leaks - return make_struct_ffitype(argsize, argalignment) - else: - return _get_type_(space, letter) - - def get_type(self, key): - space = self.space - return _get_type_(space, key) - def ptr(self, space, name, w_argtypes, w_restype): """ Get a pointer for function name with provided argtypes and restype @@ -229,6 +217,16 @@ def allocate(self, space, length, autofree=False): raise NotImplementedError + def _size_alignment(self): + raise NotImplementedError + + def descr_size_alignment(self, space, length=1): + itemsize, alignment = self._size_alignment() + return space.newtuple([space.wrap(itemsize * length), + space.wrap(alignment)]) + descr_size_alignment.unwrap_spec = ['self', ObjSpace, int] + + class W_DataInstance(Wrappable): def __init__(self, space, size, address=r_uint(0)): if address: Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/structure.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/structure.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/structure.py Fri Mar 7 10:14:58 2008 @@ -96,10 +96,8 @@ return space.wrap(self.ll_positions[index]) descr_fieldoffset.unwrap_spec = ['self', ObjSpace, str] - def descr_gettypecode(self, space): - return space.newtuple([space.wrap(self.size), - space.wrap(self.alignment)]) - descr_gettypecode.unwrap_spec = ['self', ObjSpace] + def _size_alignment(self): + return self.size, self.alignment # get the corresponding ffi_type ffi_type = lltype.nullptr(libffi.FFI_TYPE_P.TO) @@ -128,7 +126,7 @@ size = interp_attrproperty('size', W_Structure), alignment = interp_attrproperty('alignment', W_Structure), fieldoffset = interp2app(W_Structure.descr_fieldoffset), - gettypecode = interp2app(W_Structure.descr_gettypecode), + size_alignment = interp2app(W_Structure.descr_size_alignment) ) W_Structure.typedef.acceptable_as_base_class = False Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py Fri Mar 7 10:14:58 2008 @@ -23,12 +23,13 @@ assert S.fieldoffset('a') == 0 assert S.fieldoffset('b') == align assert S.fieldoffset('c') == round_up(struct.calcsize("iP")) - assert S.gettypecode() == (S.size, S.alignment) + assert S.size_alignment() == (S.size, S.alignment) + assert S.size_alignment(1) == (S.size, S.alignment) def test_nested_structures(self): import _rawffi S1 = _rawffi.Structure([('a', 'i'), ('b', 'P'), ('c', 'c')]) - S = _rawffi.Structure([('x', 'c'), ('s1', S1.gettypecode())]) + S = _rawffi.Structure([('x', 'c'), ('s1', S1.size_alignment())]) assert S.size == S1.alignment + S1.size assert S.alignment == S1.alignment assert S.fieldoffset('x') == 0 @@ -47,7 +48,7 @@ def test_array_of_structures(self): import _rawffi S = _rawffi.Structure([('a', 'i'), ('b', 'P'), ('c', 'c')]) - A = _rawffi.Array(S.gettypecode()) + A = _rawffi.Array(S.size_alignment()) a = A(3) raises(TypeError, "a[0]") s0 = S.fromaddress(a.buffer) @@ -68,8 +69,8 @@ import _rawffi, struct B = _rawffi.Array('i') sizeofint = struct.calcsize("i") - assert B.gettypecode(100) == (sizeofint * 100, sizeofint) - A = _rawffi.Array(B.gettypecode(4)) + assert B.size_alignment(100) == (sizeofint * 100, sizeofint) + A = _rawffi.Array(B.size_alignment(4)) a = A(2) b0 = B.fromaddress(a.itemaddress(0), 4) b0[0] = 3 @@ -87,8 +88,8 @@ def test_array_in_structures(self): import _rawffi, struct A = _rawffi.Array('i') - S = _rawffi.Structure([('x', 'c'), ('ar', A.gettypecode(5))]) - A5size, A5alignment = A.gettypecode(5) + S = _rawffi.Structure([('x', 'c'), ('ar', A.size_alignment(5))]) + A5size, A5alignment = A.size_alignment(5) assert S.size == A5alignment + A5size assert S.alignment == A5alignment assert S.fieldoffset('x') == 0 From arigo at codespeak.net Fri Mar 7 10:24:31 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 10:24:31 +0100 (CET) Subject: [pypy-svn] r52237 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080307092431.E0486169E23@codespeak.net> Author: arigo Date: Fri Mar 7 10:24:30 2008 New Revision: 52237 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Log: For debugging at the C level. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Fri Mar 7 10:24:30 2008 @@ -10,9 +10,11 @@ from pypy.jit.timeshifter import oop from pypy.jit.timeshifter.greenkey import KeyDesc from pypy.jit.rainbow.interpreter import JitCode, JitInterpreter +from pypy.jit.rainbow.interpreter import DEBUG_JITCODES from pypy.translator.backendopt.removenoops import remove_same_as from pypy.translator.backendopt.ssa import SSA_to_SSI from pypy.translator.unsimplify import varoftype +from cStringIO import StringIO def residual_exception_nontranslated(jitstate, e, rtyper): # since we have a normal exception instance here @@ -227,6 +229,10 @@ bytecode._interpreter = self.interpreter bytecode._labelpos = labelpos bytecode.dump() + if DEBUG_JITCODES: + f = StringIO() + bytecode.dump(f) + bytecode.dump_copy = f.getvalue() if is_portal: self.finish_all_graphs() self.interpreter.set_num_global_mergepoints( Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Fri Mar 7 10:24:30 2008 @@ -5,6 +5,9 @@ from pypy.jit.timeshifter.greenkey import empty_key, GreenKey, newgreendict from pypy.rpython.lltypesystem import lltype, llmemory +DEBUG_JITCODES = True # store a dump() of all JitCodes + # in the translated program + class JitCode(object): """ normal operations have the following format: @@ -18,6 +21,7 @@ green consts are negative indexes """ is_portal = False + dump_copy = None def __init__(self, name, code, constants, typekinds, redboxclasses, keydescs, structtypedescs, fielddescs, arrayfielddescs, @@ -190,6 +194,8 @@ self.portalstate = None self.num_global_mergepoints = -1 self.global_state_dicts = None + if DEBUG_JITCODES: + self.find_opcode("trace") # force it to be compiled in def set_portalstate(self, portalstate): assert self.portalstate is None @@ -379,6 +385,20 @@ self.frame = None # operation implementations + @arguments() + def opimpl_trace(self): + # Prints the current frame position and a dump if available. + # Although this opcode is not actually generated by + # codewriter.py so far, it can be called manually in a C-level + # debugger. More importantly it forces the .name and .dump_copy + # attributes of JitCode objects to be included in the C + # executable. + bytecode = self.frame.bytecode + print '*** opimpl_trace: in %s position %d ***' % (bytecode.name, + self.frame.pc) + if bytecode.dump_copy is not None: + print bytecode.dump_copy + @arguments("green", "2byte", returns="red") def opimpl_make_redbox(self, genconst, typeid): redboxcls = self.frame.bytecode.redboxclasses[typeid] From arigo at codespeak.net Fri Mar 7 10:48:12 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 10:48:12 +0100 (CET) Subject: [pypy-svn] r52238 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080307094812.1F977168533@codespeak.net> Author: arigo Date: Fri Mar 7 10:48:12 2008 New Revision: 52238 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py Log: Use None instead of empty lists for the descs. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Fri Mar 7 10:48:12 2008 @@ -29,32 +29,31 @@ promotiondescs, called_bytecodes, num_mergepoints, graph_color, calldescs, metacalldescs, indirectcalldescs, is_portal): - # XXX quite a lot of lists of descs here... We should at least - # try to share the empty lists between the numberous prebuilt - # JitCode instances. A better approach memory-wise could be + # XXX quite a lot of lists of descs here... At least we replace + # empty lists with None. A better approach memory-wise could be # to have a single list of descs and use 'assert isinstance' # checks; or move these lists to the Interpreter class and # do something about the fact that some of these lists could # then have more than 65536 items. self.name = name self.code = code - self.constants = constants - self.typekinds = typekinds - self.redboxclasses = redboxclasses - self.keydescs = keydescs - self.structtypedescs = structtypedescs - self.fielddescs = fielddescs - self.arrayfielddescs = arrayfielddescs - self.interiordescs = interiordescs - self.exceptioninstances = exceptioninstances - self.oopspecdescs = oopspecdescs - self.promotiondescs = promotiondescs - self.called_bytecodes = called_bytecodes + self.constants = constants or None + self.typekinds = typekinds or None + self.redboxclasses = redboxclasses or None + self.keydescs = keydescs or None + self.structtypedescs = structtypedescs or None + self.fielddescs = fielddescs or None + self.arrayfielddescs = arrayfielddescs or None + self.interiordescs = interiordescs or None + self.exceptioninstances = exceptioninstances or None + self.oopspecdescs = oopspecdescs or None + self.promotiondescs = promotiondescs or None + self.called_bytecodes = called_bytecodes or None self.num_mergepoints = num_mergepoints self.graph_color = graph_color - self.calldescs = calldescs - self.metacalldescs = metacalldescs - self.indirectcalldescs = indirectcalldescs + self.calldescs = calldescs or None + self.metacalldescs = metacalldescs or None + self.indirectcalldescs = indirectcalldescs or None self.is_portal = is_portal def _freeze_(self): Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py Fri Mar 7 10:48:12 2008 @@ -63,10 +63,10 @@ "make_new_redvars", 1, 2, "make_new_greenvars", 0, "red_return") - assert len(jitcode.constants) == 0 - assert len(jitcode.typekinds) == 0 + assert not jitcode.constants + assert not jitcode.typekinds assert jitcode.is_portal - assert len(jitcode.called_bytecodes) == 0 + assert not jitcode.called_bytecodes def test_constant(self): def f(x): @@ -82,7 +82,7 @@ assert len(jitcode.typekinds) == 1 assert len(jitcode.redboxclasses) == 1 assert jitcode.is_portal - assert len(jitcode.called_bytecodes) == 0 + assert not jitcode.called_bytecodes def test_green_switch(self): def f(x, y, z): @@ -105,10 +105,10 @@ "goto", tlabel("return"), ) assert jitcode.code == expected - assert len(jitcode.constants) == 0 - assert len(jitcode.typekinds) == 0 + assert not jitcode.constants + assert not jitcode.typekinds assert jitcode.is_portal - assert len(jitcode.called_bytecodes) == 0 + assert not jitcode.called_bytecodes def test_green_switch2(self): def f(x, y, z): @@ -139,10 +139,10 @@ "goto", tlabel("return"), ) assert jitcode.code == expected - assert len(jitcode.constants) == 0 - assert len(jitcode.typekinds) == 0 + assert not jitcode.constants + assert not jitcode.typekinds assert jitcode.is_portal - assert len(jitcode.called_bytecodes) == 0 + assert not jitcode.called_bytecodes def test_merge(self): def f(x, y, z): @@ -179,7 +179,7 @@ assert len(jitcode.constants) == 1 assert len(jitcode.typekinds) == 1 assert jitcode.is_portal - assert len(jitcode.called_bytecodes) == 0 + assert not jitcode.called_bytecodes def test_loop(self): def f(x): @@ -209,7 +209,7 @@ "make_new_redvars", 2, 2, 4, "goto", tlabel("while")) assert jitcode.is_portal - assert len(jitcode.called_bytecodes) == 0 + assert not jitcode.called_bytecodes def test_dump_loop(self): def f(x): @@ -276,7 +276,7 @@ "make_new_greenvars", 0, "red_return") assert not called_jitcode.is_portal - assert len(called_jitcode.called_bytecodes) == 0 + assert not called_jitcode.called_bytecodes def test_green_call(self): def ll_add_one(x): @@ -294,7 +294,7 @@ "make_new_greenvars", 0, "red_return") assert jitcode.is_portal - assert len(jitcode.called_bytecodes) == 0 + assert not jitcode.called_bytecodes assert len(jitcode.calldescs) == 1 assert len(jitcode.constants) == 1 @@ -333,7 +333,7 @@ "goto", tlabel("return") ) assert not called_jitcode.is_portal - assert len(called_jitcode.called_bytecodes) == 0 + assert not called_jitcode.called_bytecodes class TestLLType(AbstractSerializationTest): type_system = "lltype" From arigo at codespeak.net Fri Mar 7 10:51:23 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 10:51:23 +0100 (CET) Subject: [pypy-svn] r52239 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080307095123.31CF0168533@codespeak.net> Author: arigo Date: Fri Mar 7 10:51:22 2008 New Revision: 52239 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py Log: Revert r52238. Causes blocked blocks everywhere in the tests :-( Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Fri Mar 7 10:51:22 2008 @@ -29,31 +29,32 @@ promotiondescs, called_bytecodes, num_mergepoints, graph_color, calldescs, metacalldescs, indirectcalldescs, is_portal): - # XXX quite a lot of lists of descs here... At least we replace - # empty lists with None. A better approach memory-wise could be + # XXX quite a lot of lists of descs here... We should at least + # try to share the empty lists between the numberous prebuilt + # JitCode instances. A better approach memory-wise could be # to have a single list of descs and use 'assert isinstance' # checks; or move these lists to the Interpreter class and # do something about the fact that some of these lists could # then have more than 65536 items. self.name = name self.code = code - self.constants = constants or None - self.typekinds = typekinds or None - self.redboxclasses = redboxclasses or None - self.keydescs = keydescs or None - self.structtypedescs = structtypedescs or None - self.fielddescs = fielddescs or None - self.arrayfielddescs = arrayfielddescs or None - self.interiordescs = interiordescs or None - self.exceptioninstances = exceptioninstances or None - self.oopspecdescs = oopspecdescs or None - self.promotiondescs = promotiondescs or None - self.called_bytecodes = called_bytecodes or None + self.constants = constants + self.typekinds = typekinds + self.redboxclasses = redboxclasses + self.keydescs = keydescs + self.structtypedescs = structtypedescs + self.fielddescs = fielddescs + self.arrayfielddescs = arrayfielddescs + self.interiordescs = interiordescs + self.exceptioninstances = exceptioninstances + self.oopspecdescs = oopspecdescs + self.promotiondescs = promotiondescs + self.called_bytecodes = called_bytecodes self.num_mergepoints = num_mergepoints self.graph_color = graph_color - self.calldescs = calldescs or None - self.metacalldescs = metacalldescs or None - self.indirectcalldescs = indirectcalldescs or None + self.calldescs = calldescs + self.metacalldescs = metacalldescs + self.indirectcalldescs = indirectcalldescs self.is_portal = is_portal def _freeze_(self): Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_serializegraph.py Fri Mar 7 10:51:22 2008 @@ -63,10 +63,10 @@ "make_new_redvars", 1, 2, "make_new_greenvars", 0, "red_return") - assert not jitcode.constants - assert not jitcode.typekinds + assert len(jitcode.constants) == 0 + assert len(jitcode.typekinds) == 0 assert jitcode.is_portal - assert not jitcode.called_bytecodes + assert len(jitcode.called_bytecodes) == 0 def test_constant(self): def f(x): @@ -82,7 +82,7 @@ assert len(jitcode.typekinds) == 1 assert len(jitcode.redboxclasses) == 1 assert jitcode.is_portal - assert not jitcode.called_bytecodes + assert len(jitcode.called_bytecodes) == 0 def test_green_switch(self): def f(x, y, z): @@ -105,10 +105,10 @@ "goto", tlabel("return"), ) assert jitcode.code == expected - assert not jitcode.constants - assert not jitcode.typekinds + assert len(jitcode.constants) == 0 + assert len(jitcode.typekinds) == 0 assert jitcode.is_portal - assert not jitcode.called_bytecodes + assert len(jitcode.called_bytecodes) == 0 def test_green_switch2(self): def f(x, y, z): @@ -139,10 +139,10 @@ "goto", tlabel("return"), ) assert jitcode.code == expected - assert not jitcode.constants - assert not jitcode.typekinds + assert len(jitcode.constants) == 0 + assert len(jitcode.typekinds) == 0 assert jitcode.is_portal - assert not jitcode.called_bytecodes + assert len(jitcode.called_bytecodes) == 0 def test_merge(self): def f(x, y, z): @@ -179,7 +179,7 @@ assert len(jitcode.constants) == 1 assert len(jitcode.typekinds) == 1 assert jitcode.is_portal - assert not jitcode.called_bytecodes + assert len(jitcode.called_bytecodes) == 0 def test_loop(self): def f(x): @@ -209,7 +209,7 @@ "make_new_redvars", 2, 2, 4, "goto", tlabel("while")) assert jitcode.is_portal - assert not jitcode.called_bytecodes + assert len(jitcode.called_bytecodes) == 0 def test_dump_loop(self): def f(x): @@ -276,7 +276,7 @@ "make_new_greenvars", 0, "red_return") assert not called_jitcode.is_portal - assert not called_jitcode.called_bytecodes + assert len(called_jitcode.called_bytecodes) == 0 def test_green_call(self): def ll_add_one(x): @@ -294,7 +294,7 @@ "make_new_greenvars", 0, "red_return") assert jitcode.is_portal - assert not jitcode.called_bytecodes + assert len(jitcode.called_bytecodes) == 0 assert len(jitcode.calldescs) == 1 assert len(jitcode.constants) == 1 @@ -333,7 +333,7 @@ "goto", tlabel("return") ) assert not called_jitcode.is_portal - assert not called_jitcode.called_bytecodes + assert len(called_jitcode.called_bytecodes) == 0 class TestLLType(AbstractSerializationTest): type_system = "lltype" From arigo at codespeak.net Fri Mar 7 10:58:28 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 10:58:28 +0100 (CET) Subject: [pypy-svn] r52240 - in pypy/branch/jit-refactoring/pypy: jit/rainbow jit/rainbow/test translator Message-ID: <20080307095828.E1ADB168550@codespeak.net> Author: arigo Date: Fri Mar 7 10:58:28 2008 New Revision: 52240 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_frontend.py pypy/branch/jit-refactoring/pypy/translator/driver.py Log: Can't use constant_fold_graph() here because it doesn't preserve annotations. The original problem was that hannotator.simplify() was not done any more when using the translator driver. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Fri Mar 7 10:58:28 2008 @@ -1320,13 +1320,8 @@ self.hannotator = hannotator def transform_graph(self, graph): - from pypy.translator.backendopt.constfold import constant_fold_graph self.graph = graph remove_same_as(graph) - # to get rid of the usages of the we_are_jitted constant - # (turned to '1' by the hintannotator) - # XXX is this the best way to deal with it? - constant_fold_graph(graph) self.insert_splits() def insert_splits(self): Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_frontend.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_frontend.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_frontend.py Fri Mar 7 10:58:28 2008 @@ -7,16 +7,20 @@ type_system = "lltype" def test_we_are_jitted(self): - def f(): + def g(n): + return n + 5 + def f(m): if we_are_jitted(): return 42 - return 0 - - assert f() == 0 - res = interpret(f, []) - assert res == 0 + # the following path should not be seen by the hint-annotator + # and killed from the red-green graphs by 'hannotator.simplify()' + return g(m) + + assert f(5) == 10 + res = interpret(f, [5]) + assert res == 10 - res = self.interpret(f, []) + res = self.interpret(f, [5]) assert res == 42 def test_is_early_constant(self): Modified: pypy/branch/jit-refactoring/pypy/translator/driver.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/translator/driver.py (original) +++ pypy/branch/jit-refactoring/pypy/translator/driver.py Fri Mar 7 10:58:28 2008 @@ -394,6 +394,7 @@ [SomeLLAbstractConstant(v.concretetype, {OriginFlags(): True}) for v in self.orig_portal_graph.getargs()]) + hannotator.simplify() count = hannotator.bookkeeper.nonstuboriggraphcount stubcount = hannotator.bookkeeper.stuboriggraphcount self.log.info("The hint-annotator saw %d graphs" From pedronis at codespeak.net Fri Mar 7 11:03:48 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 7 Mar 2008 11:03:48 +0100 (CET) Subject: [pypy-svn] r52241 - in pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi: . test Message-ID: <20080307100348.3779D16857B@codespeak.net> Author: pedronis Date: Fri Mar 7 11:03:47 2008 New Revision: 52241 Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/array.py pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/structure.py pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test__rawffi.py pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py Log: Everything (Array, Structure, ptr) now takes type descriptions of the form: letter or (_rawwffi type, count) for now use unpack_to_size_aligment and unpack_to_ffi_type to interpret those type descriptions Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/array.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/array.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/array.py Fri Mar 7 11:03:47 2008 @@ -12,7 +12,8 @@ from pypy.module._rawffi.interp_rawffi import segfault_exception from pypy.module._rawffi.interp_rawffi import W_DataShape, W_DataInstance from pypy.module._rawffi.interp_rawffi import unwrap_value, wrap_value -from pypy.module._rawffi.interp_rawffi import unpack_typecode, letter2tp +from pypy.module._rawffi.interp_rawffi import letter2tp +from pypy.module._rawffi.interp_rawffi import unpack_to_size_alignment from pypy.rlib.rarithmetic import intmask, r_uint def push_elem(ll_array, pos, value): @@ -81,8 +82,8 @@ def get_array_cache(space): return space.fromcache(ArrayCache) -def descr_new_array(space, w_type, w_itemtp): - itemtp = unpack_typecode(space, w_itemtp) +def descr_new_array(space, w_type, w_shape): + itemtp = unpack_to_size_alignment(space, w_shape) array_type = get_array_cache(space).get_array_type(itemtp) return space.wrap(array_type) Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py Fri Mar 7 11:03:47 2008 @@ -87,14 +87,6 @@ raise OperationError(space.w_ValueError, space.wrap( "Unknown type letter %s" % (key,))) -def unpack_typecode(space, w_typecode): - if space.is_true(space.isinstance(w_typecode, space.w_str)): - letter = space.str_w(w_typecode) - return letter2tp(space, letter) - else: - w_size, w_align = space.unpacktuple(w_typecode, expected_length=2) - return ('V', space.int_w(w_size), space.int_w(w_align)) # value object - def _get_type_(space, key): try: return TYPEMAP[key] @@ -102,7 +94,7 @@ raise OperationError(space.w_ValueError, space.wrap( "Unknown type letter %s" % (key,))) -def unpack_shape(space, w_shape, allow_void=False, shape=False): +def unpack_to_ffi_type(space, w_shape, allow_void=False, shape=False): resshape = None if space.is_true(space.isinstance(w_shape, space.w_str)): letter = space.str_w(w_shape) @@ -121,6 +113,16 @@ ffi_type = resshape.get_ffi_type() return letter, ffi_type, resshape +def unpack_to_size_alignment(space, w_shape): + if space.is_true(space.isinstance(w_shape, space.w_str)): + letter = space.str_w(w_shape) + return letter2tp(space, letter) + else: + w_shapetype, w_length = space.unpacktuple(w_shape, expected_length=2) + resshape = space.interp_w(W_DataShape, w_shapetype) + length = space.int_w(w_length) + size, alignment = resshape._size_alignment() + return ('V', length*size, alignment) # value object class W_CDLL(Wrappable): def __init__(self, space, name): @@ -138,7 +140,7 @@ resshape = None ffi_restype = ffi_type_void else: - tp_letter, ffi_restype, resshape = unpack_shape(space, w_restype, + tp_letter, ffi_restype, resshape = unpack_to_ffi_type(space, w_restype, allow_void=True, shape=True) w = space.wrap @@ -155,7 +157,7 @@ argletters = [] ffi_argtypes = [] for w_arg in argtypes_w: - argletter, ffi_argtype, _ = unpack_shape(space, w_arg) + argletter, ffi_argtype, _ = unpack_to_ffi_type(space, w_arg) argletters.append(argletter) ffi_argtypes.append(ffi_argtype) @@ -220,9 +222,9 @@ def _size_alignment(self): raise NotImplementedError - def descr_size_alignment(self, space, length=1): - itemsize, alignment = self._size_alignment() - return space.newtuple([space.wrap(itemsize * length), + def descr_size_alignment(self, space, n=1): + size, alignment = self._size_alignment() + return space.newtuple([space.wrap(size * n), space.wrap(alignment)]) descr_size_alignment.unwrap_spec = ['self', ObjSpace, int] Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/structure.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/structure.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/structure.py Fri Mar 7 11:03:47 2008 @@ -13,7 +13,7 @@ from pypy.module._rawffi.interp_rawffi import segfault_exception from pypy.module._rawffi.interp_rawffi import W_DataShape, W_DataInstance from pypy.module._rawffi.interp_rawffi import wrap_value, unwrap_value -from pypy.module._rawffi.interp_rawffi import unpack_typecode +from pypy.module._rawffi.interp_rawffi import unpack_to_size_alignment from pypy.rlib import libffi from pypy.rlib.rarithmetic import intmask, r_uint @@ -26,7 +26,7 @@ raise OperationError(space.w_ValueError, space.wrap( "Expected list of 2-size tuples")) name = space.str_w(l_w[0]) - tp = unpack_typecode(space, l_w[1]) + tp = unpack_to_size_alignment(space, l_w[1]) fields.append((name, tp)) return fields Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test__rawffi.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test__rawffi.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test__rawffi.py Fri Mar 7 11:03:47 2008 @@ -525,7 +525,11 @@ s = struct.calcsize("i") assert (repr(_rawffi.Array('i')) == "<_rawffi.Array 'i' (%d, %d)>" % (s, s)) - assert repr(_rawffi.Array((18, 2))) == "<_rawffi.Array 'V' (18, 2)>" + + # fragile + S = _rawffi.Structure([('x', 'c'), ('y', 'l')]) + assert repr(_rawffi.Array((S, 2))) == "<_rawffi.Array 'V' (16, 4)>" + assert (repr(_rawffi.Structure([('x', 'i'), ('yz', 'i')])) == "<_rawffi.Structure 'x' 'yz' (%d, %d)>" % (2*s, s)) Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py Fri Mar 7 11:03:47 2008 @@ -29,7 +29,7 @@ def test_nested_structures(self): import _rawffi S1 = _rawffi.Structure([('a', 'i'), ('b', 'P'), ('c', 'c')]) - S = _rawffi.Structure([('x', 'c'), ('s1', S1.size_alignment())]) + S = _rawffi.Structure([('x', 'c'), ('s1', (S1, 1))]) assert S.size == S1.alignment + S1.size assert S.alignment == S1.alignment assert S.fieldoffset('x') == 0 @@ -48,7 +48,7 @@ def test_array_of_structures(self): import _rawffi S = _rawffi.Structure([('a', 'i'), ('b', 'P'), ('c', 'c')]) - A = _rawffi.Array(S.size_alignment()) + A = _rawffi.Array((S, 1)) a = A(3) raises(TypeError, "a[0]") s0 = S.fromaddress(a.buffer) @@ -70,7 +70,7 @@ B = _rawffi.Array('i') sizeofint = struct.calcsize("i") assert B.size_alignment(100) == (sizeofint * 100, sizeofint) - A = _rawffi.Array(B.size_alignment(4)) + A = _rawffi.Array((B, 4)) a = A(2) b0 = B.fromaddress(a.itemaddress(0), 4) b0[0] = 3 @@ -88,7 +88,7 @@ def test_array_in_structures(self): import _rawffi, struct A = _rawffi.Array('i') - S = _rawffi.Structure([('x', 'c'), ('ar', A.size_alignment(5))]) + S = _rawffi.Structure([('x', 'c'), ('ar', (A, 5))]) A5size, A5alignment = A.size_alignment(5) assert S.size == A5alignment + A5size assert S.alignment == A5alignment From arigo at codespeak.net Fri Mar 7 11:29:50 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 11:29:50 +0100 (CET) Subject: [pypy-svn] r52242 - pypy/branch/jit-refactoring/pypy/jit/rainbow Message-ID: <20080307102950.9995416854C@codespeak.net> Author: arigo Date: Fri Mar 7 11:29:49 2008 New Revision: 52242 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Log: Share identical lists between JitCodes. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Fri Mar 7 11:29:49 2008 @@ -127,6 +127,14 @@ self.num_global_mergepoints = 0 self.ptr_to_jitcode = {} self.transformer = GraphTransformer(hannotator) + self._listcache = {} + + def sharelist(self, name): + lst = getattr(self, name) + # 'lst' is typically a list of descs or low-level pointers. + # It's safer to compare its items by identity. + key = (name,) + tuple([id(x) for x in lst]) + return self._listcache.setdefault(key, lst) def can_raise(self, op): return self.raise_analyzer.analyze(op) @@ -207,23 +215,23 @@ code = assemble_labelpos(labelpos, self.interpreter, *self.assembler) bytecode.__init__(graph.name, code, - self.constants, - self.typekinds, - self.redboxclasses, - self.keydescs, - self.structtypedescs, - self.fielddescs, - self.arrayfielddescs, - self.interiordescs, - self.exceptioninstances, - self.oopspecdescs, - self.promotiondescs, - self.called_bytecodes, + self.sharelist("constants"), + self.sharelist("typekinds"), + self.sharelist("redboxclasses"), + self.sharelist("keydescs"), + self.sharelist("structtypedescs"), + self.sharelist("fielddescs"), + self.sharelist("arrayfielddescs"), + self.sharelist("interiordescs"), + self.sharelist("exceptioninstances"), + self.sharelist("oopspecdescs"), + self.sharelist("promotiondescs"), + self.sharelist("called_bytecodes"), self.num_local_mergepoints, self.graph_color, - self.calldescs, - self.metacalldescs, - self.indirectcalldescs, + self.sharelist("calldescs"), + self.sharelist("metacalldescs"), + self.sharelist("indirectcalldescs"), self.is_portal) bytecode._source = self.assembler bytecode._interpreter = self.interpreter Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py Fri Mar 7 11:29:49 2008 @@ -29,13 +29,9 @@ promotiondescs, called_bytecodes, num_mergepoints, graph_color, calldescs, metacalldescs, indirectcalldescs, is_portal): - # XXX quite a lot of lists of descs here... We should at least - # try to share the empty lists between the numberous prebuilt - # JitCode instances. A better approach memory-wise could be - # to have a single list of descs and use 'assert isinstance' - # checks; or move these lists to the Interpreter class and - # do something about the fact that some of these lists could - # then have more than 65536 items. + # XXX quite a lot of lists of descs here... At least we + # share identical lists between the numberous prebuilt + # JitCode instances. self.name = name self.code = code self.constants = constants From pedronis at codespeak.net Fri Mar 7 11:30:49 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 7 Mar 2008 11:30:49 +0100 (CET) Subject: [pypy-svn] r52243 - pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi Message-ID: <20080307103049.3D0AC16854C@codespeak.net> Author: pedronis Date: Fri Mar 7 11:30:48 2008 New Revision: 52243 Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py Log: oops, messy to test this one, it failed at translation though Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py Fri Mar 7 11:30:48 2008 @@ -153,7 +153,7 @@ if e.match(space, space.w_KeyError): pass else: - rais + raise argletters = [] ffi_argtypes = [] for w_arg in argtypes_w: From arigo at codespeak.net Fri Mar 7 11:51:10 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 11:51:10 +0100 (CET) Subject: [pypy-svn] r52244 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test Message-ID: <20080307105110.412A016856E@codespeak.net> Author: arigo Date: Fri Mar 7 11:51:03 2008 New Revision: 52244 Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Log: Fix test_constant_indirect_red_call. Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/codewriter.py Fri Mar 7 11:51:03 2008 @@ -832,14 +832,20 @@ fnptrindex = self.serialize_oparg("red", op.args[0]) has_result = (self.varcolor(op.result) != "gray" and op.result.concretetype != lltype.Void) - if targets: - self.emit("goto_if_constant", fnptrindex, tlabel(("direct call", op))) emitted_args = [] for v in op.args[1:-1]: if v.concretetype == lltype.Void: continue emitted_args.append(self.serialize_oparg("red", v)) + + if targets: + # XXX can we move this control flow inside the interpreter? + # the jump must be after the serialize_oparg() calls above + # to ensure that both paths of the control flow push the same + # number of results. See test_constant_indirect_red_call + self.emit("goto_if_constant", fnptrindex, tlabel(("direct call", op))) + self.emit("red_residual_call") calldescindex = self.calldesc_position(op.args[0].concretetype) self.emit(fnptrindex, calldescindex, withexc, has_result) Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_interpreter.py Fri Mar 7 11:51:03 2008 @@ -1470,7 +1470,6 @@ self.check_insns(indirect_call=1) def test_constant_indirect_red_call(self): - py.test.skip("XXX fix me") def h1(m, n, x): return x-2 def h2(m, n, x): @@ -1484,12 +1483,36 @@ P = StopAtXPolicy() res = self.interpret(f, [1, 7, 3], [0, 1], policy=P) - assert res == f(7,3) + assert res == f(1,7,3) self.check_insns({'int_mul': 1}) res = self.interpret(f, [1, 4, 113], [0, 1], policy=P) - assert res == f(4,113) + assert res == f(1,4,113) self.check_insns({'int_sub': 1}) + def test_constant_indirect_red_call_no_result(self): + class A: + pass + glob_a = A() + def h1(m, n, x): + glob_a.x = x-2 + def h2(m, n, x): + glob_a.x = x*4 + l = [h1, h2] + def f(m, n, x): + m = hint(m, concrete=True) + frozenl = hint(l, deepfreeze=True) + h = frozenl[n&1] + h(m, 5, x) + return glob_a.x + + P = StopAtXPolicy() + res = self.interpret(f, [1, 7, 3], [0, 1], policy=P) + assert res == f(1,7,3) + self.check_insns(int_mul=1, int_sub=0) + res = self.interpret(f, [1, 4, 113], [0, 1], policy=P) + assert res == f(1,4,113) + self.check_insns(int_sub=1, int_mul=0) + def test_indirect_sometimes_residual_pure_red_call(self): def h1(x): return x-2 From fijal at codespeak.net Fri Mar 7 13:07:04 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 7 Mar 2008 13:07:04 +0100 (CET) Subject: [pypy-svn] r52245 - in pypy/dist/pypy/module/_rawffi: . test Message-ID: <20080307120704.0057B168553@codespeak.net> Author: fijal Date: Fri Mar 7 13:07:03 2008 New Revision: 52245 Modified: pypy/dist/pypy/module/_rawffi/__init__.py pypy/dist/pypy/module/_rawffi/array.py pypy/dist/pypy/module/_rawffi/interp_rawffi.py pypy/dist/pypy/module/_rawffi/structure.py pypy/dist/pypy/module/_rawffi/test/test__rawffi.py Log: * Functions now return autofree=True arrays * Fix tests * don't allow .free() on AutoFree arrays and structures. Modified: pypy/dist/pypy/module/_rawffi/__init__.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/__init__.py (original) +++ pypy/dist/pypy/module/_rawffi/__init__.py Fri Mar 7 13:07:03 2008 @@ -15,8 +15,10 @@ 'FuncPtr' : 'interp_rawffi.W_FuncPtr', 'Structure' : 'structure.W_Structure', 'StructureInstance' : 'structure.W_StructureInstance', + 'StructureInstanceAutoFree' : 'structure.W_StructureInstanceAutoFree', 'Array' : 'array.W_Array', 'ArrayInstance' : 'array.W_ArrayInstance', + 'ArrayInstanceAutoFree' : 'array.W_ArrayInstanceAutoFree', 'sizeof' : 'interp_rawffi.sizeof', 'alignment' : 'interp_rawffi.alignment', 'charp2string' : 'interp_rawffi.charp2string', Modified: pypy/dist/pypy/module/_rawffi/array.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/array.py (original) +++ pypy/dist/pypy/module/_rawffi/array.py Fri Mar 7 13:07:03 2008 @@ -167,3 +167,14 @@ if self.ll_buffer: self._free() +W_ArrayInstanceAutoFree.typedef = TypeDef( + 'ArrayInstanceWithFree', + __repr__ = interp2app(W_ArrayInstance.descr_repr), + __setitem__ = interp2app(W_ArrayInstance.setitem), + __getitem__ = interp2app(W_ArrayInstance.getitem), + __len__ = interp2app(W_ArrayInstance.getlength), + buffer = GetSetProperty(W_ArrayInstance.getbuffer), + shape = interp_attrproperty('shape', W_ArrayInstance), + byptr = interp2app(W_ArrayInstance.byptr), + itemaddress = interp2app(W_ArrayInstance.descr_itemaddress), +) Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/interp_rawffi.py (original) +++ pypy/dist/pypy/module/_rawffi/interp_rawffi.py Fri Mar 7 13:07:03 2008 @@ -366,7 +366,7 @@ args_ll.append(arg.ll_buffer) # XXX we could avoid the intermediate list args_ll if self.resshape is not None: - result = self.resshape.allocate(space, 1) + result = self.resshape.allocate(space, 1, autofree=True) self.ptr.call(args_ll, result.ll_buffer) return space.wrap(result) else: Modified: pypy/dist/pypy/module/_rawffi/structure.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/structure.py (original) +++ pypy/dist/pypy/module/_rawffi/structure.py Fri Mar 7 13:07:03 2008 @@ -198,4 +198,15 @@ def __del__(self): if self.ll_buffer: self._free() + +W_StructureInstanceAutoFree.typedef = TypeDef( + 'StructureInstanceAutoFree', + __repr__ = interp2app(W_StructureInstance.descr_repr), + __getattr__ = interp2app(W_StructureInstance.getattr), + __setattr__ = interp2app(W_StructureInstance.setattr), + buffer = GetSetProperty(W_StructureInstance.getbuffer), + shape = interp_attrproperty('shape', W_StructureInstance), + byptr = interp2app(W_StructureInstance.byptr), + fieldaddress= interp2app(W_StructureInstance.descr_fieldaddress), +) Modified: pypy/dist/pypy/module/_rawffi/test/test__rawffi.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/test/test__rawffi.py (original) +++ pypy/dist/pypy/module/_rawffi/test/test__rawffi.py Fri Mar 7 13:07:03 2008 @@ -176,7 +176,6 @@ intptr[0] = i res = get_char(dupaptr, intptr) assert res[0] == 'dupa'[i] - res.free() intptr.free() dupaptr.free() dupa.free() @@ -197,13 +196,11 @@ a = A(6, 'xx\x00\x00xx') assert _rawffi.charp2string(a.buffer) == 'xx' assert _rawffi.charp2rawstring(a.buffer, 4) == 'xx\x00\x00' - res.free() arg1[0] = 'x' arg2[0] = 'y' res = char_check(arg1, arg2) assert res[0] == 0 assert _rawffi.charp2string(res[0]) is None - res.free() arg1.free() arg2.free() @@ -218,7 +215,6 @@ arg2[0] = 2 res = short_add(arg1, arg2) assert res[0] == 3 - res.free() arg1.free() arg2.free() @@ -234,7 +230,6 @@ arg2[0] = 2.0 res = pow(arg1, arg2) assert res[0] == 9.0 - res.free() arg1.free() arg2.free() @@ -246,7 +241,6 @@ arg[0] = 0 res = time(arg) assert res[0] != 0 - res.free() arg.free() def test_gettimeofday(self): @@ -260,13 +254,11 @@ arg2 = _rawffi.Array('P')(1) res = gettimeofday(arg1, arg2) assert res[0] == 0 - res.free() struct2 = struct_type() arg1[0] = struct2 res = gettimeofday(arg1, arg2) assert res[0] == 0 - res.free() assert structure.tv_usec != struct2.tv_usec assert (structure.tv_sec == struct2.tv_sec) or (structure.tv_sec == struct2.tv_sec - 1) @@ -296,7 +288,6 @@ arg = x.byptr() res = gmtime(arg) t = Tm.fromaddress(res[0]) - res.free() arg.free() assert t.tm_year == 70 assert t.tm_sec == 1 @@ -325,7 +316,6 @@ assert X.fromaddress(x.next).x2 == 3 free_double_struct = lib.ptr("free_double_struct", ['P'], None) free_double_struct(res) - res.free() def test_array(self): import _rawffi @@ -342,7 +332,6 @@ arg2[0] = i res = get_array_elem(arg1, arg2) assert res[0] == expected - res.free() arg1.free() arg2.free() assert a[3] == 0 @@ -362,12 +351,10 @@ arg2 = _rawffi.Array('i')(1) res = get_array_elem_s(arg1, arg2) assert res[0] == 0 - res.free() arg2[0] = 1 res = get_array_elem_s(arg1, arg2) assert X.fromaddress(res[0]).x2 == 3 assert res[0] == x.buffer - res.free() arg1.free() arg2.free() x.free() @@ -392,17 +379,14 @@ some_huge_value = lib.ptr('some_huge_value', [], 'q') res = some_huge_value() assert res[0] == 1<<42 - res.free() some_huge_uvalue = lib.ptr('some_huge_uvalue', [], 'Q') res = some_huge_uvalue() assert res[0] == 1<<42 - res.free() pass_ll = lib.ptr('pass_ll', ['q'], 'q') arg1 = _rawffi.Array('q')(1) arg1[0] = 1<<42 res = pass_ll(arg1) assert res[0] == 1<<42 - res.free() arg1.free() def test_callback(self): @@ -449,7 +433,6 @@ a1 = cb.byptr() res = runcallback(a1) assert res[0] == 1<<42 - res.free() a1.free() del cb @@ -480,7 +463,6 @@ A = _rawffi.Array('i') res = alloc() a = A.fromaddress(res[0], 1) - res.free() assert a[0] == 3 assert A.fromaddress(a.buffer, 1)[0] == 3 @@ -515,7 +497,6 @@ arg2 = _rawffi.Array('i')(1) res = get_array_elem(arg1, arg2) assert res[0] == 3 - res.free() arg1.free() arg2.free() a.free() @@ -650,7 +631,6 @@ res = sum_x_y(x_y) assert res[0] == 420 x_y.free() - res.free() def test_ret_struct(self): import _rawffi @@ -663,11 +643,10 @@ a1[0] = 13 a2[0] = 17 res = give(a1, a2) - assert isinstance(res, _rawffi.StructureInstance) + assert isinstance(res, _rawffi.StructureInstanceAutoFree) assert res.shape is S2H assert res.x == 13 assert res.y == 17 - res.free() a1.free() a2.free() @@ -675,13 +654,12 @@ s2h.y = 11 perturb = lib.ptr('perturb', [S2H.gettypecode()], S2H) res = perturb(s2h) - assert isinstance(res, _rawffi.StructureInstance) + assert isinstance(res, _rawffi.StructureInstanceAutoFree) assert res.shape is S2H assert res.x == 14 assert res.y == 33 assert s2h.x == 7 assert s2h.y == 11 - res.free() s2h.free() From fijal at codespeak.net Fri Mar 7 13:07:23 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 7 Mar 2008 13:07:23 +0100 (CET) Subject: [pypy-svn] r52246 - pypy/dist/pypy/lib/_ctypes Message-ID: <20080307120723.DC241168553@codespeak.net> Author: fijal Date: Fri Mar 7 13:07:23 2008 New Revision: 52246 Modified: pypy/dist/pypy/lib/_ctypes/array.py pypy/dist/pypy/lib/_ctypes/basics.py pypy/dist/pypy/lib/_ctypes/function.py pypy/dist/pypy/lib/_ctypes/pointer.py pypy/dist/pypy/lib/_ctypes/primitive.py pypy/dist/pypy/lib/_ctypes/structure.py pypy/dist/pypy/lib/_ctypes/union.py Log: use autfree=True feature Modified: pypy/dist/pypy/lib/_ctypes/array.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/array.py (original) +++ pypy/dist/pypy/lib/_ctypes/array.py Fri Mar 7 13:07:23 2008 @@ -1,8 +1,8 @@ import _rawffi -from _ctypes.basics import _CData, cdata_from_address, _CDataMeta, sizeof,\ - keepalive_key, store_reference, CArgObject +from _ctypes.basics import _CData, cdata_from_address, _CDataMeta, sizeof +from _ctypes.basics import keepalive_key, store_reference, CArgObject from _ctypes.builtin import _string_at_addr, _wstring_at_addr def _create_unicode(buffer, maxlength): @@ -129,11 +129,9 @@ class Array(_CData): __metaclass__ = ArrayMeta _ffiargshape = _ffiletter = 'P' - _needs_free = False def __init__(self, *args): - self._buffer = self._ffiarray(self._length_) - self._needs_free = True + self._buffer = self._ffiarray(self._length_, autofree=True) self._objects = {} for i, arg in enumerate(args): self[i] = arg @@ -187,12 +185,6 @@ def _get_buffer_value(self): return self._buffer.buffer - def __del__(self): - if self._needs_free: - self._buffer.free() - self._buffer = None - self._needs_free = False - ARRAY_CACHE = {} def create_array_type(base, length): Modified: pypy/dist/pypy/lib/_ctypes/basics.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/basics.py (original) +++ pypy/dist/pypy/lib/_ctypes/basics.py Fri Mar 7 13:07:23 2008 @@ -47,8 +47,8 @@ # interested only in value anyway return cobj._get_buffer_value() - def _CData_output(self, resbuffer, base=None, index=-1, needs_free=False): - assert isinstance(resbuffer, _rawffi.ArrayInstance) + def _CData_output(self, resbuffer, base=None, index=-1): + #assert isinstance(resbuffer, _rawffi.ArrayInstance) """Used when data exits ctypes and goes into user code. 'resbuffer' is a _rawffi array of length 1 containing the value, and this returns a general Python object that corresponds. @@ -57,11 +57,10 @@ res.__dict__['_buffer'] = resbuffer res.__dict__['_base'] = base res.__dict__['_index'] = index - res.__dict__['_needs_free'] = needs_free return res.__ctypes_from_outparam__() def _CData_retval(self, resbuffer): - return self._CData_output(resbuffer, needs_free=True) + return self._CData_output(resbuffer) def __mul__(self, other): from _ctypes.array import create_array_type Modified: pypy/dist/pypy/lib/_ctypes/function.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/function.py (original) +++ pypy/dist/pypy/lib/_ctypes/function.py Fri Mar 7 13:07:23 2008 @@ -83,8 +83,6 @@ resbuffer = funcptr(*[arg._buffer for obj, arg in args]) if restype is not None: return restype._CData_retval(resbuffer) - else: - resbuffer.free() def _getfuncptr(self, argtypes, restype): if restype is None: Modified: pypy/dist/pypy/lib/_ctypes/pointer.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/pointer.py (original) +++ pypy/dist/pypy/lib/_ctypes/pointer.py Fri Mar 7 13:07:23 2008 @@ -55,8 +55,7 @@ def set_type(self, TP): ffiarray = _rawffi.Array('P') def __init__(self, value=None): - self._buffer = ffiarray(1) - self._needs_free = True + self._buffer = ffiarray(1, autofree=True) if value is not None: self.contents = value self._ffiarray = ffiarray @@ -67,7 +66,6 @@ class _Pointer(_CData): __metaclass__ = PointerType - _needs_free = False def getcontents(self): addr = self._buffer[0] @@ -106,12 +104,6 @@ def __nonzero__(self): return self._buffer[0] != 0 - def __del__(self): - if self._needs_free: - self._buffer.free() - self._needs_free = False - self._buffer = None - contents = property(getcontents, setcontents) @@ -121,9 +113,8 @@ % (tp,)) if isinstance(obj, Array): ptr = tp.__new__(tp) - ptr._buffer = tp._ffiarray(1) + ptr._buffer = tp._ffiarray(1, autofree=True) ptr._buffer[0] = obj._buffer - ptr._needs_free = True return ptr if isinstance(obj, (int, long)): result = tp() @@ -134,5 +125,4 @@ % (type(obj),)) result = tp() result._buffer[0] = obj._buffer[0] - result._needs_free = True return result Modified: pypy/dist/pypy/lib/_ctypes/primitive.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/primitive.py (original) +++ pypy/dist/pypy/lib/_ctypes/primitive.py Fri Mar 7 13:07:23 2008 @@ -198,11 +198,9 @@ class _SimpleCData(_CData): __metaclass__ = SimpleType _type_ = 'i' - _needs_free = False def __init__(self, value=DEFAULT_VALUE): - self._needs_free = True - self._buffer = self._ffiarray(1) + self._buffer = self._ffiarray(1, autofree=True) if value is not DEFAULT_VALUE: self.value = value @@ -222,9 +220,3 @@ def __nonzero__(self): return self._buffer[0] not in (0, '\x00') - - def __del__(self): - if self._needs_free: - self._needs_free = False - self._buffer.free() - self._buffer = None Modified: pypy/dist/pypy/lib/_ctypes/structure.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/structure.py (original) +++ pypy/dist/pypy/lib/_ctypes/structure.py Fri Mar 7 13:07:23 2008 @@ -110,8 +110,7 @@ def __init__(self, *args, **kwds): if not hasattr(self, '_ffistruct'): raise TypeError("Cannot instantiate structure, has no _fields_") - self.__dict__['_buffer'] = self._ffistruct() - self.__dict__['_needs_free'] = True + self.__dict__['_buffer'] = self._ffistruct(autofree=True) self.__dict__['_objects'] = {} if len(args) > len(self._names): raise TypeError("too many arguments") @@ -161,12 +160,10 @@ res.__dict__['_buffer'] = resbuffer res.__dict__['_base'] = None res.__dict__['_index'] = -1 - res.__dict__['_needs_free'] = True return res.__ctypes_from_outparam__() class Structure(_CData): __metaclass__ = StructureMeta - _needs_free = False def _subarray(self, fieldtype, name): """Return a _rawffi array of length 1 whose address is the same as @@ -207,9 +204,3 @@ def _get_buffer_value(self): return self._buffer.buffer - - def __del__(self): - if self._needs_free: - self._buffer.free() - self.__dict__['_buffer'] = None - self.__dict__['_needs_free'] = False Modified: pypy/dist/pypy/lib/_ctypes/union.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/union.py (original) +++ pypy/dist/pypy/lib/_ctypes/union.py Fri Mar 7 13:07:23 2008 @@ -26,8 +26,7 @@ raise TypeError("Cannot instantiate union, has no type") # malloc size size = self.__class__._sizeofinstances() - self.__dict__['_buffer'] = _rawffi.Array('c')(size) - self.__dict__['_needs_free'] = True + self.__dict__['_buffer'] = _rawffi.Array('c')(size, autofree=True) res.__init__ = __init__ return res @@ -66,7 +65,6 @@ class Union(_CData): __metaclass__ = UnionMeta - _needs_free = False def __getattr__(self, name): try: @@ -83,9 +81,3 @@ raise AttributeError(name) buf = self._ffiarrays[name].fromaddress(self._buffer.buffer, 1) buf[0] = fieldtype._CData_value(value) - - def __del__(self): - if self._needs_free: - self._buffer.free() - self.__dict__['_buffer'] = None - self.__dict__['_needs_free'] = False From pedronis at codespeak.net Fri Mar 7 14:35:26 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 7 Mar 2008 14:35:26 +0100 (CET) Subject: [pypy-svn] r52247 - pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes Message-ID: <20080307133526.3B3D516857E@codespeak.net> Author: pedronis Date: Fri Mar 7 14:35:24 2008 New Revision: 52247 Modified: pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/array.py pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/function.py pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/pointer.py pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/primitive.py pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/structure.py pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/union.py Log: all ctypes tests pass again except test_anon, for the new world it seems we really would like the notion of anonmyous _rawffi.Structure which would have no fields but only size and alignment information. Modified: pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/array.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/array.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/array.py Fri Mar 7 14:35:24 2008 @@ -57,7 +57,8 @@ res.value = property(getvalue, setvalue) if '_length_' in typedict: - res._ffishape = ffiarray.gettypecode(typedict['_length_']) + res._ffishape = (ffiarray, typedict['_length_']) + res._fficompositesize = res._sizeofinstances() else: res._ffiarray = None return res @@ -65,7 +66,7 @@ from_address = cdata_from_address def _sizeofinstances(self): - size, alignment = self._ffiarray.gettypecode(self._length_) + size, alignment = self._ffiarray.size_alignment(self._length_) return size def _alignmentofinstances(self): @@ -128,7 +129,7 @@ class Array(_CData): __metaclass__ = ArrayMeta - _ffiargshape = _ffiletter = 'P' + _ffiargshape = 'P' _needs_free = False def __init__(self, *args): @@ -164,13 +165,13 @@ if getattr(value, '_objects', None): store_reference(self, index, value._objects) arg = self._type_._CData_value(value) - if not isinstance(self._type_._ffishape, tuple): + if self._type_._fficompositesize is None: self._buffer[index] = arg # something more sophisticated, cannot set field directly else: from ctypes import memmove dest = self._buffer.itemaddress(index) - memmove(dest, arg, self._type_._ffishape[0]) + memmove(dest, arg, self._type_._fficompositesize) def __getitem__(self, index): if isinstance(index, slice): Modified: pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/function.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/function.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/function.py Fri Mar 7 14:35:24 2008 @@ -17,8 +17,9 @@ _argtypes_ = None _restype_ = None - _ffiargshape = _ffiletter = 'P' + _ffiargshape = 'P' _ffishape = 'P' + _fficompositesize = None _needs_free = False def _getargtypes(self): @@ -48,7 +49,7 @@ elif callable(argument): self.callable = argument argtypes = [arg._ffiargshape for arg in self._argtypes_] - restype = self._restype_._ffiletter + restype = self._restype_._ffiargshape self._ptr = _rawffi.CallbackPtr(argument, argtypes, restype) self._needs_free = True self._buffer = self._ptr.byptr() @@ -91,10 +92,7 @@ import ctypes restype = ctypes.c_int argshapes = [arg._ffiargshape for arg in argtypes] - if isinstance(restype._ffiargshape, str): # xxx refactor - resshape = restype._ffiargshape - else: - resshape = restype._ffistruct + resshape = restype._ffiargshape return self.dll._handle.ptr(self.name, argshapes, resshape) def _guess_argtypes(self, args): Modified: pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/pointer.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/pointer.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/pointer.py Fri Mar 7 14:35:24 2008 @@ -14,8 +14,8 @@ align = _rawffi.alignment('P'), length = 1, _ffiargshape = 'P', - _ffiletter = 'P', _ffishape = 'P', + _fficompositesize = None ) # XXX check if typedict['_type_'] is any sane # XXX remember about paramfunc Modified: pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/primitive.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/primitive.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/primitive.py Fri Mar 7 14:35:24 2008 @@ -55,9 +55,9 @@ default = TP_TO_DEFAULT[tp] ffiarray = _rawffi.Array(tp) result = type.__new__(self, name, bases, dct) - result._ffiletter = tp result._ffiargshape = tp result._ffishape = tp + result._fficompositesize = None result._ffiarray = ffiarray if tp == 'z': # c_char_p Modified: pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/structure.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/structure.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/structure.py Fri Mar 7 14:35:24 2008 @@ -38,7 +38,8 @@ self.__dict__.get('_anonymous_', None)) self._ffistruct = _rawffi.Structure(rawfields) _CDataMeta.__setattr__(self, '_fields_', value) - self._ffiargshape = self._ffishape = self._ffistruct.gettypecode() + self._ffiargshape = self._ffishape = (self._ffistruct, 1) + self._fficompositesize = self._ffistruct.size return _CDataMeta.__setattr__(self, name, value) @@ -104,8 +105,9 @@ typedict['_fields_'], cls[0], False, typedict.get('_anonymous_', None)) res._ffistruct = _rawffi.Structure(rawfields) - res._ffishape = res._ffistruct.gettypecode() + res._ffishape = (res._ffistruct, 1) res._ffiargshape = res._ffishape + res._fficompositesize = res._ffistruct.size def __init__(self, *args, **kwds): if not hasattr(self, '_ffistruct'): @@ -184,10 +186,10 @@ key = keepalive_key(getattr(self.__class__, name).offset) store_reference(self, key, value._objects) arg = fieldtype._CData_value(value) - if isinstance(fieldtype._ffishape, tuple): + if fieldtype._fficompositesize is not None: from ctypes import memmove dest = self._buffer.fieldaddress(name) - memmove(dest, arg._buffer.buffer, fieldtype._ffishape[0]) + memmove(dest, arg._buffer.buffer, fieldtype._fficompositesize) else: self._buffer.__setattr__(name, arg) Modified: pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/union.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/union.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/union.py Fri Mar 7 14:35:24 2008 @@ -16,6 +16,7 @@ res._ffishape = (res._sizeofinstances(), res._alignmentofinstances()) res._ffiargshape = res._ffishape + res._fficompositesize = res._sizeofinstances() # we need to create an array of size one for each # of our elements res._ffiarrays = {} @@ -61,6 +62,7 @@ _CDataMeta.__setattr__(self, '_fields_', value) self._ffiargshape = self._ffishape = (self._sizeofinstances(), self._alignmentofinstances()) + self._fficompositesize = self._sizeofinstances() return _CDataMeta.__setattr__(self, name, value) From niko at codespeak.net Fri Mar 7 15:43:21 2008 From: niko at codespeak.net (niko at codespeak.net) Date: Fri, 7 Mar 2008 15:43:21 +0100 (CET) Subject: [pypy-svn] r52248 - in pypy/dist/pypy/translator/oosupport: . test Message-ID: <20080307144321.5D3A6168572@codespeak.net> Author: niko Date: Fri Mar 7 15:43:19 2008 New Revision: 52248 Modified: pypy/dist/pypy/translator/oosupport/test/test_treebuilder.py pypy/dist/pypy/translator/oosupport/treebuilder.py Log: fix a bug in treebuilder (and add a test): we were not counting the exitswitch as a use Modified: pypy/dist/pypy/translator/oosupport/test/test_treebuilder.py ============================================================================== --- pypy/dist/pypy/translator/oosupport/test/test_treebuilder.py (original) +++ pypy/dist/pypy/translator/oosupport/test/test_treebuilder.py Fri Mar 7 15:43:19 2008 @@ -6,15 +6,19 @@ from pypy.rpython.test.test_rlist import BaseTestRlist from pypy.rpython.test.tool import BaseRtypingTest, OORtypeMixin from pypy.rpython.test.test_llinterp import get_interpreter +from pypy.translator.backendopt.all import backend_optimizations +from pypy.translator.backendopt.checkvirtual import check_virtual_methods -def translate(func, argtypes): +def translate(func, argtypes, backendopt=False): t = TranslationContext() t.buildannotator().build_types(func, argtypes) t.buildrtyper(type_system='ootype').specialize() + + if backendopt: backend_optimizations(t, merge_if_blocks=True) return t -def check_trees(func, argtypes): - t = translate(func, argtypes) +def check_trees(func, argtypes, backendopt=False): + t = translate(func, argtypes, backendopt=backendopt) if option.view: t.view() graph = graphof(t, func) @@ -66,6 +70,35 @@ assert block.exits[0].args == [v0] assert eval_func(0) == 1 +def test_count_exitswitch(): + def g(x): + pass + def fn(i): + kind = i & 3 # 2 bits + str = "%x" % (kind,) + if kind == 0: # 00 bits + res = "0" + elif kind == 1: # 01 bits + res = "1" + elif kind == 3: # 11 bits + res = "3" + else: # 10 bits + res = "-1" + return res, str + graph, eval_func = check_trees(fn, [int], backendopt=True) + block = graph.startblock + assert len(block.operations) == 5 + v0 = block.operations[0].result + assert block.exitswitch == v0 + for x in range(4): + t = eval_func(x) + assert t._items['item0']._str == fn(x)[0] + assert t._items['item1']._str == fn(x)[1] + #assert eval_func(0)._str == "0" + #assert eval_func(1)._str == "1" + #assert eval_func(2)._str == "-1" + #assert eval_func(3)._str == "3" + def test_mutable_values(): def fn(): lst = [] Modified: pypy/dist/pypy/translator/oosupport/treebuilder.py ============================================================================== --- pypy/dist/pypy/translator/oosupport/treebuilder.py (original) +++ pypy/dist/pypy/translator/oosupport/treebuilder.py Fri Mar 7 15:43:19 2008 @@ -51,6 +51,8 @@ var_to_op[op.result] = i, op for v in op.args: inc(v) + if block.exitswitch is not None: + inc(block.exitswitch) for link in block.exits: for v in link.args: inc(v) From pedronis at codespeak.net Fri Mar 7 15:59:35 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 7 Mar 2008 15:59:35 +0100 (CET) Subject: [pypy-svn] r52249 - in pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi: . test Message-ID: <20080307145935.C3531168575@codespeak.net> Author: pedronis Date: Fri Mar 7 15:59:33 2008 New Revision: 52249 Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/structure.py pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py Log: support for defining opaque _rawffi structures: use Structure((size, aligment)) for them instead of Structure([(fieldinfo)...]) Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/interp_rawffi.py Fri Mar 7 15:59:33 2008 @@ -140,9 +140,10 @@ resshape = None ffi_restype = ffi_type_void else: - tp_letter, ffi_restype, resshape = unpack_to_ffi_type(space, w_restype, - allow_void=True, - shape=True) + tp_letter, ffi_restype, resshape = unpack_to_ffi_type(space, + w_restype, + allow_void=True, + shape=True) w = space.wrap argtypes_w = space.unpackiterable(w_argtypes) w_argtypes = space.newtuple(argtypes_w) Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/structure.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/structure.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/structure.py Fri Mar 7 15:59:33 2008 @@ -47,20 +47,23 @@ class W_Structure(W_DataShape): - def __init__(self, space, w_fields): - fields = unpack_fields(space, w_fields) + def __init__(self, space, fields, size, alignment): name_to_index = {} - for i in range(len(fields)): - name, tp = fields[i] - if name in name_to_index: - raise OperationError(space.w_ValueError, space.wrap( - "duplicate field name %s" % (name, ))) - name_to_index[name] = i - size, alignment, pos = size_alignment_pos(fields) + if fields is not None: + for i in range(len(fields)): + name, tp = fields[i] + if name in name_to_index: + raise OperationError(space.w_ValueError, space.wrap( + "duplicate field name %s" % (name, ))) + name_to_index[name] = i + size, alignment, pos = size_alignment_pos(fields) + else: # opaque case + fields = [] + pos = [] + self.fields = fields self.size = size - self.alignment = alignment + self.alignment = alignment self.ll_positions = pos - self.fields = fields self.name_to_index = name_to_index def allocate(self, space, length, autofree=False): @@ -114,8 +117,15 @@ -def descr_new_structure(space, w_type, w_fields): - return space.wrap(W_Structure(space, w_fields)) +def descr_new_structure(space, w_type, w_shapeinfo): + if space.is_true(space.isinstance(w_shapeinfo, space.w_tuple)): + w_size, w_alignment = space.unpacktuple(w_shapeinfo, expected_length=2) + S = W_Structure(space, None, space.int_w(w_size), + space.int_w(w_alignment)) + else: + fields = unpack_fields(space, w_shapeinfo) + S = W_Structure(space, fields, 0, 0) + return space.wrap(S) W_Structure.typedef = TypeDef( 'Structure', Modified: pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/module/_rawffi/test/test_nested.py Fri Mar 7 15:59:33 2008 @@ -12,6 +12,11 @@ def test_inspect_structure(self): import _rawffi, struct + + E = _rawffi.Structure([]) + assert E.size == 0 + assert E.alignment == 1 + align = max(struct.calcsize("i"), struct.calcsize("P")) assert align & (align-1) == 0, "not a power of 2??" def round_up(x): @@ -26,6 +31,18 @@ assert S.size_alignment() == (S.size, S.alignment) assert S.size_alignment(1) == (S.size, S.alignment) + def test_opaque_structure(self): + import _rawffi + # define opaque structure with size = 200 and aligment = 16 + N = _rawffi.Structure((200, 16)) + assert N.size == 200 + assert N.alignment == 16 + assert N.size_alignment() == (200, 16) + assert N.size_alignment(1) == (200, 16) + raises(AttributeError, N.fieldoffset, '_') + n = N() + n.free() + def test_nested_structures(self): import _rawffi S1 = _rawffi.Structure([('a', 'i'), ('b', 'P'), ('c', 'c')]) From pedronis at codespeak.net Fri Mar 7 16:11:52 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 7 Mar 2008 16:11:52 +0100 (CET) Subject: [pypy-svn] r52250 - pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes Message-ID: <20080307151152.5BBC816856E@codespeak.net> Author: pedronis Date: Fri Mar 7 16:11:51 2008 New Revision: 52250 Modified: pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/structure.py pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/union.py Log: make test_anon passes, now unions use an opaque _rawffi.Structure as their backstore some refactorings to avoid code duplication the branch is ready to be merged Modified: pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/structure.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/structure.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/structure.py Fri Mar 7 16:11:51 2008 @@ -22,27 +22,6 @@ size = round_up(size, alignment) return size, alignment, pos -def struct_getattr(self, name): - if hasattr(self, '_fieldtypes') and name in self._fieldtypes: - return self._fieldtypes[name] - return _CDataMeta.__getattribute__(self, name) - -def struct_setattr(self, name, value): - if name == '_fields_': - if self.__dict__.get('_fields_', None): - raise AttributeError("_fields_ is final") - if self in [v for k, v in value]: - raise AttributeError("Structure or union cannot contain itself") - self._names, rawfields, self._fieldtypes = names_and_fields( - value, self.__bases__[0], False, - self.__dict__.get('_anonymous_', None)) - self._ffistruct = _rawffi.Structure(rawfields) - _CDataMeta.__setattr__(self, '_fields_', value) - self._ffiargshape = self._ffishape = (self._ffistruct, 1) - self._fficompositesize = self._ffistruct.size - return - _CDataMeta.__setattr__(self, name, value) - def names_and_fields(_fields_, superclass, zero_offset=False, anon=None): if isinstance(_fields_, tuple): _fields_ = list(_fields_) @@ -92,6 +71,32 @@ return "" % (self.name, self.offset, self.size) +# ________________________________________________________________ + +def _set_shape(tp, rawfields): + tp._ffistruct = _rawffi.Structure(rawfields) + tp._ffiargshape = tp._ffishape = (tp._ffistruct, 1) + tp._fficompositesize = tp._ffistruct.size + +def struct_getattr(self, name): + if hasattr(self, '_fieldtypes') and name in self._fieldtypes: + return self._fieldtypes[name] + return _CDataMeta.__getattribute__(self, name) + +def struct_setattr(self, name, value): + if name == '_fields_': + if self.__dict__.get('_fields_', None): + raise AttributeError("_fields_ is final") + if self in [v for k, v in value]: + raise AttributeError("Structure or union cannot contain itself") + self._names, rawfields, self._fieldtypes = names_and_fields( + value, self.__bases__[0], False, + self.__dict__.get('_anonymous_', None)) + _CDataMeta.__setattr__(self, '_fields_', value) + _set_shape(self, rawfields) + return + _CDataMeta.__setattr__(self, name, value) + class StructureMeta(_CDataMeta): def __new__(self, name, cls, typedict): res = type.__new__(self, name, cls, typedict) @@ -104,10 +109,7 @@ res._names, rawfields, res._fieldtypes = names_and_fields( typedict['_fields_'], cls[0], False, typedict.get('_anonymous_', None)) - res._ffistruct = _rawffi.Structure(rawfields) - res._ffishape = (res._ffistruct, 1) - res._ffiargshape = res._ffishape - res._fficompositesize = res._ffistruct.size + _set_shape(res, rawfields) def __init__(self, *args, **kwds): if not hasattr(self, '_ffistruct'): Modified: pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/union.py ============================================================================== --- pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/union.py (original) +++ pypy/branch/rawffi-shape-cleanup/pypy/lib/_ctypes/union.py Fri Mar 7 16:11:51 2008 @@ -6,6 +6,19 @@ struct_setattr import inspect + +def _set_shape(tp): + size = tp._sizeofinstances() + alignment = tp._alignmentofinstances() + tp._ffiopaque = _rawffi.Structure((size, alignment)) # opaque + tp._ffiargshape = tp._ffishape = (tp._ffiopaque, 1) + tp._fficompositesize = tp._ffiopaque.size + # we need to create an array of size one for each + # of our elements + tp._ffiarrays = {} + for name, field in tp._fieldtypes.iteritems(): + tp._ffiarrays[name] = _rawffi.Array(field.ctype._ffishape) + class UnionMeta(_CDataMeta): def __new__(self, name, cls, typedict): res = type.__new__(self, name, cls, typedict) @@ -13,21 +26,14 @@ res._names, rawfields, res._fieldtypes = names_and_fields( typedict['_fields_'], cls[0], True, typedict.get('_anonymous_', None)) - res._ffishape = (res._sizeofinstances(), - res._alignmentofinstances()) - res._ffiargshape = res._ffishape - res._fficompositesize = res._sizeofinstances() - # we need to create an array of size one for each - # of our elements - res._ffiarrays = {} - for name, field in res._fieldtypes.iteritems(): - res._ffiarrays[name] = _rawffi.Array(field.ctype._ffishape) + _set_shape(res) + def __init__(self): # don't allow arguments by now if not hasattr(self, '_ffiarrays'): raise TypeError("Cannot instantiate union, has no type") # malloc size size = self.__class__._sizeofinstances() - self.__dict__['_buffer'] = _rawffi.Array('c')(size) + self.__dict__['_buffer'] = self._ffiopaque() self.__dict__['_needs_free'] = True res.__init__ = __init__ return res @@ -56,14 +62,8 @@ self._names, rawfields, self._fieldtypes = names_and_fields( value, self.__bases__[0], True, self.__dict__.get('_anonymous_', None)) - self._ffiarrays = {} - for name, field in self._fieldtypes.iteritems(): - self._ffiarrays[name] = _rawffi.Array(field.ctype._ffishape) _CDataMeta.__setattr__(self, '_fields_', value) - self._ffiargshape = self._ffishape = (self._sizeofinstances(), - self._alignmentofinstances()) - self._fficompositesize = self._sizeofinstances() - return + _set_shape(self) _CDataMeta.__setattr__(self, name, value) class Union(_CData): From arigo at codespeak.net Fri Mar 7 17:19:29 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 17:19:29 +0100 (CET) Subject: [pypy-svn] r52251 - pypy/branch/buffer Message-ID: <20080307161929.2B8B9168576@codespeak.net> Author: arigo Date: Fri Mar 7 17:19:27 2008 New Revision: 52251 Added: pypy/branch/buffer/ - copied from r52250, pypy/dist/ Log: A branch to try to support the buffer protocol as outlined in my pypy-dev mail. From pedronis at codespeak.net Fri Mar 7 17:27:33 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 7 Mar 2008 17:27:33 +0100 (CET) Subject: [pypy-svn] r52252 - in pypy/dist/pypy: lib/_ctypes module/_rawffi module/_rawffi/test Message-ID: <20080307162733.127BE16857B@codespeak.net> Author: pedronis Date: Fri Mar 7 17:27:32 2008 New Revision: 52252 Modified: pypy/dist/pypy/lib/_ctypes/array.py pypy/dist/pypy/lib/_ctypes/function.py pypy/dist/pypy/lib/_ctypes/pointer.py pypy/dist/pypy/lib/_ctypes/primitive.py pypy/dist/pypy/lib/_ctypes/structure.py pypy/dist/pypy/lib/_ctypes/union.py pypy/dist/pypy/module/_rawffi/array.py pypy/dist/pypy/module/_rawffi/interp_rawffi.py pypy/dist/pypy/module/_rawffi/structure.py pypy/dist/pypy/module/_rawffi/test/test__rawffi.py pypy/dist/pypy/module/_rawffi/test/test_nested.py Log: merge the rawffi-shape-cleanup branch now rawffi type constructors (Array, Structure, ptr) accept type descriptions of the forms: - primitive type letter - (rawffi shape type, count) this will allow to compute more precise ffitypes needed by some ABIs for passing, returning struct values. Opaque structures can also be defined with _rawffi.Structure((size, alignment), this is now used by the union implementation in ctypes This contains some other refacorings to avoid code duplication and clarify some things in our ctypes impl. Modified: pypy/dist/pypy/lib/_ctypes/array.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/array.py (original) +++ pypy/dist/pypy/lib/_ctypes/array.py Fri Mar 7 17:27:32 2008 @@ -57,7 +57,8 @@ res.value = property(getvalue, setvalue) if '_length_' in typedict: - res._ffishape = ffiarray.gettypecode(typedict['_length_']) + res._ffishape = (ffiarray, typedict['_length_']) + res._fficompositesize = res._sizeofinstances() else: res._ffiarray = None return res @@ -65,7 +66,7 @@ from_address = cdata_from_address def _sizeofinstances(self): - size, alignment = self._ffiarray.gettypecode(self._length_) + size, alignment = self._ffiarray.size_alignment(self._length_) return size def _alignmentofinstances(self): @@ -128,7 +129,7 @@ class Array(_CData): __metaclass__ = ArrayMeta - _ffiargshape = _ffiletter = 'P' + _ffiargshape = 'P' def __init__(self, *args): self._buffer = self._ffiarray(self._length_, autofree=True) @@ -162,13 +163,13 @@ if getattr(value, '_objects', None): store_reference(self, index, value._objects) arg = self._type_._CData_value(value) - if not isinstance(self._type_._ffishape, tuple): + if self._type_._fficompositesize is None: self._buffer[index] = arg # something more sophisticated, cannot set field directly else: from ctypes import memmove dest = self._buffer.itemaddress(index) - memmove(dest, arg, self._type_._ffishape[0]) + memmove(dest, arg, self._type_._fficompositesize) def __getitem__(self, index): if isinstance(index, slice): Modified: pypy/dist/pypy/lib/_ctypes/function.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/function.py (original) +++ pypy/dist/pypy/lib/_ctypes/function.py Fri Mar 7 17:27:32 2008 @@ -17,8 +17,9 @@ _argtypes_ = None _restype_ = None - _ffiargshape = _ffiletter = 'P' + _ffiargshape = 'P' _ffishape = 'P' + _fficompositesize = None _needs_free = False def _getargtypes(self): @@ -48,7 +49,7 @@ elif callable(argument): self.callable = argument argtypes = [arg._ffiargshape for arg in self._argtypes_] - restype = self._restype_._ffiletter + restype = self._restype_._ffiargshape self._ptr = _rawffi.CallbackPtr(argument, argtypes, restype) self._needs_free = True self._buffer = self._ptr.byptr() @@ -89,10 +90,7 @@ import ctypes restype = ctypes.c_int argshapes = [arg._ffiargshape for arg in argtypes] - if isinstance(restype._ffiargshape, str): # xxx refactor - resshape = restype._ffiargshape - else: - resshape = restype._ffistruct + resshape = restype._ffiargshape return self.dll._handle.ptr(self.name, argshapes, resshape) def _guess_argtypes(self, args): Modified: pypy/dist/pypy/lib/_ctypes/pointer.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/pointer.py (original) +++ pypy/dist/pypy/lib/_ctypes/pointer.py Fri Mar 7 17:27:32 2008 @@ -14,8 +14,8 @@ align = _rawffi.alignment('P'), length = 1, _ffiargshape = 'P', - _ffiletter = 'P', _ffishape = 'P', + _fficompositesize = None ) # XXX check if typedict['_type_'] is any sane # XXX remember about paramfunc Modified: pypy/dist/pypy/lib/_ctypes/primitive.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/primitive.py (original) +++ pypy/dist/pypy/lib/_ctypes/primitive.py Fri Mar 7 17:27:32 2008 @@ -55,9 +55,9 @@ default = TP_TO_DEFAULT[tp] ffiarray = _rawffi.Array(tp) result = type.__new__(self, name, bases, dct) - result._ffiletter = tp result._ffiargshape = tp result._ffishape = tp + result._fficompositesize = None result._ffiarray = ffiarray if tp == 'z': # c_char_p Modified: pypy/dist/pypy/lib/_ctypes/structure.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/structure.py (original) +++ pypy/dist/pypy/lib/_ctypes/structure.py Fri Mar 7 17:27:32 2008 @@ -22,26 +22,6 @@ size = round_up(size, alignment) return size, alignment, pos -def struct_getattr(self, name): - if hasattr(self, '_fieldtypes') and name in self._fieldtypes: - return self._fieldtypes[name] - return _CDataMeta.__getattribute__(self, name) - -def struct_setattr(self, name, value): - if name == '_fields_': - if self.__dict__.get('_fields_', None): - raise AttributeError("_fields_ is final") - if self in [v for k, v in value]: - raise AttributeError("Structure or union cannot contain itself") - self._names, rawfields, self._fieldtypes = names_and_fields( - value, self.__bases__[0], False, - self.__dict__.get('_anonymous_', None)) - self._ffistruct = _rawffi.Structure(rawfields) - _CDataMeta.__setattr__(self, '_fields_', value) - self._ffiargshape = self._ffishape = self._ffistruct.gettypecode() - return - _CDataMeta.__setattr__(self, name, value) - def names_and_fields(_fields_, superclass, zero_offset=False, anon=None): if isinstance(_fields_, tuple): _fields_ = list(_fields_) @@ -91,6 +71,32 @@ return "" % (self.name, self.offset, self.size) +# ________________________________________________________________ + +def _set_shape(tp, rawfields): + tp._ffistruct = _rawffi.Structure(rawfields) + tp._ffiargshape = tp._ffishape = (tp._ffistruct, 1) + tp._fficompositesize = tp._ffistruct.size + +def struct_getattr(self, name): + if hasattr(self, '_fieldtypes') and name in self._fieldtypes: + return self._fieldtypes[name] + return _CDataMeta.__getattribute__(self, name) + +def struct_setattr(self, name, value): + if name == '_fields_': + if self.__dict__.get('_fields_', None): + raise AttributeError("_fields_ is final") + if self in [v for k, v in value]: + raise AttributeError("Structure or union cannot contain itself") + self._names, rawfields, self._fieldtypes = names_and_fields( + value, self.__bases__[0], False, + self.__dict__.get('_anonymous_', None)) + _CDataMeta.__setattr__(self, '_fields_', value) + _set_shape(self, rawfields) + return + _CDataMeta.__setattr__(self, name, value) + class StructureMeta(_CDataMeta): def __new__(self, name, cls, typedict): res = type.__new__(self, name, cls, typedict) @@ -103,9 +109,7 @@ res._names, rawfields, res._fieldtypes = names_and_fields( typedict['_fields_'], cls[0], False, typedict.get('_anonymous_', None)) - res._ffistruct = _rawffi.Structure(rawfields) - res._ffishape = res._ffistruct.gettypecode() - res._ffiargshape = res._ffishape + _set_shape(res, rawfields) def __init__(self, *args, **kwds): if not hasattr(self, '_ffistruct'): @@ -181,10 +185,10 @@ key = keepalive_key(getattr(self.__class__, name).offset) store_reference(self, key, value._objects) arg = fieldtype._CData_value(value) - if isinstance(fieldtype._ffishape, tuple): + if fieldtype._fficompositesize is not None: from ctypes import memmove dest = self._buffer.fieldaddress(name) - memmove(dest, arg._buffer.buffer, fieldtype._ffishape[0]) + memmove(dest, arg._buffer.buffer, fieldtype._fficompositesize) else: self._buffer.__setattr__(name, arg) Modified: pypy/dist/pypy/lib/_ctypes/union.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/union.py (original) +++ pypy/dist/pypy/lib/_ctypes/union.py Fri Mar 7 17:27:32 2008 @@ -6,6 +6,19 @@ struct_setattr import inspect + +def _set_shape(tp): + size = tp._sizeofinstances() + alignment = tp._alignmentofinstances() + tp._ffiopaque = _rawffi.Structure((size, alignment)) # opaque + tp._ffiargshape = tp._ffishape = (tp._ffiopaque, 1) + tp._fficompositesize = tp._ffiopaque.size + # we need to create an array of size one for each + # of our elements + tp._ffiarrays = {} + for name, field in tp._fieldtypes.iteritems(): + tp._ffiarrays[name] = _rawffi.Array(field.ctype._ffishape) + class UnionMeta(_CDataMeta): def __new__(self, name, cls, typedict): res = type.__new__(self, name, cls, typedict) @@ -13,20 +26,14 @@ res._names, rawfields, res._fieldtypes = names_and_fields( typedict['_fields_'], cls[0], True, typedict.get('_anonymous_', None)) - res._ffishape = (res._sizeofinstances(), - res._alignmentofinstances()) - res._ffiargshape = res._ffishape - # we need to create an array of size one for each - # of our elements - res._ffiarrays = {} - for name, field in res._fieldtypes.iteritems(): - res._ffiarrays[name] = _rawffi.Array(field.ctype._ffishape) + _set_shape(res) + def __init__(self): # don't allow arguments by now if not hasattr(self, '_ffiarrays'): raise TypeError("Cannot instantiate union, has no type") # malloc size size = self.__class__._sizeofinstances() - self.__dict__['_buffer'] = _rawffi.Array('c')(size, autofree=True) + self.__dict__['_buffer'] = self._ffiopaque(autofree=True) res.__init__ = __init__ return res @@ -54,13 +61,8 @@ self._names, rawfields, self._fieldtypes = names_and_fields( value, self.__bases__[0], True, self.__dict__.get('_anonymous_', None)) - self._ffiarrays = {} - for name, field in self._fieldtypes.iteritems(): - self._ffiarrays[name] = _rawffi.Array(field.ctype._ffishape) _CDataMeta.__setattr__(self, '_fields_', value) - self._ffiargshape = self._ffishape = (self._sizeofinstances(), - self._alignmentofinstances()) - return + _set_shape(self) _CDataMeta.__setattr__(self, name, value) class Union(_CData): Modified: pypy/dist/pypy/module/_rawffi/array.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/array.py (original) +++ pypy/dist/pypy/module/_rawffi/array.py Fri Mar 7 17:27:32 2008 @@ -12,7 +12,8 @@ from pypy.module._rawffi.interp_rawffi import segfault_exception from pypy.module._rawffi.interp_rawffi import W_DataShape, W_DataInstance from pypy.module._rawffi.interp_rawffi import unwrap_value, wrap_value -from pypy.module._rawffi.interp_rawffi import unpack_typecode, letter2tp +from pypy.module._rawffi.interp_rawffi import letter2tp +from pypy.module._rawffi.interp_rawffi import unpack_to_size_alignment from pypy.rlib.rarithmetic import intmask, r_uint def push_elem(ll_array, pos, value): @@ -60,11 +61,9 @@ return space.wrap(W_ArrayInstance(space, self, length, address)) fromaddress.unwrap_spec = ['self', ObjSpace, r_uint, int] - def descr_gettypecode(self, space, length): + def _size_alignment(self): _, itemsize, alignment = self.itemtp - return space.newtuple([space.wrap(itemsize * length), - space.wrap(alignment)]) - descr_gettypecode.unwrap_spec = ['self', ObjSpace, int] + return itemsize, alignment class ArrayCache: def __init__(self, space): @@ -83,8 +82,8 @@ def get_array_cache(space): return space.fromcache(ArrayCache) -def descr_new_array(space, w_type, w_itemtp): - itemtp = unpack_typecode(space, w_itemtp) +def descr_new_array(space, w_type, w_shape): + itemtp = unpack_to_size_alignment(space, w_shape) array_type = get_array_cache(space).get_array_type(itemtp) return space.wrap(array_type) @@ -96,7 +95,7 @@ unwrap_spec=['self', ObjSpace, int, W_Root, int]), __repr__ = interp2app(W_Array.descr_repr), fromaddress = interp2app(W_Array.fromaddress), - gettypecode = interp2app(W_Array.descr_gettypecode), + size_alignment = interp2app(W_Array.descr_size_alignment) ) W_Array.typedef.acceptable_as_base_class = False Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/interp_rawffi.py (original) +++ pypy/dist/pypy/module/_rawffi/interp_rawffi.py Fri Mar 7 17:27:32 2008 @@ -51,9 +51,10 @@ } TYPEMAP_PTR_LETTERS = "POszZ" -UNPACKED_TYPECODES = dict([(code, (code, - intmask(field_desc.c_size), - intmask(field_desc.c_alignment))) +def size_alignment(ffi_type): + return intmask(ffi_type.c_size), intmask(ffi_type.c_alignment) + +UNPACKED_TYPECODES = dict([(code, (code,) + size_alignment(field_desc)) for code, field_desc in TYPEMAP.items()]) LL_TYPEMAP = { @@ -86,20 +87,42 @@ raise OperationError(space.w_ValueError, space.wrap( "Unknown type letter %s" % (key,))) -def unpack_typecode(space, w_typecode): - if space.is_true(space.isinstance(w_typecode, space.w_str)): - letter = space.str_w(w_typecode) - return letter2tp(space, letter) - else: - w_size, w_align = space.unpacktuple(w_typecode, expected_length=2) - return ('V', space.int_w(w_size), space.int_w(w_align)) # value object - def _get_type_(space, key): try: return TYPEMAP[key] except KeyError: raise OperationError(space.w_ValueError, space.wrap( "Unknown type letter %s" % (key,))) + +def unpack_to_ffi_type(space, w_shape, allow_void=False, shape=False): + resshape = None + if space.is_true(space.isinstance(w_shape, space.w_str)): + letter = space.str_w(w_shape) + if allow_void and letter == 'v': + return 'v', ffi_type_void, None + ffi_type = _get_type_(space, letter) + if shape: + from pypy.module._rawffi.array import get_array_cache + cache = get_array_cache(space) + resshape = cache.get_array_type(letter2tp(space, letter)) + else: + letter = 'V' + w_shapetype, w_length = space.unpacktuple(w_shape, expected_length=2) + from pypy.module._rawffi.structure import W_Structure + resshape = space.interp_w(W_Structure, w_shapetype) + ffi_type = resshape.get_ffi_type() + return letter, ffi_type, resshape + +def unpack_to_size_alignment(space, w_shape): + if space.is_true(space.isinstance(w_shape, space.w_str)): + letter = space.str_w(w_shape) + return letter2tp(space, letter) + else: + w_shapetype, w_length = space.unpacktuple(w_shape, expected_length=2) + resshape = space.interp_w(W_DataShape, w_shapetype) + length = space.int_w(w_length) + size, alignment = resshape._size_alignment() + return ('V', length*size, alignment) # value object class W_CDLL(Wrappable): def __init__(self, space, name): @@ -108,18 +131,6 @@ self.w_cache = space.newdict() self.space = space - # xxx refactor away ! - def get_arg_type(self, letter, argsize, argalignment): - space = self.space - if letter == 'V': # xxx leaks - return make_struct_ffitype(argsize, argalignment) - else: - return _get_type_(space, letter) - - def get_type(self, key): - space = self.space - return _get_type_(space, key) - def ptr(self, space, name, w_argtypes, w_restype): """ Get a pointer for function name with provided argtypes and restype @@ -128,23 +139,14 @@ if space.is_w(w_restype, space.w_None): resshape = None ffi_restype = ffi_type_void - elif space.is_true(space.isinstance(w_restype, space.w_str)): - tp_letter = space.str_w(w_restype) - if tp_letter == 'v': - resshape = None - ffi_restype = ffi_type_void - else: - from pypy.module._rawffi.array import get_array_cache - cache = get_array_cache(space) - resshape = cache.get_array_type(letter2tp(space, tp_letter)) - ffi_restype = self.get_type(tp_letter) else: - from pypy.module._rawffi.structure import W_Structure - resshape = space.interp_w(W_Structure, w_restype) - ffi_restype = resshape.get_ffi_type() - + tp_letter, ffi_restype, resshape = unpack_to_ffi_type(space, + w_restype, + allow_void=True, + shape=True) w = space.wrap - w_argtypes = space.newtuple(space.unpackiterable(w_argtypes)) + argtypes_w = space.unpackiterable(w_argtypes) + w_argtypes = space.newtuple(argtypes_w) w_key = space.newtuple([w(name), w_argtypes, w(resshape)]) try: return space.getitem(self.w_cache, w_key) @@ -153,14 +155,16 @@ pass else: raise - argtypes_w = space.unpackiterable(w_argtypes) - argtypes = [unpack_typecode(space, w_arg) for w_arg in argtypes_w] - ffi_argtypes = [self.get_arg_type(letter, argsize, argalignment) - for letter, argsize, argalignment - in argtypes] + argletters = [] + ffi_argtypes = [] + for w_arg in argtypes_w: + argletter, ffi_argtype, _ = unpack_to_ffi_type(space, w_arg) + argletters.append(argletter) + ffi_argtypes.append(ffi_argtype) + try: ptr = self.cdll.getrawpointer(name, ffi_argtypes, ffi_restype) - w_funcptr = W_FuncPtr(space, ptr, argtypes, resshape) + w_funcptr = W_FuncPtr(space, ptr, argletters, resshape) space.setitem(self.w_cache, w_key, w_funcptr) return w_funcptr except KeyError: @@ -216,6 +220,16 @@ def allocate(self, space, length, autofree=False): raise NotImplementedError + def _size_alignment(self): + raise NotImplementedError + + def descr_size_alignment(self, space, n=1): + size, alignment = self._size_alignment() + return space.newtuple([space.wrap(size * n), + space.wrap(alignment)]) + descr_size_alignment.unwrap_spec = ['self', ObjSpace, int] + + class W_DataInstance(Wrappable): def __init__(self, space, size, address=r_uint(0)): if address: @@ -323,31 +337,32 @@ wrap_value._annspecialcase_ = 'specialize:arg(1)' class W_FuncPtr(Wrappable): - def __init__(self, space, ptr, argtypes, resshape): + def __init__(self, space, ptr, argletters, resshape): self.ptr = ptr + self.argletters = argletters self.resshape = resshape - self.argtypes = argtypes def call(self, space, args_w): from pypy.module._rawffi.array import W_ArrayInstance from pypy.module._rawffi.structure import W_StructureInstance argnum = len(args_w) - if argnum != len(self.argtypes): + if argnum != len(self.argletters): msg = "Wrong number of argument: expected %d, got %d" % ( - len(self.argtypes), argnum) + len(self.argletters), argnum) raise OperationError(space.w_TypeError, space.wrap(msg)) args_ll = [] for i in range(argnum): - argtype_letter, argtype_size, argtype_alignment = self.argtypes[i] + argletter = self.argletters[i] w_arg = args_w[i] - if argtype_letter == 'V': # by value object + if argletter == 'V': # by value object arg = space.interp_w(W_StructureInstance, w_arg) - if (arg.shape.size != argtype_size or - arg.shape.alignment != argtype_alignment): + xsize, xalignment = size_alignment(self.ptr.argtypes[i]) + if (arg.shape.size != xsize or + arg.shape.alignment != xalignment): msg = ("Argument %d should be a structure of size %d and " "alignment %d, " "got instead size %d and alignment %d" % - (i+1, argtype_size, argtype_alignment, + (i+1, xsize, xalignment, arg.shape.size, arg.shape.alignment)) raise OperationError(space.w_TypeError, space.wrap(msg)) else: @@ -357,11 +372,11 @@ "got length %d" % (i+1, arg.length)) raise OperationError(space.w_TypeError, space.wrap(msg)) letter = arg.shape.itemtp[0] - if letter != argtype_letter: - if not (argtype_letter in TYPEMAP_PTR_LETTERS and + if letter != argletter: + if not (argletter in TYPEMAP_PTR_LETTERS and letter in TYPEMAP_PTR_LETTERS): msg = "Argument %d should be typecode %s, got %s" % ( - i+1, argtype_letter, letter) + i+1, argletter, letter) raise OperationError(space.w_TypeError, space.wrap(msg)) args_ll.append(arg.ll_buffer) # XXX we could avoid the intermediate list args_ll Modified: pypy/dist/pypy/module/_rawffi/structure.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/structure.py (original) +++ pypy/dist/pypy/module/_rawffi/structure.py Fri Mar 7 17:27:32 2008 @@ -13,7 +13,7 @@ from pypy.module._rawffi.interp_rawffi import segfault_exception from pypy.module._rawffi.interp_rawffi import W_DataShape, W_DataInstance from pypy.module._rawffi.interp_rawffi import wrap_value, unwrap_value -from pypy.module._rawffi.interp_rawffi import unpack_typecode +from pypy.module._rawffi.interp_rawffi import unpack_to_size_alignment from pypy.rlib import libffi from pypy.rlib.rarithmetic import intmask, r_uint @@ -26,7 +26,7 @@ raise OperationError(space.w_ValueError, space.wrap( "Expected list of 2-size tuples")) name = space.str_w(l_w[0]) - tp = unpack_typecode(space, l_w[1]) + tp = unpack_to_size_alignment(space, l_w[1]) fields.append((name, tp)) return fields @@ -47,20 +47,23 @@ class W_Structure(W_DataShape): - def __init__(self, space, w_fields): - fields = unpack_fields(space, w_fields) + def __init__(self, space, fields, size, alignment): name_to_index = {} - for i in range(len(fields)): - name, tp = fields[i] - if name in name_to_index: - raise OperationError(space.w_ValueError, space.wrap( - "duplicate field name %s" % (name, ))) - name_to_index[name] = i - size, alignment, pos = size_alignment_pos(fields) + if fields is not None: + for i in range(len(fields)): + name, tp = fields[i] + if name in name_to_index: + raise OperationError(space.w_ValueError, space.wrap( + "duplicate field name %s" % (name, ))) + name_to_index[name] = i + size, alignment, pos = size_alignment_pos(fields) + else: # opaque case + fields = [] + pos = [] + self.fields = fields self.size = size - self.alignment = alignment + self.alignment = alignment self.ll_positions = pos - self.fields = fields self.name_to_index = name_to_index def allocate(self, space, length, autofree=False): @@ -96,10 +99,8 @@ return space.wrap(self.ll_positions[index]) descr_fieldoffset.unwrap_spec = ['self', ObjSpace, str] - def descr_gettypecode(self, space): - return space.newtuple([space.wrap(self.size), - space.wrap(self.alignment)]) - descr_gettypecode.unwrap_spec = ['self', ObjSpace] + def _size_alignment(self): + return self.size, self.alignment # get the corresponding ffi_type ffi_type = lltype.nullptr(libffi.FFI_TYPE_P.TO) @@ -116,8 +117,15 @@ -def descr_new_structure(space, w_type, w_fields): - return space.wrap(W_Structure(space, w_fields)) +def descr_new_structure(space, w_type, w_shapeinfo): + if space.is_true(space.isinstance(w_shapeinfo, space.w_tuple)): + w_size, w_alignment = space.unpacktuple(w_shapeinfo, expected_length=2) + S = W_Structure(space, None, space.int_w(w_size), + space.int_w(w_alignment)) + else: + fields = unpack_fields(space, w_shapeinfo) + S = W_Structure(space, fields, 0, 0) + return space.wrap(S) W_Structure.typedef = TypeDef( 'Structure', @@ -128,7 +136,7 @@ size = interp_attrproperty('size', W_Structure), alignment = interp_attrproperty('alignment', W_Structure), fieldoffset = interp2app(W_Structure.descr_fieldoffset), - gettypecode = interp2app(W_Structure.descr_gettypecode), + size_alignment = interp2app(W_Structure.descr_size_alignment) ) W_Structure.typedef.acceptable_as_base_class = False Modified: pypy/dist/pypy/module/_rawffi/test/test__rawffi.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/test/test__rawffi.py (original) +++ pypy/dist/pypy/module/_rawffi/test/test__rawffi.py Fri Mar 7 17:27:32 2008 @@ -506,7 +506,11 @@ s = struct.calcsize("i") assert (repr(_rawffi.Array('i')) == "<_rawffi.Array 'i' (%d, %d)>" % (s, s)) - assert repr(_rawffi.Array((18, 2))) == "<_rawffi.Array 'V' (18, 2)>" + + # fragile + S = _rawffi.Structure([('x', 'c'), ('y', 'l')]) + assert repr(_rawffi.Array((S, 2))) == "<_rawffi.Array 'V' (16, 4)>" + assert (repr(_rawffi.Structure([('x', 'i'), ('yz', 'i')])) == "<_rawffi.Structure 'x' 'yz' (%d, %d)>" % (2*s, s)) @@ -625,7 +629,7 @@ X_Y = _rawffi.Structure([('x', 'l'), ('y', 'l')]) x_y = X_Y() lib = _rawffi.CDLL(self.lib_name) - sum_x_y = lib.ptr('sum_x_y', [X_Y.gettypecode()], 'l') + sum_x_y = lib.ptr('sum_x_y', [(X_Y, 1)], 'l') x_y.x = 200 x_y.y = 220 res = sum_x_y(x_y) @@ -637,7 +641,7 @@ S2H = _rawffi.Structure([('x', 'h'), ('y', 'h')]) s2h = S2H() lib = _rawffi.CDLL(self.lib_name) - give = lib.ptr('give', ['h', 'h'], S2H) + give = lib.ptr('give', ['h', 'h'], (S2H, 1)) a1 = _rawffi.Array('h')(1) a2 = _rawffi.Array('h')(1) a1[0] = 13 @@ -652,7 +656,7 @@ s2h.x = 7 s2h.y = 11 - perturb = lib.ptr('perturb', [S2H.gettypecode()], S2H) + perturb = lib.ptr('perturb', [(S2H, 1)], (S2H, 1)) res = perturb(s2h) assert isinstance(res, _rawffi.StructureInstanceAutoFree) assert res.shape is S2H Modified: pypy/dist/pypy/module/_rawffi/test/test_nested.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/test/test_nested.py (original) +++ pypy/dist/pypy/module/_rawffi/test/test_nested.py Fri Mar 7 17:27:32 2008 @@ -12,6 +12,11 @@ def test_inspect_structure(self): import _rawffi, struct + + E = _rawffi.Structure([]) + assert E.size == 0 + assert E.alignment == 1 + align = max(struct.calcsize("i"), struct.calcsize("P")) assert align & (align-1) == 0, "not a power of 2??" def round_up(x): @@ -23,12 +28,25 @@ assert S.fieldoffset('a') == 0 assert S.fieldoffset('b') == align assert S.fieldoffset('c') == round_up(struct.calcsize("iP")) - assert S.gettypecode() == (S.size, S.alignment) + assert S.size_alignment() == (S.size, S.alignment) + assert S.size_alignment(1) == (S.size, S.alignment) + + def test_opaque_structure(self): + import _rawffi + # define opaque structure with size = 200 and aligment = 16 + N = _rawffi.Structure((200, 16)) + assert N.size == 200 + assert N.alignment == 16 + assert N.size_alignment() == (200, 16) + assert N.size_alignment(1) == (200, 16) + raises(AttributeError, N.fieldoffset, '_') + n = N() + n.free() def test_nested_structures(self): import _rawffi S1 = _rawffi.Structure([('a', 'i'), ('b', 'P'), ('c', 'c')]) - S = _rawffi.Structure([('x', 'c'), ('s1', S1.gettypecode())]) + S = _rawffi.Structure([('x', 'c'), ('s1', (S1, 1))]) assert S.size == S1.alignment + S1.size assert S.alignment == S1.alignment assert S.fieldoffset('x') == 0 @@ -47,7 +65,7 @@ def test_array_of_structures(self): import _rawffi S = _rawffi.Structure([('a', 'i'), ('b', 'P'), ('c', 'c')]) - A = _rawffi.Array(S.gettypecode()) + A = _rawffi.Array((S, 1)) a = A(3) raises(TypeError, "a[0]") s0 = S.fromaddress(a.buffer) @@ -68,8 +86,8 @@ import _rawffi, struct B = _rawffi.Array('i') sizeofint = struct.calcsize("i") - assert B.gettypecode(100) == (sizeofint * 100, sizeofint) - A = _rawffi.Array(B.gettypecode(4)) + assert B.size_alignment(100) == (sizeofint * 100, sizeofint) + A = _rawffi.Array((B, 4)) a = A(2) b0 = B.fromaddress(a.itemaddress(0), 4) b0[0] = 3 @@ -83,3 +101,28 @@ assert rawbuf[4] == 13 assert rawbuf[7] == 17 a.free() + + def test_array_in_structures(self): + import _rawffi, struct + A = _rawffi.Array('i') + S = _rawffi.Structure([('x', 'c'), ('ar', (A, 5))]) + A5size, A5alignment = A.size_alignment(5) + assert S.size == A5alignment + A5size + assert S.alignment == A5alignment + assert S.fieldoffset('x') == 0 + assert S.fieldoffset('ar') == A5alignment + s = S() + s = S() + s.x = 'G' + raises(TypeError, 's.ar') + assert s.fieldaddress('ar') == s.buffer + S.fieldoffset('ar') + a1 = A.fromaddress(s.fieldaddress('ar'), 5) + a1[4] = 33 + rawbuf = _rawffi.Array('c').fromaddress(s.buffer, S.size) + assert rawbuf[0] == 'G' + sizeofint = struct.calcsize("i") + v = 0 + for i in range(sizeofint): + v += ord(rawbuf[A5alignment + sizeofint*4+i]) + assert v == 33 + s.free() From arigo at codespeak.net Fri Mar 7 17:28:31 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 17:28:31 +0100 (CET) Subject: [pypy-svn] r52253 - pypy/branch/buffer Message-ID: <20080307162831.31A20169E3B@codespeak.net> Author: arigo Date: Fri Mar 7 17:28:30 2008 New Revision: 52253 Removed: pypy/branch/buffer/ Log: Kill, to be branched off the new trunk. From pedronis at codespeak.net Fri Mar 7 17:28:52 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 7 Mar 2008 17:28:52 +0100 (CET) Subject: [pypy-svn] r52254 - pypy/dist/pypy/doc/discussion Message-ID: <20080307162852.33F9916842B@codespeak.net> Author: pedronis Date: Fri Mar 7 17:28:51 2008 New Revision: 52254 Modified: pypy/dist/pypy/doc/discussion/ctypes_todo.txt Log: update ctypes_todo Modified: pypy/dist/pypy/doc/discussion/ctypes_todo.txt ============================================================================== --- pypy/dist/pypy/doc/discussion/ctypes_todo.txt (original) +++ pypy/dist/pypy/doc/discussion/ctypes_todo.txt Fri Mar 7 17:28:51 2008 @@ -15,14 +15,13 @@ - there are features, which we don't support like buffer() and array() protocols. - - started refactoring (on the rawffi-shape-cleanup) to use rawffi types - instead of size, aligment tuples to describe members and arguments. - Rawffi composite types should be able to create corresponding ffi_types. + - no tests for passing a union by value, missing tests about nesting unions + and keep-alive logic for unions - - no tests for passing a union by value - - - for some ABIs we will need completely filled ffitypes to do the right thing for passing - structures by value + - for some ABIs we will need completely filled ffitypes to do the + right thing for passing structures by value, we are now passing enough + information to rawffi that it should be possible to construct such precise + ffitypes in most cases - bitfields are not implemented From arigo at codespeak.net Fri Mar 7 17:28:57 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 17:28:57 +0100 (CET) Subject: [pypy-svn] r52255 - pypy/branch/buffer Message-ID: <20080307162857.9AFA6168430@codespeak.net> Author: arigo Date: Fri Mar 7 17:28:57 2008 New Revision: 52255 Added: pypy/branch/buffer/ - copied from r52253, pypy/dist/ Log: A branch to experiment with the buffer protocol support as I described in the pypy-dev mail. From pedronis at codespeak.net Fri Mar 7 17:52:50 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 7 Mar 2008 17:52:50 +0100 (CET) Subject: [pypy-svn] r52256 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080307165250.A9931169E42@codespeak.net> Author: pedronis Date: Fri Mar 7 17:52:48 2008 New Revision: 52256 Modified: pypy/dist/pypy/lib/app_test/ctypes/support.py pypy/dist/pypy/lib/app_test/ctypes/test_base.py pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Log: skip ctypes test if the ctypes version is too old (maybe we check for an exact version?), also skip white-box tests except on pypy itself Modified: pypy/dist/pypy/lib/app_test/ctypes/support.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/support.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/support.py Fri Mar 7 17:52:48 2008 @@ -1,3 +1,16 @@ +import py +import ctypes + +if ctypes.__version__ < "1.0.2": + py.test.skip("we expect a ctypes implementation with ver >= 1.0.2") + +class WhiteBoxTests: + + def setup_class(cls): + try: + import _rawffi + except ImportError: + py.test.skip("these tests are white-box tests for pypy _rawffi based ctypes impl") class BaseCTypesTestChecker: def setup_class(cls): Modified: pypy/dist/pypy/lib/app_test/ctypes/test_base.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_base.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_base.py Fri Mar 7 17:52:48 2008 @@ -1,9 +1,10 @@ +from support import WhiteBoxTests from ctypes import * # WhiteBoxTests -class TestCTypesBase: +class TestCTypesBase(WhiteBoxTests): def test_pointer(self): p = pointer(pointer(c_int(2))) x = p[0] Modified: pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Fri Mar 7 17:52:48 2008 @@ -1,4 +1,5 @@ import py +import support from ctypes import * import sys From pedronis at codespeak.net Fri Mar 7 17:59:51 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 7 Mar 2008 17:59:51 +0100 (CET) Subject: [pypy-svn] r52257 - pypy/branch/rawffi-shape-cleanup Message-ID: <20080307165951.2915E169E6D@codespeak.net> Author: pedronis Date: Fri Mar 7 17:59:50 2008 New Revision: 52257 Removed: pypy/branch/rawffi-shape-cleanup/ Log: remove merged branch I'm done for today From arigo at codespeak.net Fri Mar 7 18:17:36 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 18:17:36 +0100 (CET) Subject: [pypy-svn] r52258 - in pypy/branch/buffer/pypy: interpreter interpreter/test objspace/flow objspace/std Message-ID: <20080307171736.45F59168541@codespeak.net> Author: arigo Date: Fri Mar 7 18:17:35 2008 New Revision: 52258 Added: pypy/branch/buffer/pypy/interpreter/buffer.py (contents, props changed) pypy/branch/buffer/pypy/interpreter/test/test_buffer.py (contents, props changed) Modified: pypy/branch/buffer/pypy/interpreter/baseobjspace.py pypy/branch/buffer/pypy/objspace/flow/operation.py pypy/branch/buffer/pypy/objspace/std/stringobject.py Log: The start of a buffer interface on the object space. Modified: pypy/branch/buffer/pypy/interpreter/baseobjspace.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/baseobjspace.py (original) +++ pypy/branch/buffer/pypy/interpreter/baseobjspace.py Fri Mar 7 18:17:35 2008 @@ -916,6 +916,11 @@ self.wrap('cannot convert negative integer ' 'to unsigned int')) + def buffer_w(self, w_obj): + from pypy.interpreter.buffer import Buffer + w_buffer = self.buffer(w_obj) + return self.interp_w(Buffer, w_buffer) + def warn(self, msg, w_warningcls): self.appexec([self.wrap(msg), w_warningcls], """(msg, warningcls): import warnings @@ -1020,6 +1025,7 @@ ('set', 'set', 3, ['__set__']), ('delete', 'delete', 2, ['__delete__']), ('userdel', 'del', 1, ['__del__']), + ('buffer', 'buffer', 1, ['__buffer__']), # see buffer.py ] ObjSpace.BuiltinModuleTable = [ Added: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- (empty file) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Fri Mar 7 18:17:35 2008 @@ -0,0 +1,68 @@ +""" +Buffer protocol support. +""" + +# The implementation of the buffer protocol. The basic idea is that we +# can ask any app-level object for a 'buffer' view on it, by calling its +# __buffer__() special method. It should return a wrapped instance of a +# subclass of the Buffer class defined below. Note that __buffer__() is +# a PyPy-only extension to the Python language, made necessary by the +# fact that it's not natural in PyPy to hack an interp-level-only +# interface. + +# In normal usage, the convenience method space.buffer_w() should be +# used to get directly a Buffer instance. Doing so also gives you for +# free the typecheck that __buffer__() really returned a wrapped Buffer. + +from pypy.interpreter.baseobjspace import Wrappable +from pypy.interpreter.typedef import TypeDef +from pypy.interpreter.gateway import interp2app, ObjSpace + + +class Buffer(Wrappable): + """Abstract base class for memory views.""" + + __slots__ = ('len',) # the length, stored as an attribute + + def as_str(self): + "Returns an interp-level string with the whole content of the buffer." + # May be overridden. + return self.getslice(0, self.length()) + + def getitem(self, index): + "Returns the index'th character in the buffer." + raise NotImplementedError # Must be overriden. No bounds checks. + + def getslice(self, start, stop): + # May be overridden. No bounds checks. + return ''.join([self.getitem(i) for i in range(start, stop)]) + + # __________ app-level support __________ + + def descr_len(self, space): + return space.wrap(self.length()) + descr_len.unwrap_spec = ['self', ObjSpace] + + +Buffer.typedef = TypeDef( + "buffer", + __len__ = interp2app(Buffer.descr_len), + ) + +# ____________________________________________________________ + +class StringBuffer(Buffer): + + def __init__(self, value): + self.len = len(value) + self.value = value + + def as_str(self): + return self.value + + def getitem(self, index): + return self.value[index] + + def getslice(self, start, stop): + assert 0 <= start <= stop <= self.len + return self.value[start:stop] Added: pypy/branch/buffer/pypy/interpreter/test/test_buffer.py ============================================================================== --- (empty file) +++ pypy/branch/buffer/pypy/interpreter/test/test_buffer.py Fri Mar 7 18:17:35 2008 @@ -0,0 +1,16 @@ +import py +from pypy.interpreter.buffer import Buffer + + +class TestBuffer: + + def test_buffer_w(self): + space = self.space + w_hello = space.wrap('hello world') + buf = space.buffer_w(w_hello) + assert isinstance(buf, Buffer) + assert buf.len == 11 + assert buf.as_str() == 'hello world' + assert buf.getslice(1, 6) == 'ello ' + space.raises_w(space.w_TypeError, space.buffer_w, space.wrap(5)) + space.raises_w(space.w_TypeError, space.buffer, space.wrap(5)) Modified: pypy/branch/buffer/pypy/objspace/flow/operation.py ============================================================================== --- pypy/branch/buffer/pypy/objspace/flow/operation.py (original) +++ pypy/branch/buffer/pypy/objspace/flow/operation.py Fri Mar 7 18:17:35 2008 @@ -189,6 +189,7 @@ ('set', set), ('delete', delete), ('userdel', userdel), + ('buffer', buffer), # --- operations added by graph transformations --- ('neg_ovf', neg_ovf), ('abs_ovf', abs_ovf), Modified: pypy/branch/buffer/pypy/objspace/std/stringobject.py ============================================================================== --- pypy/branch/buffer/pypy/objspace/std/stringobject.py (original) +++ pypy/branch/buffer/pypy/objspace/std/stringobject.py Fri Mar 7 18:17:35 2008 @@ -952,6 +952,10 @@ def mod__String_ANY(space, w_format, w_values): return mod_format(space, w_format, w_values, do_unicode=False) +def buffer__String(space, w_string): + from pypy.interpreter.buffer import StringBuffer + return space.wrap(StringBuffer(w_string._value)) + # register all methods from pypy.objspace.std import stringtype register_all(vars(), stringtype) From arigo at codespeak.net Fri Mar 7 18:31:04 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 18:31:04 +0100 (CET) Subject: [pypy-svn] r52259 - in pypy/branch/buffer/pypy: interpreter interpreter/test module/_file Message-ID: <20080307173104.A3893169E26@codespeak.net> Author: arigo Date: Fri Mar 7 18:31:04 2008 New Revision: 52259 Modified: pypy/branch/buffer/pypy/interpreter/baseobjspace.py pypy/branch/buffer/pypy/interpreter/buffer.py pypy/branch/buffer/pypy/interpreter/gateway.py pypy/branch/buffer/pypy/interpreter/test/test_buffer.py pypy/branch/buffer/pypy/module/_file/interp_file.py Log: Add space.bufferstr_w(), which accepts any buffer but returns an RPython-level string. For now we can just use it in places like file.write(). Modified: pypy/branch/buffer/pypy/interpreter/baseobjspace.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/baseobjspace.py (original) +++ pypy/branch/buffer/pypy/interpreter/baseobjspace.py Fri Mar 7 18:31:04 2008 @@ -917,10 +917,21 @@ 'to unsigned int')) def buffer_w(self, w_obj): + # returns a Buffer instance from pypy.interpreter.buffer import Buffer w_buffer = self.buffer(w_obj) return self.interp_w(Buffer, w_buffer) + def bufferstr_w(self, w_obj): + # directly returns an interp-level str + try: + return self.str_w(w_obj) + except OperationError, e: + if not e.match(self, self.w_TypeError): + raise + buffer = self.buffer_w(w_obj) + return buffer.as_str() + def warn(self, msg, w_warningcls): self.appexec([self.wrap(msg), w_warningcls], """(msg, warningcls): import warnings Modified: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Fri Mar 7 18:31:04 2008 @@ -43,10 +43,15 @@ return space.wrap(self.length()) descr_len.unwrap_spec = ['self', ObjSpace] + def descr__buffer__(self, space): + return space.wrap(self) + descr__buffer__.unwrap_spec = ['self', ObjSpace] + Buffer.typedef = TypeDef( "buffer", __len__ = interp2app(Buffer.descr_len), + __buffer__ = interp2app(Buffer.descr__buffer__), ) # ____________________________________________________________ Modified: pypy/branch/buffer/pypy/interpreter/gateway.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/gateway.py (original) +++ pypy/branch/buffer/pypy/interpreter/gateway.py Fri Mar 7 18:31:04 2008 @@ -119,6 +119,9 @@ def visit_index(self, index, app_sig): self.checked_space_method(index, app_sig) + def visit_bufferstr(self, el, app_sig): + self.checked_space_method(el, app_sig) + def visit__Wrappable(self, el, app_sig): name = el.__name__ argname = self.orig_arg() @@ -217,6 +220,9 @@ self.run_args.append("space.getindex_w(%s, space.w_OverflowError)" % (self.scopenext(), )) + def visit_bufferstr(self, typ): + self.run_args.append("space.bufferstr_w(%s)" % (self.scopenext(),)) + def _make_unwrap_activation_class(self, unwrap_spec, cache={}): try: key = tuple(unwrap_spec) @@ -329,6 +335,9 @@ self.unwrap.append("space.getindex_w(%s, space.w_OverflowError)" % (self.nextarg()), ) + def visit_bufferstr(self, typ): + self.unwrap.append("space.bufferstr_w(%s)" % (self.nextarg(),)) + def make_fastfunc(unwrap_spec, func): unwrap_info = UnwrapSpec_FastFunc_Unwrap() unwrap_info.apply_over(unwrap_spec) Modified: pypy/branch/buffer/pypy/interpreter/test/test_buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/test/test_buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/test/test_buffer.py Fri Mar 7 18:31:04 2008 @@ -1,5 +1,8 @@ import py from pypy.interpreter.buffer import Buffer +from pypy.tool.udir import udir + +testdir = udir.ensure('test_buffer', dir=1) class TestBuffer: @@ -12,5 +15,22 @@ assert buf.len == 11 assert buf.as_str() == 'hello world' assert buf.getslice(1, 6) == 'ello ' + assert space.buffer_w(space.wrap(buf)) is buf + assert space.bufferstr_w(w_hello) == 'hello world' + assert space.bufferstr_w(space.buffer(w_hello)) == 'hello world' space.raises_w(space.w_TypeError, space.buffer_w, space.wrap(5)) space.raises_w(space.w_TypeError, space.buffer, space.wrap(5)) + + def test_file_write(self): + space = self.space + w_buffer = space.buffer(space.wrap('hello world')) + filename = str(testdir.join('test_file_write')) + space.appexec([w_buffer, space.wrap(filename)], """(buffer, filename): + f = open(filename, 'wb') + f.write(buffer) + f.close() + """) + f = open(filename, 'rb') + data = f.read() + f.close() + assert data == 'hello world' Modified: pypy/branch/buffer/pypy/module/_file/interp_file.py ============================================================================== --- pypy/branch/buffer/pypy/module/_file/interp_file.py (original) +++ pypy/branch/buffer/pypy/module/_file/interp_file.py Fri Mar 7 18:31:04 2008 @@ -330,7 +330,7 @@ Size defaults to the current file position, as returned by tell().""") - _decl(locals(), "write", ['self', str], + _decl(locals(), "write", ['self', 'bufferstr'], """write(str) -> None. Write string str to file. Note that due to buffering, flush() or close() may be needed before From arigo at codespeak.net Fri Mar 7 18:32:31 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 18:32:31 +0100 (CET) Subject: [pypy-svn] r52260 - in pypy/branch/buffer/pypy: module/__builtin__ rlib Message-ID: <20080307173231.6F0D2169E26@codespeak.net> Author: arigo Date: Fri Mar 7 18:32:30 2008 New Revision: 52260 Removed: pypy/branch/buffer/pypy/module/__builtin__/app_buffer.py pypy/branch/buffer/pypy/module/__builtin__/interp_buffer.py pypy/branch/buffer/pypy/rlib/rbuffer.py Modified: pypy/branch/buffer/pypy/module/__builtin__/__init__.py Log: Remove these files for now. Modified: pypy/branch/buffer/pypy/module/__builtin__/__init__.py ============================================================================== --- pypy/branch/buffer/pypy/module/__builtin__/__init__.py (original) +++ pypy/branch/buffer/pypy/module/__builtin__/__init__.py Fri Mar 7 18:32:30 2008 @@ -55,7 +55,6 @@ 'vars' : 'app_inspect.vars', 'dir' : 'app_inspect.dir', - 'buffer' : 'app_buffer.buffer', 'reload' : 'app_misc.reload', '__filestub' : 'app_file_stub.file', From arigo at codespeak.net Fri Mar 7 18:59:02 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 18:59:02 +0100 (CET) Subject: [pypy-svn] r52261 - in pypy/branch/buffer/pypy: interpreter interpreter/test module/__builtin__ objspace/std Message-ID: <20080307175902.879A316855E@codespeak.net> Author: arigo Date: Fri Mar 7 18:59:01 2008 New Revision: 52261 Modified: pypy/branch/buffer/pypy/interpreter/buffer.py pypy/branch/buffer/pypy/interpreter/test/test_buffer.py pypy/branch/buffer/pypy/module/__builtin__/__init__.py pypy/branch/buffer/pypy/module/__builtin__/operation.py pypy/branch/buffer/pypy/objspace/std/unicodeobject.py Log: Some app-level support for buffer objects. Modified: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Fri Mar 7 18:59:01 2008 @@ -16,7 +16,7 @@ from pypy.interpreter.baseobjspace import Wrappable from pypy.interpreter.typedef import TypeDef -from pypy.interpreter.gateway import interp2app, ObjSpace +from pypy.interpreter.gateway import interp2app, ObjSpace, W_Root class Buffer(Wrappable): @@ -40,19 +40,57 @@ # __________ app-level support __________ def descr_len(self, space): - return space.wrap(self.length()) + return space.wrap(self.len) descr_len.unwrap_spec = ['self', ObjSpace] + def descr_getitem(self, space, w_index): + start, stop, step = space.decode_index(w_index, self.len) + if step == 0: # index only + return space.wrap(self.getitem(start)) + elif step == 1: + if 0 <= start <= stop: + res = self.getslice(start, stop) + else: + res = '' + return space.wrap(res) + else: + raise OperationError(space.w_ValueError, + space.wrap("buffer object does not support" + " slicing with a step")) + descr_getitem.unwrap_spec = ['self', ObjSpace, W_Root] + def descr__buffer__(self, space): return space.wrap(self) descr__buffer__.unwrap_spec = ['self', ObjSpace] +def descr_buffer__new__(space, w_subtype, w_object): #, offset, size + # w_subtype can only be exactly 'buffer' for now + if not space.is_w(w_subtype, space.gettypefor(Buffer)): + raise OperationError(space.w_TypeError, + space.wrap("argument 1 must be 'buffer'")) + w_buffer = space.buffer(w_object) + space.interp_w(Buffer, w_buffer) # type-check + return w_buffer +descr_buffer__new__.unwrap_spec = [ObjSpace, W_Root, W_Root] + + Buffer.typedef = TypeDef( "buffer", + __doc__ = """\ +buffer(object [, offset[, size]]) + +Create a new buffer object which references the given object. +The buffer will reference a slice of the target object from the +start of the object (or at the specified offset). The slice will +extend to the end of the target object (or with the specified size). +""", + __new__ = interp2app(descr_buffer__new__), __len__ = interp2app(Buffer.descr_len), + __getitem__ = interp2app(Buffer.descr_getitem), __buffer__ = interp2app(Buffer.descr__buffer__), ) +Buffer.typedef.acceptable_as_base_class = False # ____________________________________________________________ Modified: pypy/branch/buffer/pypy/interpreter/test/test_buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/test/test_buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/test/test_buffer.py Fri Mar 7 18:59:01 2008 @@ -34,3 +34,6 @@ data = f.read() f.close() assert data == 'hello world' + + +# Note: some app-level tests for buffer are in module/__builtin__/test/. Modified: pypy/branch/buffer/pypy/module/__builtin__/__init__.py ============================================================================== --- pypy/branch/buffer/pypy/module/__builtin__/__init__.py (original) +++ pypy/branch/buffer/pypy/module/__builtin__/__init__.py Fri Mar 7 18:59:01 2008 @@ -69,6 +69,7 @@ 'type' : '(space.w_type)', 'object' : '(space.w_object)', 'unicode' : '(space.w_unicode)', + 'buffer' : 'operation.Buffer', 'file' : 'state.get(space).w_file', 'open' : 'state.get(space).w_file', Modified: pypy/branch/buffer/pypy/module/__builtin__/operation.py ============================================================================== --- pypy/branch/buffer/pypy/module/__builtin__/operation.py (original) +++ pypy/branch/buffer/pypy/module/__builtin__/operation.py Fri Mar 7 18:59:01 2008 @@ -2,12 +2,14 @@ Interp-level implementation of the basic space operations. """ -from pypy.interpreter import gateway +from pypy.interpreter import gateway, buffer from pypy.interpreter.baseobjspace import ObjSpace from pypy.interpreter.error import OperationError import __builtin__ NoneNotWrapped = gateway.NoneNotWrapped +Buffer = buffer.Buffer + def abs(space, w_val): "abs(number) -> number\n\nReturn the absolute value of the argument." return space.abs(w_val) Modified: pypy/branch/buffer/pypy/objspace/std/unicodeobject.py ============================================================================== --- pypy/branch/buffer/pypy/objspace/std/unicodeobject.py (original) +++ pypy/branch/buffer/pypy/objspace/std/unicodeobject.py Fri Mar 7 18:59:01 2008 @@ -944,6 +944,33 @@ def mod__Unicode_ANY(space, w_format, w_values): return mod_format(space, w_format, w_values, do_unicode=True) +_maxunicode = sys.maxunicode +_bigendian = sys.byteorder == "big" + +def buffer__Unicode(space, w_unicode): + # xxx this is a slightly strange thing... + charlist = [] + for unich in w_unicode._value: + if _maxunicode <= 65535: + if _bigendian: + charlist.append(chr(ord(unich) >> 8)) + charlist.append(chr(ord(unich) & 0xFF)) + else: + charlist.append(chr(ord(unich) & 0xFF)) + charlist.append(chr(ord(unich) >> 8)) + else: + if _bigendian: + charlist.append(chr(ord(unich) >> 24)) + charlist.append(chr((ord(unich) >> 16) & 0xFF)) + charlist.append(chr((ord(unich) >> 8) & 0xFF)) + charlist.append(chr(ord(unich) & 0xFF)) + else: + charlist.append(chr(ord(unich) & 0xFF)) + charlist.append(chr((ord(unich) >> 8) & 0xFF)) + charlist.append(chr((ord(unich) >> 16) & 0xFF)) + charlist.append(chr(ord(unich) >> 24)) + from pypy.interpreter.buffer import StringBuffer + return space.wrap(StringBuffer(''.join(charlist))) import unicodetype register_all(vars(), unicodetype) From arigo at codespeak.net Fri Mar 7 19:06:37 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 19:06:37 +0100 (CET) Subject: [pypy-svn] r52262 - pypy/branch/buffer/pypy/module/array Message-ID: <20080307180637.5902316855E@codespeak.net> Author: arigo Date: Fri Mar 7 19:06:37 2008 New Revision: 52262 Modified: pypy/branch/buffer/pypy/module/array/app_array.py Log: A two-liner implementation of the buffer protocol for array objects. Obviously bad, but hard to do better before we rewrite the whole class to interp-level. Modified: pypy/branch/buffer/pypy/module/array/app_array.py ============================================================================== --- pypy/branch/buffer/pypy/module/array/app_array.py (original) +++ pypy/branch/buffer/pypy/module/array/app_array.py Fri Mar 7 19:06:37 2008 @@ -277,6 +277,9 @@ strings.append(pack(self.typecode, item)) return "".join(strings) + def __buffer__(self): # XXX baaaaad performance + return buffer(self.tostring()) + def tounicode(self): """Convert the array to a unicode string. The array must be a type 'u' array; otherwise a ValueError is raised. Use array.tostring().decode() From niko at codespeak.net Fri Mar 7 19:07:25 2008 From: niko at codespeak.net (niko at codespeak.net) Date: Fri, 7 Mar 2008 19:07:25 +0100 (CET) Subject: [pypy-svn] r52263 - pypy/dist/pypy/translator/jvm/src/pypy Message-ID: <20080307180725.3F5B416855E@codespeak.net> Author: niko Date: Fri Mar 7 19:07:24 2008 New Revision: 52263 Modified: pypy/dist/pypy/translator/jvm/src/pypy/ll_os.java Log: Ensure that when we make a String from bytes we use the encoding ISO-8859-1. Modified: pypy/dist/pypy/translator/jvm/src/pypy/ll_os.java ============================================================================== --- pypy/dist/pypy/translator/jvm/src/pypy/ll_os.java (original) +++ pypy/dist/pypy/translator/jvm/src/pypy/ll_os.java Fri Mar 7 19:07:24 2008 @@ -75,7 +75,7 @@ int n = stream.read(buf, 0, count); if (n == -1) return ""; // XXX: is it right? - return new String(buf, 0, n); + return ll_os.bytes2string(buf, n); } catch(IOException e) { os.throwOSError(PyPy.EIO, e.getMessage()); @@ -136,7 +136,7 @@ if (n == -1) return ""; // XXX: is it right? else - return new String(buffer, 0, n); + return ll_os.bytes2string(buffer, n); } catch(IOException e) { os.throwOSError(PyPy.EIO, e.getMessage()); @@ -218,6 +218,19 @@ fdcount = 2; } + public static final String bytes2string(byte[] buf, int n) + { + // careful: use this char set (ISO-8859-1) because it basically + // passes all bytes through unhindered. + try { + return new String(buf, 0, n, "ISO-8859-1"); + } catch (UnsupportedEncodingException e) { + // this should not happen, all Java impl are required + // to support ISO-8859-1. + throw new RuntimeException(e); + } + } + public static final boolean STRACE = false; public static void strace(String arg) { System.err.println(arg); From arigo at codespeak.net Fri Mar 7 19:11:30 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 19:11:30 +0100 (CET) Subject: [pypy-svn] r52264 - in pypy/branch/buffer/pypy/module/_sre: . test Message-ID: <20080307181130.2E7BD168554@codespeak.net> Author: arigo Date: Fri Mar 7 19:11:29 2008 New Revision: 52264 Modified: pypy/branch/buffer/pypy/module/_sre/interp_sre.py pypy/branch/buffer/pypy/module/_sre/test/test_app_sre.py Log: Use the buffer protocol in _sre. Modified: pypy/branch/buffer/pypy/module/_sre/interp_sre.py ============================================================================== --- pypy/branch/buffer/pypy/module/_sre/interp_sre.py (original) +++ pypy/branch/buffer/pypy/module/_sre/interp_sre.py Fri Mar 7 19:11:29 2008 @@ -9,7 +9,7 @@ # # * THREE_VERSIONS_OF_CORE=True: you get three copies of the whole # regexp searching and matching code: for strings, for unicode strings, -# and for generic wrapped objects (like mmap.mmap or array.array). +# and for generic buffer objects (like mmap.mmap or array.array). # # * THREE_VERSIONS_OF_CORE=False: there is only one copy of the code, # at the cost of an indirect method call to fetch each character. @@ -162,19 +162,11 @@ rsre.insert_sre_methods(locals(), 'generic') def unwrap_object(self): - # cannot unwrap in the general case - space = self.space - # some type-checking - if (space.lookup(self.w_string, '__getitem__') is None or - space.lookup(self.w_string, 'keys') is not None): - msg = "string or sequence of characters expected" - raise OperationError(space.w_TypeError, space.wrap(msg)) - return space.int_w(space.len(self.w_string)) + self.buffer = self.space.buffer_w(self.w_string) + return self.buffer.len def get_char_ord(self, p): - space = self.space - w_char = space.getitem(self.w_string, space.wrap(p)) - return space.int_w(space.ord(w_char)) + return ord(self.buffer.getitem(p)) def w_search(space, w_state, w_pattern_codes): Modified: pypy/branch/buffer/pypy/module/_sre/test/test_app_sre.py ============================================================================== --- pypy/branch/buffer/pypy/module/_sre/test/test_app_sre.py (original) +++ pypy/branch/buffer/pypy/module/_sre/test/test_app_sre.py Fri Mar 7 19:11:29 2008 @@ -194,6 +194,10 @@ m = re.match('hel+', a) assert m.end() == 4 + def test_match_typeerror(self): + import re + raises(TypeError, re.match, 'hel+', list('hello')) + def test_group_bugs(self): import re r = re.compile(r""" From niko at codespeak.net Fri Mar 7 19:13:10 2008 From: niko at codespeak.net (niko at codespeak.net) Date: Fri, 7 Mar 2008 19:13:10 +0100 (CET) Subject: [pypy-svn] r52265 - in pypy/dist/pypy/translator: jvm oosupport/test_template Message-ID: <20080307181310.2406D168554@codespeak.net> Author: niko Date: Fri Mar 7 19:13:09 2008 New Revision: 52265 Modified: pypy/dist/pypy/translator/jvm/genjvm.py pypy/dist/pypy/translator/oosupport/test_template/builtin.py Log: add a test for reading in binary strings with hi bit set, and comment out some obnoxious jvm printouts that cloud up py.test output Modified: pypy/dist/pypy/translator/jvm/genjvm.py ============================================================================== --- pypy/dist/pypy/translator/jvm/genjvm.py (original) +++ pypy/dist/pypy/translator/jvm/genjvm.py Fri Mar 7 19:13:09 2008 @@ -166,9 +166,9 @@ yield chunk for files in split_list(self.jasmin_files): - print "Invoking jasmin on %s" % files + #print "Invoking jasmin on %s" % files self._invoke(jascmd + files, False) - print "... completed!" + #print "... completed!" self.compiled = True self._compile_helper() Modified: pypy/dist/pypy/translator/oosupport/test_template/builtin.py ============================================================================== --- pypy/dist/pypy/translator/oosupport/test_template/builtin.py (original) +++ pypy/dist/pypy/translator/oosupport/test_template/builtin.py Fri Mar 7 19:13:09 2008 @@ -14,6 +14,29 @@ return os.O_CREAT assert self.interpret(fn, []) == NT_OS['O_CREAT'] + def test_os_read_hibytes(self): + """ + Test that we read in characters with the high bit set correctly + This can be a problem on JVM or CLI, where we use unicode strings to + encode byte arrays! + """ + tmpfile = str(udir.udir.join("os_read_hibytes.txt")) + def chrs2int(b): + assert len(b) == 4 + first = ord(b[0]) # big endian + if first & 0x80 != 0: + first = first - 0x100 + return first << 24 | ord(b[1]) << 16 | ord(b[2]) << 8 | ord(b[3]) + def fn(): + fd = os.open(tmpfile, os.O_RDONLY|os.O_BINARY, 0666) + res = os.read(fd, 4) + os.close(fd) + return chrs2int(res) + f = file(tmpfile, 'w') + f.write("".join([chr(x) for x in [0x06, 0x64, 0x90, 0x00]])) + f.close() + assert self.interpret(fn, []) == fn() + def test_os_read_binary_crlf(self): tmpfile = str(udir.udir.join("os_read_test")) def fn(flag): From arigo at codespeak.net Fri Mar 7 19:17:20 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 19:17:20 +0100 (CET) Subject: [pypy-svn] r52266 - in pypy/branch/buffer/pypy/module: md5 md5/test sha sha/test Message-ID: <20080307181720.C7E1B168554@codespeak.net> Author: arigo Date: Fri Mar 7 19:17:20 2008 New Revision: 52266 Modified: pypy/branch/buffer/pypy/module/md5/interp_md5.py pypy/branch/buffer/pypy/module/md5/test/test_md5.py pypy/branch/buffer/pypy/module/sha/interp_sha.py pypy/branch/buffer/pypy/module/sha/test/test_sha.py Log: Support passing buffers to the md5 and sha modules. This is still a happily-copying approach; when we actually have buffer objects that store their data in low-level raw memory we can improve this too. Modified: pypy/branch/buffer/pypy/module/md5/interp_md5.py ============================================================================== --- pypy/branch/buffer/pypy/module/md5/interp_md5.py (original) +++ pypy/branch/buffer/pypy/module/md5/interp_md5.py Fri Mar 7 19:17:20 2008 @@ -41,8 +41,9 @@ W_MD5.typedef = TypeDef( 'MD5Type', - __new__ = interp2app(W_MD5___new__, unwrap_spec=[ObjSpace, W_Root, str]), - update = interp2app(W_MD5.update_w, unwrap_spec=['self', str]), + __new__ = interp2app(W_MD5___new__, unwrap_spec=[ObjSpace, W_Root, + 'bufferstr']), + update = interp2app(W_MD5.update_w, unwrap_spec=['self', 'bufferstr']), digest = interp2app(W_MD5.digest_w, unwrap_spec=['self']), hexdigest = interp2app(W_MD5.hexdigest_w, unwrap_spec=['self']), copy = interp2app(W_MD5.copy_w, unwrap_spec=['self']), Modified: pypy/branch/buffer/pypy/module/md5/test/test_md5.py ============================================================================== --- pypy/branch/buffer/pypy/module/md5/test/test_md5.py (original) +++ pypy/branch/buffer/pypy/module/md5/test/test_md5.py Fri Mar 7 19:17:20 2008 @@ -78,3 +78,13 @@ d1.update("jkl") assert d1.hexdigest() == 'e570e7110ecef72fcb772a9c05d03373' assert d2.hexdigest() == 'e8dc4081b13434b45189a720b77b6818' + + + def test_buffer(self): + """ + Test passing a buffer object. + """ + md5 = self.md5 + d1 = md5.md5(buffer("abcde")) + d1.update(buffer("jkl")) + assert d1.hexdigest() == 'e570e7110ecef72fcb772a9c05d03373' Modified: pypy/branch/buffer/pypy/module/sha/interp_sha.py ============================================================================== --- pypy/branch/buffer/pypy/module/sha/interp_sha.py (original) +++ pypy/branch/buffer/pypy/module/sha/interp_sha.py Fri Mar 7 19:17:20 2008 @@ -41,8 +41,9 @@ W_SHA.typedef = TypeDef( 'SHAType', - __new__ = interp2app(W_SHA___new__, unwrap_spec=[ObjSpace, W_Root, str]), - update = interp2app(W_SHA.update_w, unwrap_spec=['self', str]), + __new__ = interp2app(W_SHA___new__, unwrap_spec=[ObjSpace, W_Root, + 'bufferstr']), + update = interp2app(W_SHA.update_w, unwrap_spec=['self', 'bufferstr']), digest = interp2app(W_SHA.digest_w, unwrap_spec=['self']), hexdigest = interp2app(W_SHA.hexdigest_w, unwrap_spec=['self']), copy = interp2app(W_SHA.copy_w, unwrap_spec=['self']), Modified: pypy/branch/buffer/pypy/module/sha/test/test_sha.py ============================================================================== --- pypy/branch/buffer/pypy/module/sha/test/test_sha.py (original) +++ pypy/branch/buffer/pypy/module/sha/test/test_sha.py Fri Mar 7 19:17:20 2008 @@ -82,3 +82,13 @@ d1.update("jkl") assert d1.hexdigest() == 'f5d13cf6341db9b0e299d7b9d562de9572b58e5d' assert d2.hexdigest() == '425af12a0743502b322e93a015bcf868e324d56a' + + + def test_buffer(self): + """ + Test passing a buffer object. + """ + sha = self.sha + d1 = sha.sha(buffer("abcde")) + d1.update(buffer("jkl")) + assert d1.hexdigest() == 'f5d13cf6341db9b0e299d7b9d562de9572b58e5d' From arigo at codespeak.net Fri Mar 7 19:24:14 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 19:24:14 +0100 (CET) Subject: [pypy-svn] r52267 - pypy/branch/buffer/pypy/module/__builtin__/test Message-ID: <20080307182414.C901616856E@codespeak.net> Author: arigo Date: Fri Mar 7 19:24:13 2008 New Revision: 52267 Modified: pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py Log: A passing test. Modified: pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py ============================================================================== --- pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py (original) +++ pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py Fri Mar 7 19:24:13 2008 @@ -25,3 +25,10 @@ b = buffer(array.array("B", [1, 2, 3])) assert len(b) == 3 assert b[0:3] == "\x01\x02\x03" + + def test_nonzero(self): + assert buffer('\x00') + assert not buffer('') + import array + assert buffer(array.array("B", [0])) + assert not buffer(array.array("B", [])) From arigo at codespeak.net Fri Mar 7 19:24:29 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 19:24:29 +0100 (CET) Subject: [pypy-svn] r52268 - in pypy/branch/buffer/pypy/module/posix: . test Message-ID: <20080307182429.EE8C2169E0A@codespeak.net> Author: arigo Date: Fri Mar 7 19:24:29 2008 New Revision: 52268 Modified: pypy/branch/buffer/pypy/module/posix/interp_posix.py pypy/branch/buffer/pypy/module/posix/test/test_posix2.py Log: Support for buffers in os.write(). Modified: pypy/branch/buffer/pypy/module/posix/interp_posix.py ============================================================================== --- pypy/branch/buffer/pypy/module/posix/interp_posix.py (original) +++ pypy/branch/buffer/pypy/module/posix/interp_posix.py Fri Mar 7 19:24:29 2008 @@ -60,7 +60,7 @@ raise wrap_oserror(space, e) else: return space.wrap(res) -write.unwrap_spec = [ObjSpace, int, str] +write.unwrap_spec = [ObjSpace, int, 'bufferstr'] def close(space, fd): """Close a file descriptor (for low level IO).""" Modified: pypy/branch/buffer/pypy/module/posix/test/test_posix2.py ============================================================================== --- pypy/branch/buffer/pypy/module/posix/test/test_posix2.py (original) +++ pypy/branch/buffer/pypy/module/posix/test/test_posix2.py Fri Mar 7 19:24:29 2008 @@ -12,6 +12,7 @@ mod.path = udir.join('posixtestfile.txt') mod.path.write("this is a test") mod.path2 = udir.join('posixtestlargefile') + mod.path3 = udir.join('posixtestwritebuffer') pdir = udir.ensure('posixtestdir', dir=True) pdir.join('file1').write("test1") os.chmod(str(pdir.join('file1')), 0600) @@ -31,6 +32,7 @@ cls.w_posix = space.appexec([], "(): import %s as m ; return m" % os.name) cls.w_path = space.wrap(str(path)) cls.w_path2 = space.wrap(str(path2)) + cls.w_path3 = space.wrap(str(path3)) cls.w_pdir = space.wrap(str(pdir)) if hasattr(os, 'getuid'): cls.w_getuid = space.wrap(os.getuid()) @@ -331,6 +333,26 @@ assert st.st_size == 10000000000L test_largefile.need_sparse_files = True + def test_write_buffer(self): + os = self.posix + fd = os.open(self.path3, os.O_RDWR | os.O_CREAT, 0666) + def writeall(s): + while s: + count = os.write(fd, s) + assert count > 0 + s = s[count:] + writeall('hello, ') + writeall(buffer('world!\n')) + res = os.lseek(fd, 0, 0) + assert res == 0 + data = '' + while True: + s = os.read(fd, 100) + if not s: + break + data += s + assert data == 'hello, world!\n' + class AppTestEnvironment(object): def setup_class(cls): cls.space = space From arigo at codespeak.net Fri Mar 7 19:52:18 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 19:52:18 +0100 (CET) Subject: [pypy-svn] r52269 - pypy/branch/buffer/pypy/interpreter Message-ID: <20080307185218.1C13C169E2A@codespeak.net> Author: arigo Date: Fri Mar 7 19:52:17 2008 New Revision: 52269 Modified: pypy/branch/buffer/pypy/interpreter/buffer.py Log: My favourite NameError. Modified: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Fri Mar 7 19:52:17 2008 @@ -17,6 +17,7 @@ from pypy.interpreter.baseobjspace import Wrappable from pypy.interpreter.typedef import TypeDef from pypy.interpreter.gateway import interp2app, ObjSpace, W_Root +from pypy.interpreter.error import OperationError class Buffer(Wrappable): From arigo at codespeak.net Fri Mar 7 20:10:22 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 20:10:22 +0100 (CET) Subject: [pypy-svn] r52270 - pypy/branch/buffer/pypy/module/_socket Message-ID: <20080307191022.C7B64169E29@codespeak.net> Author: arigo Date: Fri Mar 7 20:10:22 2008 New Revision: 52270 Modified: pypy/branch/buffer/pypy/module/_socket/interp_socket.py Log: Native buffer support. (Does not avoid copying yet.) Modified: pypy/branch/buffer/pypy/module/_socket/interp_socket.py ============================================================================== --- pypy/branch/buffer/pypy/module/_socket/interp_socket.py (original) +++ pypy/branch/buffer/pypy/module/_socket/interp_socket.py Fri Mar 7 20:10:22 2008 @@ -8,19 +8,6 @@ from pypy.interpreter.error import OperationError from pypy.interpreter import gateway -class State(object): - "Cache the lookup of the buffer type" - def __init__(self, space): - w__builtin__ = space.getbuiltinmodule('__builtin__') - self.w_buffer = space.getattr(w__builtin__, space.wrap('buffer')) - -def coerce_to_str_w(space, w_obj): - "Accept an applevel string or buffer and return a string." - w_buffer = space.fromcache(State).w_buffer - if space.is_true(space.isinstance(w_obj, w_buffer)): - w_obj = space.str(w_obj) - return space.str_w(w_obj) - class W_RSocket(Wrappable, RSocket): def __del__(self): self.clear_all_weakrefs() @@ -218,22 +205,21 @@ raise converted_error(space, e) recvfrom_w.unwrap_spec = ['self', ObjSpace, int, int] - def send_w(self, space, w_data, flags=0): + def send_w(self, space, data, flags=0): """send(data[, flags]) -> count Send a data string to the socket. For the optional flags argument, see the Unix manual. Return the number of bytes sent; this may be less than len(data) if the network is busy. """ - data = coerce_to_str_w(space, w_data) try: count = self.send(data, flags) except SocketError, e: raise converted_error(space, e) return space.wrap(count) - send_w.unwrap_spec = ['self', ObjSpace, W_Root, int] + send_w.unwrap_spec = ['self', ObjSpace, 'bufferstr', int] - def sendall_w(self, space, w_data, flags=0): + def sendall_w(self, space, data, flags=0): """sendall(data[, flags]) Send a data string to the socket. For the optional flags @@ -241,20 +227,18 @@ until all data is sent. If an error occurs, it's impossible to tell how much data has been sent. """ - data = coerce_to_str_w(space, w_data) try: count = self.sendall(data, flags) except SocketError, e: raise converted_error(space, e) - sendall_w.unwrap_spec = ['self', ObjSpace, W_Root, int] + sendall_w.unwrap_spec = ['self', ObjSpace, 'bufferstr', int] - def sendto_w(self, space, w_data, w_param2, w_param3=NoneNotWrapped): + def sendto_w(self, space, data, w_param2, w_param3=NoneNotWrapped): """sendto(data[, flags], address) -> count Like send(data, flags) but allows specifying the destination address. For IP sockets, the address is a pair (hostaddr, port). """ - data = coerce_to_str_w(space, w_data) if w_param3 is None: # 2 args version flags = 0 @@ -269,7 +253,7 @@ except SocketError, e: raise converted_error(space, e) return space.wrap(count) - sendto_w.unwrap_spec = ['self', ObjSpace, W_Root, W_Root, W_Root] + sendto_w.unwrap_spec = ['self', ObjSpace, 'bufferstr', W_Root, W_Root] def setblocking_w(self, space, flag): """setblocking(flag) From arigo at codespeak.net Fri Mar 7 20:13:28 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 20:13:28 +0100 (CET) Subject: [pypy-svn] r52271 - in pypy/branch/buffer/pypy: interpreter module/__builtin__/test Message-ID: <20080307191328.578E1169E2A@codespeak.net> Author: arigo Date: Fri Mar 7 20:13:27 2008 New Revision: 52271 Modified: pypy/branch/buffer/pypy/interpreter/buffer.py pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py Log: buffer.__str__(). Modified: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Fri Mar 7 20:13:27 2008 @@ -64,6 +64,10 @@ return space.wrap(self) descr__buffer__.unwrap_spec = ['self', ObjSpace] + def descr_str(self, space): + return space.wrap(self.as_str()) + descr_str.unwrap_spec = ['self', ObjSpace] + def descr_buffer__new__(space, w_subtype, w_object): #, offset, size # w_subtype can only be exactly 'buffer' for now @@ -90,6 +94,7 @@ __len__ = interp2app(Buffer.descr_len), __getitem__ = interp2app(Buffer.descr_getitem), __buffer__ = interp2app(Buffer.descr__buffer__), + __str__ = interp2app(Buffer.descr_str), ) Buffer.typedef.acceptable_as_base_class = False Modified: pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py ============================================================================== --- pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py (original) +++ pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py Fri Mar 7 20:13:27 2008 @@ -32,3 +32,6 @@ import array assert buffer(array.array("B", [0])) assert not buffer(array.array("B", [])) + + def test_str(self): + assert str(buffer('hello')) == 'hello' From arigo at codespeak.net Fri Mar 7 20:15:59 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 20:15:59 +0100 (CET) Subject: [pypy-svn] r52272 - in pypy/branch/buffer/pypy: interpreter module/__builtin__/test Message-ID: <20080307191559.905E91684CF@codespeak.net> Author: arigo Date: Fri Mar 7 20:15:59 2008 New Revision: 52272 Modified: pypy/branch/buffer/pypy/interpreter/buffer.py pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py Log: buffer.__add__(). Modified: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Fri Mar 7 20:15:59 2008 @@ -68,6 +68,10 @@ return space.wrap(self.as_str()) descr_str.unwrap_spec = ['self', ObjSpace] + def descr_add(self, space, other): + return space.wrap(self.as_str() + other) + descr_add.unwrap_spec = ['self', ObjSpace, 'bufferstr'] + def descr_buffer__new__(space, w_subtype, w_object): #, offset, size # w_subtype can only be exactly 'buffer' for now @@ -95,6 +99,7 @@ __getitem__ = interp2app(Buffer.descr_getitem), __buffer__ = interp2app(Buffer.descr__buffer__), __str__ = interp2app(Buffer.descr_str), + __add__ = interp2app(Buffer.descr_add), ) Buffer.typedef.acceptable_as_base_class = False Modified: pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py ============================================================================== --- pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py (original) +++ pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py Fri Mar 7 20:15:59 2008 @@ -35,3 +35,8 @@ def test_str(self): assert str(buffer('hello')) == 'hello' + + def test_add(self): + assert buffer('abc') + 'def' == 'abcdef' + import array + assert buffer('abc') + array.array('c', 'def') == 'abcdef' From arigo at codespeak.net Fri Mar 7 20:17:07 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 20:17:07 +0100 (CET) Subject: [pypy-svn] r52273 - pypy/branch/buffer/pypy/interpreter Message-ID: <20080307191707.0C1DB168553@codespeak.net> Author: arigo Date: Fri Mar 7 20:17:07 2008 New Revision: 52273 Modified: pypy/branch/buffer/pypy/interpreter/buffer.py Log: Fix. Hard to test for now (method is overridden in StringBuffer) Modified: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Fri Mar 7 20:17:07 2008 @@ -28,7 +28,7 @@ def as_str(self): "Returns an interp-level string with the whole content of the buffer." # May be overridden. - return self.getslice(0, self.length()) + return self.getslice(0, self.len) def getitem(self, index): "Returns the index'th character in the buffer." From arigo at codespeak.net Fri Mar 7 20:23:43 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 20:23:43 +0100 (CET) Subject: [pypy-svn] r52274 - in pypy/branch/buffer/pypy: interpreter module/__builtin__/test Message-ID: <20080307192343.8FC30168555@codespeak.net> Author: arigo Date: Fri Mar 7 20:23:42 2008 New Revision: 52274 Modified: pypy/branch/buffer/pypy/interpreter/buffer.py pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py Log: Comparison between buffers. Modified: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Fri Mar 7 20:23:42 2008 @@ -14,6 +14,7 @@ # used to get directly a Buffer instance. Doing so also gives you for # free the typecheck that __buffer__() really returned a wrapped Buffer. +import operator from pypy.interpreter.baseobjspace import Wrappable from pypy.interpreter.typedef import TypeDef from pypy.interpreter.gateway import interp2app, ObjSpace, W_Root @@ -72,6 +73,25 @@ return space.wrap(self.as_str() + other) descr_add.unwrap_spec = ['self', ObjSpace, 'bufferstr'] + def _make_descr__cmp(name): + def descr__cmp(self, space, w_other): + other = space.interpclass_w(w_other) + if not isinstance(other, Buffer): + return space.w_NotImplemented + # xxx not the most efficient implementation + str1 = self.as_str() + str2 = other.as_str() + return space.wrap(getattr(operator, name)(str1, str2)) + descr__cmp.unwrap_spec = ['self', ObjSpace, W_Root] + return descr__cmp + + descr_eq = _make_descr__cmp('eq') + descr_ne = _make_descr__cmp('ne') + descr_lt = _make_descr__cmp('lt') + descr_le = _make_descr__cmp('le') + descr_gt = _make_descr__cmp('gt') + descr_ge = _make_descr__cmp('ge') + def descr_buffer__new__(space, w_subtype, w_object): #, offset, size # w_subtype can only be exactly 'buffer' for now @@ -100,6 +120,12 @@ __buffer__ = interp2app(Buffer.descr__buffer__), __str__ = interp2app(Buffer.descr_str), __add__ = interp2app(Buffer.descr_add), + __eq__ = interp2app(Buffer.descr_eq), + __ne__ = interp2app(Buffer.descr_ne), + __lt__ = interp2app(Buffer.descr_lt), + __le__ = interp2app(Buffer.descr_le), + __gt__ = interp2app(Buffer.descr_gt), + __ge__ = interp2app(Buffer.descr_ge), ) Buffer.typedef.acceptable_as_base_class = False Modified: pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py ============================================================================== --- pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py (original) +++ pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py Fri Mar 7 20:23:42 2008 @@ -40,3 +40,18 @@ assert buffer('abc') + 'def' == 'abcdef' import array assert buffer('abc') + array.array('c', 'def') == 'abcdef' + + def test_cmp(self): + assert buffer('ab') != 'ab' + assert not ('ab' == buffer('ab')) + assert buffer('ab') == buffer('ab') + assert not (buffer('ab') != buffer('ab')) + assert not (buffer('ab') < buffer('ab')) + assert buffer('ab') <= buffer('ab') + assert not (buffer('ab') > buffer('ab')) + assert buffer('ab') >= buffer('ab') + assert buffer('ab') != buffer('abc') + assert buffer('ab') < buffer('abc') + assert buffer('ab') <= buffer('ab') + assert buffer('ab') > buffer('aa') + assert buffer('ab') >= buffer('ab') From arigo at codespeak.net Fri Mar 7 20:25:48 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 20:25:48 +0100 (CET) Subject: [pypy-svn] r52275 - in pypy/branch/buffer/pypy: interpreter module/__builtin__/test Message-ID: <20080307192548.939E1168555@codespeak.net> Author: arigo Date: Fri Mar 7 20:25:47 2008 New Revision: 52275 Modified: pypy/branch/buffer/pypy/interpreter/buffer.py pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py Log: buffer.__hash__(). Modified: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Fri Mar 7 20:25:47 2008 @@ -92,6 +92,10 @@ descr_gt = _make_descr__cmp('gt') descr_ge = _make_descr__cmp('ge') + def descr_hash(self, space): + return space.wrap(hash(self.as_str())) + descr_hash.unwrap_spec = ['self', ObjSpace] + def descr_buffer__new__(space, w_subtype, w_object): #, offset, size # w_subtype can only be exactly 'buffer' for now @@ -126,6 +130,7 @@ __le__ = interp2app(Buffer.descr_le), __gt__ = interp2app(Buffer.descr_gt), __ge__ = interp2app(Buffer.descr_ge), + __hash__ = interp2app(Buffer.descr_hash), ) Buffer.typedef.acceptable_as_base_class = False Modified: pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py ============================================================================== --- pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py (original) +++ pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py Fri Mar 7 20:25:47 2008 @@ -55,3 +55,6 @@ assert buffer('ab') <= buffer('ab') assert buffer('ab') > buffer('aa') assert buffer('ab') >= buffer('ab') + + def test_hash(self): + assert hash(buffer('hello')) == hash('hello') From arigo at codespeak.net Fri Mar 7 20:30:37 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 7 Mar 2008 20:30:37 +0100 (CET) Subject: [pypy-svn] r52276 - in pypy/branch/buffer/pypy: interpreter module/__builtin__/test Message-ID: <20080307193037.35B91168567@codespeak.net> Author: arigo Date: Fri Mar 7 20:30:37 2008 New Revision: 52276 Modified: pypy/branch/buffer/pypy/interpreter/buffer.py pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py Log: buffer.__mul__, buffer.__rmul__. Modified: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Fri Mar 7 20:30:37 2008 @@ -96,6 +96,14 @@ return space.wrap(hash(self.as_str())) descr_hash.unwrap_spec = ['self', ObjSpace] + def descr_mul(self, space, w_times): + # xxx not the most efficient implementation + w_string = space.wrap(self.as_str()) + # use the __mul__ method instead of space.mul() so that we + # return NotImplemented instead of raising a TypeError + return space.call_method(w_string, '__mul__', w_times) + descr_mul.unwrap_spec = ['self', ObjSpace, W_Root] + def descr_buffer__new__(space, w_subtype, w_object): #, offset, size # w_subtype can only be exactly 'buffer' for now @@ -131,6 +139,8 @@ __gt__ = interp2app(Buffer.descr_gt), __ge__ = interp2app(Buffer.descr_ge), __hash__ = interp2app(Buffer.descr_hash), + __mul__ = interp2app(Buffer.descr_mul), + __rmul__ = interp2app(Buffer.descr_mul), ) Buffer.typedef.acceptable_as_base_class = False Modified: pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py ============================================================================== --- pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py (original) +++ pypy/branch/buffer/pypy/module/__builtin__/test/test_buffer.py Fri Mar 7 20:30:37 2008 @@ -58,3 +58,9 @@ def test_hash(self): assert hash(buffer('hello')) == hash('hello') + + def test_mul(self): + assert buffer('ab') * 5 == 'ababababab' + assert buffer('ab') * (-2) == '' + assert 5 * buffer('ab') == 'ababababab' + assert (-2) * buffer('ab') == '' From tverwaes at codespeak.net Sat Mar 8 01:12:47 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 01:12:47 +0100 (CET) Subject: [pypy-svn] r52278 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308001247.12966169E2A@codespeak.net> Author: tverwaes Date: Sat Mar 8 01:12:44 2008 New Revision: 52278 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/classtable.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: making context shadows caching, invalidating w_self when shadow newer Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/classtable.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/classtable.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/classtable.py Sat Mar 8 01:12:44 2008 @@ -6,7 +6,7 @@ from pypy.lang.smalltalk import model w_class = model.W_PointersObject(w_metaclass, 0) # a dummy placeholder for testing - s = shadow.ClassShadow(w_class) + s = shadow.ClassShadow(w_class, True) s.methoddict = {} if w_superclass is not None: s.s_superclass = w_superclass.as_class_get_shadow() Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Sat Mar 8 01:12:44 2008 @@ -162,10 +162,13 @@ self.store(index0+self.instsize(), w_value) def fetch(self, n0): + if self._shadow is not None: + self._shadow.check_for_w_updates() return self._vars[n0] def store(self, n0, w_value): if self._shadow is not None: + self._shadow.check_for_w_updates() self._shadow.invalidate() self._vars[n0] = w_value @@ -196,14 +199,17 @@ def setshadow(self, shadow): self._shadow = shadow - def as_special_get_shadow(self, TheClass): + def as_special_get_shadow(self, TheClass, invalid=True): shadow = self._shadow if shadow is None: - shadow = TheClass(self) + shadow = TheClass(self, invalid) + self._shadow = shadow elif not isinstance(shadow, TheClass): shadow.invalidate() shadow = TheClass(self) + self._shadow = shadow shadow.check_for_updates() + shadow.invalidate_w_self() return shadow def as_class_get_shadow(self): @@ -237,11 +243,11 @@ def as_blockcontext_get_shadow(self): from pypy.lang.smalltalk.shadow import BlockContextShadow - return self.as_special_get_shadow(BlockContextShadow) + return self.as_special_get_shadow(BlockContextShadow, False) def as_methodcontext_get_shadow(self): from pypy.lang.smalltalk.shadow import MethodContextShadow - return self.as_special_get_shadow(MethodContextShadow) + return self.as_special_get_shadow(MethodContextShadow, False) def as_context_get_shadow(self): from pypy.lang.smalltalk.shadow import ContextPartShadow @@ -448,12 +454,6 @@ else: self.literals[index0-1] = w_value - def fetchbyte(self, index1): - index0 = index1 - 1 - index0 -= self.getliteralsize() - assert index0 < len(self.bytes) - return self.bytes[index0] - def store(self, index0, w_v): self.atput0(index0, w_v) @@ -493,7 +493,8 @@ s_result.store_expected_argument_count(argcnt) s_result.store_initialip(initialip) s_result.store_w_home(w_home) - s_result.store_stackpointer(s_result.stackstart()) + s_result._stack = [] + s_result._pc = -1 return w_result def W_MethodContext(w_method, w_receiver, @@ -508,10 +509,11 @@ if w_sender: s_result.store_w_sender(w_sender) s_result.store_w_receiver(w_receiver) - s_result.store_pc(w_method.getliteralsize()+1) + s_result.store_pc(0) for i in range(len(arguments)): s_result.settemp(i, arguments[i]) s_result.store_stackpointer(s_result.stackstart()) + s_result._stack = [] return w_result # Use black magic to create w_nil without running the constructor, Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py Sat Mar 8 01:12:44 2008 @@ -80,7 +80,7 @@ frame = interp.w_active_context s_frame = frame.as_context_get_shadow() assert argument_count == len_unwrap_spec - if s_frame.stackpointer() - s_frame.stackstart() + 1 < len_unwrap_spec: + if len(s_frame.stack()) < len_unwrap_spec: raise PrimitiveFailedError() args = () for i, spec in unrolling_unwrap_spec: @@ -640,6 +640,7 @@ # Set some fields s_block_ctx.store_pc(s_block_ctx.initialip()) s_block_ctx.store_w_sender(frame) + s_block_ctx.update_w_self() interp.w_active_context = s_block_ctx.w_self() @expose_primitive(PRIMITIVE_VALUE, no_result=True) @@ -669,7 +670,7 @@ block_args = frame.pop_and_return_n(exp_arg_cnt) # Reset stack of blockcontext to [] - s_block_ctx.store_stackpointer(s_block_ctx.stackstart()) + s_block_ctx.reset_stack() s_block_ctx.push_all(block_args) frame.pop() Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 01:12:44 2008 @@ -6,9 +6,14 @@ """A shadow is an optional extra bit of information that can be attached at run-time to any Smalltalk object. """ - def __init__(self, w_self): + + def __init__(self, w_self, invalid): self._w_self = w_self - self.invalidate() + self._version = 0 + self.invalid = invalid + self.w_invalid = False + if invalid: + self.invalidate() def getname(self): return repr(self) @@ -18,18 +23,29 @@ object changes.""" self.invalid = True + def invalidate_w_self(self): + """XXX This should get called whenever the shadow + object changes. + (current shortcut, whenever the shadow is used)""" + self.w_invalid = True + def w_self(self): return self._w_self + def check_for_w_updates(self): + if self.w_invalid: + self.update_w_self() + def check_for_updates(self): if self.invalid: - self.w_self().setshadow(self) self.update_shadow() - # XXX XXX Remove function when fixing superclass to AbstractShadow def update_shadow(self): - pass + self._version += 1 + self.invalid = False + def update_w_self(self): + self.w_invalid = False # ____________________________________________________________ @@ -50,8 +66,8 @@ """A shadow for Smalltalk objects that are classes (i.e. used as the class of another Smalltalk object). """ - def __init__(self, w_self): - AbstractShadow.__init__(self, w_self) + def __init__(self, w_self, invalid): + AbstractShadow.__init__(self, w_self, invalid) def invalidate(self): AbstractShadow.invalidate(self) @@ -66,11 +82,12 @@ from pypy.lang.smalltalk import objtable "Update the ClassShadow with data from the w_self class." + AbstractShadow.update_shadow(self) w_self = self.w_self() # read and painfully decode the format classformat = utility.unwrap_int( - w_self.fetch(constants.CLASS_FORMAT_INDEX)) + w_self._vars[constants.CLASS_FORMAT_INDEX]) # The classformat in Squeak, as an integer value, is: # <2 bits=instSize//64><5 bits=cClass><4 bits=instSpec> # <6 bits=instSize\\64><1 bit=0> @@ -105,7 +122,7 @@ raise ClassShadowError("unknown format %d" % (format,)) # read the name if w_self.size() > constants.CLASS_NAME_INDEX: - w_name = w_self.fetch(constants.CLASS_NAME_INDEX) + w_name = w_self._vars[constants.CLASS_NAME_INDEX] # XXX This is highly experimental XXX # if the name-pos of class is not bytesobject, @@ -113,22 +130,22 @@ # metaclasses hold a pointer to the real class in the last # slot. This is pos 6 in mini.image and higher in squeak3.9 if not isinstance(w_name, model.W_BytesObject): - w_realclass = w_self.fetch(w_self.size() - 1) + w_realclass = w_self._vars[w_self.size() - 1] if w_realclass.size() > constants.CLASS_NAME_INDEX: - w_name = w_realclass.fetch(constants.CLASS_NAME_INDEX) + w_name = w_realclass._vars[constants.CLASS_NAME_INDEX] if isinstance(w_name, model.W_BytesObject): self.name = w_name.as_string() # read the methoddict - w_methoddict = w_self.fetch(constants.CLASS_METHODDICT_INDEX) - w_values = w_methoddict.fetch(constants.METHODDICT_VALUES_INDEX) + w_methoddict = w_self._vars[constants.CLASS_METHODDICT_INDEX] + w_values = w_methoddict._vars[constants.METHODDICT_VALUES_INDEX] size = w_methoddict.size() - constants.METHODDICT_NAMES_INDEX for i in range(size): - w_selector = w_methoddict.fetch(constants.METHODDICT_NAMES_INDEX+i) + w_selector = w_methoddict._vars[constants.METHODDICT_NAMES_INDEX+i] if w_selector is not objtable.w_nil: if not isinstance(w_selector, model.W_BytesObject): raise ClassShadowError("bogus selector in method dict") selector = w_selector.as_string() - w_compiledmethod = w_values.fetch(i) + w_compiledmethod = w_values._vars[i] if not isinstance(w_compiledmethod, model.W_CompiledMethod): raise ClassShadowError("the methoddict must contain " "CompiledMethods only for now") @@ -136,13 +153,13 @@ # for the rest, we need to reset invalid to False already so # that cycles in the superclass and/or metaclass chains don't # cause infinite recursion - self.invalid = False # read s_superclass - w_superclass = w_self.fetch(constants.CLASS_SUPERCLASS_INDEX) + w_superclass = w_self._vars[constants.CLASS_SUPERCLASS_INDEX] if w_superclass is objtable.w_nil: self.s_superclass = None else: self.s_superclass = w_superclass.as_class_get_shadow() + AbstractShadow.update_shadow(self) # XXX check better way to store objects # XXX storing is necessary for "become" which loops over all pointers @@ -227,20 +244,20 @@ method.w_compiledin = self.w_self() class LinkedListShadow(AbstractShadow): - def __init__(self, w_self): - AbstractShadow.__init__(self, w_self) + def __init__(self, w_self, invalid): + AbstractShadow.__init__(self, w_self, invalid) def w_firstlink(self): - return self.w_self().fetch(constants.FIRST_LINK_INDEX) + return self.w_self()._vars[constants.FIRST_LINK_INDEX] def store_w_firstlink(self, w_object): - return self.w_self().store(constants.FIRST_LINK_INDEX, w_object) + self.w_self()._vars[constants.FIRST_LINK_INDEX] = w_object def w_lastlink(self): - return self.w_self().fetch(constants.LAST_LINK_INDEX) + return self.w_self()._vars[constants.LAST_LINK_INDEX] def store_w_lastlink(self, w_object): - return self.w_self().store(constants.LAST_LINK_INDEX, w_object) + self.w_self()._vars[constants.LAST_LINK_INDEX] = w_object def is_empty_list(self): from pypy.lang.smalltalk import objtable @@ -270,14 +287,14 @@ class SemaphoreShadow(LinkedListShadow): """A shadow for Smalltalk objects that are semaphores """ - def __init__(self, w_self): - LinkedListShadow.__init__(self, w_self) + def __init__(self, w_self, invalid): + LinkedListShadow.__init__(self, w_self, invalid) def put_to_sleep(self, s_process): priority = s_process.priority() s_scheduler = self.s_scheduler() w_process_lists = s_scheduler.process_lists() - w_process_list = w_process_lists.fetch(priority) + w_process_list = w_process_lists._vars[priority] w_process_list.as_linkedlist_get_shadow().add_last_link(s_process.w_self()) s_process.store_my_list(w_process_list) @@ -311,77 +328,95 @@ def synchronous_signal(self, interp): if self.is_empty_list(): - w_value = self.w_self().fetch(constants.EXCESS_SIGNALS_INDEX) + w_value = self.w_self()._vars[constants.EXCESS_SIGNALS_INDEX] w_value = utility.wrap_int(utility.unwrap_int(w_value) + 1) - self.w_self().store(constants.EXCESS_SIGNALS_INDEX, w_value) + self.w_self()._vars[constants.EXCESS_SIGNALS_INDEX] = w_value else: self.resume(self.remove_first_link_of_list(), interp) class LinkShadow(AbstractShadow): - def __init__(self, w_self): - AbstractShadow.__init__(self, w_self) + def __init__(self, w_self, invalid): + AbstractShadow.__init__(self, w_self, invalid) def next(self): - return self.w_self().fetch(constants.NEXT_LINK_INDEX) + return self.w_self()._vars[constants.NEXT_LINK_INDEX] def store_next(self, w_object): - self.w_self().store(constants.NEXT_LINK_INDEX, w_object) + self.w_self()._vars[constants.NEXT_LINK_INDEX] = w_object class ProcessShadow(LinkShadow): """A shadow for Smalltalk objects that are processes """ - def __init__(self, w_self): - LinkShadow.__init__(self, w_self) + def __init__(self, w_self, invalid): + LinkShadow.__init__(self, w_self, invalid) def priority(self): - return utility.unwrap_int(self.w_self().fetch(constants.PROCESS_PRIORITY_INDEX)) + return utility.unwrap_int(self.w_self()._vars[constants.PROCESS_PRIORITY_INDEX]) def my_list(self): - return self.w_self().fetch(constants.PROCESS_MY_LIST_INDEX) + return self.w_self()._vars[constants.PROCESS_MY_LIST_INDEX] def store_my_list(self, w_object): - self.w_self().store(constants.PROCESS_MY_LIST_INDEX, w_object) + self.w_self()._vars[constants.PROCESS_MY_LIST_INDEX] = w_object def s_suspended_context(self): # XXX Can currently only restart context if it is a method context... # XXX Depends on typechecking ... - return self.w_self().fetch(constants.PROCESS_SUSPENDED_CONTEXT_INDEX).as_methodcontext_get_shadow() + return self.w_self()._vars[constants.PROCESS_SUSPENDED_CONTEXT_INDEX].as_methodcontext_get_shadow() def store_w_suspended_context(self, w_object): - self.w_self().store(constants.PROCESS_SUSPENDED_CONTEXT_INDEX, w_object) + self.w_self()._vars[constants.PROCESS_SUSPENDED_CONTEXT_INDEX] = w_object class AssociationShadow(AbstractShadow): - def __init__(self, w_self): - AbstractShadow.__init__(self, w_self) + def __init__(self, w_self, invalid): + AbstractShadow.__init__(self, w_self, invalid) def key(self): - return self.w_self().fetch(constants.ASSOCIATION_KEY_INDEX) + return self.w_self()._vars[constants.ASSOCIATION_KEY_INDEX] def value(self): - return self.w_self().fetch(constants.ASSOCIATION_VALUE_INDEX) + return self.w_self()._vars[constants.ASSOCIATION_VALUE_INDEX] def store_value(self, w_value): - self.w_self().store(constants.ASSOCIATION_VALUE_INDEX, w_value) + self.w_self()._vars[constants.ASSOCIATION_VALUE_INDEX] = w_value class SchedulerShadow(AbstractShadow): - def __init__(self, w_self): - AbstractShadow.__init__(self, w_self) + def __init__(self, w_self, invalid): + AbstractShadow.__init__(self, w_self, invalid) def s_active_process(self): - return self.w_self().fetch(constants.SCHEDULER_ACTIVE_PROCESS_INDEX).as_process_get_shadow() + return self.w_self()._vars[constants.SCHEDULER_ACTIVE_PROCESS_INDEX].as_process_get_shadow() def store_w_active_process(self, w_object): - self.w_self().store(constants.SCHEDULER_ACTIVE_PROCESS_INDEX, w_object) + self.w_self()._vars[constants.SCHEDULER_ACTIVE_PROCESS_INDEX] = w_object def process_lists(self): - return self.w_self().fetch(constants.SCHEDULER_PROCESS_LISTS_INDEX) + return self.w_self()._vars[constants.SCHEDULER_PROCESS_LISTS_INDEX] class ContextPartShadow(AbstractShadow): __metaclass__ = extendabletype - - def __init__(self, w_self): - AbstractShadow.__init__(self, w_self) + + def update_shadow(self): + AbstractShadow.update_shadow(self) + self._stack = [self.w_self()._vars[i] + for i in range(self.stackstart() + 1, + self.stackpointer() + 1)] + self._pc = utility.unwrap_int(self.w_self()._vars[constants.CTXPART_PC_INDEX]) + self._pc -= 1 + self.w_method().getliteralsize() + AbstractShadow.update_shadow(self) + + def update_w_self(self): + AbstractShadow.update_w_self(self) + for i in range(len(self._stack)): + self.w_self()._vars[self.stackstart() + 1 + i] = self._stack[i] + self.store_stackpointer(len(self._stack) + self.stackstart()) + self.w_self()._vars[constants.CTXPART_PC_INDEX] = utility.wrap_int(self._pc + 1 + + self.w_method().getliteralsize()) + + def __init__(self, w_self, invalid): + AbstractShadow.__init__(self, w_self, invalid) + self.w_invalid = True def s_home(self): raise NotImplementedError() @@ -391,7 +426,7 @@ return self.s_home().w_receiver() def w_sender(self): - return self.w_self().fetch(constants.CTXPART_SENDER_INDEX) + return self.w_self()._vars[constants.CTXPART_SENDER_INDEX] def s_sender(self): from pypy.lang.smalltalk import objtable @@ -402,20 +437,19 @@ return w_sender.as_context_get_shadow() def store_w_sender(self, w_sender): - self.w_self().store(constants.CTXPART_SENDER_INDEX, w_sender) + self.w_self()._vars[constants.CTXPART_SENDER_INDEX] = w_sender def pc(self): - return utility.unwrap_int(self.w_self().fetch(constants.CTXPART_PC_INDEX)) + return self._pc def store_pc(self, newpc): - self.w_self().store(constants.CTXPART_PC_INDEX, utility.wrap_int(newpc)) + self._pc = newpc def stackpointer(self): - return utility.unwrap_int(self.w_self().fetch(constants.CTXPART_STACKP_INDEX)) + return utility.unwrap_int(self.w_self()._vars[constants.CTXPART_STACKP_INDEX]) def store_stackpointer(self, pointer): - self.w_self().store(constants.CTXPART_STACKP_INDEX, - utility.wrap_int(pointer)) + self.w_self()._vars[constants.CTXPART_STACKP_INDEX] = utility.wrap_int(pointer) # ______________________________________________________________________ # Method that contains the bytecode for this method/block context @@ -424,10 +458,10 @@ return self.s_home().w_method() def getbytecode(self): - pc = self.pc() - bytecode = self.w_method().fetchbyte(pc) + assert self._pc >= 0 + bytecode = self.w_method().bytes[self._pc] currentBytecode = ord(bytecode) - self.store_pc(pc + 1) + self._pc = self._pc + 1 return currentBytecode def getNextBytecode(self): @@ -448,93 +482,100 @@ # ______________________________________________________________________ # Stack Manipulation def pop(self): - idx = self.stackpointer() - w_v = self.w_self().fetch(idx) - self.store_stackpointer(idx - 1) + w_v = self._stack[-1] + self._stack = self._stack[:-1] return w_v def push(self, w_v): - idx = self.stackpointer() + 1 - self.w_self().store(idx, w_v) - self.store_stackpointer(idx) + self._stack += [w_v] def push_all(self, lst): - for x in lst: - self.push(x) + #for x in lst: + # self.push(x) + self._stack += lst def top(self): return self.peek(0) def peek(self, idx): - return self.w_self().fetch(self.stackpointer()-idx) + return self._stack[-(idx + 1)] def pop_n(self, n): assert n >= 0 - assert n <= self.stackpointer() + 1 - self.store_stackpointer(self.stackpointer() - n) + assert n <= len(self._stack) + self._stack = self._stack[:len(self._stack)-n] def stack(self): - # fetch = 1-based - return [self.w_self().fetch(i) for i in range(self.stackstart() + 1, self.stackpointer() + 1)] + return self._stack def pop_and_return_n(self, n): + w_vs = self._stack[len(self._stack)-n:] self.pop_n(n) - start = self.stackpointer() + 1 - return [self.w_self().fetch(i) for i in range(start, start+n)] + return w_vs class BlockContextShadow(ContextPartShadow): - def __init__(self, w_self): - ContextPartShadow.__init__(self, w_self) + def __init__(self, w_self, invalid): + ContextPartShadow.__init__(self, w_self, invalid) + + def update_self(self): + ContextPartShadow.update_self(self) + self._initialip = utility.unwrap_int(self.w_self()._vars[constants.BLKCTX_INITIAL_IP_INDEX]) + self._initialip -= 1 + self.w_method().getliteralsize() + + def update_w_self(self): + ContextPartShadow.update_w_self(self) + self.w_self()._vars[constants.BLKCTX_INITIAL_IP_INDEX] = utility.wrap_int(self._initialip + 1 + self.w_method().getliteralsize()) def expected_argument_count(self): - return utility.unwrap_int(self.w_self().fetch(constants.BLKCTX_BLOCK_ARGUMENT_COUNT_INDEX)) + return utility.unwrap_int(self.w_self()._vars[constants.BLKCTX_BLOCK_ARGUMENT_COUNT_INDEX]) def store_expected_argument_count(self, argc): - return self.w_self().store(constants.BLKCTX_BLOCK_ARGUMENT_COUNT_INDEX, - utility.wrap_int(argc)) + self.w_self()._vars[constants.BLKCTX_BLOCK_ARGUMENT_COUNT_INDEX] = utility.wrap_int(argc) def initialip(self): - return utility.unwrap_int(self.w_self().fetch(constants.BLKCTX_INITIAL_IP_INDEX)) + return self._initialip def store_initialip(self, initialip): - self.w_self().store(constants.BLKCTX_INITIAL_IP_INDEX, - utility.wrap_int(initialip)) + self._initialip = initialip def store_w_home(self, w_home): - self.w_self().store(constants.BLKCTX_HOME_INDEX, w_home) + self.w_self()._vars[constants.BLKCTX_HOME_INDEX] = w_home def w_home(self): - return self.w_self().fetch(constants.BLKCTX_HOME_INDEX) + return self.w_self()._vars[constants.BLKCTX_HOME_INDEX] def s_home(self): return self.w_home().as_methodcontext_get_shadow() + + def reset_stack(self): + self._stack = [] def stackstart(self): return (constants.BLKCTX_TEMP_FRAME_START + self.expected_argument_count()) class MethodContextShadow(ContextPartShadow): - def __init__(self, w_self): - ContextPartShadow.__init__(self, w_self) + def __init__(self, w_self, invalid): + ContextPartShadow.__init__(self, w_self, invalid) def w_method(self): - return self.w_self().fetch(constants.MTHDCTX_METHOD) + return self.w_self()._vars[constants.MTHDCTX_METHOD] def store_w_method(self, w_method): - return self.w_self().store(constants.MTHDCTX_METHOD, w_method) + self.w_self()._vars[constants.MTHDCTX_METHOD] = w_method def w_receiver(self): - return self.w_self().fetch(constants.MTHDCTX_RECEIVER) + return self.w_self()._vars[constants.MTHDCTX_RECEIVER] def store_w_receiver(self, w_receiver): - self.w_self().store(constants.MTHDCTX_RECEIVER, w_receiver) + self.w_self()._vars[constants.MTHDCTX_RECEIVER] = w_receiver def gettemp(self, index): - return self.w_self().fetch(constants.MTHDCTX_TEMP_FRAME_START + index) + return self.w_self()._vars[constants.MTHDCTX_TEMP_FRAME_START + index] def settemp(self, index, w_value): - self.w_self().store(constants.MTHDCTX_TEMP_FRAME_START + index, w_value) + self.w_self()._vars[constants.MTHDCTX_TEMP_FRAME_START + index] = w_value def w_home(self): return self.w_self() From tverwaes at codespeak.net Sat Mar 8 01:22:19 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 01:22:19 +0100 (CET) Subject: [pypy-svn] r52279 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308002219.205D7168529@codespeak.net> Author: tverwaes Date: Sat Mar 8 01:22:18 2008 New Revision: 52279 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py Log: forgot to remove a sync Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py Sat Mar 8 01:22:18 2008 @@ -640,7 +640,6 @@ # Set some fields s_block_ctx.store_pc(s_block_ctx.initialip()) s_block_ctx.store_w_sender(frame) - s_block_ctx.update_w_self() interp.w_active_context = s_block_ctx.w_self() @expose_primitive(PRIMITIVE_VALUE, no_result=True) From tverwaes at codespeak.net Sat Mar 8 03:08:48 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 03:08:48 +0100 (CET) Subject: [pypy-svn] r52280 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308020848.B377D16852E@codespeak.net> Author: tverwaes Date: Sat Mar 8 03:08:46 2008 New Revision: 52280 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: went back to original pop_n-style (from W_*Context*) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Sat Mar 8 03:08:46 2008 @@ -494,7 +494,7 @@ s_result.store_initialip(initialip) s_result.store_w_home(w_home) s_result._stack = [] - s_result._pc = -1 + s_result._pc = initialip return w_result def W_MethodContext(w_method, w_receiver, @@ -512,7 +512,6 @@ s_result.store_pc(0) for i in range(len(arguments)): s_result.settemp(i, arguments[i]) - s_result.store_stackpointer(s_result.stackstart()) s_result._stack = [] return w_result Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 03:08:46 2008 @@ -404,7 +404,6 @@ self.stackpointer() + 1)] self._pc = utility.unwrap_int(self.w_self()._vars[constants.CTXPART_PC_INDEX]) self._pc -= 1 + self.w_method().getliteralsize() - AbstractShadow.update_shadow(self) def update_w_self(self): AbstractShadow.update_w_self(self) @@ -502,16 +501,20 @@ def pop_n(self, n): assert n >= 0 - assert n <= len(self._stack) - self._stack = self._stack[:len(self._stack)-n] + start = len(self._stack) - n + assert start >= 0 # XXX what if this fails? + del self._stack[start:] def stack(self): return self._stack def pop_and_return_n(self, n): - w_vs = self._stack[len(self._stack)-n:] - self.pop_n(n) - return w_vs + assert n >= 0 + start = len(self._stack) - n + assert start >= 0 # XXX what if this fails? + res = self._stack[start:] + del self._stack[start:] + return res class BlockContextShadow(ContextPartShadow): @@ -522,16 +525,18 @@ ContextPartShadow.update_self(self) self._initialip = utility.unwrap_int(self.w_self()._vars[constants.BLKCTX_INITIAL_IP_INDEX]) self._initialip -= 1 + self.w_method().getliteralsize() + self._eargc = utility.unwrap_int(self.w_self()._vars[constants.BLKCTX_BLOCK_ARGUMENT_COUNT_INDEX]) def update_w_self(self): ContextPartShadow.update_w_self(self) self.w_self()._vars[constants.BLKCTX_INITIAL_IP_INDEX] = utility.wrap_int(self._initialip + 1 + self.w_method().getliteralsize()) + self.w_self()._vars[constants.BLKCTX_BLOCK_ARGUMENT_COUNT_INDEX] = utility.wrap_int(self._eargc) def expected_argument_count(self): - return utility.unwrap_int(self.w_self()._vars[constants.BLKCTX_BLOCK_ARGUMENT_COUNT_INDEX]) + return self._eargc def store_expected_argument_count(self, argc): - self.w_self()._vars[constants.BLKCTX_BLOCK_ARGUMENT_COUNT_INDEX] = utility.wrap_int(argc) + self._eargc = argc def initialip(self): return self._initialip From tverwaes at codespeak.net Sat Mar 8 03:11:35 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 03:11:35 +0100 (CET) Subject: [pypy-svn] r52281 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308021135.BF622168550@codespeak.net> Author: tverwaes Date: Sat Mar 8 03:11:29 2008 New Revision: 52281 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Log: added comment Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Sat Mar 8 03:11:29 2008 @@ -209,6 +209,11 @@ shadow = TheClass(self) self._shadow = shadow shadow.check_for_updates() + # XXX + # Should only invalidate when we write to the instance... + # For now easier to always invalidate when the shadow is + # requested lokaly. Probably the w_self is invalid + # afterwards anyway (currently only for contexts however...) shadow.invalidate_w_self() return shadow From tverwaes at codespeak.net Sat Mar 8 03:12:24 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 03:12:24 +0100 (CET) Subject: [pypy-svn] r52282 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308021224.33AE6168414@codespeak.net> Author: tverwaes Date: Sat Mar 8 03:12:23 2008 New Revision: 52282 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Log: we don't overwrite the shadow anymore. shadows are not directly referenced Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Sat Mar 8 03:12:23 2008 @@ -195,10 +195,6 @@ isinstance(self._vars, list)) # XXX XXX - # Need to find better way of handling overloading of shadows!!! - def setshadow(self, shadow): - self._shadow = shadow - def as_special_get_shadow(self, TheClass, invalid=True): shadow = self._shadow if shadow is None: From tverwaes at codespeak.net Sat Mar 8 03:35:04 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 03:35:04 +0100 (CET) Subject: [pypy-svn] r52283 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308023504.D1BA8168547@codespeak.net> Author: tverwaes Date: Sat Mar 8 03:35:04 2008 New Revision: 52283 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py Log: made interpreted code 12% faster by moving indenting code into the part only used when --bc-trace. Calls as_context_get_shadow 200.000 times less for compile_method. Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py Sat Mar 8 03:35:04 2008 @@ -50,16 +50,17 @@ # translating the interpreter if not objectmodel.we_are_translated(): bytecodeimpl = BYTECODE_TABLE[next] - if self._w_last_active_context != self.w_active_context: - cnt = 0 - p = self.w_active_context - # AK make method - while p is not objtable.w_nil: - cnt += 1 - p = p.as_context_get_shadow().w_sender() - self._last_indent = " " * cnt - self._w_last_active_context = self.w_active_context if self.should_trace(): + if self._w_last_active_context != self.w_active_context: + cnt = 0 + p = self.w_active_context + # AK make method + while p is not objtable.w_nil: + cnt += 1 + p = p.as_context_get_shadow().w_sender() + self._last_indent = " " * cnt + self._w_last_active_context = self.w_active_context + print "%sStack=%s" % ( self._last_indent, repr(self.s_active_context().stack()),) From tverwaes at codespeak.net Sat Mar 8 04:36:09 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 04:36:09 +0100 (CET) Subject: [pypy-svn] r52284 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308033609.B72F91684CF@codespeak.net> Author: tverwaes Date: Sat Mar 8 04:36:05 2008 New Revision: 52284 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: minor performance boost. Shadow impl: 8.5s W_*Context* impl: 5.6s Major speedloss at s_active_context() in interp. Hacking away the tests (not fully correct though) would result in 6.8s Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Sat Mar 8 04:36:05 2008 @@ -201,6 +201,7 @@ shadow = TheClass(self, invalid) self._shadow = shadow elif not isinstance(shadow, TheClass): + shadow.check_for_w_updates() shadow.invalidate() shadow = TheClass(self) self._shadow = shadow @@ -242,13 +243,13 @@ from pypy.lang.smalltalk.shadow import AssociationShadow return self.as_special_get_shadow(AssociationShadow) - def as_blockcontext_get_shadow(self): + def as_blockcontext_get_shadow(self, invalid=True): from pypy.lang.smalltalk.shadow import BlockContextShadow - return self.as_special_get_shadow(BlockContextShadow, False) + return self.as_special_get_shadow(BlockContextShadow, invalid) - def as_methodcontext_get_shadow(self): + def as_methodcontext_get_shadow(self, invalid=True): from pypy.lang.smalltalk.shadow import MethodContextShadow - return self.as_special_get_shadow(MethodContextShadow, False) + return self.as_special_get_shadow(MethodContextShadow, invalid) def as_context_get_shadow(self): from pypy.lang.smalltalk.shadow import ContextPartShadow @@ -490,7 +491,8 @@ def W_BlockContext(w_home, w_sender, argcnt, initialip): from pypy.lang.smalltalk.classtable import w_BlockContext w_result = W_PointersObject(w_BlockContext, w_home.size()) - s_result = w_result.as_blockcontext_get_shadow() + # Only home-brewed shadows are not invalid from start. + s_result = w_result.as_blockcontext_get_shadow(invalid=False) s_result.store_expected_argument_count(argcnt) s_result.store_initialip(initialip) s_result.store_w_home(w_home) @@ -505,7 +507,8 @@ # mc for methods with islarge flag turned on 32 size = 12 + w_method.islarge * 20 + w_method.argsize w_result = w_MethodContext.as_class_get_shadow().new(size) - s_result = w_result.as_methodcontext_get_shadow() + # Only home-brewed shadows are not invalid from start. + s_result = w_result.as_methodcontext_get_shadow(invalid=False) s_result.store_w_method(w_method) if w_sender: s_result.store_w_sender(w_sender) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 04:36:05 2008 @@ -521,8 +521,8 @@ def __init__(self, w_self, invalid): ContextPartShadow.__init__(self, w_self, invalid) - def update_self(self): - ContextPartShadow.update_self(self) + def update_shadow(self): + ContextPartShadow.update_shadow(self) self._initialip = utility.unwrap_int(self.w_self()._vars[constants.BLKCTX_INITIAL_IP_INDEX]) self._initialip -= 1 + self.w_method().getliteralsize() self._eargc = utility.unwrap_int(self.w_self()._vars[constants.BLKCTX_BLOCK_ARGUMENT_COUNT_INDEX]) @@ -564,11 +564,20 @@ def __init__(self, w_self, invalid): ContextPartShadow.__init__(self, w_self, invalid) + def update_shadow(self): + # Make sure the method is updated first + self._w_method = self.w_self()._vars[constants.MTHDCTX_METHOD] + ContextPartShadow.update_shadow(self) + + def update_w_self(self): + ContextPartShadow.update_w_self(self) + self.w_self()._vars[constants.MTHDCTX_METHOD] = self._w_method + def w_method(self): - return self.w_self()._vars[constants.MTHDCTX_METHOD] + return self._w_method def store_w_method(self, w_method): - self.w_self()._vars[constants.MTHDCTX_METHOD] = w_method + self._w_method = w_method def w_receiver(self): return self.w_self()._vars[constants.MTHDCTX_RECEIVER] From tverwaes at codespeak.net Sat Mar 8 04:49:27 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 04:49:27 +0100 (CET) Subject: [pypy-svn] r52285 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308034927.18D68168505@codespeak.net> Author: tverwaes Date: Sat Mar 8 04:49:24 2008 New Revision: 52285 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: only invalidating w_self when poking in the cache. 8.5s -> 8s Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Sat Mar 8 04:49:24 2008 @@ -206,12 +206,6 @@ shadow = TheClass(self) self._shadow = shadow shadow.check_for_updates() - # XXX - # Should only invalidate when we write to the instance... - # For now easier to always invalidate when the shadow is - # requested lokaly. Probably the w_self is invalid - # afterwards anyway (currently only for contexts however...) - shadow.invalidate_w_self() return shadow def as_class_get_shadow(self): @@ -498,6 +492,7 @@ s_result.store_w_home(w_home) s_result._stack = [] s_result._pc = initialip + s_result.invalidate_w_self() return w_result def W_MethodContext(w_method, w_receiver, @@ -517,6 +512,7 @@ for i in range(len(arguments)): s_result.settemp(i, arguments[i]) s_result._stack = [] + s_result.invalidate_w_self() return w_result # Use black magic to create w_nil without running the constructor, Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 04:49:24 2008 @@ -415,7 +415,6 @@ def __init__(self, w_self, invalid): AbstractShadow.__init__(self, w_self, invalid) - self.w_invalid = True def s_home(self): raise NotImplementedError() @@ -442,6 +441,7 @@ return self._pc def store_pc(self, newpc): + self.invalidate_w_self() self._pc = newpc def stackpointer(self): @@ -476,19 +476,23 @@ return self.s_home().gettemp(index) def settemp(self, index, w_value): + self.invalidate_w_self() self.s_home().settemp(index, w_value) # ______________________________________________________________________ # Stack Manipulation def pop(self): + self.invalidate_w_self() w_v = self._stack[-1] self._stack = self._stack[:-1] return w_v def push(self, w_v): + self.invalidate_w_self() self._stack += [w_v] def push_all(self, lst): + self.invalidate_w_self() #for x in lst: # self.push(x) self._stack += lst @@ -500,6 +504,7 @@ return self._stack[-(idx + 1)] def pop_n(self, n): + self.invalidate_w_self() assert n >= 0 start = len(self._stack) - n assert start >= 0 # XXX what if this fails? @@ -509,6 +514,7 @@ return self._stack def pop_and_return_n(self, n): + self.invalidate_w_self() assert n >= 0 start = len(self._stack) - n assert start >= 0 # XXX what if this fails? @@ -536,12 +542,14 @@ return self._eargc def store_expected_argument_count(self, argc): + self.invalidate_w_self() self._eargc = argc def initialip(self): return self._initialip def store_initialip(self, initialip): + self.invalidate_w_self() self._initialip = initialip def store_w_home(self, w_home): @@ -554,6 +562,7 @@ return self.w_home().as_methodcontext_get_shadow() def reset_stack(self): + self.invalidate_w_self() self._stack = [] def stackstart(self): From tverwaes at codespeak.net Sat Mar 8 05:17:26 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 05:17:26 +0100 (CET) Subject: [pypy-svn] r52286 - in pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk: . test Message-ID: <20080308041726.5144B1684DC@codespeak.net> Author: tverwaes Date: Sat Mar 8 05:17:25 2008 New Revision: 52286 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_miniimage.py Log: allowing caching of s_active_context in interpreter as long as it checks if it wasn't invalidated after caching. 8s -> 6.6s (vs 5.8s in non-shadow version) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py Sat Mar 8 05:17:25 2008 @@ -28,11 +28,24 @@ _w_last_active_context = None def __init__(self): - self.w_active_context = None + self._w_active_context = None + self._s_active_context = None + self.s_version = None self.cnt = 0 + def w_active_context(self): + return self._w_active_context + + def store_w_active_context(self, w_context): + self._w_active_context = w_context + self._s_active_context = w_context.as_context_get_shadow() + self.s_version = self._s_active_context.version + def s_active_context(self): - return self.w_active_context.as_context_get_shadow() + if self._s_active_context.version != self.s_version: + self._s_active_context = self.w_active_context().as_context_get_shadow() + self.s_version = self._s_active_context.version + return self._s_active_context def interpret(self): try: @@ -51,15 +64,15 @@ if not objectmodel.we_are_translated(): bytecodeimpl = BYTECODE_TABLE[next] if self.should_trace(): - if self._w_last_active_context != self.w_active_context: + if self._w_last_active_context != self.w_active_context(): cnt = 0 - p = self.w_active_context + p = self.w_active_context() # AK make method while p is not objtable.w_nil: cnt += 1 p = p.as_context_get_shadow().w_sender() self._last_indent = " " * cnt - self._w_last_active_context = self.w_active_context + self._w_last_active_context = self.w_active_context() print "%sStack=%s" % ( self._last_indent, @@ -203,7 +216,8 @@ print "PRIMITIVE FAILED: %d %s" % (method.primitive, selector,) pass # ignore this error and fall back to the Smalltalk version arguments = self.pop_and_return_n(argcount) - interp.w_active_context = method.create_frame(receiver, arguments, self.w_self()) + interp.store_w_active_context(method.create_frame(receiver, arguments, + self.w_self())) self.pop() def _return(self, object, interp, w_return_to): @@ -211,7 +225,7 @@ if w_return_to is objtable.w_nil: raise ReturnFromTopLevel(object) w_return_to.as_context_get_shadow().push(object) - interp.w_active_context = w_return_to + interp.store_w_active_context(w_return_to) def returnReceiver(self, interp): self._return(self.w_receiver(), interp, self.s_home().w_sender()) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py Sat Mar 8 05:17:25 2008 @@ -77,7 +77,7 @@ unrolling_unwrap_spec = unrolling_iterable(enumerate(unwrap_spec)) def wrapped(interp, argument_count_m1): argument_count = argument_count_m1 + 1 # to account for the rcvr - frame = interp.w_active_context + frame = interp.w_active_context() s_frame = frame.as_context_get_shadow() assert argument_count == len_unwrap_spec if len(s_frame.stack()) < len_unwrap_spec: @@ -640,7 +640,7 @@ # Set some fields s_block_ctx.store_pc(s_block_ctx.initialip()) s_block_ctx.store_w_sender(frame) - interp.w_active_context = s_block_ctx.w_self() + interp.store_w_active_context(s_block_ctx.w_self()) @expose_primitive(PRIMITIVE_VALUE, no_result=True) def func(interp, argument_count): @@ -693,7 +693,7 @@ # XXX Check original logic. Image does not test this anyway # because falls back to value + internal implementation - finalize_block_ctx(interp, s_block_ctx, interp.w_active_context) + finalize_block_ctx(interp, s_block_ctx, interp.w_active_context()) @expose_primitive(PRIMITIVE_PERFORM) def func(interp, argcount): @@ -709,8 +709,8 @@ w_frame = w_method.create_frame(w_rcvr, [w_args.fetch(i) for i in range(w_args.size())]) - w_frame.as_context_get_shadow().store_w_sender(interp.w_active_context) - interp.w_active_context = w_frame + w_frame.as_context_get_shadow().store_w_sender(interp.w_active_context()) + interp.store_w_active_context(w_frame) @expose_primitive(PRIMITIVE_SIGNAL, unwrap_spec=[object]) def func(interp, w_rcvr): Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 05:17:25 2008 @@ -9,7 +9,7 @@ def __init__(self, w_self, invalid): self._w_self = w_self - self._version = 0 + self.version = 0 self.invalid = invalid self.w_invalid = False if invalid: @@ -21,6 +21,7 @@ def invalidate(self): """XXX This should get called whenever the base Smalltalk object changes.""" + self.version += 1 self.invalid = True def invalidate_w_self(self): @@ -41,7 +42,6 @@ self.update_shadow() def update_shadow(self): - self._version += 1 self.invalid = False def update_w_self(self): Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py Sat Mar 8 05:17:25 2008 @@ -75,7 +75,7 @@ w_method.tempsize=8 w_frame = w_method.create_frame(receiver, ["foo", "bar"]) interp = interpreter.Interpreter() - interp.w_active_context = w_frame + interp.store_w_active_context(w_frame) return interp def test_create_frame(): @@ -119,7 +119,7 @@ def test_pushReceiverBytecode(): interp = new_interpreter(pushReceiverBytecode) interp.step() - assert interp.s_active_context().top() == interp.w_active_context.as_methodcontext_get_shadow().w_receiver() + assert interp.s_active_context().top() == interp.w_active_context().as_methodcontext_get_shadow().w_receiver() def test_pushReceiverVariableBytecode(bytecode = (pushReceiverVariableBytecode(0) + pushReceiverVariableBytecode(1) + @@ -138,7 +138,7 @@ pushTemporaryVariableBytecode(1) + pushTemporaryVariableBytecode(2))): interp = new_interpreter(bytecode) - interp.w_active_context.as_methodcontext_get_shadow().settemp(2, "temp") + interp.w_active_context().as_methodcontext_get_shadow().settemp(2, "temp") interp.step() interp.step() interp.step() @@ -148,7 +148,7 @@ pushLiteralConstantBytecode(1) + pushLiteralConstantBytecode(2)): interp = new_interpreter(bytecode) - interp.w_active_context.as_methodcontext_get_shadow().w_method().literals = fakeliterals("a", "b", "c") + interp.w_active_context().as_methodcontext_get_shadow().w_method().literals = fakeliterals("a", "b", "c") interp.step() interp.step() interp.step() @@ -161,7 +161,7 @@ w_association.store(0, "mykey") w_association.store(1, "myvalue") interp = new_interpreter(bytecode) - interp.w_active_context.as_methodcontext_get_shadow().w_method().literals = fakeliterals(w_association) + interp.w_active_context().as_methodcontext_get_shadow().w_method().literals = fakeliterals(w_association) interp.step() assert interp.s_active_context().stack() == ["myvalue"] @@ -171,7 +171,7 @@ for index in range(8): w_object = shadow.new() interp = new_interpreter(pushConstantTrueBytecode + bytecode(index)) - interp.w_active_context.as_methodcontext_get_shadow().store_w_receiver(w_object) + interp.w_active_context().as_methodcontext_get_shadow().store_w_receiver(w_object) interp.step() interp.step() if popped: @@ -188,13 +188,13 @@ def test_storeAndPopTemporaryVariableBytecode(bytecode=storeAndPopTemporaryVariableBytecode): for index in range(8): interp = new_interpreter(pushConstantTrueBytecode + bytecode(index)) - #interp.w_active_context.as_methodcontext_get_shadow().temps = [None] * 8 + #interp.w_active_context().as_methodcontext_get_shadow().temps = [None] * 8 interp.step() interp.step() assert interp.s_active_context().stack() == [] - interp.w_active_context.as_methodcontext_get_shadow() + interp.w_active_context().as_methodcontext_get_shadow() for test_index in range(8): - print interp.w_active_context._vars + print interp.w_active_context()._vars if test_index == index: assert interp.s_active_context().gettemp(test_index) == interp.TRUE else: @@ -395,18 +395,18 @@ w_method.bytes = pushConstantOneBytecode + bytecode shadow.installmethod("foo", w_method) interp = new_interpreter(bytecodes) - interp.w_active_context.as_methodcontext_get_shadow().w_method().literals = fakeliterals("foo") + interp.w_active_context().as_methodcontext_get_shadow().w_method().literals = fakeliterals("foo") interp.s_active_context().push(w_object) callerContext = interp.w_active_context interp.step() assert interp.s_active_context().w_sender() == callerContext assert interp.s_active_context().stack() == [] - assert interp.w_active_context.as_methodcontext_get_shadow().w_receiver() == w_object - assert interp.w_active_context.as_methodcontext_get_shadow().w_method() == shadow.methoddict["foo"] + assert interp.w_active_context().as_methodcontext_get_shadow().w_receiver() == w_object + assert interp.w_active_context().as_methodcontext_get_shadow().w_method() == shadow.methoddict["foo"] assert callerContext.as_context_get_shadow().stack() == [] interp.step() interp.step() - assert interp.w_active_context == callerContext + assert interp.w_active_context() == callerContext assert interp.s_active_context().stack() == [result] def test_sendLiteralSelectorBytecode(): @@ -425,7 +425,7 @@ shadow.installmethod("fib:", method) w_object = shadow.new() interp = new_interpreter(sendLiteralSelectorBytecode(16) + returnTopFromMethod) - interp.w_active_context.as_methodcontext_get_shadow().w_method().literals = fakeliterals("fib:") + interp.w_active_context().as_methodcontext_get_shadow().w_method().literals = fakeliterals("fib:") interp.s_active_context().push(w_object) interp.s_active_context().push(wrap_int(8)) result = interp.interpret() @@ -435,12 +435,12 @@ def test(): interp = new_interpreter(sendLiteralSelectorBytecode(1 + 16)) - interp.w_active_context.as_methodcontext_get_shadow().w_method().literals = fakeliterals("foo", "sub") + interp.w_active_context().as_methodcontext_get_shadow().w_method().literals = fakeliterals("foo", "sub") interp.s_active_context().push(wrap_int(50)) interp.s_active_context().push(wrap_int(8)) callerContext = interp.w_active_context interp.step() - assert interp.w_active_context is callerContext + assert interp.w_active_context() is callerContext assert len(interp.s_active_context().stack()) == 1 w_result = interp.s_active_context().pop() assert unwrap_int(w_result) == 42 @@ -525,7 +525,7 @@ w_association.store(0, "mykey") w_association.store(1, "myvalue") interp = new_interpreter(pushConstantOneBytecode + bytecode) - interp.w_active_context.as_methodcontext_get_shadow().w_method().literals = fakeliterals(w_association) + interp.w_active_context().as_methodcontext_get_shadow().w_method().literals = fakeliterals(w_association) interp.step() interp.step() assert w_association.fetch(1) == interp.ONE @@ -553,9 +553,9 @@ interp.s_active_context().push(w_object) interp.s_active_context().push(interp.ONE) interp.step() - assert interp.w_active_context.as_methodcontext_get_shadow().w_method() == shadow.methoddict["+"] + assert interp.w_active_context().as_methodcontext_get_shadow().w_method() == shadow.methoddict["+"] assert interp.s_active_context().w_receiver() is w_object - assert interp.w_active_context.as_methodcontext_get_shadow().gettemp(0) == interp.ONE + assert interp.w_active_context().as_methodcontext_get_shadow().gettemp(0) == interp.ONE assert interp.s_active_context().stack() == [] def test_bytecodePrimBool(): @@ -598,7 +598,7 @@ meth1.literals = fakeliterals("foo") meth2.literals = fakeliterals("foo") interp = new_interpreter(bytecodes) - interp.w_active_context.as_methodcontext_get_shadow().w_method().literals = fakeliterals("foo") + interp.w_active_context().as_methodcontext_get_shadow().w_method().literals = fakeliterals("foo") interp.s_active_context().push(w_object) interp.step() for w_specificclass in [w_super, w_supersuper]: @@ -607,9 +607,9 @@ interp.step() assert interp.s_active_context().w_sender() == callerContext assert interp.s_active_context().stack() == [] - assert interp.w_active_context.as_methodcontext_get_shadow().w_receiver() == w_object + assert interp.w_active_context().as_methodcontext_get_shadow().w_receiver() == w_object meth = w_specificclass.as_class_get_shadow().methoddict["foo"] - assert interp.w_active_context.as_methodcontext_get_shadow().w_method() == meth + assert interp.w_active_context().as_methodcontext_get_shadow().w_method() == meth assert callerContext.as_context_get_shadow().stack() == [] def test_secondExtendedSendBytecode(): @@ -644,7 +644,7 @@ def interpret_bc(bcodes, literals, receiver=objtable.w_nil): bcode = "".join([chr(x) for x in bcodes]) interp = new_interpreter(bcode, receiver=receiver) - interp.w_active_context.as_methodcontext_get_shadow().w_method().literals = literals + interp.w_active_context().as_methodcontext_get_shadow().w_method().literals = literals return interp.interpret() # tests: bytecodePrimValue & bytecodePrimValueWithArg Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_miniimage.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_miniimage.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_miniimage.py Sat Mar 8 05:17:25 2008 @@ -202,7 +202,7 @@ assert w_method w_frame = w_method.create_frame(w_object, []) - interp.w_active_context = w_frame + interp.store_w_active_context(w_frame) while True: try: @@ -233,7 +233,7 @@ s_ctx = s_ap.s_suspended_context() s_ap.store_w_suspended_context(objtable.w_nil) interp = interpreter.Interpreter() - interp.w_active_context = s_ctx.w_self() + interp.store_w_active_context(s_ctx.w_self()) interp.interpret() def test_compile_method(): @@ -268,7 +268,7 @@ w_method = s_class.lookup(selector) assert w_method w_frame = w_method.create_frame(w_receiver, list(arguments_w)) - interp.w_active_context = w_frame + interp.store_w_active_context(w_frame) while True: try: interp.step() From tverwaes at codespeak.net Sat Mar 8 05:24:16 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 05:24:16 +0100 (CET) Subject: [pypy-svn] r52287 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308042416.CA92616852C@codespeak.net> Author: tverwaes Date: Sat Mar 8 05:24:16 2008 New Revision: 52287 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: making method of version for composite shadows (ie, a class' methoddictionary depends on the shadow of the methoddict which depends on the shadows of its Arrays) Quick check if update is necessary could be by quickly running over versionnumbers, halting and updating for any version mismatch. Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py Sat Mar 8 05:24:16 2008 @@ -38,13 +38,15 @@ def store_w_active_context(self, w_context): self._w_active_context = w_context - self._s_active_context = w_context.as_context_get_shadow() - self.s_version = self._s_active_context.version + self.store_s_active_context() + + def store_s_active_context(self): + self._s_active_context = self.w_active_context().as_context_get_shadow() + self.s_version = self._s_active_context.version() def s_active_context(self): - if self._s_active_context.version != self.s_version: - self._s_active_context = self.w_active_context().as_context_get_shadow() - self.s_version = self._s_active_context.version + if self._s_active_context.version() != self.s_version: + self.store_s_active_context() return self._s_active_context def interpret(self): Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 05:24:16 2008 @@ -9,7 +9,7 @@ def __init__(self, w_self, invalid): self._w_self = w_self - self.version = 0 + self._version = 0 self.invalid = invalid self.w_invalid = False if invalid: @@ -21,9 +21,15 @@ def invalidate(self): """XXX This should get called whenever the base Smalltalk object changes.""" - self.version += 1 + self._version += 1 self.invalid = True + def version(self): + """ XXX If decoded shadows depends on more than just w_self, + this method should be overwritten to check the versions of the + shadows used to build up this shadow. """ + return self._version + def invalidate_w_self(self): """XXX This should get called whenever the shadow object changes. From tverwaes at codespeak.net Sat Mar 8 05:48:05 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 05:48:05 +0100 (CET) Subject: [pypy-svn] r52288 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308044805.B751C168519@codespeak.net> Author: tverwaes Date: Sat Mar 8 05:48:04 2008 New Revision: 52288 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: removed versioning system, replaced by invalidation notification system. Only notifies first time the shadow becomes invalid. Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py Sat Mar 8 05:48:04 2008 @@ -30,7 +30,6 @@ def __init__(self): self._w_active_context = None self._s_active_context = None - self.s_version = None self.cnt = 0 def w_active_context(self): @@ -38,15 +37,14 @@ def store_w_active_context(self, w_context): self._w_active_context = w_context - self.store_s_active_context() + self._s_active_context = None - def store_s_active_context(self): - self._s_active_context = self.w_active_context().as_context_get_shadow() - self.s_version = self._s_active_context.version() + def invalidate(self): + self._s_active_context = None def s_active_context(self): - if self._s_active_context.version() != self.s_version: - self.store_s_active_context() + if self._s_active_context is None: + self._s_active_context = self.w_active_context().as_context_get_shadow() return self._s_active_context def interpret(self): Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 05:48:04 2008 @@ -9,20 +9,26 @@ def __init__(self, w_self, invalid): self._w_self = w_self - self._version = 0 + self._invalidnotify = [] self.invalid = invalid self.w_invalid = False if invalid: self.invalidate() + def invalidnotify(self, other): + if other not in self._invalidnotify: + self._invalidnotify += [other] + def getname(self): return repr(self) def invalidate(self): """XXX This should get called whenever the base Smalltalk object changes.""" - self._version += 1 - self.invalid = True + if not self.invalid: + self.invalid = True + for listener in self._invalidnotify: + listener.invalidate() def version(self): """ XXX If decoded shadows depends on more than just w_self, From tverwaes at codespeak.net Sat Mar 8 06:01:37 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 06:01:37 +0100 (CET) Subject: [pypy-svn] r52289 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308050137.1173C1684CF@codespeak.net> Author: tverwaes Date: Sat Mar 8 06:01:35 2008 New Revision: 52289 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: making sure interpreter gets invalidated. 6.8s -> 6.6s (vs 5.8) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py Sat Mar 8 06:01:35 2008 @@ -36,8 +36,10 @@ return self._w_active_context def store_w_active_context(self, w_context): + if self._s_active_context is not None: + self._s_active_context.unnotify(self) + self.invalidate() self._w_active_context = w_context - self._s_active_context = None def invalidate(self): self._s_active_context = None @@ -45,6 +47,7 @@ def s_active_context(self): if self._s_active_context is None: self._s_active_context = self.w_active_context().as_context_get_shadow() + self._s_active_context.invalidnotify(self) return self._s_active_context def interpret(self): Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 06:01:35 2008 @@ -19,6 +19,10 @@ if other not in self._invalidnotify: self._invalidnotify += [other] + def unnotify(self, other): + if other in self._invalidnotify: + self._invalidnotify.remove(other) + def getname(self): return repr(self) From tverwaes at codespeak.net Sat Mar 8 06:22:26 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 06:22:26 +0100 (CET) Subject: [pypy-svn] r52290 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308052226.4B8AD168522@codespeak.net> Author: tverwaes Date: Sat Mar 8 06:22:25 2008 New Revision: 52290 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: yet untested but now classes should be reinitialized whenever its method dictionary changes (main array with selectors or the array with compiled methods which invalidates the main array). Objects always have to register back to shadows after receiving invalidation notice. Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py Sat Mar 8 06:22:25 2008 @@ -36,9 +36,7 @@ return self._w_active_context def store_w_active_context(self, w_context): - if self._s_active_context is not None: - self._s_active_context.unnotify(self) - self.invalidate() + self._s_active_context = None self._w_active_context = w_context def invalidate(self): @@ -47,7 +45,7 @@ def s_active_context(self): if self._s_active_context is None: self._s_active_context = self.w_active_context().as_context_get_shadow() - self._s_active_context.invalidnotify(self) + self._s_active_context.notifyinvalid(self) return self._s_active_context def interpret(self): Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Sat Mar 8 06:22:25 2008 @@ -208,10 +208,13 @@ shadow.check_for_updates() return shadow + def get_shadow(self): + from pypy.lang.smalltalk.shadow import AbstractShadow + return self.as_special_get_shadow(AbstractShadow) + def as_class_get_shadow(self): from pypy.lang.smalltalk.shadow import ClassShadow - shadow = self.as_special_get_shadow(ClassShadow) - return shadow + return self.as_special_get_shadow(ClassShadow) def as_link_get_shadow(self): from pypy.lang.smalltalk.shadow import LinkShadow @@ -249,6 +252,10 @@ from pypy.lang.smalltalk.shadow import ContextPartShadow return self.as_special_get_shadow(ContextPartShadow) + def as_methoddict_get_shadow(self): + from pypy.lang.smalltalk.shadow import MethodDictionaryShadow + return self.as_special_get_shadow(MethodDictionaryShadow) + def become(self, w_old, w_new): W_AbstractObjectWithClassReference.become(self, w_old, w_new) for i in range(len(self._vars)): Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 06:22:25 2008 @@ -9,19 +9,14 @@ def __init__(self, w_self, invalid): self._w_self = w_self - self._invalidnotify = [] + self._notifyinvalid = [] self.invalid = invalid self.w_invalid = False if invalid: self.invalidate() - def invalidnotify(self, other): - if other not in self._invalidnotify: - self._invalidnotify += [other] - - def unnotify(self, other): - if other in self._invalidnotify: - self._invalidnotify.remove(other) + def notifyinvalid(self, other): + self._notifyinvalid += [other] def getname(self): return repr(self) @@ -31,8 +26,9 @@ object changes.""" if not self.invalid: self.invalid = True - for listener in self._invalidnotify: + for listener in self._notifyinvalid: listener.invalidate() + self._notifyinvalid = [] def version(self): """ XXX If decoded shadows depends on more than just w_self, @@ -153,19 +149,10 @@ self.name = w_name.as_string() # read the methoddict w_methoddict = w_self._vars[constants.CLASS_METHODDICT_INDEX] - w_values = w_methoddict._vars[constants.METHODDICT_VALUES_INDEX] - size = w_methoddict.size() - constants.METHODDICT_NAMES_INDEX - for i in range(size): - w_selector = w_methoddict._vars[constants.METHODDICT_NAMES_INDEX+i] - if w_selector is not objtable.w_nil: - if not isinstance(w_selector, model.W_BytesObject): - raise ClassShadowError("bogus selector in method dict") - selector = w_selector.as_string() - w_compiledmethod = w_values._vars[i] - if not isinstance(w_compiledmethod, model.W_CompiledMethod): - raise ClassShadowError("the methoddict must contain " - "CompiledMethods only for now") - self.methoddict[selector] = w_compiledmethod + s_methoddict = w_methoddict.as_methoddict_get_shadow() + self.methoddict = s_methoddict.methoddict + s_methoddict.notifyinvalid(self) + # for the rest, we need to reset invalid to False already so # that cycles in the superclass and/or metaclass chains don't # cause infinite recursion @@ -259,6 +246,31 @@ self.methoddict[selector] = method method.w_compiledin = self.w_self() +class MethodDictionaryShadow(AbstractShadow): + def __init__(self, w_self, invalid): + AbstractShadow.__init__(self, w_self, invalid) + + def invalidate(self): + self.methoddict = {} + + def update_shadow(self): + from pypy.lang.smalltalk import objtable + w_values = self.w_self()._vars[constants.METHODDICT_VALUES_INDEX] + s_values = w_values.get_shadow() + s_values.notifyinvalid(self) + size = self.w_self().size() - constants.METHODDICT_NAMES_INDEX + for i in range(size): + w_selector = self.w_self()._vars[constants.METHODDICT_NAMES_INDEX+i] + if w_selector is not objtable.w_nil: + if not isinstance(w_selector, model.W_BytesObject): + raise ClassShadowError("bogus selector in method dict") + selector = w_selector.as_string() + w_compiledmethod = w_values._vars[i] + if not isinstance(w_compiledmethod, model.W_CompiledMethod): + raise ClassShadowError("the methoddict must contain " + "CompiledMethods only for now") + self.methoddict[selector] = w_compiledmethod + class LinkedListShadow(AbstractShadow): def __init__(self, w_self, invalid): AbstractShadow.__init__(self, w_self, invalid) From tverwaes at codespeak.net Sat Mar 8 06:25:33 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 06:25:33 +0100 (CET) Subject: [pypy-svn] r52291 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308052533.D5EC4168522@codespeak.net> Author: tverwaes Date: Sat Mar 8 06:25:33 2008 New Revision: 52291 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: if we save a direct link to a shadow (superclass-shadow in this case), we have to be notified when it becomes invalid! Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 06:25:33 2008 @@ -162,6 +162,7 @@ self.s_superclass = None else: self.s_superclass = w_superclass.as_class_get_shadow() + self.s_superclass.notifyinvalid(self) AbstractShadow.update_shadow(self) # XXX check better way to store objects From tverwaes at codespeak.net Sat Mar 8 06:34:43 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 06:34:43 +0100 (CET) Subject: [pypy-svn] r52292 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308053443.EF80B1684E4@codespeak.net> Author: tverwaes Date: Sat Mar 8 06:34:43 2008 New Revision: 52292 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: caching s_home for blockcontexts; shouldn't change too frequently. Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py Sat Mar 8 06:34:43 2008 @@ -36,7 +36,9 @@ return self._w_active_context def store_w_active_context(self, w_context): - self._s_active_context = None + if self._s_active_context is not None: + self._s_active_context.unnotify(self) + self._s_active_context = None self._w_active_context = w_context def invalidate(self): Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 06:34:43 2008 @@ -18,6 +18,10 @@ def notifyinvalid(self, other): self._notifyinvalid += [other] + def unnotify(self, other): + if other in self._notifyinvalid: + self._notifyinvalid.remove(other) + def getname(self): return repr(self) @@ -554,6 +558,7 @@ class BlockContextShadow(ContextPartShadow): def __init__(self, w_self, invalid): + self._s_home = None ContextPartShadow.__init__(self, w_self, invalid) def update_shadow(self): @@ -561,11 +566,13 @@ self._initialip = utility.unwrap_int(self.w_self()._vars[constants.BLKCTX_INITIAL_IP_INDEX]) self._initialip -= 1 + self.w_method().getliteralsize() self._eargc = utility.unwrap_int(self.w_self()._vars[constants.BLKCTX_BLOCK_ARGUMENT_COUNT_INDEX]) + self.store_w_home(self.w_self()._vars[constants.BLKCTX_HOME_INDEX]) def update_w_self(self): ContextPartShadow.update_w_self(self) self.w_self()._vars[constants.BLKCTX_INITIAL_IP_INDEX] = utility.wrap_int(self._initialip + 1 + self.w_method().getliteralsize()) self.w_self()._vars[constants.BLKCTX_BLOCK_ARGUMENT_COUNT_INDEX] = utility.wrap_int(self._eargc) + self.w_self()._vars[constants.BLKCTX_HOME_INDEX] = self._w_home def expected_argument_count(self): return self._eargc @@ -582,13 +589,18 @@ self._initialip = initialip def store_w_home(self, w_home): - self.w_self()._vars[constants.BLKCTX_HOME_INDEX] = w_home + if self._s_home is not None: + self._s_home.unnotify(self) + self.invalidate_w_self() + self._w_home = w_home + self._s_home = self._w_home.as_methodcontext_get_shadow() + self._s_home.notifyinvalid(self) def w_home(self): - return self.w_self()._vars[constants.BLKCTX_HOME_INDEX] + return self._w_home def s_home(self): - return self.w_home().as_methodcontext_get_shadow() + return self._s_home def reset_stack(self): self.invalidate_w_self() From tverwaes at codespeak.net Sat Mar 8 06:40:15 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 06:40:15 +0100 (CET) Subject: [pypy-svn] r52293 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308054015.DF5E4168523@codespeak.net> Author: tverwaes Date: Sat Mar 8 06:40:15 2008 New Revision: 52293 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: fixing bug, making sure that the home context used in updating a block context is always the newest version. (invalidate invalidates s_home) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 06:40:15 2008 @@ -558,15 +558,19 @@ class BlockContextShadow(ContextPartShadow): def __init__(self, w_self, invalid): - self._s_home = None ContextPartShadow.__init__(self, w_self, invalid) - + self._s_home = None + + def invalidate(self): + self._s_home = None + AbstractShadow.invalidate(self) + def update_shadow(self): - ContextPartShadow.update_shadow(self) + self.store_w_home(self.w_self()._vars[constants.BLKCTX_HOME_INDEX]) self._initialip = utility.unwrap_int(self.w_self()._vars[constants.BLKCTX_INITIAL_IP_INDEX]) self._initialip -= 1 + self.w_method().getliteralsize() self._eargc = utility.unwrap_int(self.w_self()._vars[constants.BLKCTX_BLOCK_ARGUMENT_COUNT_INDEX]) - self.store_w_home(self.w_self()._vars[constants.BLKCTX_HOME_INDEX]) + ContextPartShadow.update_shadow(self) def update_w_self(self): ContextPartShadow.update_w_self(self) From tverwaes at codespeak.net Sat Mar 8 06:41:35 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 06:41:35 +0100 (CET) Subject: [pypy-svn] r52294 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308054135.0081E1684F4@codespeak.net> Author: tverwaes Date: Sat Mar 8 06:41:35 2008 New Revision: 52294 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: removed "old" version function Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 06:41:35 2008 @@ -34,12 +34,6 @@ listener.invalidate() self._notifyinvalid = [] - def version(self): - """ XXX If decoded shadows depends on more than just w_self, - this method should be overwritten to check the versions of the - shadows used to build up this shadow. """ - return self._version - def invalidate_w_self(self): """XXX This should get called whenever the shadow object changes. From tverwaes at codespeak.net Sat Mar 8 06:54:55 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 06:54:55 +0100 (CET) Subject: [pypy-svn] r52295 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308055455.1951D168502@codespeak.net> Author: tverwaes Date: Sat Mar 8 06:54:54 2008 New Revision: 52295 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: cache superclass methods locally. 6.6 -> 6.5 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 06:54:54 2008 @@ -156,10 +156,12 @@ # cause infinite recursion # read s_superclass w_superclass = w_self._vars[constants.CLASS_SUPERCLASS_INDEX] - if w_superclass is objtable.w_nil: - self.s_superclass = None - else: + if w_superclass is not objtable.w_nil: self.s_superclass = w_superclass.as_class_get_shadow() + # Cache all methods of superclasses locally. + for selector, method in self.s_superclass.methoddict.items(): + if selector not in self.methoddict: + self.methoddict[selector] = method self.s_superclass.notifyinvalid(self) AbstractShadow.update_shadow(self) @@ -229,15 +231,11 @@ def lookup(self, selector): look_in_shadow = self - while True: - try: - return look_in_shadow.methoddict[selector] - except KeyError: - pass - look_in_shadow = look_in_shadow.s_superclass - if look_in_shadow is None: - # attach information on the exception, for debugging. - raise MethodNotFound(self, selector) + if selector in self.methoddict: + # We cached all methods of superclasses locally. + return self.methoddict[selector] + else: + raise MethodNotFound(self, selector) def installmethod(self, selector, method): "NOT_RPYTHON" # this is only for testing. From tverwaes at codespeak.net Sat Mar 8 07:06:23 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 07:06:23 +0100 (CET) Subject: [pypy-svn] r52296 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/tool Message-ID: <20080308060623.DB506168503@codespeak.net> Author: tverwaes Date: Sat Mar 8 07:06:23 2008 New Revision: 52296 Added: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/tool/infostats.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/tool/profile.sh Log: adding a profile script for quick profiling by running compile_method Added: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/tool/infostats.py ============================================================================== --- (empty file) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/tool/infostats.py Sat Mar 8 07:06:23 2008 @@ -0,0 +1,5 @@ +import pstats +p = pstats.Stats('compile_method.txt') +#print p.print_callers('as_context_get_shadow') +#print p.print_callers('s_active_context') +p.sort_stats('time', 'cum').print_stats(.5) Added: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/tool/profile.sh ============================================================================== --- (empty file) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/tool/profile.sh Sat Mar 8 07:06:23 2008 @@ -0,0 +1,2 @@ +python -m cProfile -o compile_method.txt `which py.test` -k compile_method ../test/test_miniimage.py +python infostats.py From tverwaes at codespeak.net Sat Mar 8 07:27:15 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 07:27:15 +0100 (CET) Subject: [pypy-svn] r52297 - in pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk: . test Message-ID: <20080308062715.712B81684CC@codespeak.net> Author: tverwaes Date: Sat Mar 8 07:27:14 2008 New Revision: 52297 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_model.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_primitives.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_shadow.py Log: fixing all tests which were broken (except for 2 flagged as to-fix (smaller rewrite) and 1 (bigger) rewrite) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Sat Mar 8 07:27:14 2008 @@ -195,6 +195,10 @@ isinstance(self._vars, list)) # XXX XXX + # Find better way of overloading shadows... + def setshadow(self, shadow): + self._shadow = shadow + def as_special_get_shadow(self, TheClass, invalid=True): shadow = self._shadow if shadow is None: @@ -203,7 +207,7 @@ elif not isinstance(shadow, TheClass): shadow.check_for_w_updates() shadow.invalidate() - shadow = TheClass(self) + shadow = TheClass(self, invalid) self._shadow = shadow shadow.check_for_updates() return shadow Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 07:27:14 2008 @@ -52,6 +52,7 @@ self.update_shadow() def update_shadow(self): + self.w_self().setshadow(self) self.invalid = False def update_w_self(self): @@ -550,11 +551,13 @@ class BlockContextShadow(ContextPartShadow): def __init__(self, w_self, invalid): - ContextPartShadow.__init__(self, w_self, invalid) self._s_home = None + ContextPartShadow.__init__(self, w_self, invalid) def invalidate(self): - self._s_home = None + if self._s_home is not None: + self._s_home.unnotify(self) + self._s_home = None AbstractShadow.invalidate(self) def update_shadow(self): @@ -587,15 +590,17 @@ def store_w_home(self, w_home): if self._s_home is not None: self._s_home.unnotify(self) + self._s_home = None self.invalidate_w_self() self._w_home = w_home - self._s_home = self._w_home.as_methodcontext_get_shadow() - self._s_home.notifyinvalid(self) def w_home(self): return self._w_home def s_home(self): + if self._s_home is None: + self._s_home = self._w_home.as_methodcontext_get_shadow() + self._s_home.notifyinvalid(self) return self._s_home def reset_stack(self): Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py Sat Mar 8 07:27:14 2008 @@ -245,7 +245,7 @@ def test_pushActiveContextBytecode(): interp = new_interpreter(pushActiveContextBytecode) interp.step() - assert interp.s_active_context().pop() == interp.w_active_context + assert interp.s_active_context().pop() == interp.w_active_context() assert interp.s_active_context().stack() == [] def test_duplicateTopBytecode(): @@ -397,7 +397,7 @@ interp = new_interpreter(bytecodes) interp.w_active_context().as_methodcontext_get_shadow().w_method().literals = fakeliterals("foo") interp.s_active_context().push(w_object) - callerContext = interp.w_active_context + callerContext = interp.w_active_context() interp.step() assert interp.s_active_context().w_sender() == callerContext assert interp.s_active_context().stack() == [] @@ -438,7 +438,7 @@ interp.w_active_context().as_methodcontext_get_shadow().w_method().literals = fakeliterals("foo", "sub") interp.s_active_context().push(wrap_int(50)) interp.s_active_context().push(wrap_int(8)) - callerContext = interp.w_active_context + callerContext = interp.w_active_context() interp.step() assert interp.w_active_context() is callerContext assert len(interp.s_active_context().stack()) == 1 @@ -602,7 +602,7 @@ interp.s_active_context().push(w_object) interp.step() for w_specificclass in [w_super, w_supersuper]: - callerContext = interp.w_active_context + callerContext = interp.w_active_context() interp.step() interp.step() assert interp.s_active_context().w_sender() == callerContext Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_model.py Sat Mar 8 07:27:14 2008 @@ -54,6 +54,7 @@ py.test.raises(IndexError, lambda: w_bytes.getword(20)) def test_method_lookup(): + py.test.skip("Fix me; methods are now cached on each level -> when a level changes other levels need to be notified and updated.") w_class = mockclass(0) shadow = w_class.as_class_get_shadow() shadow.methoddict["foo"] = 1 @@ -65,11 +66,13 @@ assert shadow.lookup("foo") == 1 assert shadow.lookup("bar") == 2 py.test.raises(MethodNotFound, shadow.lookup, "zork") + print subshadow.methoddict assert subshadow.lookup("foo") == 3 assert subshadow.lookup("bar") == 2 py.test.raises(MethodNotFound, subshadow.lookup, "zork") def test_w_compiledin(): + py.test.skip("Fix me; methods are now cached on each level -> when a level changes other levels need to be notified and updated.") w_super = mockclass(0) w_class = mockclass(0, w_superclass=w_super) supershadow = w_super.as_class_get_shadow() @@ -94,6 +97,7 @@ assert h1 == w_inst.hash def test_compiledmethod_fetchbyte(): + py.test.skip("Fetchbyte doesn't exist anymore. Test by setting pc in pointersobject; decoding and asking next bytecode") w_method = model.W_CompiledMethod() w_method.bytes = "abc" w_method.literalsize = 2 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_primitives.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_primitives.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_primitives.py Sat Mar 8 07:27:14 2008 @@ -12,9 +12,9 @@ class MockFrame(model.W_PointersObject): def __init__(self, stack): self._vars = [None] * 6 + stack - s_self = self.as_blockcontext_get_shadow() + s_self = self.as_blockcontext_get_shadow(False) + s_self._stack = stack s_self.store_expected_argument_count(0) - s_self.store_stackpointer(s_self.stackstart()+len(stack)-1) def wrap(x): if isinstance(x, int): return utility.wrap_int(x) @@ -28,7 +28,7 @@ mapped_stack = [wrap(x) for x in stack] frame = MockFrame(mapped_stack) interp = interpreter.Interpreter() - interp.w_active_context = frame + interp.store_w_active_context(frame) return (interp, len(stack)) def prim(code, stack): Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_shadow.py Sat Mar 8 07:27:14 2008 @@ -122,6 +122,7 @@ w_object.store(idx + 1, 'f') w_object.store(idx + 2, 'g') w_object.store(idx + 3, 'h') + s_object.update_shadow() assert s_object.top() == 'h' assert s_object.stack() == ['f', 'g', 'h' ] s_object.push('i') @@ -130,6 +131,8 @@ assert s_object.pop() == 'i' assert s_object.pop_and_return_n(2) == ['g', 'h'] assert s_object.pop() == 'f' + s_object.update_w_self() + s_object.update_shadow() assert s_object.stackpointer() == s_object.stackstart() def test_methodcontext(): From arigo at codespeak.net Sat Mar 8 10:56:49 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 10:56:49 +0100 (CET) Subject: [pypy-svn] r52298 - in pypy/branch/buffer/pypy: interpreter interpreter/test module/_file/test module/_socket/test module/md5/test module/posix/test module/sha/test Message-ID: <20080308095649.98F6F168509@codespeak.net> Author: arigo Date: Sat Mar 8 10:56:47 2008 New Revision: 52298 Modified: pypy/branch/buffer/pypy/interpreter/baseobjspace.py pypy/branch/buffer/pypy/interpreter/test/test_buffer.py pypy/branch/buffer/pypy/module/_file/test/test_file.py pypy/branch/buffer/pypy/module/_socket/test/test_sock_app.py pypy/branch/buffer/pypy/module/md5/test/test_md5.py pypy/branch/buffer/pypy/module/posix/test/test_posix2.py pypy/branch/buffer/pypy/module/sha/test/test_sha.py Log: A comment, and many tests for this comment :-) Modified: pypy/branch/buffer/pypy/interpreter/baseobjspace.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/baseobjspace.py (original) +++ pypy/branch/buffer/pypy/interpreter/baseobjspace.py Sat Mar 8 10:56:47 2008 @@ -923,7 +923,14 @@ return self.interp_w(Buffer, w_buffer) def bufferstr_w(self, w_obj): - # directly returns an interp-level str + # Directly returns an interp-level str. Note that if w_obj is a + # unicode string, this is different from str_w(buffer(w_obj)): + # indeed, the latter returns a string with the raw bytes from + # the underlying unicode buffer, but bufferstr_w() just converts + # the unicode to an ascii string. This inconsistency is kind of + # needed because CPython has the same issue. (Well, it's + # unclear if there is any use at all for getting the bytes in + # the unicode buffer.) try: return self.str_w(w_obj) except OperationError, e: Modified: pypy/branch/buffer/pypy/interpreter/test/test_buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/test/test_buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/test/test_buffer.py Sat Mar 8 10:56:47 2008 @@ -35,5 +35,13 @@ f.close() assert data == 'hello world' + def test_unicode(self): + space = self.space + s = space.bufferstr_w(space.wrap(u'hello')) + assert type(s) is str + assert s == 'hello' + space.raises_w(space.w_UnicodeEncodeError, + space.bufferstr_w, space.wrap(u'\xe9')) + # Note: some app-level tests for buffer are in module/__builtin__/test/. Modified: pypy/branch/buffer/pypy/module/_file/test/test_file.py ============================================================================== --- pypy/branch/buffer/pypy/module/_file/test/test_file.py (original) +++ pypy/branch/buffer/pypy/module/_file/test/test_file.py Sat Mar 8 10:56:47 2008 @@ -117,6 +117,7 @@ import os f = self.file(self.temppath, "w") f.write(u"hello\n") + raises(UnicodeEncodeError, f.write, u'\xe9') f.close() f = self.file(self.temppath, "r") res = f.read() Modified: pypy/branch/buffer/pypy/module/_socket/test/test_sock_app.py ============================================================================== --- pypy/branch/buffer/pypy/module/_socket/test/test_sock_app.py (original) +++ pypy/branch/buffer/pypy/module/_socket/test/test_sock_app.py Sat Mar 8 10:56:47 2008 @@ -394,8 +394,8 @@ assert s.getsockname() == s2.getsockname() - def test_buffer(self): - # Test that send/sendall/sendto accept a buffer as argument + def test_buffer_or_unicode(self): + # Test that send/sendall/sendto accept a buffer or a unicode as arg import _socket, os s = _socket.socket(_socket.AF_INET, _socket.SOCK_STREAM, 0) # XXX temporarily we use codespeak to test, will have more robust tests in @@ -404,6 +404,9 @@ s.connect(("codespeak.net", 80)) s.send(buffer('')) s.sendall(buffer('')) + s.send(u'') + s.sendall(u'') + raises(UnicodeEncodeError, s.send, u'\xe9') s.close() s = _socket.socket(_socket.AF_INET, _socket.SOCK_DGRAM, 0) s.sendto(buffer(''), ('localhost', 9)) # Send to discard port. Modified: pypy/branch/buffer/pypy/module/md5/test/test_md5.py ============================================================================== --- pypy/branch/buffer/pypy/module/md5/test/test_md5.py (original) +++ pypy/branch/buffer/pypy/module/md5/test/test_md5.py Sat Mar 8 10:56:47 2008 @@ -88,3 +88,14 @@ d1 = md5.md5(buffer("abcde")) d1.update(buffer("jkl")) assert d1.hexdigest() == 'e570e7110ecef72fcb772a9c05d03373' + + + def test_unicode(self): + """ + Test passing unicode strings. + """ + md5 = self.md5 + d1 = md5.md5(u"abcde") + d1.update(u"jkl") + assert d1.hexdigest() == 'e570e7110ecef72fcb772a9c05d03373' + raises(UnicodeEncodeError, d1.update, u'\xe9') Modified: pypy/branch/buffer/pypy/module/posix/test/test_posix2.py ============================================================================== --- pypy/branch/buffer/pypy/module/posix/test/test_posix2.py (original) +++ pypy/branch/buffer/pypy/module/posix/test/test_posix2.py Sat Mar 8 10:56:47 2008 @@ -352,6 +352,17 @@ break data += s assert data == 'hello, world!\n' + os.close(fd) + + def test_write_unicode(self): + os = self.posix + fd = os.open(self.path3, os.O_RDWR | os.O_CREAT, 0666) + os.write(fd, u'X') + raises(UnicodeEncodeError, os.write, fd, u'\xe9') + os.lseek(fd, 0, 0) + data = os.read(fd, 2) + assert data == 'X' + os.close(fd) class AppTestEnvironment(object): def setup_class(cls): Modified: pypy/branch/buffer/pypy/module/sha/test/test_sha.py ============================================================================== --- pypy/branch/buffer/pypy/module/sha/test/test_sha.py (original) +++ pypy/branch/buffer/pypy/module/sha/test/test_sha.py Sat Mar 8 10:56:47 2008 @@ -92,3 +92,14 @@ d1 = sha.sha(buffer("abcde")) d1.update(buffer("jkl")) assert d1.hexdigest() == 'f5d13cf6341db9b0e299d7b9d562de9572b58e5d' + + + def test_unicode(self): + """ + Test passing unicode strings. + """ + sha = self.sha + d1 = sha.sha(u"abcde") + d1.update(u"jkl") + assert d1.hexdigest() == 'f5d13cf6341db9b0e299d7b9d562de9572b58e5d' + raises(UnicodeEncodeError, d1.update, u'\xe9') From arigo at codespeak.net Sat Mar 8 11:21:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 11:21:09 +0100 (CET) Subject: [pypy-svn] r52299 - in pypy/branch/buffer/pypy: interpreter module/mmap module/mmap/test Message-ID: <20080308102109.5ED901684FC@codespeak.net> Author: arigo Date: Sat Mar 8 11:21:08 2008 New Revision: 52299 Modified: pypy/branch/buffer/pypy/interpreter/baseobjspace.py pypy/branch/buffer/pypy/interpreter/buffer.py pypy/branch/buffer/pypy/module/mmap/interp_mmap.py pypy/branch/buffer/pypy/module/mmap/test/test_mmap.py Log: mmap().__buffer__. Inefficient implementation for now. Modified: pypy/branch/buffer/pypy/interpreter/baseobjspace.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/baseobjspace.py (original) +++ pypy/branch/buffer/pypy/interpreter/baseobjspace.py Sat Mar 8 11:21:08 2008 @@ -853,6 +853,11 @@ if step == 0: raise OperationError(self.w_ValueError, self.wrap("slice step cannot be zero")) + if start < 0: + start = 0 + if stop < start: + stop = start + assert stop <= seqlength else: start = self.int_w(w_index_or_slice) if start < 0: Modified: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Sat Mar 8 11:21:08 2008 @@ -50,10 +50,7 @@ if step == 0: # index only return space.wrap(self.getitem(start)) elif step == 1: - if 0 <= start <= stop: - res = self.getslice(start, stop) - else: - res = '' + res = self.getslice(start, stop) return space.wrap(res) else: raise OperationError(space.w_ValueError, @@ -161,3 +158,30 @@ def getslice(self, start, stop): assert 0 <= start <= stop <= self.len return self.value[start:stop] + + +class StringLikeBuffer(Buffer): + """For app-level objects that already have a string-like interface + with __len__ and a __getitem__ that returns characters or (with + slicing) substrings.""" + # XXX this is inefficient, it should only be used temporarily + + def __init__(self, space, w_obj): + self.space = space + self.w_obj = w_obj + self.len = space.int_w(space.len(w_obj)) + + def getitem(self, index): + space = self.space + s = space.str_w(space.getitem(self.w_obj, space.wrap(index))) + if len(s) != 1: + raise OperationError(space.w_ValueError, + space.wrap("character expected, got string")) + char = s[0] # annotator hint + return char + + def getslice(self, start, stop): + space = self.space + s = space.str_w(space.getslice(self.w_obj, space.wrap(start), + space.wrap(stop))) + return s Modified: pypy/branch/buffer/pypy/module/mmap/interp_mmap.py ============================================================================== --- pypy/branch/buffer/pypy/module/mmap/interp_mmap.py (original) +++ pypy/branch/buffer/pypy/module/mmap/interp_mmap.py Sat Mar 8 11:21:08 2008 @@ -138,10 +138,7 @@ if step == 0: # index only return space.wrap(self.mmap.getitem(start)) elif step == 1: - if 0 <= start <= stop: - res = "".join([self.mmap.getitem(i) for i in range(start, stop)]) - else: - res = '' + res = "".join([self.mmap.getitem(i) for i in range(start, stop)]) return space.wrap(res) else: raise OperationError(space.w_ValueError, @@ -163,8 +160,6 @@ self.mmap.setitem(start, value) elif step == 1: length = stop - start - if start < 0 or length < 0: - length = 0 if len(value) != length: raise OperationError(space.w_ValueError, space.wrap("mmap slice assignment is wrong size")) @@ -175,6 +170,13 @@ space.wrap("mmap object does not support slicing with a step")) descr_setitem.unwrap_spec = ['self', W_Root, str] + def descr_buffer(self): + # XXX improve to work directly on the low-level address + from pypy.interpreter.buffer import StringLikeBuffer + space = self.space + return space.wrap(StringLikeBuffer(space, space.wrap(self))) + descr_buffer.unwrap_spec = ['self'] + W_MMap.typedef = TypeDef("mmap", close = interp2app(W_MMap.close), read_byte = interp2app(W_MMap.read_byte), @@ -194,6 +196,7 @@ __len__ = interp2app(W_MMap.__len__), __getitem__ = interp2app(W_MMap.descr_getitem), __setitem__ = interp2app(W_MMap.descr_setitem), + __buffer__ = interp2app(W_MMap.descr_buffer), ) def _check_map_size(space, size): Modified: pypy/branch/buffer/pypy/module/mmap/test/test_mmap.py ============================================================================== --- pypy/branch/buffer/pypy/module/mmap/test/test_mmap.py (original) +++ pypy/branch/buffer/pypy/module/mmap/test/test_mmap.py Sat Mar 8 11:21:08 2008 @@ -430,6 +430,17 @@ assert operator.isSequenceType(m) assert not operator.isMappingType(m) + def test_buffer(self): + from mmap import mmap + f = open(self.tmpname + "y", "w+") + f.write("foobar") + f.flush() + m = mmap(f.fileno(), 6) + b = buffer(m) + assert len(b) == 6 + assert b[3] == "b" + assert b[:] == "foobar" + def test_all(self): # this is a global test, ported from test_mmap.py import mmap From arigo at codespeak.net Sat Mar 8 11:25:36 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 11:25:36 +0100 (CET) Subject: [pypy-svn] r52300 - in pypy/branch/buffer/pypy/module/zlib: . test Message-ID: <20080308102536.02CDD1684FC@codespeak.net> Author: arigo Date: Sat Mar 8 11:25:36 2008 New Revision: 52300 Modified: pypy/branch/buffer/pypy/module/zlib/interp_zlib.py pypy/branch/buffer/pypy/module/zlib/test/test_zlib.py Log: Buffer support in zlib. Modified: pypy/branch/buffer/pypy/module/zlib/interp_zlib.py ============================================================================== --- pypy/branch/buffer/pypy/module/zlib/interp_zlib.py (original) +++ pypy/branch/buffer/pypy/module/zlib/interp_zlib.py Sat Mar 8 11:25:36 2008 @@ -25,7 +25,7 @@ checksum = intmask(checksum) return space.wrap(checksum) -crc32.unwrap_spec = [ObjSpace, str, int] +crc32.unwrap_spec = [ObjSpace, 'bufferstr', int] def adler32(space, string, start = rzlib.ADLER32_DEFAULT_START): @@ -44,7 +44,7 @@ checksum = intmask(checksum) return space.wrap(checksum) -adler32.unwrap_spec = [ObjSpace, str, int] +adler32.unwrap_spec = [ObjSpace, 'bufferstr', int] def zlib_error(space, msg): @@ -71,7 +71,7 @@ except rzlib.RZlibError, e: raise zlib_error(space, e.msg) return space.wrap(result) -compress.unwrap_spec = [ObjSpace, str, int] +compress.unwrap_spec = [ObjSpace, 'bufferstr', int] def decompress(space, string, wbits=rzlib.MAX_WBITS, bufsize=0): @@ -93,7 +93,7 @@ except rzlib.RZlibError, e: raise zlib_error(space, e.msg) return space.wrap(result) -decompress.unwrap_spec = [ObjSpace, str, int, int] +decompress.unwrap_spec = [ObjSpace, 'bufferstr', int, int] class ZLibObject(Wrappable): @@ -166,7 +166,7 @@ except rzlib.RZlibError, e: raise zlib_error(self.space, e.msg) return self.space.wrap(result) - compress.unwrap_spec = ['self', str] + compress.unwrap_spec = ['self', 'bufferstr'] def flush(self, mode=rzlib.Z_FINISH): @@ -293,7 +293,7 @@ else: self.unconsumed_tail = tail return self.space.wrap(string) - decompress.unwrap_spec = ['self', str, int] + decompress.unwrap_spec = ['self', 'bufferstr', int] def flush(self, length=0): Modified: pypy/branch/buffer/pypy/module/zlib/test/test_zlib.py ============================================================================== --- pypy/branch/buffer/pypy/module/zlib/test/test_zlib.py (original) +++ pypy/branch/buffer/pypy/module/zlib/test/test_zlib.py Sat Mar 8 11:25:36 2008 @@ -178,3 +178,27 @@ assert s1 == self.expanded[i:i+10] data = d.unconsumed_tail assert not data + + + def test_buffer(self): + """ + We should be able to pass buffer objects instead of strings. + """ + assert self.zlib.crc32(buffer('hello, world.')) == -936931198 + assert self.zlib.adler32(buffer('hello, world.')) == 571147447 + + compressor = self.zlib.compressobj() + bytes = compressor.compress(buffer(self.expanded)) + bytes += compressor.flush() + assert bytes == self.compressed + + decompressor = self.zlib.decompressobj() + bytes = decompressor.decompress(buffer(self.compressed)) + bytes += decompressor.flush() + assert bytes == self.expanded + + bytes = self.zlib.compress(buffer(self.expanded)) + assert bytes == self.compressed + + bytes = self.zlib.decompress(buffer(self.compressed)) + assert bytes == self.expanded From arigo at codespeak.net Sat Mar 8 11:27:03 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 11:27:03 +0100 (CET) Subject: [pypy-svn] r52301 - pypy/branch/buffer/pypy/module/bz2/test Message-ID: <20080308102703.1EDDD1684FC@codespeak.net> Author: arigo Date: Sat Mar 8 11:27:03 2008 New Revision: 52301 Modified: pypy/branch/buffer/pypy/module/bz2/test/test_bz2_compdecomp.py Log: Bogus teardown_module(). Modified: pypy/branch/buffer/pypy/module/bz2/test/test_bz2_compdecomp.py ============================================================================== --- pypy/branch/buffer/pypy/module/bz2/test/test_bz2_compdecomp.py (original) +++ pypy/branch/buffer/pypy/module/bz2/test/test_bz2_compdecomp.py Sat Mar 8 11:27:03 2008 @@ -27,10 +27,6 @@ mod.DATA = DATA mod.decompress = decompress -def teardown_module(mod): - if os.path.exists("foo"): - os.unlink("foo") - class AppTestBZ2Compressor(CheckAllocation): def setup_class(cls): space = gettestobjspace(usemodules=('bz2',)) From arigo at codespeak.net Sat Mar 8 11:33:26 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 11:33:26 +0100 (CET) Subject: [pypy-svn] r52302 - in pypy/branch/buffer/pypy/module/bz2: . test Message-ID: <20080308103326.B925616847B@codespeak.net> Author: arigo Date: Sat Mar 8 11:33:26 2008 New Revision: 52302 Modified: pypy/branch/buffer/pypy/module/bz2/interp_bz2.py pypy/branch/buffer/pypy/module/bz2/test/test_bz2_compdecomp.py Log: Buffer support in bz2. Modified: pypy/branch/buffer/pypy/module/bz2/interp_bz2.py ============================================================================== --- pypy/branch/buffer/pypy/module/bz2/interp_bz2.py (original) +++ pypy/branch/buffer/pypy/module/bz2/interp_bz2.py Sat Mar 8 11:33:26 2008 @@ -507,7 +507,7 @@ lltype.free(in_buf, flavor='raw') lltype.free(out_buf, flavor='raw') - compress.unwrap_spec = ['self', str] + compress.unwrap_spec = ['self', 'bufferstr'] def flush(self): if not self.running: @@ -670,7 +670,7 @@ lltype.free(in_buf, flavor='raw') lltype.free(out_buf, flavor='raw') - decompress.unwrap_spec = ['self', str] + decompress.unwrap_spec = ['self', 'bufferstr'] W_BZ2Decompressor.typedef = TypeDef("BZ2Decompressor", @@ -751,7 +751,7 @@ lltype.free(bzs, flavor='raw') lltype.free(in_buf, flavor='raw') lltype.free(out_buf, flavor='raw') -compress.unwrap_spec = [ObjSpace, str, int] +compress.unwrap_spec = [ObjSpace, 'bufferstr', int] def decompress(space, data): """decompress(data) -> decompressed data @@ -822,4 +822,4 @@ lltype.free(bzs, flavor='raw') lltype.free(out_buf, flavor='raw') lltype.free(in_buf, flavor='raw') -decompress.unwrap_spec = [ObjSpace, str] +decompress.unwrap_spec = [ObjSpace, 'bufferstr'] Modified: pypy/branch/buffer/pypy/module/bz2/test/test_bz2_compdecomp.py ============================================================================== --- pypy/branch/buffer/pypy/module/bz2/test/test_bz2_compdecomp.py (original) +++ pypy/branch/buffer/pypy/module/bz2/test/test_bz2_compdecomp.py Sat Mar 8 11:33:26 2008 @@ -80,6 +80,13 @@ data = "%s%s" % (data, bz2c.flush()) assert self.decompress(data) == self.TEXT + def test_buffer(self): + from bz2 import BZ2Compressor + bz2c = BZ2Compressor() + data = bz2c.compress(buffer(self.TEXT)) + data = "%s%s" % (data, bz2c.flush()) + assert self.decompress(data) == self.TEXT + class AppTestBZ2Decompressor(CheckAllocation): def setup_class(cls): space = gettestobjspace(usemodules=('bz2',)) @@ -140,6 +147,12 @@ bz2d.decompress(self.DATA) raises(EOFError, bz2d.decompress, "foo") + def test_buffer(self): + from bz2 import BZ2Decompressor + bz2d = BZ2Decompressor() + decompressed_data = bz2d.decompress(buffer(self.DATA)) + assert decompressed_data == self.TEXT + class AppTestBZ2ModuleFunctions(CheckAllocation): def setup_class(cls): space = gettestobjspace(usemodules=('bz2',)) @@ -181,3 +194,9 @@ import bz2 raises(ValueError, bz2.decompress, self.DATA[:-10]) + + def test_buffer(self): + import bz2 + data = bz2.compress(buffer(self.TEXT)) + result = bz2.decompress(buffer(data)) + assert result == self.TEXT From tverwaes at codespeak.net Sat Mar 8 15:27:04 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sat, 8 Mar 2008 15:27:04 +0100 (CET) Subject: [pypy-svn] r52303 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080308142704.17BE51684BF@codespeak.net> Author: tverwaes Date: Sat Mar 8 15:27:03 2008 New Revision: 52303 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: fixing some bugs found while translating Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py Sat Mar 8 15:27:03 2008 @@ -1,4 +1,6 @@ import py +from pypy.lang.smalltalk.shadow import AbstractShadow +from pypy.lang.smalltalk.shadow import ContextPartShadow from pypy.lang.smalltalk import model, constants, primitives from pypy.lang.smalltalk import objtable from pypy.lang.smalltalk.shadow import ContextPartShadow @@ -15,7 +17,7 @@ class IllegalStoreError(Exception): """Illegal Store.""" -class Interpreter: +class Interpreter(AbstractShadow): TRUE = objtable.w_true FALSE = objtable.w_false @@ -39,6 +41,7 @@ if self._s_active_context is not None: self._s_active_context.unnotify(self) self._s_active_context = None + assert isinstance(w_context, model.W_PointersObject) self._w_active_context = w_context def invalidate(self): @@ -47,6 +50,7 @@ def s_active_context(self): if self._s_active_context is None: self._s_active_context = self.w_active_context().as_context_get_shadow() + assert isinstance(self._s_active_context, ContextPartShadow) self._s_active_context.notifyinvalid(self) return self._s_active_context Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Sat Mar 8 15:27:03 2008 @@ -134,14 +134,17 @@ # read the name if w_self.size() > constants.CLASS_NAME_INDEX: w_name = w_self._vars[constants.CLASS_NAME_INDEX] + else: + w_name = None # XXX This is highly experimental XXX # if the name-pos of class is not bytesobject, # we are probably holding a metaclass instead of a class. # metaclasses hold a pointer to the real class in the last # slot. This is pos 6 in mini.image and higher in squeak3.9 - if not isinstance(w_name, model.W_BytesObject): + if w_name is None: w_realclass = w_self._vars[w_self.size() - 1] + assert isinstance(w_realclass, model.W_PointersObject) if w_realclass.size() > constants.CLASS_NAME_INDEX: w_name = w_realclass._vars[constants.CLASS_NAME_INDEX] if isinstance(w_name, model.W_BytesObject): @@ -184,6 +187,8 @@ raise NotImplementedError(self.instance_kind) if store: from pypy.lang.smalltalk import objtable +## XXX breaks translation + assert isinstance(w_new, model.W_Object) objtable.objects += [w_new] return w_new @@ -254,6 +259,7 @@ def update_shadow(self): from pypy.lang.smalltalk import objtable w_values = self.w_self()._vars[constants.METHODDICT_VALUES_INDEX] + assert isinstance(w_values, model.W_PointersObject) s_values = w_values.get_shadow() s_values.notifyinvalid(self) size = self.w_self().size() - constants.METHODDICT_NAMES_INDEX @@ -320,17 +326,18 @@ priority = s_process.priority() s_scheduler = self.s_scheduler() w_process_lists = s_scheduler.process_lists() + assert isinstance(w_process_lists, model.W_PointersObject) w_process_list = w_process_lists._vars[priority] w_process_list.as_linkedlist_get_shadow().add_last_link(s_process.w_self()) s_process.store_my_list(w_process_list) def transfer_to(self, s_process, interp): from pypy.lang.smalltalk import objtable - s_scheduler = self.scheduler() + s_scheduler = self.s_scheduler() s_old_process = s_scheduler.s_active_process() s_scheduler.store_w_active_process(s_process.w_self()) - s_old_process.store_w_suspended_context(interp.s_active_context.w_self()) - interp.s_active_context = s_process.s_suspended_context() + s_old_process.store_w_suspended_context(interp.s_active_context().w_self()) + interp.store_w_active_context(s_process.w_suspended_context()) s_process.store_w_suspended_context(objtable.w_nil) #reclaimableContextCount := 0 @@ -385,10 +392,10 @@ def store_my_list(self, w_object): self.w_self()._vars[constants.PROCESS_MY_LIST_INDEX] = w_object - def s_suspended_context(self): + def w_suspended_context(self): # XXX Can currently only restart context if it is a method context... # XXX Depends on typechecking ... - return self.w_self()._vars[constants.PROCESS_SUSPENDED_CONTEXT_INDEX].as_methodcontext_get_shadow() + return self.w_self()._vars[constants.PROCESS_SUSPENDED_CONTEXT_INDEX] def store_w_suspended_context(self, w_object): self.w_self()._vars[constants.PROCESS_SUSPENDED_CONTEXT_INDEX] = w_object @@ -484,7 +491,9 @@ def getbytecode(self): assert self._pc >= 0 - bytecode = self.w_method().bytes[self._pc] + w_method = self.w_method() + assert isinstance(w_method, model.W_CompiledMethod) + bytecode = w_method.bytes[self._pc] currentBytecode = ord(bytecode) self._pc = self._pc + 1 return currentBytecode @@ -618,6 +627,7 @@ def update_shadow(self): # Make sure the method is updated first self._w_method = self.w_self()._vars[constants.MTHDCTX_METHOD] + assert isinstance(self._w_method, model.W_CompiledMethod) ContextPartShadow.update_shadow(self) def update_w_self(self): @@ -625,9 +635,11 @@ self.w_self()._vars[constants.MTHDCTX_METHOD] = self._w_method def w_method(self): + assert isinstance(self._w_method, model.W_CompiledMethod) return self._w_method def store_w_method(self, w_method): + assert isinstance(w_method, model.W_CompiledMethod) self._w_method = w_method def w_receiver(self): @@ -649,6 +661,8 @@ return self def stackstart(self): + w_method = self.w_method() + assert isinstance(w_method, model.W_CompiledMethod) return (constants.MTHDCTX_TEMP_FRAME_START + - self.w_method().argsize + - self.w_method().tempsize) + w_method.argsize + + w_method.tempsize) From arigo at codespeak.net Sat Mar 8 16:45:04 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 16:45:04 +0100 (CET) Subject: [pypy-svn] r52304 - pypy/branch/buffer/pypy/module/_rawffi Message-ID: <20080308154504.6ED4A168472@codespeak.net> Author: arigo Date: Sat Mar 8 16:45:02 2008 New Revision: 52304 Modified: pypy/branch/buffer/pypy/module/_rawffi/interp_rawffi.py Log: Typo. Modified: pypy/branch/buffer/pypy/module/_rawffi/interp_rawffi.py ============================================================================== --- pypy/branch/buffer/pypy/module/_rawffi/interp_rawffi.py (original) +++ pypy/branch/buffer/pypy/module/_rawffi/interp_rawffi.py Sat Mar 8 16:45:02 2008 @@ -299,7 +299,7 @@ s = space.unicode_w(w_arg) if len(s) != 1: raise OperationError(space.w_TypeError, w( - "Expected unicode string og length one as wide character")) + "Expected unicode string of length one as wide character")) val = s[0] push_func(add_arg, argdesc, val) else: From arigo at codespeak.net Sat Mar 8 17:31:54 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 17:31:54 +0100 (CET) Subject: [pypy-svn] r52305 - in pypy/branch/buffer/pypy: module/struct module/struct/test objspace/std Message-ID: <20080308163154.C1FF21684D1@codespeak.net> Author: arigo Date: Sat Mar 8 17:31:53 2008 New Revision: 52305 Added: pypy/branch/buffer/pypy/module/struct/unichar.py (contents, props changed) Modified: pypy/branch/buffer/pypy/module/struct/formatiterator.py pypy/branch/buffer/pypy/module/struct/nativefmttable.py pypy/branch/buffer/pypy/module/struct/test/test_struct.py pypy/branch/buffer/pypy/objspace/std/unicodeobject.py Log: Trying to use the struct module for an interp-level reimplementation of the array module, I found out that there is just one extra typecode that arrays support but not the struct module. As an obvious extension, let's support it too. Modified: pypy/branch/buffer/pypy/module/struct/formatiterator.py ============================================================================== --- pypy/branch/buffer/pypy/module/struct/formatiterator.py (original) +++ pypy/branch/buffer/pypy/module/struct/formatiterator.py Sat Mar 8 17:31:53 2008 @@ -200,6 +200,10 @@ w_obj = self.accept_obj_arg() return self.space.str_w(w_obj) + def accept_unicode_arg(self): + w_obj = self.accept_obj_arg() + return self.space.unicode_w(w_obj) + def accept_float_arg(self): w_obj = self.accept_obj_arg() return self.space.float_w(w_obj) Modified: pypy/branch/buffer/pypy/module/struct/nativefmttable.py ============================================================================== --- pypy/branch/buffer/pypy/module/struct/nativefmttable.py (original) +++ pypy/branch/buffer/pypy/module/struct/nativefmttable.py Sat Mar 8 17:31:53 2008 @@ -1,3 +1,7 @@ +""" +Native type codes. +The table 'native_fmttable' is also used by pypy.module.array.interp_array. +""" import struct from pypy.module.struct import standardfmttable as std from pypy.rpython.tool import rffi_platform @@ -118,3 +122,28 @@ sizeof_double = native_fmttable['d']['size'] sizeof_float = native_fmttable['f']['size'] + +# ____________________________________________________________ +# +# A PyPy extension: accepts the 'u' format character in native mode, +# just like the array module does. (This is actually used in the +# implementation of our interp-level array module.) + +from pypy.module.struct import unichar + +def pack_unichar(fmtiter): + unistr = fmtiter.accept_unicode_arg() + if len(unistr) != 1: + raise StructError("expected a unicode string of length 1") + c = unistr[0] # string->char conversion for the annotator + unichar.pack_unichar(c, fmtiter.result) + +def unpack_unichar(fmtiter): + data = fmtiter.read(unichar.UNICODE_SIZE) + fmtiter.appendobj(unichar.unpack_unichar(data)) + +native_fmttable['u'] = {'size': unichar.UNICODE_SIZE, + 'alignment': unichar.UNICODE_SIZE, + 'pack': pack_unichar, + 'unpack': unpack_unichar, + } Modified: pypy/branch/buffer/pypy/module/struct/test/test_struct.py ============================================================================== --- pypy/branch/buffer/pypy/module/struct/test/test_struct.py (original) +++ pypy/branch/buffer/pypy/module/struct/test/test_struct.py Sat Mar 8 17:31:53 2008 @@ -322,3 +322,14 @@ assert pack("!B", -1.1) == '\xff' assert pack("!h", 0xa000) == '\xa0\x00' assert pack("!H", -2.2) == '\xff\xfe' + + + def test_unicode(self): + """ + A PyPy extension: accepts the 'u' format character in native mode, + just like the array module does. (This is actually used in the + implementation of our interp-level array module.) + """ + data = self.struct.pack("uuu", u'X', u'Y', u'Z') + assert data == str(buffer(u'XYZ')) + assert self.struct.unpack("uuu", data) == (u'X', u'Y', u'Z') Added: pypy/branch/buffer/pypy/module/struct/unichar.py ============================================================================== --- (empty file) +++ pypy/branch/buffer/pypy/module/struct/unichar.py Sat Mar 8 17:31:53 2008 @@ -0,0 +1,55 @@ +""" +Helpers to pack and unpack a unicode character into raw bytes. +""" + +import sys + +# XXX For now we assume CPython's own native maxunicode + +if sys.maxunicode <= 65535: + UNICODE_SIZE = 2 +else: + UNICODE_SIZE = 4 +BIGENDIAN = sys.byteorder == "big" + +def pack_unichar(unich, charlist): + if UNICODE_SIZE == 2: + if BIGENDIAN: + charlist.append(chr(ord(unich) >> 8)) + charlist.append(chr(ord(unich) & 0xFF)) + else: + charlist.append(chr(ord(unich) & 0xFF)) + charlist.append(chr(ord(unich) >> 8)) + else: + if BIGENDIAN: + charlist.append(chr(ord(unich) >> 24)) + charlist.append(chr((ord(unich) >> 16) & 0xFF)) + charlist.append(chr((ord(unich) >> 8) & 0xFF)) + charlist.append(chr(ord(unich) & 0xFF)) + else: + charlist.append(chr(ord(unich) & 0xFF)) + charlist.append(chr((ord(unich) >> 8) & 0xFF)) + charlist.append(chr((ord(unich) >> 16) & 0xFF)) + charlist.append(chr(ord(unich) >> 24)) + +def unpack_unichar(rawstring): + assert len(rawstring) == UNICODE_SIZE + if UNICODE_SIZE == 2: + if BIGENDIAN: + n = (ord(rawstring[0]) << 8 | + ord(rawstring[1])) + else: + n = (ord(rawstring[0]) | + ord(rawstring[1]) << 8) + else: + if BIGENDIAN: + n = (ord(rawstring[0]) << 24 | + ord(rawstring[1]) << 16 | + ord(rawstring[2]) << 8 | + ord(rawstring[3])) + else: + n = (ord(rawstring[0]) | + ord(rawstring[1]) << 8 | + ord(rawstring[2]) << 16 | + ord(rawstring[3]) << 24) + return unichr(n) Modified: pypy/branch/buffer/pypy/objspace/std/unicodeobject.py ============================================================================== --- pypy/branch/buffer/pypy/objspace/std/unicodeobject.py (original) +++ pypy/branch/buffer/pypy/objspace/std/unicodeobject.py Sat Mar 8 17:31:53 2008 @@ -944,31 +944,12 @@ def mod__Unicode_ANY(space, w_format, w_values): return mod_format(space, w_format, w_values, do_unicode=True) -_maxunicode = sys.maxunicode -_bigendian = sys.byteorder == "big" - def buffer__Unicode(space, w_unicode): # xxx this is a slightly strange thing... + from pypy.module.struct.unichar import pack_unichar charlist = [] for unich in w_unicode._value: - if _maxunicode <= 65535: - if _bigendian: - charlist.append(chr(ord(unich) >> 8)) - charlist.append(chr(ord(unich) & 0xFF)) - else: - charlist.append(chr(ord(unich) & 0xFF)) - charlist.append(chr(ord(unich) >> 8)) - else: - if _bigendian: - charlist.append(chr(ord(unich) >> 24)) - charlist.append(chr((ord(unich) >> 16) & 0xFF)) - charlist.append(chr((ord(unich) >> 8) & 0xFF)) - charlist.append(chr(ord(unich) & 0xFF)) - else: - charlist.append(chr(ord(unich) & 0xFF)) - charlist.append(chr((ord(unich) >> 8) & 0xFF)) - charlist.append(chr((ord(unich) >> 16) & 0xFF)) - charlist.append(chr(ord(unich) >> 24)) + pack_unichar(unich, charlist) from pypy.interpreter.buffer import StringBuffer return space.wrap(StringBuffer(''.join(charlist))) From arigo at codespeak.net Sat Mar 8 18:50:10 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 18:50:10 +0100 (CET) Subject: [pypy-svn] r52306 - pypy/branch/buffer/pypy/interpreter Message-ID: <20080308175010.A6DE41684DE@codespeak.net> Author: arigo Date: Sat Mar 8 18:50:09 2008 New Revision: 52306 Modified: pypy/branch/buffer/pypy/interpreter/baseobjspace.py pypy/branch/buffer/pypy/interpreter/buffer.py Log: A basic read-write buffer object. Modified: pypy/branch/buffer/pypy/interpreter/baseobjspace.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/baseobjspace.py (original) +++ pypy/branch/buffer/pypy/interpreter/baseobjspace.py Sat Mar 8 18:50:09 2008 @@ -927,6 +927,15 @@ w_buffer = self.buffer(w_obj) return self.interp_w(Buffer, w_buffer) + def rwbuffer_w(self, w_obj): + # returns a RWBuffer instance + from pypy.interpreter.buffer import RWBuffer + buffer = self.buffer_w(w_obj) + if not isinstance(buffer, RWBuffer): + raise OperationError(self.w_TypeError, + self.wrap('read-write buffer expected')) + return buffer + def bufferstr_w(self, w_obj): # Directly returns an interp-level str. Note that if w_obj is a # unicode string, this is different from str_w(buffer(w_obj)): Modified: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Sat Mar 8 18:50:09 2008 @@ -58,6 +58,29 @@ " slicing with a step")) descr_getitem.unwrap_spec = ['self', ObjSpace, W_Root] + def descr_setitem(self, space, w_index, newstring): + if not isinstance(self, RWBuffer): + raise OperationError(space.w_TypeError, + space.wrap("buffer is read-only")) + start, stop, step = space.decode_index(w_index, self.len) + if step == 0: # index only + if len(newstring) != 1: + msg = 'buffer[index]=x: x must be a single character' + raise OperationError(space.w_ValueError, space.wrap(msg)) + char = newstring[0] # annotator hint + self.setitem(start, char) + elif step == 1: + length = stop - start + if length != len(newstring): + msg = "buffer slice assignment is wrong size" + raise OperationError(space.w_ValueError, space.wrap(msg)) + self.setslice(start, newstring) + else: + raise OperationError(space.w_ValueError, + space.wrap("buffer object does not support" + " slicing with a step")) + descr_setitem.unwrap_spec = ['self', ObjSpace, W_Root, 'bufferstr'] + def descr__buffer__(self, space): return space.wrap(self) descr__buffer__.unwrap_spec = ['self', ObjSpace] @@ -101,6 +124,29 @@ return space.call_method(w_string, '__mul__', w_times) descr_mul.unwrap_spec = ['self', ObjSpace, W_Root] + def descr_repr(self, space): + if isinstance(self, RWBuffer): + info = 'read-write buffer' + else: + info = 'read-only buffer' + return self.getrepr(space, info) + descr_repr.unwrap_spec = ['self', ObjSpace] + + +class RWBuffer(Buffer): + """Abstract base class for read-write memory views.""" + + __slots__ = () # no extra slot here + + def setitem(self, index, char): + "Write a character into the buffer." + raise NotImplementedError # Must be overriden. No bounds checks. + + def setslice(self, start, string): + # May be overridden. No bounds checks. + for i in range(len(string)): + self.setitem(start + i, string[i]) + def descr_buffer__new__(space, w_subtype, w_object): #, offset, size # w_subtype can only be exactly 'buffer' for now @@ -126,6 +172,7 @@ __new__ = interp2app(descr_buffer__new__), __len__ = interp2app(Buffer.descr_len), __getitem__ = interp2app(Buffer.descr_getitem), + __setitem__ = interp2app(Buffer.descr_setitem), __buffer__ = interp2app(Buffer.descr__buffer__), __str__ = interp2app(Buffer.descr_str), __add__ = interp2app(Buffer.descr_add), @@ -138,6 +185,7 @@ __hash__ = interp2app(Buffer.descr_hash), __mul__ = interp2app(Buffer.descr_mul), __rmul__ = interp2app(Buffer.descr_mul), + __repr__ = interp2app(Buffer.descr_repr), ) Buffer.typedef.acceptable_as_base_class = False From arigo at codespeak.net Sat Mar 8 19:08:55 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 19:08:55 +0100 (CET) Subject: [pypy-svn] r52307 - in pypy/branch/buffer/pypy/module/_rawffi: . test Message-ID: <20080308180855.5B57C168462@codespeak.net> Author: arigo Date: Sat Mar 8 19:08:54 2008 New Revision: 52307 Added: pypy/branch/buffer/pypy/module/_rawffi/buffer.py (contents, props changed) Modified: pypy/branch/buffer/pypy/module/_rawffi/array.py pypy/branch/buffer/pypy/module/_rawffi/interp_rawffi.py pypy/branch/buffer/pypy/module/_rawffi/structure.py pypy/branch/buffer/pypy/module/_rawffi/test/test__rawffi.py Log: Give the _rawffi structures and arrays the read-write buffer interface. Modified: pypy/branch/buffer/pypy/module/_rawffi/array.py ============================================================================== --- pypy/branch/buffer/pypy/module/_rawffi/array.py (original) +++ pypy/branch/buffer/pypy/module/_rawffi/array.py Sat Mar 8 19:08:54 2008 @@ -143,12 +143,17 @@ return space.wrap(rffi.cast(lltype.Unsigned, ptr)) descr_itemaddress.unwrap_spec = ['self', ObjSpace, int] + def getrawsize(self): + _, itemsize, _ = self.shape.itemtp + return itemsize * self.length + W_ArrayInstance.typedef = TypeDef( 'ArrayInstance', __repr__ = interp2app(W_ArrayInstance.descr_repr), __setitem__ = interp2app(W_ArrayInstance.setitem), __getitem__ = interp2app(W_ArrayInstance.getitem), __len__ = interp2app(W_ArrayInstance.getlength), + __buffer__ = interp2app(W_ArrayInstance.descr_buffer), buffer = GetSetProperty(W_ArrayInstance.getbuffer), shape = interp_attrproperty('shape', W_ArrayInstance), free = interp2app(W_ArrayInstance.free), @@ -172,6 +177,7 @@ __setitem__ = interp2app(W_ArrayInstance.setitem), __getitem__ = interp2app(W_ArrayInstance.getitem), __len__ = interp2app(W_ArrayInstance.getlength), + __buffer__ = interp2app(W_ArrayInstance.descr_buffer), buffer = GetSetProperty(W_ArrayInstance.getbuffer), shape = interp_attrproperty('shape', W_ArrayInstance), byptr = interp2app(W_ArrayInstance.byptr), Added: pypy/branch/buffer/pypy/module/_rawffi/buffer.py ============================================================================== --- (empty file) +++ pypy/branch/buffer/pypy/module/_rawffi/buffer.py Sat Mar 8 19:08:54 2008 @@ -0,0 +1,18 @@ +from pypy.interpreter.buffer import RWBuffer + +# XXX not the most efficient implementation + + +class RawFFIBuffer(RWBuffer): + + def __init__(self, datainstance): + self.datainstance = datainstance + self.len = datainstance.getrawsize() + + def getitem(self, index): + ll_buffer = self.datainstance.ll_buffer + return ll_buffer[index] + + def setitem(self, index, char): + ll_buffer = self.datainstance.ll_buffer + ll_buffer[index] = char Modified: pypy/branch/buffer/pypy/module/_rawffi/interp_rawffi.py ============================================================================== --- pypy/branch/buffer/pypy/module/_rawffi/interp_rawffi.py (original) +++ pypy/branch/buffer/pypy/module/_rawffi/interp_rawffi.py Sat Mar 8 19:08:54 2008 @@ -265,6 +265,11 @@ lltype.free(self.ll_buffer, flavor='raw') self.ll_buffer = lltype.nullptr(rffi.VOIDP.TO) + def descr_buffer(self, space): + from pypy.module._rawffi.buffer import RawFFIBuffer + return space.wrap(RawFFIBuffer(self)) + descr_buffer.unwrap_spec = ['self', ObjSpace] + def unwrap_truncate_int(TP, space, w_arg): if space.is_true(space.isinstance(w_arg, space.w_int)): return rffi.cast(TP, space.int_w(w_arg)) Modified: pypy/branch/buffer/pypy/module/_rawffi/structure.py ============================================================================== --- pypy/branch/buffer/pypy/module/_rawffi/structure.py (original) +++ pypy/branch/buffer/pypy/module/_rawffi/structure.py Sat Mar 8 19:08:54 2008 @@ -185,12 +185,16 @@ return space.wrap(rffi.cast(lltype.Unsigned, ptr)) descr_fieldaddress.unwrap_spec = ['self', ObjSpace, str] + def getrawsize(self): + return self.shape.size + W_StructureInstance.typedef = TypeDef( 'StructureInstance', __repr__ = interp2app(W_StructureInstance.descr_repr), __getattr__ = interp2app(W_StructureInstance.getattr), __setattr__ = interp2app(W_StructureInstance.setattr), + __buffer__ = interp2app(W_StructureInstance.descr_buffer), buffer = GetSetProperty(W_StructureInstance.getbuffer), free = interp2app(W_StructureInstance.free), shape = interp_attrproperty('shape', W_StructureInstance), @@ -212,6 +216,7 @@ __repr__ = interp2app(W_StructureInstance.descr_repr), __getattr__ = interp2app(W_StructureInstance.getattr), __setattr__ = interp2app(W_StructureInstance.setattr), + __buffer__ = interp2app(W_StructureInstance.descr_buffer), buffer = GetSetProperty(W_StructureInstance.getbuffer), shape = interp_attrproperty('shape', W_StructureInstance), byptr = interp2app(W_StructureInstance.byptr), Modified: pypy/branch/buffer/pypy/module/_rawffi/test/test__rawffi.py ============================================================================== --- pypy/branch/buffer/pypy/module/_rawffi/test/test__rawffi.py (original) +++ pypy/branch/buffer/pypy/module/_rawffi/test/test__rawffi.py Sat Mar 8 19:08:54 2008 @@ -667,6 +667,28 @@ s2h.free() + def test_buffer(self): + import _rawffi + S = _rawffi.Structure((40, 1)) + s = S(autofree=True) + b = buffer(s) + assert len(b) == 40 + b[4] = 'X' + b[:3] = 'ABC' + assert b[:6] == 'ABC\x00X\x00' + + A = _rawffi.Array('c') + a = A(10, autofree=True) + a[3] = 'x' + b = buffer(a) + assert len(b) == 10 + assert b[3] == 'x' + b[6] = 'y' + assert a[6] == 'y' + b[3:5] = 'zt' + assert a[3] == 'z' + assert a[4] == 't' + class AppTestAutoFree: def setup_class(cls): From arigo at codespeak.net Sat Mar 8 19:24:32 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 19:24:32 +0100 (CET) Subject: [pypy-svn] r52308 - in pypy/branch/buffer/pypy/module/__pypy__: . test Message-ID: <20080308182432.01B92168473@codespeak.net> Author: arigo Date: Sat Mar 8 19:24:32 2008 New Revision: 52308 Added: pypy/branch/buffer/pypy/module/__pypy__/bytebuffer.py (contents, props changed) pypy/branch/buffer/pypy/module/__pypy__/test/test_bytebuffer.py (contents, props changed) Modified: pypy/branch/buffer/pypy/module/__pypy__/__init__.py Log: Just because it's easy, here is a basic concrete RWBuffer object. Modified: pypy/branch/buffer/pypy/module/__pypy__/__init__.py ============================================================================== --- pypy/branch/buffer/pypy/module/__pypy__/__init__.py (original) +++ pypy/branch/buffer/pypy/module/__pypy__/__init__.py Sat Mar 8 19:24:32 2008 @@ -8,6 +8,7 @@ interpleveldefs = { 'internal_repr' : 'interp_magic.internal_repr', + 'bytebuffer' : 'bytebuffer.bytebuffer', } def setup_after_space_initialization(self): Added: pypy/branch/buffer/pypy/module/__pypy__/bytebuffer.py ============================================================================== --- (empty file) +++ pypy/branch/buffer/pypy/module/__pypy__/bytebuffer.py Sat Mar 8 19:24:32 2008 @@ -0,0 +1,24 @@ +# +# A convenient read-write buffer. Located here for want of a better place. +# + +from pypy.interpreter.buffer import RWBuffer +from pypy.interpreter.gateway import ObjSpace + + +class ByteBuffer(RWBuffer): + + def __init__(self, len): + self.len = len + self.data = ['\x00'] * len + + def getitem(self, index): + return self.data[index] + + def setitem(self, index, char): + self.data[index] = char + + +def bytebuffer(space, length): + return space.wrap(ByteBuffer(length)) +bytebuffer.unwrap_spec = [ObjSpace, int] Added: pypy/branch/buffer/pypy/module/__pypy__/test/test_bytebuffer.py ============================================================================== --- (empty file) +++ pypy/branch/buffer/pypy/module/__pypy__/test/test_bytebuffer.py Sat Mar 8 19:24:32 2008 @@ -0,0 +1,19 @@ +import py +from pypy.conftest import gettestobjspace + +class AppTest(object): + def setup_class(cls): + cls.space = gettestobjspace(usemodules=['__pypy__']) + + def test_bytebuffer(self): + from __pypy__ import bytebuffer + b = bytebuffer(12) + assert isinstance(b, buffer) + assert len(b) == 12 + b[3] = '!' + b[5] = '?' + assert b[2:7] == '\x00!\x00?\x00' + b[9:] = '+-*' + assert b[-1] == '*' + assert b[-2] == '-' + assert b[-3] == '+' From arigo at codespeak.net Sat Mar 8 19:35:29 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 19:35:29 +0100 (CET) Subject: [pypy-svn] r52309 - in pypy/branch/buffer/pypy/module/struct: . test Message-ID: <20080308183529.408331683CE@codespeak.net> Author: arigo Date: Sat Mar 8 19:35:28 2008 New Revision: 52309 Modified: pypy/branch/buffer/pypy/module/struct/__init__.py pypy/branch/buffer/pypy/module/struct/app_struct.py pypy/branch/buffer/pypy/module/struct/test/test_struct.py Log: Some inefficient implementations of struct.pack_into() and struct.unpack_from(). Modified: pypy/branch/buffer/pypy/module/struct/__init__.py ============================================================================== --- pypy/branch/buffer/pypy/module/struct/__init__.py (original) +++ pypy/branch/buffer/pypy/module/struct/__init__.py Sat Mar 8 19:35:28 2008 @@ -53,4 +53,6 @@ appleveldefs = { 'error': 'app_struct.error', + 'pack_into': 'app_struct.pack_into', + 'unpack_from': 'app_struct.unpack_from', } Modified: pypy/branch/buffer/pypy/module/struct/app_struct.py ============================================================================== --- pypy/branch/buffer/pypy/module/struct/app_struct.py (original) +++ pypy/branch/buffer/pypy/module/struct/app_struct.py Sat Mar 8 19:35:28 2008 @@ -4,7 +4,22 @@ NOT_RPYTHON """ +import struct class error(Exception): """Exception raised on various occasions; argument is a string describing what is wrong.""" + +# XXX inefficient +def pack_into(fmt, buf, offset, *args): + data = struct.pack(fmt, *args) + buffer(buf)[offset:offset+len(data)] = data + +# XXX inefficient +def unpack_from(fmt, buf, offset=0): + size = struct.calcsize(fmt) + data = buffer(buf)[offset:offset+size] + if len(data) != size: + raise error("unpack_from requires a buffer of at least %d bytes" + % (size,)) + return struct.unpack(fmt, data) Modified: pypy/branch/buffer/pypy/module/struct/test/test_struct.py ============================================================================== --- pypy/branch/buffer/pypy/module/struct/test/test_struct.py (original) +++ pypy/branch/buffer/pypy/module/struct/test/test_struct.py Sat Mar 8 19:35:28 2008 @@ -333,3 +333,36 @@ data = self.struct.pack("uuu", u'X', u'Y', u'Z') assert data == str(buffer(u'XYZ')) assert self.struct.unpack("uuu", data) == (u'X', u'Y', u'Z') + + +class AppTestStructBuffer(object): + + def setup_class(cls): + """ + Create a space with the struct and __pypy__ modules. + """ + cls.space = gettestobjspace(usemodules=['struct', '__pypy__']) + cls.w_struct = cls.space.appexec([], """(): + import struct + return struct + """) + cls.w_bytebuffer = cls.space.appexec([], """(): + import __pypy__ + return __pypy__.bytebuffer + """) + + def test_pack_into(self): + b = self.bytebuffer(19) + sz = self.struct.calcsize("ii") + self.struct.pack_into("ii", b, 2, 17, 42) + assert b[:] == ('\x00' * 2 + + self.struct.pack("ii", 17, 42) + + '\x00' * (19-sz-2)) + + def test_unpack_from(self): + b = self.bytebuffer(19) + sz = self.struct.calcsize("ii") + b[2:2+sz] = self.struct.pack("ii", 17, 42) + assert self.struct.unpack_from("ii", b, 2) == (17, 42) + b[:sz] = self.struct.pack("ii", 18, 43) + assert self.struct.unpack_from("ii", b) == (18, 43) From arigo at codespeak.net Sat Mar 8 22:01:27 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 22:01:27 +0100 (CET) Subject: [pypy-svn] r52310 - in pypy/branch/buffer/pypy: config lib module/array module/array/test Message-ID: <20080308210127.00FC41684D7@codespeak.net> Author: arigo Date: Sat Mar 8 22:01:25 2008 New Revision: 52310 Added: pypy/branch/buffer/pypy/lib/array.py - copied, changed from r52303, pypy/branch/buffer/pypy/module/array/app_array.py pypy/branch/buffer/pypy/module/array/test/ (props changed) pypy/branch/buffer/pypy/module/array/test/__init__.py (contents, props changed) pypy/branch/buffer/pypy/module/array/test/test_array.py (contents, props changed) Modified: pypy/branch/buffer/pypy/config/pypyoption.py pypy/branch/buffer/pypy/module/array/app_array.py Log: Move the original array module to pypy/lib/. Update the module in pypy/module/array/ to be based on __pypy__.bytebuffer() and the struct module, allowing it to expose a read-write buffer interface and giving it a more reasonable performance. Rewriting all this to interp-level would be the next step but is less urgent now. lib-python/modified-2.4.1/test/test_array.py passes. XXX check what occurs on oo backends Modified: pypy/branch/buffer/pypy/config/pypyoption.py ============================================================================== --- pypy/branch/buffer/pypy/config/pypyoption.py (original) +++ pypy/branch/buffer/pypy/config/pypyoption.py Sat Mar 8 22:01:25 2008 @@ -15,7 +15,7 @@ default_modules = essential_modules.copy() default_modules.update(dict.fromkeys( - ["_codecs", "gc", "_weakref", "array", "marshal", "errno", + ["_codecs", "gc", "_weakref", "marshal", "errno", "math", "_sre", "_pickle_support", "operator", "recparser", "symbol", "_random", "__pypy__"])) @@ -35,7 +35,8 @@ del working_modules["termios"] -module_dependencies = {} +module_dependencies = {'array': [("objspace.usemodules.struct", True)], + } module_suggests = { # the reason you want _rawffi is for ctypes, which # itself needs the interp-level struct module # because 'P' is missing from the app-level one Modified: pypy/branch/buffer/pypy/module/array/app_array.py ============================================================================== --- pypy/branch/buffer/pypy/module/array/app_array.py (original) +++ pypy/branch/buffer/pypy/module/array/app_array.py Sat Mar 8 22:01:25 2008 @@ -1,3 +1,4 @@ +# NOT_RPYTHON """This module defines an object type which can efficiently represent an array of basic values: characters, integers, floating point numbers. Arrays are sequence types and behave very much like lists, @@ -23,115 +24,12 @@ array(typecode [, initializer]) -- create a new array """ -import sys -if sys.maxunicode == 65535: - UNICODE_SIZE = 2 - UNICODE_FORMAT = "H" -else: - UNICODE_SIZE = 4 - UNICODE_FORMAT = "I" - -def c_type_check(x): - if not isinstance(x, str) or len(x) != 1: - raise TypeError("array item must be char") - return x - -def general_int_type_check(x, lower_bound, upper_bound): - if not (isinstance(x, int) or isinstance(x, long) or isinstance(x, float)): - raise TypeError("an integer is required") - x_int = int(x) - if not (x_int >= lower_bound and x_int <= upper_bound): - raise OverflowError("integer is not in the allowed range") - return x_int - -def b_type_check(x): - return general_int_type_check(x, -128, 127) - -def BB_type_check(x): - return general_int_type_check(x, 0, 255) - -def u_type_check(x): - if isinstance(x, str): - if len(x) / UNICODE_SIZE == 1: - # XXX Problem: CPython will gladly accept any unicode codepoint - # up to 0xFFFFFFFF in UCS-4 builds here, but unichr which is used - # to implement decode for unicode_internal in PyPy will - # reject anything above 0x00110000. I don't think there is a - # way to replicate CPython behaviour without resorting to C. - x_uni = x[:UNICODE_SIZE].decode("unicode_internal") - else: - raise TypeError("array item must be unicode character") - elif isinstance(x, unicode): - x_uni = x - else: - raise TypeError("array item must be unicode character") - if len(x_uni) != 1: - raise TypeError("array item must be unicode character") - return x_uni - -def h_type_check(x): - return general_int_type_check(x, -32768, 32767) - -def HH_type_check(x): - return general_int_type_check(x, 0, 65535) - -def i_type_check(x): - return general_int_type_check(x, -2147483648, 2147483647) - -def general_long_type_check(x, lower_bound, upper_bound): - if not (isinstance(x, int) or isinstance(x, long) or isinstance(x, float)): - raise TypeError("an integer is required") - x_long = long(x) - if not (x_long >= lower_bound and x_long <= upper_bound): - raise OverflowError("integer/long is not in the allowed range") - return x_long - -def II_type_check(x): - return general_long_type_check(x, 0, 4294967295L) - -l_type_check = i_type_check - -LL_type_check = II_type_check - -def f_type_check(x): - if not (isinstance(x, int) or isinstance(x, long) or isinstance(x, float)): - raise TypeError("a float is required") - x_float = float(x) - # XXX This is not exactly a nice way of checking bounds. Formerly, I tried - # this: return unpack("f", pack("f", x_float))[0] - # Which works in CPython, but PyPy struct is not currently intelligent - # enough to handle this. - if x_float > 3.4028e38: - x_float = 3.4028e38 - elif x_float < -3.4028e38: - x_float = -3.4028e38 - return x_float - -def d_type_check(x): - if not (isinstance(x, int) or isinstance(x, long) or isinstance(x, float)): - raise TypeError("a float is required") - return float(x) - -def dummy_type_check(x): - return x - -# XXX Assuming fixed sizes of the different types, independent of platform. -# These are the same assumptions that struct makes at the moment. -descriptors = { - 'c' : ('char', 1, c_type_check), - 'b' : ('signed char', 1, b_type_check), - 'B' : ('unsigned char', 1, BB_type_check), - 'u' : ('Py_UNICODE', UNICODE_SIZE, u_type_check), - 'h' : ('signed short', 2, h_type_check), - 'H' : ('unsigned short', 2, HH_type_check), - 'i' : ('signed int', 4, i_type_check), - 'I' : ('unsigned int', 4, II_type_check), - 'l' : ('signed long', 4, l_type_check), - 'L' : ('unsigned long', 4, LL_type_check), - 'f' : ('float', 4, f_type_check), - 'd' : ('double', 8, d_type_check), -} +from struct import calcsize, pack, pack_into, unpack_from +from __pypy__ import bytebuffer +import operator + +TYPECODES = "cbBuhHiIlLfd" class array(object): """array(typecode [, initializer]) -> array @@ -176,13 +74,12 @@ if not isinstance(typecode, str) or len(typecode) != 1: raise TypeError( "array() argument 1 must be char, not %s" % type(typecode)) - if not descriptors.has_key(typecode): + if typecode not in TYPECODES: raise ValueError( - "bad typecode (must be c, b, B, u, h, H, i, I, l, L, f or d)") - self._descriptor = descriptors[typecode] - self._data = [] + "bad typecode (must be one of %s)" % ', '.join(TYPECODES)) + self._data = bytebuffer(0) self.typecode = typecode - self.itemsize = self._descriptor[1] + self.itemsize = calcsize(typecode) if isinstance(initializer, list): self.fromlist(initializer) elif isinstance(initializer, str): @@ -193,6 +90,9 @@ self.extend(initializer) return self + def _clear(self): + self._data = bytebuffer(0) + ##### array-specific operations def fromfile(self, f, n): @@ -200,11 +100,11 @@ the array. Also called as read.""" if not isinstance(f, file): raise TypeError("arg1 must be open file") - for i in range(n): - item = f.read(self.itemsize) - if len(item) < self.itemsize: - raise EOFError("not enough items in file") - self.fromstring(item) + size = self.itemsize * n + item = f.read(size) + if len(item) < size: + raise EOFError("not enough items in file") + self.fromstring(item) def fromlist(self, l): """Append items to array from list.""" @@ -213,27 +113,22 @@ self._fromiterable(l) def fromstring(self, s): - from struct import pack, unpack """Appends items from the string, interpreting it as an array of machine values, as if it had been read from a file using the fromfile() - method).""" + method.""" if isinstance(s, unicode): s = str(s) - if not (isinstance(s, str) or isinstance(s, buffer)): - raise TypeError( - "fromstring() argument 1 must be string or read-only buffer") - if len(s) % self.itemsize != 0: + self._frombuffer(s) + + def _frombuffer(self, s): + length = len(s) + if length % self.itemsize != 0: raise ValueError("string length not a multiple of item size") - items = [] - if self.typecode == "u": - for i in range(0, len(s), self.itemsize): - items.append(u_type_check(s[i:i + self.itemsize])) - else: - for i in range(0, len(s), self.itemsize): - item = unpack(self.typecode, s[i:i + self.itemsize])[0] - # the item needn't be type checked if unpack succeeded - items.append(item) - self._data.extend(items) + boundary = len(self._data) + newdata = bytebuffer(boundary + length) + newdata[:boundary] = self._data + newdata[boundary:] = s + self._data = newdata def fromunicode(self, ustr): """Extends this array with data from the unicode string ustr. The array @@ -243,16 +138,16 @@ if not self.typecode == "u": raise ValueError( "fromunicode() may only be called on type 'u' arrays") - if isinstance(ustr, unicode): - self._fromiterable(ustr) - elif isinstance(ustr, str) or isinstance(ustr, buffer): - # CPython strangely truncates string arguments at multiples of the - # unicode byte size ... - trunc_s = ustr[:len(ustr) - (len(ustr) % self.itemsize)] - self.fromstring(trunc_s) - else: - raise TypeError( - "fromunicode() argument 1 must be string or read-only buffer") + # XXX the following probable bug is not emulated: + # CPython accepts a non-unicode string or a buffer, and then + # behaves just like fromstring(), except that it strangely truncates + # string arguments at multiples of the unicode byte size. + # Let's only accept unicode arguments for now. + if not isinstance(ustr, unicode): + raise TypeError("fromunicode() argument should probably be " + "a unicode string") + self._frombuffer(ustr) # _frombuffer() does the currect thing using + # the buffer behavior of unicode objects def tofile(self, f): """Write all items (as machine values) to the file object f. Also @@ -263,22 +158,14 @@ def tolist(self): """Convert array to an ordinary list with the same items.""" - return self._data[:] + count = len(self._data) // self.itemsize + return list(unpack_from('%d%s' % (count, self.typecode), self._data)) def tostring(self): - from struct import pack, unpack - """Convert the array to an array of machine values and return the string - representation.""" - if self.typecode == "u": - return u"".join(self._data).encode("unicode_internal") - else: - strings = [] - for item in self._data: - strings.append(pack(self.typecode, item)) - return "".join(strings) + return self._data[:] - def __buffer__(self): # XXX baaaaad performance - return buffer(self.tostring()) + def __buffer__(self): + return self._data def tounicode(self): """Convert the array to a unicode string. The array must be a type 'u' @@ -286,21 +173,20 @@ to obtain a unicode string from an array of some other type.""" if self.typecode != "u": raise ValueError("tounicode() may only be called on type 'u' arrays") - return u"".join(self._data) + # XXX performance is not too good + return u"".join(self.tolist()) def byteswap(self): """Byteswap all items of the array. If the items in the array are not 1, 2, 4, or 8 bytes in size, RuntimeError is raised.""" if self.itemsize not in [1, 2, 4, 8]: raise RuntimeError("byteswap not supported for this array") - bytes = self.tostring() - swapped = [] - for offset in range(0, len(self._data) * self.itemsize, self.itemsize): - l = list(bytes[offset:offset + self.itemsize]) - l.reverse() - swapped += l - self._data = [] - self.fromstring("".join(swapped)) + # XXX slowish + itemsize = self.itemsize + bytes = self._data + for start in range(0, len(bytes), itemsize): + stop = start + itemsize + bytes[start:stop] = bytes[start:stop][::-1] def buffer_info(self): """Return a tuple (address, length) giving the current memory address @@ -328,49 +214,55 @@ def __copy__(self): a = array(self.typecode) - a._data = self._data[:] + a._data = bytebuffer(len(self._data)) + a._data[:] = self._data return a def __eq__(self, other): if not isinstance(other, array): return NotImplemented - return self._data == other._data + # XXX slowish + return self._data[:] == other._data[:] def __ne__(self, other): if not isinstance(other, array): return NotImplemented - return self._data != other._data + # XXX slowish + return self._data[:] != other._data[:] def __lt__(self, other): if not isinstance(other, array): return NotImplemented - return self._data < other._data + # XXX slowish + return self._data[:] < other._data[:] def __gt__(self, other): if not isinstance(other, array): return NotImplemented - return self._data > other._data + # XXX slowish + return self._data[:] > other._data[:] def __le__(self, other): if not isinstance(other, array): return NotImplemented - return self._data <= other._data + # XXX slowish + return self._data[:] <= other._data[:] def __ge__(self, other): if not isinstance(other, array): return NotImplemented - return self._data >= other._data + # XXX slowish + return self._data[:] >= other._data[:] ##### list methods def append(self, x): """Append new value x to the end of the array.""" - x_checked = self._type_check(x) - self._data.append(x_checked) + self._frombuffer(pack(self.typecode, x)) def count(self, x): """Return number of occurences of x in the array.""" - return self._data.count(x) + return operator.countOf(self, x) def extend(self, iterable): """Append items to the end of the array.""" @@ -381,30 +273,54 @@ def index(self, x): """Return index of first occurence of x in the array.""" - return self._data.index(x) + return operator.indexOf(self, x) def insert(self, i, x): """Insert a new item x into the array before position i.""" - x_checked = self._type_check(x) - self._data.insert(i, x_checked) + seqlength = len(self) + if i < 0: + i += seqlength + if not (0 <= i <= seqlength): + raise IndexError(i) + boundary = i * self.itemsize + data = pack(self.typecode, x) + newdata = bytebuffer(len(self._data) + len(data)) + newdata[:boundary] = self._data[:boundary] + newdata[boundary:boundary+self.itemsize] = data + newdata[boundary+self.itemsize:] = self._data[boundary:] + self._data = newdata def pop(self, i=-1): """Return the i-th element and delete it from the array. i defaults to -1.""" - return self._data.pop(i) + seqlength = len(self) + if i < 0: + i += seqlength + if not (0 <= i < seqlength): + raise IndexError(i) + boundary = i * self.itemsize + result = unpack_from(self.typecode, self._data, boundary)[0] + newdata = bytebuffer(len(self._data) - self.itemsize) + newdata[:boundary] = self._data[:boundary] + newdata[boundary:] = self._data[boundary+self.itemsize:] + self._data = newdata + return result def remove(self, x): """Remove the first occurence of x in the array.""" - self._data.remove(x) + self.pop(self.index(x)) def reverse(self): """Reverse the order of the items in the array.""" - self._data.reverse() + lst = self.tolist() + lst.reverse() + self._clear() + self.fromlist(lst) ##### list protocol def __len__(self): - return len(self._data) + return len(self._data) // self.itemsize def __add__(self, other): if not isinstance(other, array): @@ -419,11 +335,28 @@ __rmul__ = __mul__ def __getitem__(self, i): + if self.typecode == 'c': # speed trick + return self._data[i] + seqlength = len(self) if isinstance(i, slice): - sliced = array(self.typecode) - sliced._data = self._data[i] - return sliced - return self._data[i] + start, stop, step = i.indices(seqlength) + if step != 1: + sublist = self.tolist()[i] # fall-back + return array(self.typecode, sublist) + if start < 0: + start = 0 + if stop < start: + stop = start + assert stop <= seqlength + return array(self.typecode, self._data[start * self.itemsize : + stop * self.itemsize]) + else: + if i < 0: + i += seqlength + if not (0 <= i < seqlength): + raise IndexError(i) + boundary = i * self.itemsize + return unpack_from(self.typecode, self._data, boundary)[0] def __getslice__(self, i, j): return self.__getitem__(slice(i, j)) @@ -432,28 +365,76 @@ if isinstance(i, slice): if not isinstance(x, array): raise TypeError("can only assign array to array slice") - if x.typecode != self.typecode: - raise TypeError("bad argument type for built-in operation") - self._data[i] = x._data - return - if not (isinstance(i, int) or isinstance(i, long)): - raise TypeError("list indices must be integers") - if i >= len(self._data) or i < -len(self._data): - raise IndexError("array assignment index out of range") - x_checked = self._type_check(x) - self._data[i] = x_checked + seqlength = len(self) + start, stop, step = i.indices(seqlength) + if start < 0: + start = 0 + if stop < start: + stop = start + assert stop <= seqlength + asslength = stop - start + if step != 1 or len(x) != asslength: + sublist = self.tolist() # fall-back + sublist[i] = x.tolist() + self._clear() + self.fromlist(sublist) + return + self._data[start * self.itemsize : + stop * self.itemsize] = x._data + else: + seqlength = len(self) + if i < 0: + i += seqlength + if not (0 <= i < seqlength): + raise IndexError(i) + boundary = i * self.itemsize + pack_into(self.typecode, self._data, boundary, x) def __setslice__(self, i, j, x): self.__setitem__(slice(i, j), x) def __delitem__(self, i): - del self._data[i] + if isinstance(i, slice): + seqlength = len(self) + start, stop, step = i.indices(seqlength) + if start < 0: + start = 0 + if stop < start: + stop = start + assert stop <= seqlength + if step != 1: + sublist = self.tolist() # fall-back + del sublist[i] + self._clear() + self.fromlist(sublist) + return + dellength = stop - start + boundary1 = start * self.itemsize + boundary2 = stop * self.itemsize + newdata = bytebuffer(len(self._data) - (boundary2-boundary1)) + newdata[:boundary1] = self._data[:boundary1] + newdata[boundary1:] = self._data[boundary2:] + self._data = newdata + else: + seqlength = len(self) + if i < 0: + i += seqlength + if not (0 <= i < seqlength): + raise IndexError(i) + boundary = i * self.itemsize + newdata = bytebuffer(len(self._data) - self.itemsize) + newdata[:boundary] = self._data[:boundary] + newdata[boundary:] = self._data[boundary+self.itemsize:] + self._data = newdata def __delslice__(self, i, j): self.__delitem__(slice(i, j)) def __contains__(self, item): - return item in self._data + for x in self: + if x == item: + return True + return False def __iadd__(self, other): if not isinstance(other, array): @@ -462,22 +443,28 @@ return self def __imul__(self, repeat): - self._data *= repeat + newdata = self._data.repeat + self._data = bytebuffer(len(newdata)) + self._data[:] = newdata return self def __iter__(self): - return iter(self._data) + p = 0 + typecode = self.typecode + itemsize = self.itemsize + while p < len(self._data): + yield unpack_from(typecode, self._data, p)[0] + p += itemsize ##### internal methods - - def _type_check(self, x): - return self._descriptor[2](x) def _fromiterable(self, iterable): - items = [] - for item in iterable: - item_checked = self._type_check(item) - items.append(item_checked) - self._data.extend(items) + iterable = tuple(iterable) + n = len(iterable) + boundary = len(self._data) + newdata = bytebuffer(boundary + n * self.itemsize) + newdata[:boundary] = self._data + pack_into('%d%s' % (n, self.typecode), newdata, boundary, *iterable) + self._data = newdata ArrayType = array Added: pypy/branch/buffer/pypy/module/array/test/__init__.py ============================================================================== Added: pypy/branch/buffer/pypy/module/array/test/test_array.py ============================================================================== --- (empty file) +++ pypy/branch/buffer/pypy/module/array/test/test_array.py Sat Mar 8 22:01:25 2008 @@ -0,0 +1,28 @@ +# minimal tests. See also lib-python/modified-2.4.1/test/test_array. + +import py +import struct +from pypy.conftest import gettestobjspace + + +class AppTestArray: + + def setup_class(cls): + """ + Create a space with the array module and import it for use by the + tests. + """ + cls.space = gettestobjspace(usemodules=['array']) + cls.w_array = cls.space.appexec([], """(): + import array + return array + """) + cls.w_native_sizes = cls.space.wrap({'l': struct.calcsize('l')}) + + def test_attributes(self): + a = self.array.array('c') + assert a.typecode == 'c' + assert a.itemsize == 1 + a = self.array.array('l') + assert a.typecode == 'l' + assert a.itemsize == self.native_sizes['l'] From arigo at codespeak.net Sat Mar 8 22:01:56 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 22:01:56 +0100 (CET) Subject: [pypy-svn] r52311 - in pypy/branch/buffer/pypy/module/_file: . test Message-ID: <20080308210156.4D7351684D7@codespeak.net> Author: arigo Date: Sat Mar 8 22:01:55 2008 New Revision: 52311 Modified: pypy/branch/buffer/pypy/module/_file/interp_file.py pypy/branch/buffer/pypy/module/_file/test/test_file_extra.py Log: A saner (but still not most efficient) implementation of file.readinto(). Modified: pypy/branch/buffer/pypy/module/_file/interp_file.py ============================================================================== --- pypy/branch/buffer/pypy/module/_file/interp_file.py (original) +++ pypy/branch/buffer/pypy/module/_file/interp_file.py Sat Mar 8 22:01:55 2008 @@ -361,24 +361,15 @@ return self.getrepr(self.space, info) file__repr__.unwrap_spec = ['self'] - def file_readinto(self, w_array): + def file_readinto(self, w_rwbuffer): """readinto() -> Undocumented. Don't use this; it may go away.""" - # completely inefficient and incomplete for now + # XXX not the most efficient solution as it doesn't avoid the copying space = self.space - w_len = space.appexec([space.wrap(self), w_array], """(self, a): - from array import array - if not isinstance(a, array): - raise TypeError('Can only read into array objects') - length = len(a) - data = self.read(length) - n = len(data) - if n < length: - data += a.tostring()[len(data):] - del a[:] - a.fromstring(data) - return n - """) - return w_len + rwbuffer = space.rwbuffer_w(w_rwbuffer) + w_data = self.file_read(rwbuffer.len) + data = space.str_w(w_data) + rwbuffer.setslice(0, data) + return space.wrap(len(data)) file_readinto.unwrap_spec = ['self', W_Root] Modified: pypy/branch/buffer/pypy/module/_file/test/test_file_extra.py ============================================================================== --- pypy/branch/buffer/pypy/module/_file/test/test_file_extra.py (original) +++ pypy/branch/buffer/pypy/module/_file/test/test_file_extra.py Sat Mar 8 22:01:55 2008 @@ -1,6 +1,7 @@ import os, random, sys import pypy.tool.udir import py +from pypy.conftest import gettestobjspace udir = pypy.tool.udir.udir.ensure('test_file_extra', dir=1) @@ -349,6 +350,9 @@ class AppTestAFewExtra: + def setup_class(cls): + cls.space = gettestobjspace(usemodules=['array']) + def setup_method(self, method): fn = str(udir.join('temptestfile')) self.w_temptestfile = self.space.wrap(fn) From arigo at codespeak.net Sat Mar 8 23:18:34 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 23:18:34 +0100 (CET) Subject: [pypy-svn] r52312 - pypy/branch/buffer/pypy/config Message-ID: <20080308221834.1C39016845E@codespeak.net> Author: arigo Date: Sat Mar 8 23:18:33 2008 New Revision: 52312 Modified: pypy/branch/buffer/pypy/config/pypyoption.py Log: Update options. Modified: pypy/branch/buffer/pypy/config/pypyoption.py ============================================================================== --- pypy/branch/buffer/pypy/config/pypyoption.py (original) +++ pypy/branch/buffer/pypy/config/pypyoption.py Sat Mar 8 23:18:33 2008 @@ -24,7 +24,7 @@ working_modules.update(dict.fromkeys( ["_socket", "unicodedata", "mmap", "fcntl", "rctime", "select", "crypt", "signal", "dyngram", "readline", "termios", "zlib", - "struct", "md5", "sha", "bz2", + "array", "struct", "md5", "sha", "bz2", ] )) @@ -35,7 +35,8 @@ del working_modules["termios"] -module_dependencies = {'array': [("objspace.usemodules.struct", True)], +module_dependencies = {'array': [("objspace.usemodules.struct", True), + ("objspace.usemodules.__pypy__", True)], } module_suggests = { # the reason you want _rawffi is for ctypes, which # itself needs the interp-level struct module From arigo at codespeak.net Sat Mar 8 23:57:49 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 8 Mar 2008 23:57:49 +0100 (CET) Subject: [pypy-svn] r52313 - pypy/branch/buffer/pypy/module/struct Message-ID: <20080308225749.BCE79168467@codespeak.net> Author: arigo Date: Sat Mar 8 23:57:47 2008 New Revision: 52313 Modified: pypy/branch/buffer/pypy/module/struct/nativefmttable.py Log: Missing import. Modified: pypy/branch/buffer/pypy/module/struct/nativefmttable.py ============================================================================== --- pypy/branch/buffer/pypy/module/struct/nativefmttable.py (original) +++ pypy/branch/buffer/pypy/module/struct/nativefmttable.py Sat Mar 8 23:57:47 2008 @@ -4,6 +4,7 @@ """ import struct from pypy.module.struct import standardfmttable as std +from pypy.module.struct.error import StructError from pypy.rpython.tool import rffi_platform from pypy.rpython.lltypesystem import lltype, rffi from pypy.rlib.rarithmetic import r_singlefloat From pypy-svn at codespeak.net Sun Mar 9 12:00:22 2008 From: pypy-svn at codespeak.net (pypy-svn at codespeak.net) Date: Sun, 9 Mar 2008 12:00:22 +0100 (CET) Subject: [pypy-svn] SALE 70% OFF Message-ID: <20080309125937.124630.qmail@foss-210.ctn.cz> An HTML attachment was scrubbed... URL: From arigo at codespeak.net Sun Mar 9 12:46:26 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 12:46:26 +0100 (CET) Subject: [pypy-svn] r52327 - in pypy/branch/buffer/pypy/objspace/std: . test Message-ID: <20080309114626.A0276168419@codespeak.net> Author: arigo Date: Sun Mar 9 12:46:23 2008 New Revision: 52327 Modified: pypy/branch/buffer/pypy/objspace/std/ropeobject.py pypy/branch/buffer/pypy/objspace/std/ropeunicodeobject.py pypy/branch/buffer/pypy/objspace/std/test/test_stringobject.py pypy/branch/buffer/pypy/objspace/std/test/test_unicodeobject.py Log: Buffer support for the ropes. Should be improved at some point for string ropes. Modified: pypy/branch/buffer/pypy/objspace/std/ropeobject.py ============================================================================== --- pypy/branch/buffer/pypy/objspace/std/ropeobject.py (original) +++ pypy/branch/buffer/pypy/objspace/std/ropeobject.py Sun Mar 9 12:46:23 2008 @@ -842,6 +842,11 @@ encoding, errors = _get_encoding_and_errors(space, w_encoding, w_errors) return encode_object(space, w_string, encoding, errors) +def buffer__Rope(space, w_string): + from pypy.interpreter.buffer import StringBuffer + value = w_string._node.flatten_string() # XXX inefficient + return space.wrap(StringBuffer(value)) + # methods of the iterator Modified: pypy/branch/buffer/pypy/objspace/std/ropeunicodeobject.py ============================================================================== --- pypy/branch/buffer/pypy/objspace/std/ropeunicodeobject.py (original) +++ pypy/branch/buffer/pypy/objspace/std/ropeunicodeobject.py Sun Mar 9 12:46:23 2008 @@ -909,6 +909,18 @@ def mod__RopeUnicode_ANY(space, w_format, w_values): return mod_format(space, w_format, w_values, do_unicode=True) +def buffer__RopeUnicode(space, w_unicode): + # xxx this is a slightly strange thing... + from pypy.module.struct.unichar import pack_unichar + charlist = [] + node = w_unicode._node + iter = rope.ItemIterator(node) + for idx in range(node.length()): + unich = unichr(iter.nextint()) + pack_unichar(unich, charlist) + from pypy.interpreter.buffer import StringBuffer + return space.wrap(StringBuffer(''.join(charlist))) + # methods of the iterator Modified: pypy/branch/buffer/pypy/objspace/std/test/test_stringobject.py ============================================================================== --- pypy/branch/buffer/pypy/objspace/std/test/test_stringobject.py (original) +++ pypy/branch/buffer/pypy/objspace/std/test/test_stringobject.py Sun Mar 9 12:46:23 2008 @@ -657,6 +657,15 @@ assert hash('hello') & 0x7fffffff == 0x347697fd assert hash('hello world!') & 0x7fffffff == 0x2f0bb411 + def test_buffer(self): + x = "he" + x += "llo" + b = buffer(x) + assert len(b) == 5 + assert b[-1] == "o" + assert b[:] == "hello" + raises(TypeError, "b[3] = 'x'") + def test_getnewargs(self): assert "foo".__getnewargs__() == ("foo",) Modified: pypy/branch/buffer/pypy/objspace/std/test/test_unicodeobject.py ============================================================================== --- pypy/branch/buffer/pypy/objspace/std/test/test_unicodeobject.py (original) +++ pypy/branch/buffer/pypy/objspace/std/test/test_unicodeobject.py Sun Mar 9 12:46:23 2008 @@ -547,3 +547,10 @@ def test_swapcase(self): assert u'\xe4\xc4\xdf'.swapcase() == u'\xc4\xe4\xdf' + + def test_buffer(self): + buf = buffer(u'XY') + assert str(buf) in ['X\x00Y\x00', + '\x00X\x00Y', + 'X\x00\x00\x00Y\x00\x00\x00', + '\x00\x00\x00X\x00\x00\x00Y'] From arigo at codespeak.net Sun Mar 9 12:47:07 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 12:47:07 +0100 (CET) Subject: [pypy-svn] r52328 - in pypy/branch/buffer/pypy: lib/_ctypes module/_ssl module/fcntl module/fcntl/test module/marshal module/marshal/test module/mmap module/struct module/struct/test Message-ID: <20080309114707.1DE8016841B@codespeak.net> Author: arigo Date: Sun Mar 9 12:47:06 2008 New Revision: 52328 Modified: pypy/branch/buffer/pypy/lib/_ctypes/basics.py pypy/branch/buffer/pypy/module/_ssl/interp_ssl.py pypy/branch/buffer/pypy/module/fcntl/interp_fcntl.py pypy/branch/buffer/pypy/module/fcntl/test/test_fcntl.py pypy/branch/buffer/pypy/module/marshal/interp_marshal.py pypy/branch/buffer/pypy/module/marshal/test/test_marshalimpl.py pypy/branch/buffer/pypy/module/mmap/interp_mmap.py pypy/branch/buffer/pypy/module/struct/interp_struct.py pypy/branch/buffer/pypy/module/struct/test/test_struct.py Log: Buffer support for various modules. Modified: pypy/branch/buffer/pypy/lib/_ctypes/basics.py ============================================================================== --- pypy/branch/buffer/pypy/lib/_ctypes/basics.py (original) +++ pypy/branch/buffer/pypy/lib/_ctypes/basics.py Sun Mar 9 12:47:06 2008 @@ -104,6 +104,9 @@ def _get_buffer_value(self): return self._buffer[0] + def __buffer__(self): + return buffer(self._buffer) + def sizeof(tp): if not isinstance(tp, _CDataMeta): if isinstance(tp, _CData): Modified: pypy/branch/buffer/pypy/module/_ssl/interp_ssl.py ============================================================================== --- pypy/branch/buffer/pypy/module/_ssl/interp_ssl.py (original) +++ pypy/branch/buffer/pypy/module/_ssl/interp_ssl.py Sun Mar 9 12:47:06 2008 @@ -297,7 +297,7 @@ errstr, errval = _ssl_seterror(self.space, self, num_bytes) raise OperationError(self.space.w_Exception, self.space.wrap("%s: %d" % (errstr, errval))) - write.unwrap_spec = ['self', str] + write.unwrap_spec = ['self', 'bufferstr'] def read(self, num_bytes=1024): """read([len]) -> string Modified: pypy/branch/buffer/pypy/module/fcntl/interp_fcntl.py ============================================================================== --- pypy/branch/buffer/pypy/module/fcntl/interp_fcntl.py (original) +++ pypy/branch/buffer/pypy/module/fcntl/interp_fcntl.py Sun Mar 9 12:47:06 2008 @@ -82,7 +82,8 @@ def _conv_descriptor(space, w_f): w_conv_descriptor = _get_module_object(space, "_conv_descriptor") w_fd = space.call_function(w_conv_descriptor, w_f) - return space.int_w(w_fd) + fd = space.int_w(w_fd) + return rffi.cast(rffi.INT, fd) # C long => C int def _check_flock_op(space, op): @@ -107,24 +108,33 @@ available from the fcntl module. The argument arg is optional, and defaults to 0; it may be an int or a string. If arg is given as a string, the return value of fcntl is a string of that length, containing the - resulting value put in the arg buffer by the operating system. The length - of the arg string is not allowed to exceed 1024 bytes. If the arg given - is an integer or if none is specified, the result value is an integer - corresponding to the return value of the fcntl call in the C code.""" + resulting value put in the arg buffer by the operating system. If the + arg given is an integer or if none is specified, the result value is an + integer corresponding to the return value of the fcntl call in the C code. + """ fd = _conv_descriptor(space, w_fd) - - if space.is_w(space.type(w_arg), space.w_int): - rv = fcntl_int(fd, op, space.int_w(w_arg)) + op = rffi.cast(rffi.INT, op) # C long => C int + + try: + intarg = space.int_w(w_arg) + except OperationError, e: + if not e.match(space, space.w_TypeError): + raise + else: + intarg = rffi.cast(rffi.INT, intarg) # C long => C int + rv = fcntl_int(fd, op, intarg) if rv < 0: raise OperationError(space.w_IOError, space.wrap(_get_error_msg())) return space.wrap(rv) - elif space.is_w(space.type(w_arg), space.w_str): - arg = space.str_w(w_arg) - if len(arg) > 1024: # XXX probably makes no sense for PyPy - raise OperationError(space.w_ValueError, - space.wrap("fcntl string arg too long")) + + try: + arg = space.bufferstr_w(w_arg) + except OperationError, e: + if not e.match(space, space.w_TypeError): + raise + else: ll_arg = rffi.str2charp(arg) rv = fcntl_str(fd, op, ll_arg) arg = rffi.charpsize2str(ll_arg, len(arg)) @@ -133,9 +143,9 @@ raise OperationError(space.w_IOError, space.wrap(_get_error_msg())) return space.wrap(arg) - else: - raise OperationError(space.w_TypeError, - space.wrap("int or string required")) + + raise OperationError(space.w_TypeError, + space.wrap("int or string or buffer required")) fcntl.unwrap_spec = [ObjSpace, W_Root, int, W_Root] def flock(space, w_fd, op): @@ -158,6 +168,7 @@ rffi.setintfield(l, 'c_l_start', 0) rffi.setintfield(l, 'c_l_len', 0) op = [F_SETLKW, F_SETLK][op & LOCK_NB] + op = rffi.cast(rffi.INT, op) # C long => C int fcntl_flock(fd, op, l) lltype.free(l, flavor='raw') flock.unwrap_spec = [ObjSpace, W_Root, int] @@ -207,60 +218,63 @@ except IndexError: raise OperationError(space.w_ValueError, space.wrap("invalid value for operation")) + op = rffi.cast(rffi.INT, op) # C long => C int fcntl_flock(fd, op, l) finally: lltype.free(l, flavor='raw') lockf.unwrap_spec = [ObjSpace, W_Root, int, int, int, int] -def ioctl(space, w_fd, op, w_arg=0, mutate_flag=True): +def ioctl(space, w_fd, op, w_arg=0, mutate_flag=-1): """ioctl(fd, opt[, arg[, mutate_flag]]) Perform the requested operation on file descriptor fd. The operation is defined by opt and is operating system dependent. Typically these codes are retrieved from the fcntl or termios library modules. + """ + # removed the largish docstring because it is not in sync with the + # documentation any more (even in CPython's docstring is out of date) - The argument arg is optional, and defaults to 0; it may be an int or a - buffer containing character data (most likely a string or an array). - - If the argument is a mutable buffer (such as an array) and if the - mutate_flag argument (which is only allowed in this case) is true then the - buffer is (in effect) passed to the operating system and changes made by - the OS will be reflected in the contents of the buffer after the call has - returned. The return value is the integer returned by the ioctl system - call. - - If the argument is a mutable buffer and the mutable_flag argument is not - passed or is false, the behavior is as if a string had been passed. This - behavior will change in future releases of Python. - - If the argument is an immutable buffer (most likely a string) then a copy - of the buffer is passed to the operating system and the return value is a - string of the same length containing whatever the operating system put in - the buffer. The length of the arg buffer in this case is not allowed to - exceed 1024 bytes. - - If the arg given is an integer or if none is specified, the result value - is an integer corresponding to the return value of the ioctl call in the - C code.""" + # XXX this function's interface is a mess. + # We try to emulate the behavior of Python >= 2.5 w.r.t. mutate_flag + fd = _conv_descriptor(space, w_fd) - # Python turns number > sys.maxint into long, we need the signed C value - op = rffi.cast(rffi.INT, op) + op = rffi.cast(rffi.INT, op) # C long => C int - IOCTL_BUFSZ = 1024 - - if space.is_w(space.type(w_arg), space.w_int): - arg = space.int_w(w_arg) - rv = ioctl_int(fd, op, arg) - if rv < 0: - raise OperationError(space.w_IOError, - space.wrap(_get_error_msg())) - return space.wrap(rv) - elif space.is_w(space.type(w_arg), space.w_str): # immutable - arg = space.str_w(w_arg) - if len(arg) > IOCTL_BUFSZ: - raise OperationError(space.w_ValueError, - space.wrap("ioctl string arg too long")) - + if mutate_flag != 0: + try: + rwbuffer = space.rwbuffer_w(w_arg) + except OperationError, e: + if not e.match(space, space.w_TypeError): + raise + if mutate_flag > 0: + raise + else: + arg = rwbuffer.as_str() + ll_arg = rffi.str2charp(arg) + rv = ioctl_str(fd, op, ll_arg) + arg = rffi.charpsize2str(ll_arg, len(arg)) + lltype.free(ll_arg, flavor='raw') + if rv < 0: + raise OperationError(space.w_IOError, + space.wrap(_get_error_msg())) + rwbuffer.setslice(0, arg) + return space.wrap(rv) + + try: + intarg = space.int_w(w_arg) + except OperationError, e: + if not e.match(space, space.w_TypeError): + raise + else: + intarg = rffi.cast(rffi.INT, intarg) # C long => C int + rv = ioctl_int(fd, op, intarg) + + try: + arg = space.bufferstr_w(w_arg) + except OperationError, e: + if not e.match(space, space.w_TypeError): + raise + else: ll_arg = rffi.str2charp(arg) rv = ioctl_str(fd, op, ll_arg) arg = rffi.charpsize2str(ll_arg, len(arg)) @@ -269,29 +283,7 @@ raise OperationError(space.w_IOError, space.wrap(_get_error_msg())) return space.wrap(arg) - else: - raise OperationError(space.w_TypeError, - space.wrap("an integer or a buffer required")) - # try: - # # array.array instances - # arg = space.call_method(w_arg, "tostring") - # buf = create_string_buffer(len(arg)) - # except: - # raise OperationError(space.w_TypeError, - # space.wrap("an integer or a buffer required")) - # - # if not mutate_flag: - # if len(arg) > IOCTL_BUFSZ: - # raise OperationError(space.w_ValueError, - # space.wrap("ioctl string arg too long")) - # - # rv = ioctl_str(fd, op, buf) - # if rv < 0: - # raise OperationError(space.w_IOError, - # space.wrap(_get_error_msg())) - # - # if mutate_flag: - # return space.wrap(rv) - # else: - # return space.wrap(buf.value) + + raise OperationError(space.w_TypeError, + space.wrap("int or string or buffer required")) ioctl.unwrap_spec = [ObjSpace, W_Root, int, W_Root, int] Modified: pypy/branch/buffer/pypy/module/fcntl/test/test_fcntl.py ============================================================================== --- pypy/branch/buffer/pypy/module/fcntl/test/test_fcntl.py (original) +++ pypy/branch/buffer/pypy/module/fcntl/test/test_fcntl.py Sun Mar 9 12:47:06 2008 @@ -1,5 +1,6 @@ from pypy.conftest import gettestobjspace import os +from pypy.tool.udir import udir if os.name == "nt": from py.test import skip @@ -12,13 +13,17 @@ class AppTestFcntl: def setup_class(cls): - space = gettestobjspace(usemodules=('fcntl',)) + space = gettestobjspace(usemodules=('fcntl', 'array')) cls.space = space + tmpprefix = str(udir.ensure('test_fcntl', dir=1).join('tmp_')) + cls.w_tmp = space.wrap(tmpprefix) def test_conv_descriptor(self): import fcntl + if not hasattr(fcntl, '_conv_descriptor'): + skip("PyPy only") - f = open("a", "w+") + f = open(self.tmp + "a", "w+") raises(TypeError, fcntl._conv_descriptor, "foo") raises(TypeError, fcntl._conv_descriptor, 2.0) @@ -37,15 +42,16 @@ import sys import struct - f = open("b", "w+") + f = open(self.tmp + "b", "w+") fcntl.fcntl(f, 1, 0) fcntl.fcntl(f, 1) raises(TypeError, fcntl.fcntl, "foo") raises(TypeError, fcntl.fcntl, f, "foo") - raises(IOError, fcntl.fcntl, -1, 1, 0) + raises((IOError, ValueError), fcntl.fcntl, -1, 1, 0) assert fcntl.fcntl(f, 1, 0) == 0 assert fcntl.fcntl(f, 2, "foo") == "foo" + assert fcntl.fcntl(f, 2, buffer("foo")) == "foo" try: os.O_LARGEFILE @@ -119,7 +125,7 @@ import fcntl import sys - f = open("c", "w+") + f = open(self.tmp + "c", "w+") raises(TypeError, fcntl.flock, "foo") raises(TypeError, fcntl.flock, f, "foo") @@ -134,12 +140,12 @@ def test_lockf(self): import fcntl - f = open("d", "w+") + f = open(self.tmp + "d", "w+") raises(TypeError, fcntl.lockf, f, "foo") raises(TypeError, fcntl.lockf, f, fcntl.LOCK_UN, "foo") - raises(ValueError, fcntl.lockf, f, -1) - raises(ValueError, fcntl.lockf, f, 255) + raises(ValueError, fcntl.lockf, f, -256) + raises(ValueError, fcntl.lockf, f, 256) fcntl.lockf(f, fcntl.LOCK_SH) fcntl.lockf(f, fcntl.LOCK_UN) @@ -149,23 +155,39 @@ def test_ioctl(self): import fcntl import array - import sys - - f = open("e", "w+") - + import sys, os + if "linux" in sys.platform: TIOCGPGRP = 0x540f elif "darwin" in sys.platform or "freebsd6" == sys.platform: TIOCGPGRP = 0x40047477 + else: + skip("don't know how to test ioctl() on this platform") raises(TypeError, fcntl.ioctl, "foo") - raises(TypeError, fcntl.ioctl, f, "foo") - raises(TypeError, fcntl.ioctl, f, TIOCGPGRP, float(0)) - raises(TypeError, fcntl.ioctl, f, TIOCGPGRP, 1, "foo") - - # buf = array.array('h', [0]) - # fcntl.ioctl(0, TIOCGPGRP, buf, True) - # buf = array.array('c', "a"*1025) - # py.test.raises(ValueError, cfcntl.ioctl, 0, termios.TIOCGPGRP, buf, 0) - # py.test.raises(ValueError, cfcntl.ioctl, 0, termios.TIOCGPGRP, - # "a"*1025, 0) + raises(TypeError, fcntl.ioctl, 0, "foo") + #raises(TypeError, fcntl.ioctl, 0, TIOCGPGRP, float(0)) + raises(TypeError, fcntl.ioctl, 0, TIOCGPGRP, 1, "foo") + + if not os.isatty(0): + skip("stdin is not a tty") + + buf = array.array('h', [0]) + res = fcntl.ioctl(0, TIOCGPGRP, buf, True) + assert res == 0 + assert buf[0] != 0 + expected = buf.tostring() + + if '__pypy__' in sys.builtin_module_names or sys.version_info >= (2,5): + buf = array.array('h', [0]) + res = fcntl.ioctl(0, TIOCGPGRP, buf) + assert res == 0 + assert buf.tostring() == expected + + res = fcntl.ioctl(0, TIOCGPGRP, buf, False) + assert res == expected + + raises(TypeError, fcntl.ioctl, 0, TIOCGPGRP, "\x00\x00", True) + + res = fcntl.ioctl(0, TIOCGPGRP, "\x00\x00") + assert res == expected Modified: pypy/branch/buffer/pypy/module/marshal/interp_marshal.py ============================================================================== --- pypy/branch/buffer/pypy/module/marshal/interp_marshal.py (original) +++ pypy/branch/buffer/pypy/module/marshal/interp_marshal.py Sun Mar 9 12:47:06 2008 @@ -503,12 +503,12 @@ def __init__(self, space, w_str): Unmarshaller.__init__(self, space, None) try: - self.bufstr = space.str_w(w_str) + self.bufstr = space.bufferstr_w(w_str) except OperationError, e: if not e.match(space, space.w_TypeError): raise raise OperationError(space.w_TypeError, space.wrap( - 'marshal.loads() arg must be string')) + 'marshal.loads() arg must be string or buffer')) self.bufpos = 0 self.limit = len(self.bufstr) Modified: pypy/branch/buffer/pypy/module/marshal/test/test_marshalimpl.py ============================================================================== --- pypy/branch/buffer/pypy/module/marshal/test/test_marshalimpl.py (original) +++ pypy/branch/buffer/pypy/module/marshal/test/test_marshalimpl.py Sun Mar 9 12:47:06 2008 @@ -20,3 +20,8 @@ assert z == 10000000000 z = marshal.loads('I\x00\x1c\xf4\xab\xfd\xff\xff\xff') assert z == -10000000000 + + def test_buffer(self): + import marshal + z = marshal.loads(buffer('i\x02\x00\x00\x00???')) + assert z == 2 Modified: pypy/branch/buffer/pypy/module/mmap/interp_mmap.py ============================================================================== --- pypy/branch/buffer/pypy/module/mmap/interp_mmap.py (original) +++ pypy/branch/buffer/pypy/module/mmap/interp_mmap.py Sun Mar 9 12:47:06 2008 @@ -39,7 +39,7 @@ def find(self, tofind, start=0): return self.space.wrap(self.mmap.find(tofind, start)) - find.unwrap_spec = ['self', str, int] + find.unwrap_spec = ['self', 'bufferstr', int] def seek(self, pos, whence=0): try: @@ -64,7 +64,7 @@ except RValueError, v: raise OperationError(self.space.w_ValueError, self.space.wrap(v.message)) - write.unwrap_spec = ['self', str] + write.unwrap_spec = ['self', 'bufferstr'] def write_byte(self, byte): try: @@ -168,7 +168,7 @@ else: raise OperationError(space.w_ValueError, space.wrap("mmap object does not support slicing with a step")) - descr_setitem.unwrap_spec = ['self', W_Root, str] + descr_setitem.unwrap_spec = ['self', W_Root, 'bufferstr'] def descr_buffer(self): # XXX improve to work directly on the low-level address Modified: pypy/branch/buffer/pypy/module/struct/interp_struct.py ============================================================================== --- pypy/branch/buffer/pypy/module/struct/interp_struct.py (original) +++ pypy/branch/buffer/pypy/module/struct/interp_struct.py Sun Mar 9 12:47:06 2008 @@ -34,4 +34,4 @@ except StructError, e: raise e.at_applevel(space) return space.newtuple(fmtiter.result_w) -unpack.unwrap_spec = [ObjSpace, str, str] +unpack.unwrap_spec = [ObjSpace, str, 'bufferstr'] Modified: pypy/branch/buffer/pypy/module/struct/test/test_struct.py ============================================================================== --- pypy/branch/buffer/pypy/module/struct/test/test_struct.py (original) +++ pypy/branch/buffer/pypy/module/struct/test/test_struct.py Sun Mar 9 12:47:06 2008 @@ -335,6 +335,15 @@ assert self.struct.unpack("uuu", data) == (u'X', u'Y', u'Z') + def test_unpack_buffer(self): + """ + Buffer objects can be passed to struct.unpack(). + """ + b = buffer(self.struct.pack("ii", 62, 12)) + assert self.struct.unpack("ii", b) == (62, 12) + raises(self.struct.error, self.struct.unpack, "i", b) + + class AppTestStructBuffer(object): def setup_class(cls): From arigo at codespeak.net Sun Mar 9 12:55:01 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 12:55:01 +0100 (CET) Subject: [pypy-svn] r52329 - pypy/branch/buffer/lib-python Message-ID: <20080309115501.400591683F5@codespeak.net> Author: arigo Date: Sun Mar 9 12:54:59 2008 New Revision: 52329 Modified: pypy/branch/buffer/lib-python/conftest.py Log: Add module dependency. Modified: pypy/branch/buffer/lib-python/conftest.py ============================================================================== --- pypy/branch/buffer/lib-python/conftest.py (original) +++ pypy/branch/buffer/lib-python/conftest.py Sun Mar 9 12:54:59 2008 @@ -487,7 +487,7 @@ RegrTest('test_errno.py', enabled=True, dumbtest=1), RegrTest('test_exceptions.py', enabled=True, core=True), RegrTest('test_extcall.py', enabled=True, core=True), - RegrTest('test_fcntl.py', enabled=False, dumbtest=1), + RegrTest('test_fcntl.py', enabled=False, dumbtest=1, usemodules='fcntl'), RegrTest('test_file.py', enabled=True, dumbtest=1, usemodules="posix", core=True), RegrTest('test_filecmp.py', enabled=True, core=True), RegrTest('test_fileinput.py', enabled=True, dumbtest=1, core=True), From arigo at codespeak.net Sun Mar 9 13:35:56 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 13:35:56 +0100 (CET) Subject: [pypy-svn] r52330 - in pypy/branch/buffer/pypy: interpreter interpreter/test module/__pypy__ module/_file module/_rawffi module/_sre Message-ID: <20080309123556.73577168419@codespeak.net> Author: arigo Date: Sun Mar 9 13:35:55 2008 New Revision: 52330 Modified: pypy/branch/buffer/pypy/interpreter/buffer.py pypy/branch/buffer/pypy/interpreter/test/test_buffer.py pypy/branch/buffer/pypy/module/__pypy__/bytebuffer.py pypy/branch/buffer/pypy/module/_file/interp_file.py pypy/branch/buffer/pypy/module/_rawffi/buffer.py pypy/branch/buffer/pypy/module/_sre/interp_sre.py Log: Change the Buffer interface: .len => .getlength(). Otherwise, if the underlying object changes its size, we get RPython-level index errors. Modified: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Sun Mar 9 13:35:55 2008 @@ -24,12 +24,15 @@ class Buffer(Wrappable): """Abstract base class for memory views.""" - __slots__ = ('len',) # the length, stored as an attribute + __slots__ = () # no extra slot here + + def getlength(self): + raise NotImplementedError def as_str(self): "Returns an interp-level string with the whole content of the buffer." # May be overridden. - return self.getslice(0, self.len) + return self.getslice(0, self.getlength()) def getitem(self, index): "Returns the index'th character in the buffer." @@ -42,11 +45,11 @@ # __________ app-level support __________ def descr_len(self, space): - return space.wrap(self.len) + return space.wrap(self.getlength()) descr_len.unwrap_spec = ['self', ObjSpace] def descr_getitem(self, space, w_index): - start, stop, step = space.decode_index(w_index, self.len) + start, stop, step = space.decode_index(w_index, self.getlength()) if step == 0: # index only return space.wrap(self.getitem(start)) elif step == 1: @@ -62,7 +65,7 @@ if not isinstance(self, RWBuffer): raise OperationError(space.w_TypeError, space.wrap("buffer is read-only")) - start, stop, step = space.decode_index(w_index, self.len) + start, stop, step = space.decode_index(w_index, self.getlength()) if step == 0: # index only if len(newstring) != 1: msg = 'buffer[index]=x: x must be a single character' @@ -194,9 +197,11 @@ class StringBuffer(Buffer): def __init__(self, value): - self.len = len(value) self.value = value + def getlength(self): + return len(self.value) + def as_str(self): return self.value @@ -204,7 +209,7 @@ return self.value[index] def getslice(self, start, stop): - assert 0 <= start <= stop <= self.len + assert 0 <= start <= stop <= len(self.value) return self.value[start:stop] @@ -217,7 +222,10 @@ def __init__(self, space, w_obj): self.space = space self.w_obj = w_obj - self.len = space.int_w(space.len(w_obj)) + + def getlength(self): + space = self.space + return space.int_w(space.len(self.w_obj)) def getitem(self, index): space = self.space Modified: pypy/branch/buffer/pypy/interpreter/test/test_buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/test/test_buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/test/test_buffer.py Sun Mar 9 13:35:55 2008 @@ -12,7 +12,7 @@ w_hello = space.wrap('hello world') buf = space.buffer_w(w_hello) assert isinstance(buf, Buffer) - assert buf.len == 11 + assert buf.getlength() == 11 assert buf.as_str() == 'hello world' assert buf.getslice(1, 6) == 'ello ' assert space.buffer_w(space.wrap(buf)) is buf Modified: pypy/branch/buffer/pypy/module/__pypy__/bytebuffer.py ============================================================================== --- pypy/branch/buffer/pypy/module/__pypy__/bytebuffer.py (original) +++ pypy/branch/buffer/pypy/module/__pypy__/bytebuffer.py Sun Mar 9 13:35:55 2008 @@ -9,9 +9,11 @@ class ByteBuffer(RWBuffer): def __init__(self, len): - self.len = len self.data = ['\x00'] * len + def getlength(self): + return len(self.data) + def getitem(self, index): return self.data[index] Modified: pypy/branch/buffer/pypy/module/_file/interp_file.py ============================================================================== --- pypy/branch/buffer/pypy/module/_file/interp_file.py (original) +++ pypy/branch/buffer/pypy/module/_file/interp_file.py Sun Mar 9 13:35:55 2008 @@ -366,7 +366,7 @@ # XXX not the most efficient solution as it doesn't avoid the copying space = self.space rwbuffer = space.rwbuffer_w(w_rwbuffer) - w_data = self.file_read(rwbuffer.len) + w_data = self.file_read(rwbuffer.getlength()) data = space.str_w(w_data) rwbuffer.setslice(0, data) return space.wrap(len(data)) Modified: pypy/branch/buffer/pypy/module/_rawffi/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/module/_rawffi/buffer.py (original) +++ pypy/branch/buffer/pypy/module/_rawffi/buffer.py Sun Mar 9 13:35:55 2008 @@ -7,7 +7,9 @@ def __init__(self, datainstance): self.datainstance = datainstance - self.len = datainstance.getrawsize() + + def getlength(self): + return self.datainstance.getrawsize() def getitem(self, index): ll_buffer = self.datainstance.ll_buffer Modified: pypy/branch/buffer/pypy/module/_sre/interp_sre.py ============================================================================== --- pypy/branch/buffer/pypy/module/_sre/interp_sre.py (original) +++ pypy/branch/buffer/pypy/module/_sre/interp_sre.py Sun Mar 9 13:35:55 2008 @@ -163,7 +163,7 @@ def unwrap_object(self): self.buffer = self.space.buffer_w(self.w_string) - return self.buffer.len + return self.buffer.getlength() def get_char_ord(self, p): return ord(self.buffer.getitem(p)) From arigo at codespeak.net Sun Mar 9 15:09:01 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 15:09:01 +0100 (CET) Subject: [pypy-svn] r52333 - in pypy/branch/buffer/pypy/module/_rawffi: . test Message-ID: <20080309140901.27829168408@codespeak.net> Author: arigo Date: Sun Mar 9 15:08:59 2008 New Revision: 52333 Modified: pypy/branch/buffer/pypy/module/_rawffi/array.py pypy/branch/buffer/pypy/module/_rawffi/test/test__rawffi.py Log: A useful extension to arrays of shape 'c': buffer-like slicing, because this can be implemented kind-of-efficiently. Modified: pypy/branch/buffer/pypy/module/_rawffi/array.py ============================================================================== --- pypy/branch/buffer/pypy/module/_rawffi/array.py (original) +++ pypy/branch/buffer/pypy/module/_rawffi/array.py Sun Mar 9 15:08:59 2008 @@ -113,7 +113,8 @@ self.length)) descr_repr.unwrap_spec = ['self', ObjSpace] - # XXX don't allow negative indexes, nor slices + # This only allows non-negative indexes. Arrays of shape 'c' also + # support simple slices. def setitem(self, space, num, w_value): if not self.ll_buffer: @@ -122,7 +123,17 @@ raise OperationError(space.w_IndexError, space.w_None) unwrap_value(space, push_elem, self.ll_buffer, num, self.shape.itemtp, w_value) - setitem.unwrap_spec = ['self', ObjSpace, int, W_Root] + + def descr_setitem(self, space, w_index, w_value): + try: + num = space.int_w(w_index) + except OperationError, e: + if not e.match(space, space.w_TypeError): + raise + self.setslice(space, w_index, w_value) + else: + self.setitem(space, num, w_value) + descr_setitem.unwrap_spec = ['self', ObjSpace, W_Root, W_Root] def getitem(self, space, num): if not self.ll_buffer: @@ -131,7 +142,17 @@ raise OperationError(space.w_IndexError, space.w_None) return wrap_value(space, get_elem, self.ll_buffer, num, self.shape.itemtp) - getitem.unwrap_spec = ['self', ObjSpace, int] + + def descr_getitem(self, space, w_index): + try: + num = space.int_w(w_index) + except OperationError, e: + if not e.match(space, space.w_TypeError): + raise + return self.getslice(space, w_index) + else: + return self.getitem(space, num) + descr_getitem.unwrap_spec = ['self', ObjSpace, W_Root] def getlength(self, space): return space.wrap(self.length) @@ -147,11 +168,59 @@ _, itemsize, _ = self.shape.itemtp return itemsize * self.length + def decodeslice(self, space, w_slice): + if not space.is_true(space.isinstance(w_slice, space.w_slice)): + return OperationError(space.w_TypeError, + space.wrap('index must be int or slice')) + letter, _, _ = self.shape.itemtp + if letter != 'c': + raise OperationError(space.w_TypeError, + space.wrap("only 'c' arrays support slicing")) + w_start = space.getattr(w_slice, space.wrap('start')) + w_stop = space.getattr(w_slice, space.wrap('stop')) + w_step = space.getattr(w_slice, space.wrap('step')) + + if space.is_w(w_start, space.w_None): + start = 0 + else: + start = space.int_w(w_start) + if space.is_w(w_stop, space.w_None): + stop = self.length + else: + stop = space.int_w(w_stop) + if not space.is_w(w_step, space.w_None): + step = space.int_w(w_step) + if step != 1: + raise OperationError(space.w_ValueError, + space.wrap("no step support")) + if not (0 <= start <= stop <= self.length): + raise OperationError(space.w_ValueError, + space.wrap("slice out of bounds")) + if not self.ll_buffer: + raise segfault_exception(space, "accessing a freed array") + return start, stop + + def getslice(self, space, w_slice): + start, stop = self.decodeslice(space, w_slice) + ll_buffer = self.ll_buffer + result = [ll_buffer[i] for i in range(start, stop)] + return space.wrap(''.join(result)) + + def setslice(self, space, w_slice, w_value): + start, stop = self.decodeslice(space, w_slice) + value = space.bufferstr_w(w_value) + if start + len(value) != stop: + raise OperationError(space.w_ValueError, + space.wrap("cannot resize array")) + ll_buffer = self.ll_buffer + for i in range(len(value)): + ll_buffer[start + i] = value[i] + W_ArrayInstance.typedef = TypeDef( 'ArrayInstance', __repr__ = interp2app(W_ArrayInstance.descr_repr), - __setitem__ = interp2app(W_ArrayInstance.setitem), - __getitem__ = interp2app(W_ArrayInstance.getitem), + __setitem__ = interp2app(W_ArrayInstance.descr_setitem), + __getitem__ = interp2app(W_ArrayInstance.descr_getitem), __len__ = interp2app(W_ArrayInstance.getlength), __buffer__ = interp2app(W_ArrayInstance.descr_buffer), buffer = GetSetProperty(W_ArrayInstance.getbuffer), @@ -174,8 +243,8 @@ W_ArrayInstanceAutoFree.typedef = TypeDef( 'ArrayInstanceWithFree', __repr__ = interp2app(W_ArrayInstance.descr_repr), - __setitem__ = interp2app(W_ArrayInstance.setitem), - __getitem__ = interp2app(W_ArrayInstance.getitem), + __setitem__ = interp2app(W_ArrayInstance.descr_setitem), + __getitem__ = interp2app(W_ArrayInstance.descr_getitem), __len__ = interp2app(W_ArrayInstance.getlength), __buffer__ = interp2app(W_ArrayInstance.descr_buffer), buffer = GetSetProperty(W_ArrayInstance.getbuffer), Modified: pypy/branch/buffer/pypy/module/_rawffi/test/test__rawffi.py ============================================================================== --- pypy/branch/buffer/pypy/module/_rawffi/test/test__rawffi.py (original) +++ pypy/branch/buffer/pypy/module/_rawffi/test/test__rawffi.py Sun Mar 9 15:08:59 2008 @@ -180,6 +180,17 @@ dupaptr.free() dupa.free() + def test_chararray_as_bytebuffer(self): + # a useful extension to arrays of shape 'c': buffer-like slicing + import _rawffi + A = _rawffi.Array('c') + buf = A(10, autofree=True) + buf[0] = '*' + assert buf[1:5] == '\x00' * 4 + buf[7:] = 'abc' + assert buf[9] == 'c' + assert buf[:8] == '*' + '\x00'*6 + 'a' + def test_returning_str(self): import _rawffi lib = _rawffi.CDLL(self.lib_name) From arigo at codespeak.net Sun Mar 9 15:12:42 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 15:12:42 +0100 (CET) Subject: [pypy-svn] r52334 - pypy/branch/buffer/pypy/module/struct Message-ID: <20080309141242.B94C816840A@codespeak.net> Author: arigo Date: Sun Mar 9 15:12:42 2008 New Revision: 52334 Modified: pypy/branch/buffer/pypy/module/struct/app_struct.py Log: Yeek. NOT_RPYTHON must appear in the first 3 lines... Modified: pypy/branch/buffer/pypy/module/struct/app_struct.py ============================================================================== --- pypy/branch/buffer/pypy/module/struct/app_struct.py (original) +++ pypy/branch/buffer/pypy/module/struct/app_struct.py Sun Mar 9 15:12:42 2008 @@ -1,8 +1,6 @@ - +# NOT_RPYTHON """ Application-level definitions for the struct module. - -NOT_RPYTHON """ import struct From arigo at codespeak.net Sun Mar 9 15:14:04 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 15:14:04 +0100 (CET) Subject: [pypy-svn] r52335 - pypy/branch/buffer/pypy/lib Message-ID: <20080309141404.43AA316840A@codespeak.net> Author: arigo Date: Sun Mar 9 15:14:03 2008 New Revision: 52335 Modified: pypy/branch/buffer/pypy/lib/struct.py Log: In the app-level version of struct: struct.pack_into, struct.unpack_from Modified: pypy/branch/buffer/pypy/lib/struct.py ============================================================================== --- pypy/branch/buffer/pypy/lib/struct.py (original) +++ pypy/branch/buffer/pypy/lib/struct.py Sun Mar 9 15:14:03 2008 @@ -337,3 +337,15 @@ j += format['size'] return tuple(result) + +def pack_into(fmt, buf, offset, *args): + data = pack(fmt, *args) + buffer(buf)[offset:offset+len(data)] = data + +def unpack_from(fmt, buf, offset=0): + size = calcsize(fmt) + data = buffer(buf)[offset:offset+size] + if len(data) != size: + raise error("unpack_from requires a buffer of at least %d bytes" + % (size,)) + return unpack(fmt, data) From arigo at codespeak.net Sun Mar 9 15:39:18 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 15:39:18 +0100 (CET) Subject: [pypy-svn] r52336 - in pypy/branch/buffer: lib-python pypy/config pypy/lib pypy/lib/test2 pypy/module/array Message-ID: <20080309143918.D48F5168409@codespeak.net> Author: arigo Date: Sun Mar 9 15:39:18 2008 New Revision: 52336 Added: pypy/branch/buffer/pypy/lib/array.py - copied, changed from r52330, pypy/branch/buffer/pypy/module/array/app_array.py pypy/branch/buffer/pypy/lib/test2/test_array.py - copied, changed from r52328, pypy/branch/buffer/pypy/module/array/test/test_array.py Removed: pypy/branch/buffer/pypy/module/array/ Modified: pypy/branch/buffer/lib-python/conftest.py pypy/branch/buffer/pypy/config/pypyoption.py pypy/branch/buffer/pypy/lib/struct.py Log: For now a good compromise for the array module is to have it purely at app-level but based on various low-level read-write buffer implementations, as available. This version has the advantage of running on top of CPython too. On PyPy it uses _rawffi if available, allowing buffer_info() to be meaningful. Modified: pypy/branch/buffer/lib-python/conftest.py ============================================================================== --- pypy/branch/buffer/lib-python/conftest.py (original) +++ pypy/branch/buffer/lib-python/conftest.py Sun Mar 9 15:39:18 2008 @@ -387,7 +387,7 @@ RegrTest('test_al.py', enabled=False, dumbtest=1), RegrTest('test_anydbm.py', enabled=True), RegrTest('test_applesingle.py', enabled=False), - RegrTest('test_array.py', enabled=True, core=True), + RegrTest('test_array.py', enabled=True, core=True, usemodules='struct'), RegrTest('test_asynchat.py', enabled=False, usemodules='thread'), RegrTest('test_atexit.py', enabled=True, dumbtest=1, core=True), RegrTest('test_audioop.py', enabled=False, dumbtest=1), Modified: pypy/branch/buffer/pypy/config/pypyoption.py ============================================================================== --- pypy/branch/buffer/pypy/config/pypyoption.py (original) +++ pypy/branch/buffer/pypy/config/pypyoption.py Sun Mar 9 15:39:18 2008 @@ -24,7 +24,7 @@ working_modules.update(dict.fromkeys( ["_socket", "unicodedata", "mmap", "fcntl", "rctime", "select", "crypt", "signal", "dyngram", "readline", "termios", "zlib", - "array", "struct", "md5", "sha", "bz2", + "struct", "md5", "sha", "bz2", ] )) @@ -35,9 +35,7 @@ del working_modules["termios"] -module_dependencies = {'array': [("objspace.usemodules.struct", True), - ("objspace.usemodules.__pypy__", True)], - } +module_dependencies = {} module_suggests = { # the reason you want _rawffi is for ctypes, which # itself needs the interp-level struct module # because 'P' is missing from the app-level one Modified: pypy/branch/buffer/pypy/lib/struct.py ============================================================================== --- pypy/branch/buffer/pypy/lib/struct.py (original) +++ pypy/branch/buffer/pypy/lib/struct.py Sun Mar 9 15:39:18 2008 @@ -285,7 +285,7 @@ raise StructError,"arg for string format not a string" else: - if len(args) == 0: + if len(args) < num: raise StructError,"insufficient arguments to pack" for var in args[:num]: result += [format['pack'](var,format['size'],endianness)] From arigo at codespeak.net Sun Mar 9 15:43:28 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 15:43:28 +0100 (CET) Subject: [pypy-svn] r52337 - pypy/branch/buffer/pypy/lib Message-ID: <20080309144328.8B09A16841C@codespeak.net> Author: arigo Date: Sun Mar 9 15:43:28 2008 New Revision: 52337 Modified: pypy/branch/buffer/pypy/lib/array.py Log: Bug fix. Many more remain. Modified: pypy/branch/buffer/pypy/lib/array.py ============================================================================== --- pypy/branch/buffer/pypy/lib/array.py (original) +++ pypy/branch/buffer/pypy/lib/array.py Sun Mar 9 15:43:28 2008 @@ -296,8 +296,10 @@ seqlength = len(self) if i < 0: i += seqlength - if not (0 <= i <= seqlength): - raise IndexError(i) + if i < 0: + i = 0 + elif i > seqlength: + i = seqlength boundary = i * self.itemsize data = pack(self.typecode, x) newdata = bytebuffer(len(self._data) + len(data)) From arigo at codespeak.net Sun Mar 9 16:04:22 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 16:04:22 +0100 (CET) Subject: [pypy-svn] r52338 - in pypy/branch/buffer: lib-python/modified-2.4.1/test pypy/lib Message-ID: <20080309150422.DEC6416842D@codespeak.net> Author: arigo Date: Sun Mar 9 16:04:21 2008 New Revision: 52338 Modified: pypy/branch/buffer/lib-python/modified-2.4.1/test/test_array.py pypy/branch/buffer/pypy/lib/array.py Log: Bug fixes. Modified: pypy/branch/buffer/lib-python/modified-2.4.1/test/test_array.py ============================================================================== --- pypy/branch/buffer/lib-python/modified-2.4.1/test/test_array.py (original) +++ pypy/branch/buffer/lib-python/modified-2.4.1/test/test_array.py Sun Mar 9 16:04:21 2008 @@ -57,7 +57,7 @@ bi = a.buffer_info() self.assert_(isinstance(bi, tuple)) self.assertEqual(len(bi), 2) - self.assert_(isinstance(bi[0], int)) + self.assert_(isinstance(bi[0], (int, long))) self.assert_(isinstance(bi[1], int)) self.assertEqual(bi[1], len(a)) Modified: pypy/branch/buffer/pypy/lib/array.py ============================================================================== --- pypy/branch/buffer/pypy/lib/array.py (original) +++ pypy/branch/buffer/pypy/lib/array.py Sun Mar 9 16:04:21 2008 @@ -243,32 +243,50 @@ def __eq__(self, other): if not isinstance(other, array): return NotImplemented - return buffer(self._data) == buffer(other._data) + if self.typecode == 'c': + return buffer(self._data) == buffer(other._data) + else: + return self.tolist() == other.tolist() def __ne__(self, other): if not isinstance(other, array): return NotImplemented - return buffer(self._data) != buffer(other._data) + if self.typecode == 'c': + return buffer(self._data) != buffer(other._data) + else: + return self.tolist() != other.tolist() def __lt__(self, other): if not isinstance(other, array): return NotImplemented - return buffer(self._data) < buffer(other._data) + if self.typecode == 'c': + return buffer(self._data) < buffer(other._data) + else: + return self.tolist() < other.tolist() def __gt__(self, other): if not isinstance(other, array): return NotImplemented - return buffer(self._data) > buffer(other._data) + if self.typecode == 'c': + return buffer(self._data) > buffer(other._data) + else: + return self.tolist() > other.tolist() def __le__(self, other): if not isinstance(other, array): return NotImplemented - return buffer(self._data) <= buffer(other._data) + if self.typecode == 'c': + return buffer(self._data) <= buffer(other._data) + else: + return self.tolist() <= other.tolist() def __ge__(self, other): if not isinstance(other, array): return NotImplemented - return buffer(self._data) >= buffer(other._data) + if self.typecode == 'c': + return buffer(self._data) >= buffer(other._data) + else: + return self.tolist() >= other.tolist() ##### list methods @@ -354,7 +372,10 @@ def __getitem__(self, i): if self.typecode == 'c': # speed trick - return self._data[i] + try: + return self._data[i] + except TypeError: + pass # "bug": ctypes.create_string_buffer(10)[slice(2,5)] seqlength = len(self) if isinstance(i, slice): start, stop, step = i.indices(seqlength) @@ -381,8 +402,10 @@ def __setitem__(self, i, x): if isinstance(i, slice): - if not isinstance(x, array): - raise TypeError("can only assign array to array slice") + if (not isinstance(x, array) + or self.typecode != x.typecode): + raise TypeError("can only assign array of same kind" + " to array slice") seqlength = len(self) start, stop, step = i.indices(seqlength) if start < 0: From arigo at codespeak.net Sun Mar 9 16:06:59 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 16:06:59 +0100 (CET) Subject: [pypy-svn] r52339 - pypy/branch/buffer/pypy/module/_rawffi Message-ID: <20080309150659.AF0F016842D@codespeak.net> Author: arigo Date: Sun Mar 9 16:06:58 2008 New Revision: 52339 Modified: pypy/branch/buffer/pypy/module/_rawffi/array.py Log: Typo. Modified: pypy/branch/buffer/pypy/module/_rawffi/array.py ============================================================================== --- pypy/branch/buffer/pypy/module/_rawffi/array.py (original) +++ pypy/branch/buffer/pypy/module/_rawffi/array.py Sun Mar 9 16:06:58 2008 @@ -170,8 +170,8 @@ def decodeslice(self, space, w_slice): if not space.is_true(space.isinstance(w_slice, space.w_slice)): - return OperationError(space.w_TypeError, - space.wrap('index must be int or slice')) + raise OperationError(space.w_TypeError, + space.wrap('index must be int or slice')) letter, _, _ = self.shape.itemtp if letter != 'c': raise OperationError(space.w_TypeError, From arigo at codespeak.net Sun Mar 9 16:26:38 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 16:26:38 +0100 (CET) Subject: [pypy-svn] r52340 - in pypy/branch/buffer/pypy/lib: . test2 Message-ID: <20080309152638.CFCB0168419@codespeak.net> Author: arigo Date: Sun Mar 9 16:26:38 2008 New Revision: 52340 Modified: pypy/branch/buffer/pypy/lib/array.py pypy/branch/buffer/pypy/lib/test2/test_array.py Log: More bug fixes. Modified: pypy/branch/buffer/pypy/lib/array.py ============================================================================== --- pypy/branch/buffer/pypy/lib/array.py (original) +++ pypy/branch/buffer/pypy/lib/array.py Sun Mar 9 16:26:38 2008 @@ -168,8 +168,9 @@ if not isinstance(ustr, unicode): raise TypeError("fromunicode() argument should probably be " "a unicode string") - self._frombuffer(ustr) # _frombuffer() does the currect thing using - # the buffer behavior of unicode objects + # _frombuffer() does the currect thing using + # the buffer behavior of unicode objects + self._frombuffer(buffer(ustr)) def tofile(self, f): """Write all items (as machine values) to the file object f. Also @@ -371,11 +372,6 @@ __rmul__ = __mul__ def __getitem__(self, i): - if self.typecode == 'c': # speed trick - try: - return self._data[i] - except TypeError: - pass # "bug": ctypes.create_string_buffer(10)[slice(2,5)] seqlength = len(self) if isinstance(i, slice): start, stop, step = i.indices(seqlength) @@ -390,6 +386,8 @@ return array(self.typecode, self._data[start * self.itemsize : stop * self.itemsize]) else: + if self.typecode == 'c': # speed trick + return self._data[i] if i < 0: i += seqlength if not (0 <= i < seqlength): @@ -423,6 +421,9 @@ self._data[start * self.itemsize : stop * self.itemsize] = x._data else: + if self.typecode == 'c': # speed trick + self._data[i] = x + return seqlength = len(self) if i < 0: i += seqlength Modified: pypy/branch/buffer/pypy/lib/test2/test_array.py ============================================================================== --- pypy/branch/buffer/pypy/lib/test2/test_array.py (original) +++ pypy/branch/buffer/pypy/lib/test2/test_array.py Sun Mar 9 16:26:38 2008 @@ -24,6 +24,12 @@ a *= 3 assert a.tolist() == [12, 34] * 3 + def test_unicode(self): + a = self.array.array('u') + a.fromunicode(unichr(9999)) + assert len(a) == 1 + assert a.tolist() == [unichr(9999)] + class TestArrayOnTopOfCPython(BaseArrayTests): From arigo at codespeak.net Sun Mar 9 16:29:14 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 16:29:14 +0100 (CET) Subject: [pypy-svn] r52341 - in pypy/branch/buffer: lib-python/modified-2.4.1/test pypy/interpreter Message-ID: <20080309152914.9251C16840A@codespeak.net> Author: arigo Date: Sun Mar 9 16:29:13 2008 New Revision: 52341 Modified: pypy/branch/buffer/lib-python/modified-2.4.1/test/test_array.py pypy/branch/buffer/pypy/interpreter/buffer.py Log: Trying to make test_array pass again: whack at the test :-/ Modified: pypy/branch/buffer/lib-python/modified-2.4.1/test/test_array.py ============================================================================== --- pypy/branch/buffer/lib-python/modified-2.4.1/test/test_array.py (original) +++ pypy/branch/buffer/lib-python/modified-2.4.1/test/test_array.py Sun Mar 9 16:29:13 2008 @@ -8,6 +8,11 @@ #from weakref import proxy import array, cStringIO, math +# XXX as we use the struct module we get struct.error when trying to push +# objects of invalid types or out of range into an array. If this issue +# is fixed, remove all mentions of struct.error in the sequel. +import struct + tests = [] # list to accumulate all tests typecodes = "cubBhHiIlLfd" @@ -88,7 +93,7 @@ self.assertEqual(a[0], a[1]) self.assertRaises(TypeError, a.insert) self.assertRaises(TypeError, a.insert, None) - self.assertRaises(TypeError, a.insert, 0, None) + self.assertRaises((TypeError, struct.error), a.insert, 0, None) a = array.array(self.typecode, self.example) a.insert(-1, self.example[0]) @@ -148,7 +153,7 @@ self.assertRaises(TypeError, a.tolist, 42) self.assertRaises(TypeError, b.fromlist) self.assertRaises(TypeError, b.fromlist, 42) - self.assertRaises(TypeError, b.fromlist, [None]) + self.assertRaises((TypeError, struct.error), b.fromlist, [None]) b.fromlist(a.tolist()) self.assertEqual(a, b) @@ -333,7 +338,7 @@ self.assertRaises(TypeError, a.__setitem__) self.assertRaises(TypeError, a.__setitem__, None) - self.assertRaises(TypeError, a.__setitem__, 0, None) + self.assertRaises((TypeError, struct.error), a.__setitem__, 0, None) self.assertRaises( IndexError, a.__setitem__, @@ -660,7 +665,7 @@ def test_setitem(self): super(StringTest, self).test_setitem() a = array.array(self.typecode, self.example) - self.assertRaises(TypeError, a.__setitem__, 0, self.example[:2]) + self.assertRaises((TypeError, struct.error), a.__setitem__, 0, self.example[:2]) class CharacterTest(StringTest): typecode = 'c' @@ -711,7 +716,7 @@ minitemsize = 2 def test_unicode(self): - self.assertRaises(TypeError, array.array, 'b', unicode('foo', 'ascii')) + self.assertRaises((TypeError, struct.error), array.array, 'b', unicode('foo', 'ascii')) a = array.array('u', unicode(r'\xa0\xc2\u1234', 'unicode-escape')) a.fromunicode(unicode(' ', 'ascii')) @@ -805,14 +810,14 @@ a = array.array(self.typecode, [lower]) a[0] = lower # should overflow assigning less than lower limit - self.assertRaises(OverflowError, array.array, self.typecode, [lower-1]) - self.assertRaises(OverflowError, a.__setitem__, 0, lower-1) + self.assertRaises((OverflowError, struct.error), array.array, self.typecode, [lower-1]) + self.assertRaises((OverflowError, struct.error), a.__setitem__, 0, lower-1) # should not overflow assigning upper limit a = array.array(self.typecode, [upper]) a[0] = upper # should overflow assigning more than upper limit - self.assertRaises(OverflowError, array.array, self.typecode, [upper+1]) - self.assertRaises(OverflowError, a.__setitem__, 0, upper+1) + self.assertRaises((OverflowError, struct.error), array.array, self.typecode, [upper+1]) + self.assertRaises((OverflowError, struct.error), a.__setitem__, 0, upper+1) def test_subclassing(self): typecode = self.typecode Modified: pypy/branch/buffer/pypy/interpreter/buffer.py ============================================================================== --- pypy/branch/buffer/pypy/interpreter/buffer.py (original) +++ pypy/branch/buffer/pypy/interpreter/buffer.py Sun Mar 9 16:29:13 2008 @@ -69,7 +69,7 @@ if step == 0: # index only if len(newstring) != 1: msg = 'buffer[index]=x: x must be a single character' - raise OperationError(space.w_ValueError, space.wrap(msg)) + raise OperationError(space.w_TypeError, space.wrap(msg)) char = newstring[0] # annotator hint self.setitem(start, char) elif step == 1: From arigo at codespeak.net Sun Mar 9 16:36:58 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 16:36:58 +0100 (CET) Subject: [pypy-svn] r52342 - pypy/branch/buffer/lib-python/modified-2.4.1/test Message-ID: <20080309153658.4438416840A@codespeak.net> Author: arigo Date: Sun Mar 9 16:36:57 2008 New Revision: 52342 Modified: pypy/branch/buffer/lib-python/modified-2.4.1/test/test_array.py Log: Final whacking. Tests pass. Modified: pypy/branch/buffer/lib-python/modified-2.4.1/test/test_array.py ============================================================================== --- pypy/branch/buffer/lib-python/modified-2.4.1/test/test_array.py (original) +++ pypy/branch/buffer/lib-python/modified-2.4.1/test/test_array.py Sun Mar 9 16:36:57 2008 @@ -810,8 +810,8 @@ a = array.array(self.typecode, [lower]) a[0] = lower # should overflow assigning less than lower limit - self.assertRaises((OverflowError, struct.error), array.array, self.typecode, [lower-1]) - self.assertRaises((OverflowError, struct.error), a.__setitem__, 0, lower-1) + self.assertRaises((OverflowError, struct.error, ValueError), array.array, self.typecode, [lower-1]) + self.assertRaises((OverflowError, struct.error, ValueError), a.__setitem__, 0, lower-1) # should not overflow assigning upper limit a = array.array(self.typecode, [upper]) a[0] = upper From arigo at codespeak.net Sun Mar 9 17:05:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 17:05:09 +0100 (CET) Subject: [pypy-svn] r52343 - pypy/branch/buffer/pypy/lib Message-ID: <20080309160509.7ADF0168415@codespeak.net> Author: arigo Date: Sun Mar 9 17:05:08 2008 New Revision: 52343 Modified: pypy/branch/buffer/pypy/lib/array.py Log: Bug fix. test_array passes on top of pypy-c too now. Modified: pypy/branch/buffer/pypy/lib/array.py ============================================================================== --- pypy/branch/buffer/pypy/lib/array.py (original) +++ pypy/branch/buffer/pypy/lib/array.py Sun Mar 9 17:05:08 2008 @@ -386,10 +386,10 @@ return array(self.typecode, self._data[start * self.itemsize : stop * self.itemsize]) else: - if self.typecode == 'c': # speed trick - return self._data[i] if i < 0: i += seqlength + if self.typecode == 'c': # speed trick + return self._data[i] if not (0 <= i < seqlength): raise IndexError(i) boundary = i * self.itemsize @@ -421,12 +421,12 @@ self._data[start * self.itemsize : stop * self.itemsize] = x._data else: - if self.typecode == 'c': # speed trick - self._data[i] = x - return seqlength = len(self) if i < 0: i += seqlength + if self.typecode == 'c': # speed trick + self._data[i] = x + return if not (0 <= i < seqlength): raise IndexError(i) boundary = i * self.itemsize From arigo at codespeak.net Sun Mar 9 18:04:40 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 9 Mar 2008 18:04:40 +0100 (CET) Subject: [pypy-svn] r52348 - in pypy/branch/buffer/pypy: module/_socket/test rlib Message-ID: <20080309170440.9F354168434@codespeak.net> Author: arigo Date: Sun Mar 9 18:04:40 2008 New Revision: 52348 Modified: pypy/branch/buffer/pypy/module/_socket/test/test_sock_app.py pypy/branch/buffer/pypy/rlib/rsocket.py Log: Aaah. socket.send() with a timeout would wait until the socket was ready to be *read* from before sending its data..... Modified: pypy/branch/buffer/pypy/module/_socket/test/test_sock_app.py ============================================================================== --- pypy/branch/buffer/pypy/module/_socket/test/test_sock_app.py (original) +++ pypy/branch/buffer/pypy/module/_socket/test/test_sock_app.py Sun Mar 9 18:04:40 2008 @@ -474,6 +474,39 @@ self.serv.settimeout(0.0) foo = self.serv.accept() raises(error, raise_error) + + def test_recv_send_timeout(self): + from _socket import socket, timeout + cli = socket() + cli.connect(self.serv.getsockname()) + t, addr = self.serv.accept() + cli.settimeout(1.0) + # test recv() timeout + t.send('*') + buf = cli.recv(100) + assert buf == '*' + raises(timeout, cli.recv, 100) + # test that send() works + count = cli.send('!') + assert count == 1 + buf = t.recv(1) + assert buf == '!' + # test that sendall() works + cli.sendall('?') + assert count == 1 + buf = t.recv(1) + assert buf == '?' + # test send() timeout + try: + while 1: + cli.send('foobar' * 70) + except timeout: + pass + # test sendall() timeout + raises(timeout, cli.sendall, 'foobar' * 70) + # done + cli.close() + t.close() class AppTestErrno: Modified: pypy/branch/buffer/pypy/rlib/rsocket.py ============================================================================== --- pypy/branch/buffer/pypy/rlib/rsocket.py (original) +++ pypy/branch/buffer/pypy/rlib/rsocket.py Sun Mar 9 18:04:40 2008 @@ -856,7 +856,7 @@ def send_raw(self, dataptr, length, flags=0): """Send data from a CCHARP buffer.""" res = -1 - timeout = self._select(False) + timeout = self._select(True) if timeout == 1: raise SocketTimeout elif timeout == 0: @@ -895,7 +895,7 @@ """Like send(data, flags) but allows specifying the destination address. (Note that 'flags' is mandatory here.)""" res = -1 - timeout = self._select(False) + timeout = self._select(True) if timeout == 1: raise SocketTimeout elif timeout == 0: From tverwaes at codespeak.net Mon Mar 10 00:59:54 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Mon, 10 Mar 2008 00:59:54 +0100 (CET) Subject: [pypy-svn] r52351 - in pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk: . test Message-ID: <20080309235954.0699C168400@codespeak.net> Author: tverwaes Date: Mon Mar 10 00:59:52 2008 New Revision: 52351 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_model.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_shadow.py Log: - moving around typecorrecting asserts - adding InvalidateableType as superclass of Shadows + Interpreter - Changing methodcaching to only cache used methods when they are used + reenabling tests concerning methodlookup Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py Mon Mar 10 00:59:52 2008 @@ -1,5 +1,5 @@ import py -from pypy.lang.smalltalk.shadow import AbstractShadow +from pypy.lang.smalltalk.shadow import Invalidateable from pypy.lang.smalltalk.shadow import ContextPartShadow from pypy.lang.smalltalk import model, constants, primitives from pypy.lang.smalltalk import objtable @@ -17,7 +17,7 @@ class IllegalStoreError(Exception): """Illegal Store.""" -class Interpreter(AbstractShadow): +class Interpreter(Invalidateable): TRUE = objtable.w_true FALSE = objtable.w_false @@ -50,7 +50,6 @@ def s_active_context(self): if self._s_active_context is None: self._s_active_context = self.w_active_context().as_context_get_shadow() - assert isinstance(self._s_active_context, ContextPartShadow) self._s_active_context.notifyinvalid(self) return self._s_active_context Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Mon Mar 10 00:59:52 2008 @@ -1,5 +1,5 @@ import sys -from pypy.rlib import rrandom +from pypy.rlib import rrandom, objectmodel from pypy.rlib.rarithmetic import intmask from pypy.lang.smalltalk import constants from pypy.tool.pairtype import extendabletype @@ -199,6 +199,7 @@ def setshadow(self, shadow): self._shadow = shadow + @objectmodel.specialize.arg(1) def as_special_get_shadow(self, TheClass, invalid=True): shadow = self._shadow if shadow is None: Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py Mon Mar 10 00:59:52 2008 @@ -36,7 +36,8 @@ objects = [] for name in constants.objects_in_special_object_table: + name = "w_" + name try: - objtable["w_" + name] = globals()["w_" + name] + objtable[name] = globals()[name] except KeyError, e: - objtable["w_" + name ] = None + objtable[name] = None Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Mon Mar 10 00:59:52 2008 @@ -2,7 +2,11 @@ from pypy.lang.smalltalk import model, constants, utility, error from pypy.tool.pairtype import extendabletype -class AbstractShadow(object): +class Invalidateable(object): + def invalidate(self): + pass + +class AbstractShadow(Invalidateable): """A shadow is an optional extra bit of information that can be attached at run-time to any Smalltalk object. """ @@ -162,10 +166,6 @@ w_superclass = w_self._vars[constants.CLASS_SUPERCLASS_INDEX] if w_superclass is not objtable.w_nil: self.s_superclass = w_superclass.as_class_get_shadow() - # Cache all methods of superclasses locally. - for selector, method in self.s_superclass.methoddict.items(): - if selector not in self.methoddict: - self.methoddict[selector] = method self.s_superclass.notifyinvalid(self) AbstractShadow.update_shadow(self) @@ -187,8 +187,6 @@ raise NotImplementedError(self.instance_kind) if store: from pypy.lang.smalltalk import objtable -## XXX breaks translation - assert isinstance(w_new, model.W_Object) objtable.objects += [w_new] return w_new @@ -237,11 +235,15 @@ def lookup(self, selector): look_in_shadow = self - if selector in self.methoddict: - # We cached all methods of superclasses locally. - return self.methoddict[selector] - else: - raise MethodNotFound(self, selector) + while look_in_shadow is not None: + try: + w_method = look_in_shadow.methoddict[selector] + # We locally cache the method we found. + self.methoddict[selector] = w_method + return w_method + except KeyError, e: + look_in_shadow = look_in_shadow.s_superclass + raise MethodNotFound(self, selector) def installmethod(self, selector, method): "NOT_RPYTHON" # this is only for testing. @@ -326,7 +328,6 @@ priority = s_process.priority() s_scheduler = self.s_scheduler() w_process_lists = s_scheduler.process_lists() - assert isinstance(w_process_lists, model.W_PointersObject) w_process_list = w_process_lists._vars[priority] w_process_list.as_linkedlist_get_shadow().add_last_link(s_process.w_self()) s_process.store_my_list(w_process_list) @@ -424,7 +425,9 @@ self.w_self()._vars[constants.SCHEDULER_ACTIVE_PROCESS_INDEX] = w_object def process_lists(self): - return self.w_self()._vars[constants.SCHEDULER_PROCESS_LISTS_INDEX] + w_v = self.w_self()._vars[constants.SCHEDULER_PROCESS_LISTS_INDEX] + assert isinstance(w_v, model.W_PointersObject) + return w_v class ContextPartShadow(AbstractShadow): @@ -492,7 +495,6 @@ def getbytecode(self): assert self._pc >= 0 w_method = self.w_method() - assert isinstance(w_method, model.W_CompiledMethod) bytecode = w_method.bytes[self._pc] currentBytecode = ord(bytecode) self._pc = self._pc + 1 @@ -626,8 +628,7 @@ def update_shadow(self): # Make sure the method is updated first - self._w_method = self.w_self()._vars[constants.MTHDCTX_METHOD] - assert isinstance(self._w_method, model.W_CompiledMethod) + self.store_w_method(self.w_self()._vars[constants.MTHDCTX_METHOD]) ContextPartShadow.update_shadow(self) def update_w_self(self): @@ -635,7 +636,6 @@ self.w_self()._vars[constants.MTHDCTX_METHOD] = self._w_method def w_method(self): - assert isinstance(self._w_method, model.W_CompiledMethod) return self._w_method def store_w_method(self, w_method): @@ -662,7 +662,6 @@ def stackstart(self): w_method = self.w_method() - assert isinstance(w_method, model.W_CompiledMethod) return (constants.MTHDCTX_TEMP_FRAME_START + w_method.argsize + w_method.tempsize) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_model.py Mon Mar 10 00:59:52 2008 @@ -54,7 +54,6 @@ py.test.raises(IndexError, lambda: w_bytes.getword(20)) def test_method_lookup(): - py.test.skip("Fix me; methods are now cached on each level -> when a level changes other levels need to be notified and updated.") w_class = mockclass(0) shadow = w_class.as_class_get_shadow() shadow.methoddict["foo"] = 1 @@ -72,7 +71,6 @@ py.test.raises(MethodNotFound, subshadow.lookup, "zork") def test_w_compiledin(): - py.test.skip("Fix me; methods are now cached on each level -> when a level changes other levels need to be notified and updated.") w_super = mockclass(0) w_class = mockclass(0, w_superclass=w_super) supershadow = w_super.as_class_get_shadow() @@ -96,15 +94,6 @@ assert h1 == h2 assert h1 == w_inst.hash -def test_compiledmethod_fetchbyte(): - py.test.skip("Fetchbyte doesn't exist anymore. Test by setting pc in pointersobject; decoding and asking next bytecode") - w_method = model.W_CompiledMethod() - w_method.bytes = "abc" - w_method.literalsize = 2 - w_method.fetchbyte(9) == ord('a') - w_method.fetchbyte(10) == ord('b') - w_method.fetchbyte(11) == ord('c') - def test_compiledmethod_at0(): w_method = model.W_CompiledMethod() w_method.bytes = "abc" Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_shadow.py Mon Mar 10 00:59:52 2008 @@ -162,7 +162,7 @@ assert s_object.next() == 'foo' assert s_object.priority() == 3 assert s_object.my_list() == 'mli' - assert s_object.s_suspended_context() == w_context.as_context_get_shadow() + assert s_object.w_suspended_context() == w_context def test_association(): w_object = model.W_PointersObject(None, 2) @@ -174,15 +174,16 @@ def test_scheduler(): w_process = process() + w_pl = model.W_PointersObject(None, 0) w_object = model.W_PointersObject(None, 2) w_object.store(constants.SCHEDULER_ACTIVE_PROCESS_INDEX, w_process) - w_object.store(constants.SCHEDULER_PROCESS_LISTS_INDEX, 'pl') + w_object.store(constants.SCHEDULER_PROCESS_LISTS_INDEX, w_pl) s_object = w_object.as_scheduler_get_shadow() assert s_object.s_active_process() == w_process.as_process_get_shadow() - assert s_object.process_lists() == 'pl' + assert s_object.process_lists() == w_pl w_process2 = process() s_object.store_w_active_process(w_process2) - assert s_object.process_lists() == 'pl' + assert s_object.process_lists() == w_pl assert s_object.s_active_process() != w_process.as_process_get_shadow() assert s_object.s_active_process() == w_process2.as_process_get_shadow() From tverwaes at codespeak.net Mon Mar 10 01:55:17 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Mon, 10 Mar 2008 01:55:17 +0100 (CET) Subject: [pypy-svn] r52352 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080310005517.931C1168418@codespeak.net> Author: tverwaes Date: Mon Mar 10 01:55:15 2008 New Revision: 52352 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py Log: making objtable.objects additions translatable Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py Mon Mar 10 01:55:15 2008 @@ -18,6 +18,10 @@ wrap_char_table() +def init_chartable_from_objtable(): + global CharacterTable + CharacterTable = objtable["w_charactertable"] + w_true = classtable.classtable['w_True'].as_class_get_shadow().new(store=False) w_false = classtable.classtable['w_False'].as_class_get_shadow().new(store=False) w_minus_one = model.W_SmallInteger(-1) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Mon Mar 10 01:55:15 2008 @@ -187,7 +187,7 @@ raise NotImplementedError(self.instance_kind) if store: from pypy.lang.smalltalk import objtable - objtable.objects += [w_new] + objtable.objects.extend([w_new]) return w_new # _______________________________________________________________ Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py Mon Mar 10 01:55:15 2008 @@ -203,11 +203,13 @@ .g_object.pointers] from pypy.lang.smalltalk import objtable - objtable.objects = [chunk.g_object.w_object for chunk in reader.chunklist] + objtable.objects.extend( + [chunk.g_object.w_object + for chunk in reader.chunklist]) for name, idx in constants.objects_in_special_object_table.items(): objtable.objtable["w_" + name] = self.special_objects[idx] - objtable.CharacterTable = objtable.objtable["w_charactertable"] + objtable.init_chartable_from_objtable() def special(self, index): return self.special_objects[index] From tverwaes at codespeak.net Mon Mar 10 02:00:12 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Mon, 10 Mar 2008 02:00:12 +0100 (CET) Subject: [pypy-svn] r52353 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080310010012.07E59168418@codespeak.net> Author: tverwaes Date: Mon Mar 10 02:00:12 2008 New Revision: 52353 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/utility.py Log: making CharacterTable loading from image translatable while keeping stub working for tests. Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py Mon Mar 10 02:00:12 2008 @@ -6,22 +6,18 @@ # Global Data def wrap_char_table(): - global CharacterTable + global w_charactertable def bld_char(i): w_cinst = classtable.w_Character.as_class_get_shadow().new(store=False) w_cinst.store(constants.CHARACTER_VALUE_INDEX, model.W_SmallInteger(i)) return w_cinst - CharacterTable = model.W_PointersObject(classtable.classtable['w_Array'], 256) + w_charactertable = model.W_PointersObject(classtable.classtable['w_Array'], 256) for i in range(256): - CharacterTable.atput0(i, bld_char(i)) + w_charactertable.atput0(i, bld_char(i)) wrap_char_table() -def init_chartable_from_objtable(): - global CharacterTable - CharacterTable = objtable["w_charactertable"] - w_true = classtable.classtable['w_True'].as_class_get_shadow().new(store=False) w_false = classtable.classtable['w_False'].as_class_get_shadow().new(store=False) w_minus_one = model.W_SmallInteger(-1) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py Mon Mar 10 02:00:12 2008 @@ -209,8 +209,6 @@ for name, idx in constants.objects_in_special_object_table.items(): objtable.objtable["w_" + name] = self.special_objects[idx] - objtable.init_chartable_from_objtable() - def special(self, index): return self.special_objects[index] Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/utility.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/utility.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/utility.py Mon Mar 10 02:00:12 2008 @@ -51,8 +51,8 @@ return w_inst def wrap_char(c): - from pypy.lang.smalltalk.objtable import CharacterTable - return CharacterTable.fetch(ord(c)) + from pypy.lang.smalltalk.objtable import w_charactertable + return w_charactertable.fetch(ord(c)) def wrap_bool(bool): from pypy.lang.smalltalk import objtable From tverwaes at codespeak.net Mon Mar 10 02:48:12 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Mon, 10 Mar 2008 02:48:12 +0100 (CET) Subject: [pypy-svn] r52354 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080310014812.7580E16841B@codespeak.net> Author: tverwaes Date: Mon Mar 10 02:48:10 2008 New Revision: 52354 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Log: making code translatable Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py Mon Mar 10 02:48:10 2008 @@ -129,6 +129,7 @@ # named var (the value). index = self.currentBytecode & 31 w_association = self.w_method().getliteral(index) + assert isinstance(w_association, model.W_PointersObject) s_association = w_association.as_association_get_shadow() self.push(s_association.value()) @@ -269,6 +270,7 @@ self.push(self.w_method().getliteral(variableIndex)) elif variableType == 3: w_association = self.w_method().getliteral(variableIndex) + assert isinstance(w_association, model.W_PointersObject) s_association = w_association.as_association_get_shadow() self.push(s_association.value()) else: @@ -284,6 +286,7 @@ raise IllegalStoreError elif variableType == 3: w_association = self.w_method().getliteral(variableIndex) + assert isinstance(w_association, model.W_PointersObject) s_association = w_association.as_association_get_shadow() s_association.store_value(self.top()) @@ -321,6 +324,7 @@ elif opType == 4: # pushLiteralVariable w_association = self.w_method().getliteral(third) + assert isinstance(w_association, model.W_PointersObject) s_association = w_association.as_association_get_shadow() self.push(s_association.value()) elif opType == 5: @@ -329,6 +333,7 @@ self.w_receiver().store(third, self.pop()) elif opType == 7: w_association = self.w_method().getliteral(third) + assert isinstance(w_association, model.W_PointersObject) s_association = w_association.as_association_get_shadow() s_association.store_value(self.top()) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Mon Mar 10 02:48:10 2008 @@ -373,6 +373,7 @@ # Last of the literals is an association with compiledin # as a class w_association = self.literals[-1] + assert isinstance(w_association, W_PointersObject) s_association = w_association.as_association_get_shadow() self.w_compiledin = s_association.value() return self.w_compiledin Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Mon Mar 10 02:48:10 2008 @@ -329,6 +329,7 @@ s_scheduler = self.s_scheduler() w_process_lists = s_scheduler.process_lists() w_process_list = w_process_lists._vars[priority] + assert isinstance(w_process_list, model.W_PointersObject) w_process_list.as_linkedlist_get_shadow().add_last_link(s_process.w_self()) s_process.store_my_list(w_process_list) @@ -345,6 +346,8 @@ def s_scheduler(self): from pypy.lang.smalltalk import objtable w_association = objtable.objtable["w_schedulerassociationpointer"] + assert w_association is not None + assert isinstance(w_association, model.W_PointersObject) w_scheduler = w_association.as_association_get_shadow().value() return w_scheduler.as_scheduler_get_shadow() From tverwaes at codespeak.net Mon Mar 10 07:24:27 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Mon, 10 Mar 2008 07:24:27 +0100 (CET) Subject: [pypy-svn] r52355 - in pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk: . test tool Message-ID: <20080310062427.2CE0D168405@codespeak.net> Author: tverwaes Date: Mon Mar 10 07:24:26 2008 New Revision: 52355 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_miniimage.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_primitives.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/tool/analyseimage.py Log: adding asserts to satisfy translation warnings disabling own BECOME hack (-> makes tinybenchmarks run +/- 6 times faster; but breaks compile_method) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/interpreter.py Mon Mar 10 07:24:26 2008 @@ -184,7 +184,9 @@ receiver, receiver.shadow_of_my_class()) def _sendSuperSelector(self, selector, argcount, interp): - s_compiledin = self.w_method().compiledin().as_class_get_shadow() + w_compiledin = self.w_method().compiledin() + assert isinstance(w_compiledin, model.W_PointersObject) + s_compiledin = w_compiledin.as_class_get_shadow() self._sendSelector(selector, argcount, interp, self.w_receiver(), s_compiledin.s_superclass) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Mon Mar 10 07:24:26 2008 @@ -19,22 +19,22 @@ return self.size() def getclass(self): - raise NotImplementedError + raise NotImplementedError() def gethash(self): - raise NotImplementedError + raise NotImplementedError() def at0(self, index0): - raise NotImplementedError + raise NotImplementedError() def atput0(self, index0, w_value): - raise NotImplementedError + raise NotImplementedError() def fetch(self, n0): - raise NotImplementedError + raise NotImplementedError() def store(self, n0, w_value): - raise NotImplementedError + raise NotImplementedError() def invariant(self): return True @@ -122,6 +122,7 @@ self.w_class = w_class def getclass(self): + assert self.w_class is not None return self.w_class def __repr__(self): @@ -143,6 +144,8 @@ def become(self, w_old, w_new): if self.w_class == w_old: self.w_class = w_new + elif self.w_class == w_new: + self.w_class = w_old class W_PointersObject(W_AbstractObjectWithClassReference): """ The normal object """ @@ -179,10 +182,10 @@ self._vars[idx+self.instsize()] = value def varsize(self): - return self.size() - self.shadow_of_my_class().instsize() + return self.size() - self.instsize() def instsize(self): - return self.getclass().as_class_get_shadow().instsize() + return self.shadow_of_my_class().instsize() def primsize(self): return self.varsize() @@ -264,8 +267,11 @@ def become(self, w_old, w_new): W_AbstractObjectWithClassReference.become(self, w_old, w_new) for i in range(len(self._vars)): - if self.fetch(i) == w_old: + w_test = self.fetch(i) + if w_test == w_old: self.store(i, w_new) + elif w_test == w_new: + self.store(i, w_old) class W_BytesObject(W_AbstractObjectWithClassReference): def __init__(self, w_class, size): @@ -515,6 +521,7 @@ # mc for methods with islarge flag turned on 32 size = 12 + w_method.islarge * 20 + w_method.argsize w_result = w_MethodContext.as_class_get_shadow().new(size) + assert isinstance(w_result, W_PointersObject) # Only home-brewed shadows are not invalid from start. s_result = w_result.as_methodcontext_get_shadow(invalid=False) s_result.store_w_method(w_method) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/objtable.py Mon Mar 10 07:24:26 2008 @@ -32,8 +32,8 @@ w_nil.w_class = classtable.classtable['w_UndefinedObject'] objtable = {} -# XXX Should be table of weakref, contains all objects in the system -objects = [] +# XXX Used for non-PyPy way of doing become. +#objects = [] for name in constants.objects_in_special_object_table: name = "w_" + name Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py Mon Mar 10 07:24:26 2008 @@ -95,6 +95,7 @@ elif spec is object: args += (w_arg, ) elif spec is str: + assert isinstance(w_arg, model.W_BytesObject) args += (w_arg.as_string(), ) elif spec is char: args += (unwrap_char(w_arg), ) @@ -366,6 +367,7 @@ @expose_primitive(NEW, unwrap_spec=[object]) def func(interp, w_cls): + assert isinstance(w_cls, model.W_PointersObject) s_class = w_cls.as_class_get_shadow() if s_class.isvariable(): raise PrimitiveFailedError() @@ -373,6 +375,7 @@ @expose_primitive(NEW_WITH_ARG, unwrap_spec=[object, int]) def func(interp, w_cls, size): + assert isinstance(w_cls, model.W_PointersObject) s_class = w_cls.as_class_get_shadow() if not s_class.isvariable(): raise PrimitiveFailedError() @@ -499,9 +502,9 @@ @expose_primitive(BECOME, unwrap_spec=[object, object]) def func(interp, w_rcvr, w_new): - for w_object in objtable.objects: - w_object.become(w_rcvr, w_new) - return w_rcvr +# for w_object in objtable.objects: +# w_object.become(w_rcvr, w_new) + raise PrimitiveNotYetWrittenError def fake_bytes_left(): return utility.wrap_int(2**20) # XXX we don't know how to do this :-( @@ -627,6 +630,7 @@ # the new BlockContext's home context. Otherwise, the home # context of the receiver is used for the new BlockContext. # Note that in our impl, MethodContext.w_home == self + assert isinstance(w_context, model.W_PointersObject) w_method_context = w_context.as_context_get_shadow().w_home() # The block bytecodes are stored inline: so we skip past the @@ -655,8 +659,12 @@ # Validate that we have a block on the stack and that it received # the proper number of arguments: w_block_ctx = frame.peek(argument_count) + + # XXX need to check this since VALUE is called on all sorts of objects. if w_block_ctx.getclass() != classtable.w_BlockContext: raise PrimitiveFailedError() + + assert isinstance(w_block_ctx, model.W_PointersObject) s_block_ctx = w_block_ctx.as_blockcontext_get_shadow() @@ -678,6 +686,8 @@ @expose_primitive(PRIMITIVE_VALUE_WITH_ARGS, unwrap_spec=[object, object], no_result=True) def func(interp, w_block_ctx, w_args): + + assert isinstance(w_block_ctx, model.W_PointersObject) s_block_ctx = w_block_ctx.as_blockcontext_get_shadow() exp_arg_cnt = s_block_ctx.expected_argument_count() @@ -687,6 +697,7 @@ if w_args.size() != exp_arg_cnt: raise PrimitiveFailedError() + assert isinstance(w_args, model.W_PointersObject) # Push all the items from the array for i in range(exp_arg_cnt): s_block_ctx.push(w_args.fetchvarpointer(i)) @@ -714,8 +725,9 @@ @expose_primitive(PRIMITIVE_SIGNAL, unwrap_spec=[object]) def func(interp, w_rcvr): - if w_rcvr.getclass() != classtable.classtable['w_Semaphore']: - raise PrimitiveFailedError() + #if w_rcvr.getclass() != classtable.classtable['w_Semaphore']: + # raise PrimitiveFailedError() + assert isinstance(w_rcvr, model.W_PointersObject) w_rcvr.as_semaphore_get_shadow().synchronous_signal(interp) return w_rcvr Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Mon Mar 10 07:24:26 2008 @@ -155,6 +155,7 @@ self.name = w_name.as_string() # read the methoddict w_methoddict = w_self._vars[constants.CLASS_METHODDICT_INDEX] + assert isinstance(w_methoddict, model.W_PointersObject) s_methoddict = w_methoddict.as_methoddict_get_shadow() self.methoddict = s_methoddict.methoddict s_methoddict.notifyinvalid(self) @@ -165,6 +166,7 @@ # read s_superclass w_superclass = w_self._vars[constants.CLASS_SUPERCLASS_INDEX] if w_superclass is not objtable.w_nil: + assert isinstance(w_superclass, model.W_PointersObject) self.s_superclass = w_superclass.as_class_get_shadow() self.s_superclass.notifyinvalid(self) AbstractShadow.update_shadow(self) @@ -185,9 +187,10 @@ w_new = model.W_CompiledMethod(extrasize) else: raise NotImplementedError(self.instance_kind) - if store: - from pypy.lang.smalltalk import objtable - objtable.objects.extend([w_new]) + # XXX Used for non-PyPy way of doing become. + #if store: + # from pypy.lang.smalltalk import objtable + # objtable.objects.extend([w_new]) return w_new # _______________________________________________________________ @@ -235,11 +238,12 @@ def lookup(self, selector): look_in_shadow = self - while look_in_shadow is not None: + while lookin_shadow is not None: try: w_method = look_in_shadow.methoddict[selector] # We locally cache the method we found. - self.methoddict[selector] = w_method + if look_in_shadow is not self: + self.methoddict[selector] = w_method return w_method except KeyError, e: look_in_shadow = look_in_shadow.s_superclass @@ -282,13 +286,17 @@ AbstractShadow.__init__(self, w_self, invalid) def w_firstlink(self): - return self.w_self()._vars[constants.FIRST_LINK_INDEX] + w_v = self.w_self()._vars[constants.FIRST_LINK_INDEX] + assert isinstance(w_v, model.W_PointersObject) + return w_v def store_w_firstlink(self, w_object): self.w_self()._vars[constants.FIRST_LINK_INDEX] = w_object def w_lastlink(self): - return self.w_self()._vars[constants.LAST_LINK_INDEX] + w_v = self.w_self()._vars[constants.LAST_LINK_INDEX] + assert isinstance(w_v, model.W_PointersObject) + return w_v def store_w_lastlink(self, w_object): self.w_self()._vars[constants.LAST_LINK_INDEX] = w_object @@ -349,6 +357,7 @@ assert w_association is not None assert isinstance(w_association, model.W_PointersObject) w_scheduler = w_association.as_association_get_shadow().value() + assert isinstance(w_scheduler, model.W_PointersObject) return w_scheduler.as_scheduler_get_shadow() def resume(self, w_process, interp): @@ -422,7 +431,9 @@ AbstractShadow.__init__(self, w_self, invalid) def s_active_process(self): - return self.w_self()._vars[constants.SCHEDULER_ACTIVE_PROCESS_INDEX].as_process_get_shadow() + w_v = self.w_self()._vars[constants.SCHEDULER_ACTIVE_PROCESS_INDEX] + assert isinstance(w_v, model.W_PointersObject) + return w_v.as_process_get_shadow() def store_w_active_process(self, w_object): self.w_self()._vars[constants.SCHEDULER_ACTIVE_PROCESS_INDEX] = w_object @@ -443,6 +454,8 @@ self.stackpointer() + 1)] self._pc = utility.unwrap_int(self.w_self()._vars[constants.CTXPART_PC_INDEX]) self._pc -= 1 + self.w_method().getliteralsize() + # Using a shadow most likely results in an invalid state for w_self + self.invalidate_w_self() def update_w_self(self): AbstractShadow.update_w_self(self) @@ -455,15 +468,23 @@ def __init__(self, w_self, invalid): AbstractShadow.__init__(self, w_self, invalid) + def w_home(self): + raise NotImplementedError() + def s_home(self): raise NotImplementedError() + + def stackstart(self): + raise NotImplementedError() def w_receiver(self): " Return self of the method, or the method that contains the block " return self.s_home().w_receiver() def w_sender(self): - return self.w_self()._vars[constants.CTXPART_SENDER_INDEX] + w_v = self.w_self()._vars[constants.CTXPART_SENDER_INDEX] + assert isinstance(w_v, model.W_PointersObject) + return w_v def s_sender(self): from pypy.lang.smalltalk import objtable @@ -480,7 +501,6 @@ return self._pc def store_pc(self, newpc): - self.invalidate_w_self() self._pc = newpc def stackpointer(self): @@ -497,10 +517,9 @@ def getbytecode(self): assert self._pc >= 0 - w_method = self.w_method() - bytecode = w_method.bytes[self._pc] + bytecode = self.w_method().bytes[self._pc] currentBytecode = ord(bytecode) - self._pc = self._pc + 1 + self._pc += 1 return currentBytecode def getNextBytecode(self): @@ -516,23 +535,19 @@ return self.s_home().gettemp(index) def settemp(self, index, w_value): - self.invalidate_w_self() self.s_home().settemp(index, w_value) # ______________________________________________________________________ # Stack Manipulation def pop(self): - self.invalidate_w_self() w_v = self._stack[-1] self._stack = self._stack[:-1] return w_v def push(self, w_v): - self.invalidate_w_self() self._stack += [w_v] def push_all(self, lst): - self.invalidate_w_self() #for x in lst: # self.push(x) self._stack += lst @@ -544,7 +559,6 @@ return self._stack[-(idx + 1)] def pop_n(self, n): - self.invalidate_w_self() assert n >= 0 start = len(self._stack) - n assert start >= 0 # XXX what if this fails? @@ -554,14 +568,13 @@ return self._stack def pop_and_return_n(self, n): - self.invalidate_w_self() assert n >= 0 start = len(self._stack) - n assert start >= 0 # XXX what if this fails? res = self._stack[start:] del self._stack[start:] return res - + class BlockContextShadow(ContextPartShadow): def __init__(self, w_self, invalid): @@ -591,21 +604,19 @@ return self._eargc def store_expected_argument_count(self, argc): - self.invalidate_w_self() self._eargc = argc def initialip(self): return self._initialip def store_initialip(self, initialip): - self.invalidate_w_self() self._initialip = initialip def store_w_home(self, w_home): if self._s_home is not None: self._s_home.unnotify(self) self._s_home = None - self.invalidate_w_self() + assert isinstance(w_home, model.W_PointersObject) self._w_home = w_home def w_home(self): @@ -618,7 +629,6 @@ return self._s_home def reset_stack(self): - self.invalidate_w_self() self._stack = [] def stackstart(self): Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py Mon Mar 10 07:24:26 2008 @@ -203,9 +203,10 @@ .g_object.pointers] from pypy.lang.smalltalk import objtable - objtable.objects.extend( - [chunk.g_object.w_object - for chunk in reader.chunklist]) + # XXX Used for non-PyPy way of doing become. + #objtable.objects.extend( + # [chunk.g_object.w_object + # for chunk in reader.chunklist]) for name, idx in constants.objects_in_special_object_table.items(): objtable.objtable["w_" + name] = self.special_objects[idx] Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_miniimage.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_miniimage.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_miniimage.py Mon Mar 10 07:24:26 2008 @@ -56,6 +56,7 @@ def test_number_of_objects(): + py.test.skip("we don't store globally available objects other than the special objects array") image = get_image() objects = objtable.objects assert len(objects) > 0 @@ -75,6 +76,7 @@ assert len(reader.compactclasses) == 31 def test_invariant(): + py.test.skip("we don't store globally available objects other than the special objects array") image = get_image() for each in objtable.objects: each.invariant() Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_primitives.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_primitives.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_primitives.py Mon Mar 10 07:24:26 2008 @@ -401,20 +401,36 @@ p1 := 1 at 2. p2 := #(3 4 5). a := p1 -> p2. - self assert: 1 at 2 = a key. - self assert: #(3 4 5) = a value. - self assert: p1 -> p2 = a. + XXX ? self assert: 1 at 2 = a key. + XXX ? self assert: #(3 4 5) = a value. + XXX ? self assert: p1 -> p2 = a. self assert: p1 == a key. self assert: p2 == a value. p1 become: p2. - self assert: 1 at 2 = a value. - self assert: #(3 4 5) = a key. - self assert: p1 -> p2 = a. + XXX ? self assert: 1 at 2 = a value. + XXX ? self assert: #(3 4 5) = a key. + XXX ? self assert: p1 -> p2 = a. self assert: p1 == a key. self assert: p2 == a value. self should: [1 become: 2] raise: Error. """ + # XXX Test deviates from original spec + w_p1 = model.W_PointersObject(None, 2) + w_p2 = model.W_PointersObject(None, 3) + w_a = model.W_PointersObject(classtable.w_Array, 2) + w_a.atput0(0,w_p1) + w_a.atput0(1,w_p2) + objtable.objects += [w_p1] + objtable.objects += [w_p2] + objtable.objects += [w_a] + s_a = w_a.as_association_get_shadow() + assert s_a.key() == w_p1 + assert s_a.value() == w_p2 + prim(primitives.BECOME, [w_p1, w_p2]) + s_a = w_a.as_association_get_shadow() + assert s_a.key() == w_p2 + assert s_a.value() == w_p1 def test_load_inst_var(): " try to test the LoadInstVar primitives a little " Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/tool/analyseimage.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/tool/analyseimage.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/tool/analyseimage.py Mon Mar 10 07:24:26 2008 @@ -42,39 +42,15 @@ assert w_method w_frame = w_method.create_frame(w_object, []) - interp.w_active_context = w_frame - - print w_method - print "Going to execute %d toplevel bytecodes" % (len(w_method.bytes),) - counter = 0 + interp.store_w_active_context(w_frame) from pypy.lang.smalltalk.interpreter import BYTECODE_TABLE while True: try: - counter += 1 - if interp.w_active_context == w_frame: - print "Executing toplevel bytecode nr: %d of %d" % (interp.w_active_context.pc+1, len(w_method.bytes)) - cb = ord(interp.w_active_context.w_method().bytes[interp.w_active_context.pc]) - print "= bytecode: %s %d" % (BYTECODE_TABLE[cb].__name__,cb) interp.step() - #if hasattr(interp.w_active_context,"currentBytecode"): - # print "Executing bytecode: %s" % (BYTECODE_TABLE[interp.w_active_context.currentBytecode].__name__,) - #else: - # print "Jump to new stackframe" - # print interp.w_active_context.stack - if counter == 100000: - counter = 0 - sys.stderr.write("#") except interpreter.ReturnFromTopLevel, e: print e.object return - except: - if hasattr(interp.w_active_context,"currentBytecode"): - cb = interp.w_active_context.currentBytecode - print "Failing bytecode: %s %d" % (BYTECODE_TABLE[cb].__name__,cb) - raise - - def test_do(): #testSelector() From cami at codespeak.net Mon Mar 10 12:12:40 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Mon, 10 Mar 2008 12:12:40 +0100 (CET) Subject: [pypy-svn] r52356 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080310111240.762CE168407@codespeak.net> Author: cami Date: Mon Mar 10 12:12:39 2008 New Revision: 52356 Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Removed: pypy/branch/gameboy-emulator/pypy/lang/gameboy/romimage.py Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py Log: started implementation of the cartridge module, moved all constants into constans.py (which may be a mistake, we'll see) Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py ============================================================================== --- (empty file) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Mon Mar 10 12:12:39 2008 @@ -0,0 +1,193 @@ +# CATRIGE TYPES +# ___________________________________________________________________________ + + +TYPE_ROM_ONLY = 0x00 + +TYPE_MBC1 = 0x01 +TYPE_MBC1_RAM = 0x02 +TYPE_MBC1_RAM_BATTERY = 0x03 + +TYPE_MBC2 = 0x05 +TYPE_MBC2_BATTERY = 0x06 + +TYPE_MBC3_RTC_BATTERY = 0x0F +TYPE_MBC3_RTC_RAM_BATTERY = 0x10 +TYPE_MBC3 = 0x11 +TYPE_MBC3_RAM = 0x12 +TYPE_MBC3_RAM_BATTERY = 0x13 + +TYPE_MBC5 = 0x19 +TYPE_MBC5_RAM = 0x1A +TYPE_MBC5_RAM_BATTERY = 0x1B + +TYPE_MBC5_RUMBLE = 0x1C +TYPE_MBC5_RUMBLE_RAM = 0x1D +TYPE_MBC5_RUMBLE_RAM_BATTERY = 0x1E + +TYPE_HUC3_RTC_RAM = 0xFE +TYPE_HUC1_RAM_BATTERY = 0xFF + +CATRIDGE_TYPE_MAPPING = { + TYPE_ROM_ONLY: MBC1, + TYPE_MBC1: MBC1, + TYPE_MBC1_RAM: MBC1, + TYPE_MBC1_RAM_BATTERY: MBC1, + TYPE_MBC2: MBC2, + TYPE_MBC2_BATTERY: MBC2, + TYPE_MBC3_RTC_BATTERY: MBC3, + TYPE_MBC3_RTC_RAM_BATTERY: MBC3, + TYPE_MBC3: MBC3, + TYPE_MBC3_RAM: MBC3, + TYPE_MBC3_RAM_BATTERY: MBC3, + TYPE_MBC5: MBC5, + TYPE_MBC5_RAM: MBC5, + TYPE_MBC5_RAM_BATTERY: MBC5, + TYPE_MBC5_RUMBLE: MBC5, + TYPE_MBC5_RUMBLE_RAM: MBC5, + TYPE_MBC5_RUMBLE_RAM_BATTERY: MBC5, + TYPE_HUC3_RTC_RAM: HuC3, + TYPE_HUC1_RAM_BATTERY: HuC1 + }; + + + +def hasCartridgeBattery(self, cartridgeType): + return (cartridgeType == TYPE_MBC1_RAM_BATTERY \ + or cartridgeType == TYPE_MBC2_BATTERY \ + or cartridgeType == TYPE_MBC3_RTC_BATTERY \ + or cartridgeType == TYPE_MBC3_RTC_RAM_BATTERY \ + or cartridgeType == TYPE_MBC3_RAM_BATTERY \ + or cartridgeType == TYPE_MBC5_RAM_BATTERY \ + or cartridgeType == TYPE_MBC5_RUMBLE_RAM_BATTERY \ + or cartridgeType == TYPE_HUC1_RAM_BATTERY); + + +def hasCartridgeType(self, catridgeType): + return CATRIDGE_TYPE_MAPPING.has_key(cartridgeType); + + +def createBankController(self, cartridgeType, rom, ram, clock): + if hasCartridgeType(cartridgeType): + return CATRIDGE_TYPE_MAPPING[cartridgeType](rom, ram, clock); + else: + raise InvalidMemoryBankTypeError("Unsupported memory bank controller (0x"+hex(cartridgeType)+")") + + +class InvalidMemoryBankTypeError(Exception): + pass + + + +# ______________________________________________________________________________ +# CARTRIDGE + +class Cartridge(object): + + CARTRIDGE_TYPE_ADDRESS = 0x0147 + ROM_SIZE_ADDRESS = 0x0148 + RAM_SIZE_ADDRESS = 0x0149 + RAM_SIZE_MAPPING = {0x00:0, 0x01:8192, 0x02:8192, 0x03:32768} + DESTINATION_CODE_ADDRESS = 0x014A + LICENSEE_ADDRESS = 0x014B + ROM_VERSION_ADDRESS = 0x014C + HEADER_CHECKSUM_ADDRESS = 0x014D + CHECKSUM_A_ADDRESS = 0x014E + CHECKSUM_B_ADDRESS = 0x014F + + def __init__(self, storeDriver, clockDriver): + self.store = storeDriver + self.clock = clockDriver + + def initialize(self): + pass + + def getTitle(self): + pass + + def getCartridgeType(self): + return self.rom[CARTRIDGE_TYPE_ADDRESS] & 0xFF + + def getRom(self): + return self.rom + + def getROMSize(self): + romSize = self.rom[CARTRIDGE_SIZE_ADDRESS] & 0xFF + if romSize>=0x00 and romSize<=0x07: + return 32768 << romSize + return -1 + + + def getRAMSize(self): + return RAM_SIZE_MAPPING[self.rom[RAM_SIZE_ADDRESS]] + + def getDestinationCode(self): + return self.rom[DESTINATION_CODE_ADDRESS] & 0xFF; + + def getLicenseeCode(): + return self.rom[LICENSEE_ADDRESS] & 0xFF; + + def getROMVersion(self): + return self.rom[ROM_VERSION_ADDRESS] & 0xFF; + + def getHeaderChecksum(self): + return self.rom[HEADER_CHECKSUM_ADDRESS] & 0xFF; + + def getChecksum(self): + return ((rom[CHECKSUM_A_ADDRESS] & 0xFF) << 8) + (rom[CHECKSUM_B_ADDRESS] & 0xFF); + + def hasBattery(self): + return hasCartridgeBattery(self.getCartridgeType()) + + def reset(self): + if not self.hasBattery(): + self.ram[0:len(self.ram):1] = 0xFF; + self.mbc.reset(); + + def read(self, address): + return self.mbc.read(address); + + def write(self, address, data): + self.mbc.write(address, data); + + def load(self, cartridgeName): + romSize = self.store.getCartridgeSize(cartridgeName); + self.rom = [] + self.rom[0:romSize:1] = 0 + self.store.readCartridge(cartridgeName, self.rom) + + if not self.verifyHeader(): + raise Exeption("Cartridge header is corrupted") + if romSize < self.getROMSize(): + raise Exeption("Cartridge is truncated") + + ramSize = self.getRAMSize() + if (getCartridgeType() >= CartridgeFactory.TYPE_MBC2 + and getCartridgeType() <= CartridgeFactory.TYPE_MBC2_BATTERY): + ramSize = 512; + self.ram = [] + self.ram[0:ramSize:1] = 0xFF + if self.store.hasBattery(cartridgeName): + self.store.readBattery(cartridgeName, ram) + self.mbc = createBankController(self.getCartridgeType(), rom, ram, clock) + + def save(self, cartridgeName): + if self.hasBattery(): + self.store.writeBattery(cartridgeName, self.ram) + + def verify(self): + checksum = 0; + for address in range(len(self.rom)): + if address is not 0x014E and address is not 0x014F: + checksum = (checksum + (self.rom[address] & 0xFF)) & 0xFFFF + return (checksum == self.getChecksum()); + + def verifyHeader(self): + if self.rom.length < 0x0150: + return false; + checksum = 0xE7; + for address in range(0x0134,0x014C): + checksum = (checksum - (rom[address] & 0xFF)) & 0xFF; + return (checksum == self.getHeaderChecksum()) + + Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py Mon Mar 10 12:12:39 2008 @@ -0,0 +1,210 @@ +#___________________________________________________________________________ +# GAMEBOY +#___________________________________________________________________________ + +# Gameboy Clock Speed (1048576 Hz) +GAMEBOY_CLOCK = 1 << 20 + +REGISTERED_BITMAP = [ 0x3C, 0x42, 0xB9, 0xA5, 0xB9, 0xA5, 0x42, 0x3C ] + +#___________________________________________________________________________ +# CATRIGE TYPES +# ___________________________________________________________________________ + + +TYPE_ROM_ONLY = 0x00 + +TYPE_MBC1 = 0x01 +TYPE_MBC1_RAM = 0x02 +TYPE_MBC1_RAM_BATTERY = 0x03 + +TYPE_MBC2 = 0x05 +TYPE_MBC2_BATTERY = 0x06 + +TYPE_MBC3_RTC_BATTERY = 0x0F +TYPE_MBC3_RTC_RAM_BATTERY = 0x10 +TYPE_MBC3 = 0x11 +TYPE_MBC3_RAM = 0x12 +TYPE_MBC3_RAM_BATTERY = 0x13 + +TYPE_MBC5 = 0x19 +TYPE_MBC5_RAM = 0x1A +TYPE_MBC5_RAM_BATTERY = 0x1B + +TYPE_MBC5_RUMBLE = 0x1C +TYPE_MBC5_RUMBLE_RAM = 0x1D +TYPE_MBC5_RUMBLE_RAM_BATTERY = 0x1E + +TYPE_HUC3_RTC_RAM = 0xFE +TYPE_HUC1_RAM_BATTERY = 0xFF + +# ___________________________________________________________________________ +# CPU FLAGS +# ___________________________________________________________________________ + +Z_FLAG = 0x80 +N_FLAG = 0x40 +H_FLAG = 0x20 + +#CPU OP CODES + + +# ___________________________________________________________________________ +#INTERRUP FLAGS +# ___________________________________________________________________________ + +# Interrupt Registers +IE = 0xFFFF # Interrupt Enable +IF = 0xFF0F # Interrupt Flag + +# Interrupt Flags +VBLANK = 0x01 # V-Blank Interrupt (INT 40h) +LCD = 0x02 # LCD STAT Interrupt (INT 48h) +TIMER = 0x04 # Timer Interrupt (INT 50h) +SERIAL = 0x08 # Serial Interrupt (INT 58h) +JOYPAD = 0x10 # Joypad Interrupt (INT 60h) + + +# ___________________________________________________________________________ +# VIDEO +# ___________________________________________________________________________ + +# LCD Register Addresses +LCDC = 0xFF40 # LCD Control */ +STAT = 0xFF41 # LCD Status */ +SCY = 0xFF42 # BG Scroll Y (0-255) */ +SCX = 0xFF43 # BG Scroll X (0-255) */ +LY = 0xFF44 # LCDC Y-Coordinate (0-153) */ +LYC = 0xFF45 # LY Compare */ +DMA = 0xFF46 # OAM DMA Transfer */ +BGP = 0xFF47 # BG Palette Data */ +OBP0 = 0xFF48 # Object Palette 0 Data */ +OBP1 = 0xFF49 # Object Palette 1 Data */ +WY = 0xFF4A # Window Y Position (0-143) */ +WX = 0xFF4B # Window X Position (0-166) */ + +# OAM Register Addresses +OAM_ADDR = 0xFE00 # OAM Object Attribute Map (FE00..FE9F) */ +OAM_SIZE = 0xA0 + +# Video RAM Addresses +VRAM_ADDR = 0x8000 # 8KB Video RAM (8000..9FFF) */ +VRAM_SIZE = 0x2000 + +# VRAM Tile Data/Maps Addresses +VRAM_DATA_A = 0x0000 # 4KB Tile Data (8000..8FFF) */ +VRAM_DATA_B = 0x0800 # 4KB Tile Data (8800..97FF) */ + +VRAM_MAP_A = 0x1800 # 1KB BG Tile Map 0 (9800..9BFF) */ +VRAM_MAP_B = 0x1C00 # 1KB BG Tile Map 1 (9C00..9FFF) */ + + +#LCD Mode Durations +MODE_0_TICKS = 50 # H-Blank */ +MODE_1_TICKS = 114 # V-Blank */ +MODE_2_TICKS = 20 # OAM#/ +MODE_3_BEGIN_TICKS = 12 # Display */ +MODE_3_END_TICKS = 32 # Display */ + +MODE_1_BEGIN_TICKS = 8 # V-Blank Line 144 */ +MODE_1_END_TICKS = 1 # V-Blank Line 153 */ + +# Objects per Line +OBJECTS_PER_LINE = 10 + +# LCD Color Palette +COLOR_MAP =[ + 0x9CB916, 0x8CAA14, 0x306430, 0x103F10 + # 0xE0F8D0, 0x88C070, 0x386850, 0x081820 + # 0xFFFFFF, 0xAAAAAA, 0x555555, 0x000000 + ] + + + +# ___________________________________________________________________________ +# JOYPAD +# ___________________________________________________________________________ + +# Joypad Registers P+ +JOYP = 0xFF00 + + +# Joypad Poll Speed (64 Hz) +JOYPAD_CLOCK = GAMEBOY_CLOCK >> 6 + + + +# ___________________________________________________________________________ +# SERIAL +# ___________________________________________________________________________ + +# Serial Clock Speed (8 x 1024 bits/sec) +SERIAL_CLOCK = GAMEBOY_CLOCK >> 16 + +# Serial Idle Speed (128 Hz) +SERIAL_IDLE_CLOCK = GAMEBOY_CLOCK >> 7 + +# Serial Register Addresses +SB = 0xFF01 # Serial Transfer Data +SC = 0xFF02 # Serial Transfer Control + + + + +# ___________________________________________________________________________ +# SOUND +# ___________________________________________________________________________ + +# Sound Clock (256 Hz) +SOUND_CLOCK = 256 + +# Sound Register Addresses +NR10 = 0xFF10 # AUD1SWEEP */ +NR11 = 0xFF11 # AUD1LEN */ +NR12 = 0xFF12 # AUD1ENV */ +NR13 = 0xFF13 # AUD1LOW */ +NR14 = 0xFF14 # AUD1HIGH */ + +NR21 = 0xFF16 # AUD2LEN */ +NR22 = 0xFF17 # AUD2ENV */ +NR23 = 0xFF18 # AUD2LOW */ +NR24 = 0xFF19 # AUD2HIGH */ + +NR30 = 0xFF1A # AUD3ENA */ +NR31 = 0xFF1B # AUD3LEN */ +NR32 = 0xFF1C # AUD3LEVEL */ +NR33 = 0xFF1D # AUD3LOW */ +NR34 = 0xFF1E # AUD3HIGH */ + +NR41 = 0xFF20 # AUD4LEN */ +NR42 = 0xFF21 # AUD4ENV */ +NR43 = 0xFF22 # AUD4POLY */ +NR44 = 0xFF23 # AUD4GO */ + +NR50 = 0xFF24 # AUDVOL */ +NR51 = 0xFF25 # AUDTERM */ +NR52 = 0xFF26 # AUDENA */ + +AUD3WAVERAM = 0xFF30 + +# ___________________________________________________________________________ +# TIMER +# ___________________________________________________________________________ + + +# DIV Timer Speed (16384 Hz) +DIV_CLOCK = GAMEBOY_CLOCK >> 14 + +# Timer Clock Speeds (4096, 262144, 65536 and 16384 Hz) +TIMER_CLOCK = [ + GAMEBOY_CLOCK >> 12, + GAMEBOY_CLOCK >> 18, + GAMEBOY_CLOCK >> 16, + GAMEBOY_CLOCK >> 14 +] + +# Timer Register Addresses +DIV = 0xFF04 # Divider Register */ +TIMA = 0xFF05 # Timer Counter */ +TMA = 0xFF06 # Timer Modulo */ +TAC = 0xFF07 # Timer Control */ \ No newline at end of file From arigo at codespeak.net Mon Mar 10 13:17:22 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 10 Mar 2008 13:17:22 +0100 (CET) Subject: [pypy-svn] r52359 - in pypy: branch/buffer dist/lib-python dist/pypy/config dist/pypy/interpreter dist/pypy/lib dist/pypy/lib/_ctypes dist/pypy/lib/test2 dist/pypy/module dist/pypy/objspace dist/pypy/rlib Message-ID: <20080310121722.1CF0F1683FD@codespeak.net> Author: arigo Date: Mon Mar 10 13:17:22 2008 New Revision: 52359 Added: pypy/dist/lib-python/ - copied from r52358, pypy/branch/buffer/lib-python/ pypy/dist/pypy/config/ - copied from r52358, pypy/branch/buffer/pypy/config/ pypy/dist/pypy/interpreter/ - copied from r52358, pypy/branch/buffer/pypy/interpreter/ pypy/dist/pypy/lib/_ctypes/ - copied from r52358, pypy/branch/buffer/pypy/lib/_ctypes/ pypy/dist/pypy/lib/array.py - copied unchanged from r52358, pypy/branch/buffer/pypy/lib/array.py pypy/dist/pypy/lib/struct.py - copied unchanged from r52358, pypy/branch/buffer/pypy/lib/struct.py pypy/dist/pypy/lib/test2/ - copied from r52358, pypy/branch/buffer/pypy/lib/test2/ pypy/dist/pypy/module/ - copied from r52358, pypy/branch/buffer/pypy/module/ pypy/dist/pypy/objspace/ - copied from r52358, pypy/branch/buffer/pypy/objspace/ pypy/dist/pypy/rlib/ - copied from r52358, pypy/branch/buffer/pypy/rlib/ Removed: pypy/branch/buffer/ Log: Merge the 'buffer' branch. The buffer interface should now be well-supported, and the array module has a not-too-terrible performance. The internal buffer interface is still missing support for direct raw pointers; that would be the next step, with the goal of reducing the number of copies of the data done for each I/O operation. From arigo at codespeak.net Mon Mar 10 17:26:13 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 10 Mar 2008 17:26:13 +0100 (CET) Subject: [pypy-svn] r52360 - pypy/branch/jit-hotpath Message-ID: <20080310162613.47CE61683E3@codespeak.net> Author: arigo Date: Mon Mar 10 17:26:12 2008 New Revision: 52360 Added: pypy/branch/jit-hotpath/ - copied from r52359, pypy/branch/jit-refactoring/ Log: A branch off the jit-refactoring branch to start playing with the hotpath approach described in jit-refactoring-plan.txt. This is all experimental. Some of the changes in this branch might be easy to merge back if the approach seems to work, but some not. Anyway for now I will just go ahead and whack at code just to try things out without worrying about merging. From arigo at codespeak.net Mon Mar 10 17:27:50 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 10 Mar 2008 17:27:50 +0100 (CET) Subject: [pypy-svn] r52361 - in pypy/branch/jit-hotpath/pypy/jit/hintannotator: . test Message-ID: <20080310162750.4A8E01683E6@codespeak.net> Author: arigo Date: Mon Mar 10 17:27:49 2008 New Revision: 52361 Added: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py (contents, props changed) pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py (contents, props changed) Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py pypy/branch/jit-hotpath/pypy/jit/hintannotator/policy.py pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_annotator.py Log: The "hotpath" hint-annotation policy, creating a hint-annotated graph that starts directly at the global_merge_point. Added: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Mon Mar 10 17:27:49 2008 @@ -0,0 +1,47 @@ +from pypy.objspace.flow.model import copygraph +from pypy.translator.unsimplify import split_block +from pypy.jit.hintannotator.annotator import HintAnnotator +from pypy.jit.hintannotator.model import SomeLLAbstractConstant, OriginFlags + + +class HotPathHintAnnotator(HintAnnotator): + + def find_global_merge_point(self, graph): + found_at = [] + for block in graph.iterblocks(): + for op in block.operations: + if op.opname == 'hint': + hints = op.args[1].value + if hints.get('global_merge_point'): + found_at.append((graph, block, op)) + if len(found_at) > 1: + raise Exception("multiple global_merge_point not supported") + if found_at: + return found_at[0] + else: + return None + + def build_hotpath_types(self): + # find the graph with the global_merge_point + found_at = [] + for graph in self.base_translator.graphs: + place = self.find_global_merge_point(graph) + if place is not None: + found_at.append(place) + if len(found_at) != 1: + raise Exception("found %d graphs with a global_merge_point," + " expected 1 (for now)" % len(found_at)) + portalgraph, _, _ = found_at[0] + # make a copy of the portalgraph before mutating it + portalgraph = copygraph(portalgraph) + _, portalblock, portalop = self.find_global_merge_point(portalgraph) + portalopindex = portalblock.operations.index(portalop) + # split the block across the global_merge_point + link = split_block(None, portalblock, portalopindex) + # rewire the graph to start at the global_merge_point + portalgraph.startblock = link.target + self.portalgraph = portalgraph + input_args_hs = [SomeLLAbstractConstant(v.concretetype, + {OriginFlags(): True}) + for v in portalgraph.getargs()] + return self.build_types(portalgraph, input_args_hs) Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py Mon Mar 10 17:27:49 2008 @@ -348,7 +348,7 @@ hs_clone.deepfrozen = True return hs_clone for name in ["reverse_split_queue", "global_merge_point", - "access_directly"]: + "access_directly", "can_enter_jit"]: if hs_flags.const.get(name, False): return Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/policy.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/policy.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/policy.py Mon Mar 10 17:27:49 2008 @@ -6,16 +6,20 @@ novirtualcontainer = False oopspec = False entrypoint_returns_red = True + hotpath = False def __init__(self, novirtualcontainer = None, oopspec = None, - entrypoint_returns_red = None): + entrypoint_returns_red = None, + hotpath = None): if novirtualcontainer is not None: self.novirtualcontainer = novirtualcontainer if oopspec is not None: self.oopspec = oopspec if entrypoint_returns_red is not None: self.entrypoint_returns_red = entrypoint_returns_red + if hotpath is not None: + self.hotpath = hotpath def look_inside_graph(self, graph): return True Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_annotator.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_annotator.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_annotator.py Mon Mar 10 17:27:49 2008 @@ -72,10 +72,16 @@ # build hint annotator types policy = self.fixpolicy(policy) - hannotator = HintAnnotator(base_translator=t, policy=policy) - hs = hannotator.build_types(graph1, [SomeLLAbstractConstant(v.concretetype, - {OriginFlags(): True}) - for v in graph1.getargs()]) + if policy.hotpath: + from pypy.jit.hintannotator.hotpath import HotPathHintAnnotator + hannotator = HotPathHintAnnotator(base_translator=t, policy=policy) + self.hannotator = hannotator + hs = hannotator.build_hotpath_types() + else: + hannotator = HintAnnotator(base_translator=t, policy=policy) + hs = hannotator.build_types(graph1, + [SomeLLAbstractConstant(v.concretetype, {OriginFlags(): True}) + for v in graph1.getargs()]) hannotator.simplify() t = hannotator.translator if conftest.option.view: Added: pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py Mon Mar 10 17:27:49 2008 @@ -0,0 +1,38 @@ +from pypy.objspace.flow.model import summary +from pypy.rlib.jit import hint, we_are_jitted +from pypy.jit.hintannotator.policy import HintAnnotatorPolicy +from pypy.jit.hintannotator.test.test_annotator import AbstractAnnotatorTest + + +P_HOTPATH = HintAnnotatorPolicy(oopspec=True, + novirtualcontainer=True, + hotpath=True) + +class TestHotPath(AbstractAnnotatorTest): + type_system = 'lltype' + + def hannotate(self, func, argtypes, policy=P_HOTPATH): + # change default policy + AbstractAnnotatorTest.hannotate(self, func, argtypes, policy=policy) + + def test_simple_loop(self): + def ll_function(n): + n1 = n * 2 + total = 0 + while n1 > 0: + hint(None, can_enter_jit=True) + hint(None, global_merge_point=True) + if we_are_jitted(): + total += 1000 + total += n1 + n1 -= 1 + return total + + def main(n, m): + return ll_function(n * m) + + self.hannotate(main, [int, int]) + graphs = self.hannotator.translator.graphs + assert len(graphs) == 1 + assert ll_function is graphs[0].func + assert 'int_mul' not in summary(graphs[0]) From arigo at codespeak.net Mon Mar 10 18:56:39 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 10 Mar 2008 18:56:39 +0100 (CET) Subject: [pypy-svn] r52362 - in pypy/branch/jit-hotpath/pypy: jit/hintannotator jit/hintannotator/test jit/rainbow jit/rainbow/test rlib rpython rpython/lltypesystem Message-ID: <20080310175639.739AE168415@codespeak.net> Author: arigo Date: Mon Mar 10 18:56:38 2008 New Revision: 52362 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-hotpath/pypy/rlib/jit.py pypy/branch/jit-hotpath/pypy/rpython/llinterp.py pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py Log: In-progress. Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Mon Mar 10 18:56:38 2008 @@ -1,4 +1,4 @@ -from pypy.objspace.flow.model import copygraph +from pypy.objspace.flow.model import checkgraph, copygraph from pypy.translator.unsimplify import split_block from pypy.jit.hintannotator.annotator import HintAnnotator from pypy.jit.hintannotator.model import SomeLLAbstractConstant, OriginFlags @@ -6,41 +6,51 @@ class HotPathHintAnnotator(HintAnnotator): - def find_global_merge_point(self, graph): + def find_jit_merge_point(self, graph): found_at = [] for block in graph.iterblocks(): for op in block.operations: - if op.opname == 'hint': - hints = op.args[1].value - if hints.get('global_merge_point'): - found_at.append((graph, block, op)) + if op.opname == 'jit_merge_point': + found_at.append((graph, block, op)) if len(found_at) > 1: - raise Exception("multiple global_merge_point not supported") + raise Exception("multiple jit_merge_point() not supported") if found_at: return found_at[0] else: return None def build_hotpath_types(self): - # find the graph with the global_merge_point + # find the graph with the jit_merge_point() found_at = [] for graph in self.base_translator.graphs: - place = self.find_global_merge_point(graph) + place = self.find_jit_merge_point(graph) if place is not None: found_at.append(place) if len(found_at) != 1: - raise Exception("found %d graphs with a global_merge_point," + raise Exception("found %d graphs with a jit_merge_point()," " expected 1 (for now)" % len(found_at)) portalgraph, _, _ = found_at[0] # make a copy of the portalgraph before mutating it portalgraph = copygraph(portalgraph) - _, portalblock, portalop = self.find_global_merge_point(portalgraph) + _, portalblock, portalop = self.find_jit_merge_point(portalgraph) portalopindex = portalblock.operations.index(portalop) - # split the block across the global_merge_point + # split the block just before the jit_merge_point() link = split_block(None, portalblock, portalopindex) + # split again, this time enforcing the order of the live vars + # specified by the user in the jit_merge_point() call + _, portalblock, portalop = self.find_jit_merge_point(portalgraph) + assert portalop is portalblock.operations[0] + livevars = portalop.args[2:] + link = split_block(None, portalblock, 0, livevars) # rewire the graph to start at the global_merge_point + portalgraph.startblock.isstartblock = False portalgraph.startblock = link.target + portalgraph.startblock.isstartblock = True self.portalgraph = portalgraph + # check the new graph: errors mean some live vars have not + # been listed in the jit_merge_point() + checkgraph(portalgraph) + # annotate! input_args_hs = [SomeLLAbstractConstant(v.concretetype, {OriginFlags(): True}) for v in portalgraph.getargs()] Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py Mon Mar 10 18:56:38 2008 @@ -22,6 +22,8 @@ ptr_nonzero ptr_iszero is_early_constant + jit_merge_point + can_enter_jit oogetfield oosetfield oononnull @@ -348,7 +350,7 @@ hs_clone.deepfrozen = True return hs_clone for name in ["reverse_split_queue", "global_merge_point", - "access_directly", "can_enter_jit"]: + "access_directly"]: if hs_flags.const.get(name, False): return @@ -488,6 +490,12 @@ # like an indirect_call return hs_c1._call_multiple_graphs(graph_list, METH.RESULT, hs_c1, *args_hs) # prepend hs_c1 to the args + def jit_merge_point(hs_numgreens, hs_numreds, *livevars_hs): + pass # XXX should check colors + + def can_enter_jit(hs_numgreens, hs_numreds, *livevars_hs): + pass # XXX should check colors + class __extend__(SomeLLAbstractConstant): def same_as(hs_c1): Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py Mon Mar 10 18:56:38 2008 @@ -1,5 +1,5 @@ from pypy.objspace.flow.model import summary -from pypy.rlib.jit import hint, we_are_jitted +from pypy.rlib.jit import jit_merge_point, can_enter_jit, we_are_jitted from pypy.jit.hintannotator.policy import HintAnnotatorPolicy from pypy.jit.hintannotator.test.test_annotator import AbstractAnnotatorTest @@ -13,15 +13,16 @@ def hannotate(self, func, argtypes, policy=P_HOTPATH): # change default policy - AbstractAnnotatorTest.hannotate(self, func, argtypes, policy=policy) + AbstractAnnotatorTest.hannotate(self, func, argtypes, policy=policy, + backendoptimize=True) def test_simple_loop(self): def ll_function(n): n1 = n * 2 total = 0 while n1 > 0: - hint(None, can_enter_jit=True) - hint(None, global_merge_point=True) + can_enter_jit(red=(n1, total)) + jit_merge_point(red=(n1, total)) if we_are_jitted(): total += 1000 total += n1 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Mon Mar 10 18:56:38 2008 @@ -1328,6 +1328,31 @@ c = 'red' return c + def serialize_op_jit_merge_point(self, op): + # by construction, the graph should have exactly the vars listed + # in the op as live vars. Check this. Also check the colors + # while we are at it. + numgreens = op.args[0].value + numreds = op.args[1].value + greens_v = op.args[2:2+numgreens] + reds_v = op.args[2+numgreens:2+numgreens+numreds] + for i, v in enumerate(greens_v): + if self.varcolor(v) != "green": + raise Exception("computed color does not match declared color:" + " %s is %s, but jit_merge_point() declares it" + " as green" % (v, self.varcolor(v))) + assert self.green_position(v) == i + for i, v in enumerate(reds_v): + if self.varcolor(v) != "red": + raise Exception("computed color does not match declared color:" + " %s is %s, but jit_merge_point() declares it" + " as red" % (v, self.varcolor(v))) + assert self.redvar_position(v) == i + self.emit('jit_merge_point') + + def serialize_op_can_enter_jit(self, op): + return # no need to put anything in the bytecode here + class GraphTransformer(object): def __init__(self, hannotator): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Mon Mar 10 18:56:38 2008 @@ -792,6 +792,9 @@ return true return false + @arguments() + def opimpl_jit_merge_point(self): + xxx # ____________________________________________________________ # construction-time interface Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Mon Mar 10 18:56:38 2008 @@ -65,10 +65,15 @@ policy.seetranslator(t) graph1 = graphof(t, portal) # build hint annotator types - hannotator = HintAnnotator(base_translator=t, policy=policy) - hs = hannotator.build_types(graph1, [SomeLLAbstractConstant(v.concretetype, - {OriginFlags(): True}) - for v in graph1.getargs()]) + if policy.hotpath: + from pypy.jit.hintannotator.hotpath import HotPathHintAnnotator + hannotator = HotPathHintAnnotator(base_translator=t, policy=policy) + hs = hannotator.build_hotpath_types() + else: + hannotator = HintAnnotator(base_translator=t, policy=policy) + hs = hannotator.build_types(graph1, + [SomeLLAbstractConstant(v.concretetype, {OriginFlags(): True}) + for v in graph1.getargs()]) hannotator.simplify() if conftest.option.view: hannotator.translator.view() @@ -106,14 +111,26 @@ self.rtyper = rtyper self.hintannotator = hannotator t = hannotator.translator - graph2 = graphof(t, portal) - self.graph = graph2 - self.maingraph = graphof(rtyper.annotator.translator, func) + if policy.hotpath: + graph2 = t.graphs[0] + else: + graph2 = graphof(t, portal) + self.graph = graph2 + self.maingraph = graphof(rtyper.annotator.translator, func) writer = BytecodeWriter(t, hannotator, self.RGenOp) jitcode = writer.make_bytecode(graph2) # the bytecode writer can ask for llhelpers about lists and dicts rtyper.specialize_more_blocks() + self.writer = writer + self.jitcode = jitcode + if policy.hotpath: + from pypy.jit.rainbow.hotpath import EntryPointsRewriter + rewriter = EntryPointsRewriter(rtyper, hannotator, jitcode, + self.translate_support_code) + self.rewriter = rewriter + rewriter.rewrite_all() + return # rewire the original portal @@ -128,9 +145,6 @@ view = conftest.option.view and self.small) self.RESIDUAL_FUNCTYPE = rewriter.RESIDUAL_FUNCTYPE - self.writer = writer - self.jitcode = jitcode - def serialize(self, func, values, policy=None, inline=None, backendoptimize=False, Modified: pypy/branch/jit-hotpath/pypy/rlib/jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/jit.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/jit.py Mon Mar 10 18:56:38 2008 @@ -84,4 +84,50 @@ return hop.genop('is_early_constant', [v], resulttype=lltype.Bool) +def jit_merge_point(green=(), red=()): + pass +def can_enter_jit(green=(), red=()): + pass + +class Entry(ExtRegistryEntry): + _about_ = jit_merge_point, can_enter_jit + + def compute_result_annotation(self, s_green=None, s_red=None): + from pypy.annotation import model as annmodel + assert s_green is None or isinstance(s_green, annmodel.SomeTuple) + assert s_red is None or isinstance(s_red, annmodel.SomeTuple) + return annmodel.s_None + + def specialize_call(self, hop, **kwds_i): + from pypy.rpython.error import TyperError + from pypy.rpython.lltypesystem import lltype + lst = kwds_i.values() + lst.sort() + if lst != range(hop.nb_args): + raise TyperError("%s() takes only keyword arguments" % ( + self.instance.__name__,)) + greens_v = [] + reds_v = [] + if 'i_green' in kwds_i: + i = kwds_i['i_green'] + r_green_tuple = hop.args_r[i] + v_green_tuple = hop.inputarg(r_green_tuple, arg=i) + for j in range(len(r_green_tuple.items_r)): + v = r_green_tuple.getitem(hop.llops, v_green_tuple, j) + greens_v.append(v) + if 'i_red' in kwds_i: + i = kwds_i['i_red'] + r_red_tuple = hop.args_r[i] + v_red_tuple = hop.inputarg(r_red_tuple, arg=i) + for j in range(len(r_red_tuple.items_r)): + v = r_red_tuple.getitem(hop.llops, v_red_tuple, j) + reds_v.append(v) + + hop.exception_cannot_occur() + vlist = [hop.inputconst(lltype.Signed, len(greens_v)), + hop.inputconst(lltype.Signed, len(reds_v))] + vlist.extend(greens_v) + vlist.extend(reds_v) + return hop.genop(self.instance.__name__, vlist, + resulttype=lltype.Void) Modified: pypy/branch/jit-hotpath/pypy/rpython/llinterp.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/llinterp.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/llinterp.py Mon Mar 10 18:56:38 2008 @@ -518,6 +518,12 @@ def op_debug_llinterpcall(self, pythonfunction, *args_ll): return pythonfunction(*args_ll) + def op_can_enter_jit(self, *args): + pass + + def op_jit_merge_point(self, *args): + pass + def op_instrument_count(self, ll_tag, ll_label): pass # xxx for now Modified: pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py Mon Mar 10 18:56:38 2008 @@ -383,6 +383,8 @@ # __________ used by the JIT ________ 'call_boehm_gc_alloc': LLOp(canraise=(MemoryError,)), + 'can_enter_jit': LLOp(), + 'jit_merge_point': LLOp(), # __________ GC operations __________ From arigo at codespeak.net Mon Mar 10 18:57:12 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 10 Mar 2008 18:57:12 +0100 (CET) Subject: [pypy-svn] r52363 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080310175712.F10F816841F@codespeak.net> Author: arigo Date: Mon Mar 10 18:57:12 2008 New Revision: 52363 Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (contents, props changed) pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (contents, props changed) Log: Forgot these files. Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Mon Mar 10 18:57:12 2008 @@ -0,0 +1,36 @@ + + +class EntryPointsRewriter: + + def __init__(self, rtyper, hannotator, jitcode, + translate_support_code=True): + self.rtyper = rtyper + self.hannotator = hannotator + self.jitcode = jitcode + self.translate_support_code = translate_support_code + + def rewrite_all(self): + for graph in self.hannotator.base_translator.graphs: + for block in graph.iterblocks(): + for op in block.operations: + if op.opname == 'hint': + hints = op.args[1].value + if hints.get('can_enter_jit'): + index = block.operations.index(op) + self.rewrite_can_enter_jit(graph, block, index) + + def rewrite_can_enter_jit(self, graph, block, index): + if graph is not self.hannotator.portalgraph: + raise Exception("for now, can_enter_jit must be in the" + " same function as global_merge_point") + # find out ./. + + + if not self.translate_support_code: + # this case is used for most tests: the jit stuff should be run + # directly to make these tests faster + + portal_entry_graph_ptr = llhelper(lltype.Ptr(self.PORTAL_FUNCTYPE), + self.portal_entry) + else: + xxx Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Mon Mar 10 18:57:12 2008 @@ -0,0 +1,39 @@ +from pypy.rlib.jit import jit_merge_point, can_enter_jit, we_are_jitted +from pypy.jit.rainbow.test import test_interpreter +from pypy.jit.hintannotator.policy import HintAnnotatorPolicy +from pypy.rpython.llinterp import LLInterpreter + +P_HOTPATH = HintAnnotatorPolicy(oopspec=True, + novirtualcontainer=True, + hotpath=True) + + +class TestHotPath(test_interpreter.InterpretationTest): + type_system = 'lltype' + + def run(self, main, main_args, threshold, policy=P_HOTPATH): + self.serialize(main, main_args, policy=policy, backendoptimize=True) + graph = self.rtyper.annotator.translator.graphs[0] + assert graph.func is main + llinterp = LLInterpreter( + self.rtyper, exc_data_ptr=self.writer.exceptiondesc.exc_data_ptr) + return llinterp.eval_graph(graph, main_args) + + def test_simple_loop(self): + def ll_function(n): + n1 = n * 2 + total = 0 + while n1 > 0: + can_enter_jit(red=(n1, total)) + jit_merge_point(red=(n1, total)) + if we_are_jitted(): + total += 1000 + total += n1 + n1 -= 1 + return total + + def main(n, m): + return ll_function(n * m) + + res = self.run(main, [2, 5], threshold=7) + assert res == 210 + 13*1000 From arigo at codespeak.net Mon Mar 10 21:05:58 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 10 Mar 2008 21:05:58 +0100 (CET) Subject: [pypy-svn] r52364 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080310200558.34819168412@codespeak.net> Author: arigo Date: Mon Mar 10 21:05:56 2008 New Revision: 52364 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Log: First test passes. There is a lot of code in jit/rainbow/hotpath.py that comes more or less directly from jit/rainbow/portal.py. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Mon Mar 10 21:05:56 2008 @@ -1,36 +1,168 @@ +from pypy.objspace.flow.model import Constant, Variable, SpaceOperation +from pypy.rpython.annlowlevel import llhelper +from pypy.rpython.lltypesystem import lltype +from pypy.rpython.llinterp import LLInterpreter +from pypy.rpython.extregistry import ExtRegistryEntry +from pypy.rlib.unroll import unrolling_iterable +from pypy.rlib.objectmodel import we_are_translated +from pypy.jit.hintannotator.model import originalconcretetype +from pypy.jit.timeshifter import rvalue class EntryPointsRewriter: - def __init__(self, rtyper, hannotator, jitcode, - translate_support_code=True): + def __init__(self, hintannotator, rtyper, entryjitcode, RGenOp, + codewriter, threshold, translate_support_code = True): + self.hintannotator = hintannotator + self.entryjitcode = entryjitcode self.rtyper = rtyper - self.hannotator = hannotator - self.jitcode = jitcode + self.RGenOp = RGenOp + self.interpreter = codewriter.interpreter + self.codewriter = codewriter + self.threshold = threshold self.translate_support_code = translate_support_code + def _freeze_(self): + return True + def rewrite_all(self): - for graph in self.hannotator.base_translator.graphs: + self.make_args_specification() + self.make_enter_function() + for graph in self.hintannotator.base_translator.graphs: for block in graph.iterblocks(): for op in block.operations: - if op.opname == 'hint': - hints = op.args[1].value - if hints.get('can_enter_jit'): - index = block.operations.index(op) - self.rewrite_can_enter_jit(graph, block, index) + if op.opname == 'can_enter_jit': + index = block.operations.index(op) + self.rewrite_can_enter_jit(graph, block, index) + + def make_args_specification(self): + origportalgraph = self.hintannotator.portalgraph + for block in origportalgraph.iterblocks(): + if block is origportalgraph.returnblock: + raise Exception("XXX doesn't support portal functions with" + " a 'return' yet - leave it with 'raise' :-)") + newportalgraph = self.hintannotator.translator.graphs[0] + ALLARGS = [] + RESARGS = [] + self.args_specification = [] + for v in newportalgraph.getargs(): + TYPE = v.concretetype + ALLARGS.append(TYPE) + if self.hintannotator.binding(v).is_green(): + xxx + else: + RESARGS.append(TYPE) + kind = self.RGenOp.kindToken(TYPE) + boxcls = rvalue.ll_redboxcls(TYPE) + self.args_specification.append((kind, boxcls)) + + self.JIT_ENTER_FUNCTYPE = lltype.FuncType(ALLARGS, lltype.Void) + self.RESIDUAL_FUNCTYPE = lltype.FuncType(RESARGS, lltype.Void) + self.sigtoken = self.RGenOp.sigToken(self.RESIDUAL_FUNCTYPE) + + def make_enter_function(self): + HotEnterState = make_state_class(self) + state = HotEnterState() + + def jit_may_enter(*args): + if not state.machine_code: + state.counter += 1 + if state.counter < self.threshold: + return + state.compile() + maybe_on_top_of_llinterp(self, state.machine_code)(*args) + + HotEnterState.compile.im_func._dont_inline_ = True + jit_may_enter._always_inline = True + self.jit_enter_fn = jit_may_enter def rewrite_can_enter_jit(self, graph, block, index): - if graph is not self.hannotator.portalgraph: - raise Exception("for now, can_enter_jit must be in the" - " same function as global_merge_point") - # find out ./. - - if not self.translate_support_code: # this case is used for most tests: the jit stuff should be run # directly to make these tests faster - - portal_entry_graph_ptr = llhelper(lltype.Ptr(self.PORTAL_FUNCTYPE), - self.portal_entry) + op = block.operations[index] + numgreens = op.args[0].value + numreds = op.args[1].value + assert numgreens == 0 # XXX for the first test + reds_v = op.args[2+numgreens:2+numgreens+numreds] + + FUNCPTR = lltype.Ptr(self.JIT_ENTER_FUNCTYPE) + jit_enter_graph_ptr = llhelper(FUNCPTR, self.jit_enter_fn) + vlist = [Constant(jit_enter_graph_ptr, FUNCPTR)] + reds_v + + v_result = Variable() + v_result.concretetype = lltype.Void + newop = SpaceOperation('direct_call', vlist, v_result) + block.operations[index] = newop else: xxx + + +def make_state_class(rewriter): + # very minimal, just to make the first test pass + args_specification = unrolling_iterable(rewriter.args_specification) + + class HotEnterState: + def __init__(self): + self.graph_compilation_queue = [] + self.machine_code = lltype.nullptr(rewriter.RESIDUAL_FUNCTYPE) + self.counter = 0 + + def compile_more_functions(self): + while self.graph_compilation_queue: + top_jitstate, greenargs, redargs = self.graph_compilation_queue.pop() + builder = top_jitstate.curbuilder + builder.start_writing() + top_jitstate = rewriter.interpreter.run(top_jitstate, + rewriter.entryjitcode, + greenargs, redargs) + if top_jitstate is not None: + rewriter.interpreter.finish_jitstate_gray( + rewriter.sigtoken) + builder.end() + builder.show_incremental_progress() + + def compile(self): + rgenop = rewriter.interpreter.rgenop + builder, gv_generated, inputargs_gv = rgenop.newgraph( + rewriter.sigtoken, "residual") + top_jitstate = rewriter.interpreter.fresh_jitstate(builder) + + greenargs = () + redargs = () + red_i = 0 + for kind, boxcls in args_specification: + gv_arg = inputargs_gv[red_i] + red_i += 1 + box = boxcls(kind, gv_arg) + redargs += (box,) + greenargs = list(greenargs) + redargs = list(redargs) + + self.graph_compilation_queue.append((top_jitstate, + greenargs, redargs)) + self.compile_more_functions() + + FUNCPTR = lltype.Ptr(rewriter.RESIDUAL_FUNCTYPE) + self.machine_code = gv_generated.revealconst(FUNCPTR) + + return HotEnterState + + +def maybe_on_top_of_llinterp(rewriter, fnptr): + # Run a generated graph on top of the llinterp for testing. + # When translated, this just returns the fnptr. + exc_data_ptr = rewriter.codewriter.exceptiondesc.exc_data_ptr + llinterp = LLInterpreter(rewriter.rtyper, exc_data_ptr=exc_data_ptr) + def on_top_of_llinterp(*args): + return llinterp.eval_graph(fnptr._obj.graph, list(args)) + return on_top_of_llinterp + +class Entry(ExtRegistryEntry): + _about_ = maybe_on_top_of_llinterp + + def compute_result_annotation(self, s_rewriter, s_fnptr): + return s_fnptr + + def specialize_call(self, hop): + return hop.inputarg(hop.args_r[1], arg=1) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Mon Mar 10 21:05:56 2008 @@ -244,6 +244,18 @@ exceptiondesc.store_global_excdata(jitstate) jitstate.curbuilder.finish_and_return(graphsigtoken, gv_ret) + def finish_jitstate_gray(self, graphsigtoken): + jitstate = self.jitstate + exceptiondesc = self.exceptiondesc + builder = jitstate.curbuilder + for virtualizable_box in jitstate.virtualizables: + assert isinstance(virtualizable_box, rvalue.PtrRedBox) + content = virtualizable_box.content + assert isinstance(content, rcontainer.VirtualizableStruct) + content.store_back(jitstate) + exceptiondesc.store_global_excdata(jitstate) + jitstate.curbuilder.finish_and_return(graphsigtoken, None) + def bytecode_loop(self): while 1: bytecode = self.load_2byte() @@ -267,7 +279,7 @@ is_portal = frame.bytecode.is_portal graph_color = frame.bytecode.graph_color if graph_color == "gray": - assert not is_portal + #assert not is_portal newjitstate = rtimeshift.leave_graph_gray(queue) elif is_portal or graph_color == "red": newjitstate = rtimeshift.leave_graph_red( @@ -794,7 +806,8 @@ @arguments() def opimpl_jit_merge_point(self): - xxx + # xxx in-progress + pass # ____________________________________________________________ # construction-time interface Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Mon Mar 10 21:05:56 2008 @@ -1,5 +1,6 @@ from pypy.rlib.jit import jit_merge_point, can_enter_jit, we_are_jitted from pypy.jit.rainbow.test import test_interpreter +from pypy.jit.rainbow.hotpath import EntryPointsRewriter from pypy.jit.hintannotator.policy import HintAnnotatorPolicy from pypy.rpython.llinterp import LLInterpreter @@ -13,6 +14,11 @@ def run(self, main, main_args, threshold, policy=P_HOTPATH): self.serialize(main, main_args, policy=policy, backendoptimize=True) + rewriter = EntryPointsRewriter(self.hintannotator, self.rtyper, + self.jitcode, self.RGenOp, self.writer, + threshold, self.translate_support_code) + self.rewriter = rewriter + rewriter.rewrite_all() graph = self.rtyper.annotator.translator.graphs[0] assert graph.func is main llinterp = LLInterpreter( @@ -20,6 +26,10 @@ return llinterp.eval_graph(graph, main_args) def test_simple_loop(self): + class Exit(Exception): + def __init__(self, result): + self.result = result + def ll_function(n): n1 = n * 2 total = 0 @@ -30,10 +40,13 @@ total += 1000 total += n1 n1 -= 1 - return total + raise Exit(total) def main(n, m): - return ll_function(n * m) + try: + ll_function(n * m) + except Exit, e: + return e.result res = self.run(main, [2, 5], threshold=7) - assert res == 210 + 13*1000 + assert res == 210 + 14*1000 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Mon Mar 10 21:05:56 2008 @@ -125,11 +125,6 @@ self.jitcode = jitcode if policy.hotpath: - from pypy.jit.rainbow.hotpath import EntryPointsRewriter - rewriter = EntryPointsRewriter(rtyper, hannotator, jitcode, - self.translate_support_code) - self.rewriter = rewriter - rewriter.rewrite_all() return From cami at codespeak.net Mon Mar 10 23:45:48 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Mon, 10 Mar 2008 23:45:48 +0100 (CET) Subject: [pypy-svn] r52366 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080310224548.B8B7F168441@codespeak.net> Author: cami Date: Mon Mar 10 23:45:47 2008 New Revision: 52366 Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Log: converted java files to python. starting to implement the tests Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Mon Mar 10 23:45:47 2008 @@ -79,7 +79,7 @@ -# ______________________________________________________________________________ +# ============================================================================== # CARTRIDGE class Cartridge(object): @@ -116,7 +116,6 @@ if romSize>=0x00 and romSize<=0x07: return 32768 << romSize return -1 - def getRAMSize(self): return RAM_SIZE_MAPPING[self.rom[RAM_SIZE_ADDRESS]] @@ -152,23 +151,32 @@ def load(self, cartridgeName): romSize = self.store.getCartridgeSize(cartridgeName); - self.rom = [] - self.rom[0:romSize:1] = 0 + self.rom = range(0, romSize) + for i in range(0, romSize): + self.rom[i] = 0 + self.store.readCartridge(cartridgeName, self.rom) if not self.verifyHeader(): raise Exeption("Cartridge header is corrupted") + if romSize < self.getROMSize(): raise Exeption("Cartridge is truncated") ramSize = self.getRAMSize() + if (getCartridgeType() >= CartridgeFactory.TYPE_MBC2 and getCartridgeType() <= CartridgeFactory.TYPE_MBC2_BATTERY): ramSize = 512; + self.ram = [] - self.ram[0:ramSize:1] = 0xFF + + for i in range(0,ramSize): + self.ram[i] = 0xFF + if self.store.hasBattery(cartridgeName): self.store.readBattery(cartridgeName, ram) + self.mbc = createBankController(self.getCartridgeType(), rom, ram, clock) def save(self, cartridgeName): @@ -190,4 +198,608 @@ checksum = (checksum - (rom[address] & 0xFF)) & 0xFF; return (checksum == self.getHeaderChecksum()) +# ============================================================================== +# CARTRIDGE TYPES + +class MBC(object): + #ROM Bank Size (16KB) + ROM_BANK_SIZE = 0x4000 + + # RAM Bank Size (8KB) + RAM_BANK_SIZE = 0x2000 + + +""" +Mario GameBoy (TM) Emulator + +Memory Bank Controller 1 (2MB ROM, 32KB RAM) + +0000-3FFF ROM Bank 0 (16KB) +4000-7FFF ROM Bank 1-127 (16KB) +A000-BFFF RAM Bank 0-3 (8KB) + """ +class MBC1(MBC): + + rom + ram + ramEnable + + def __init__(self, rom, ram): + self.setRom(rom) + self.serRam(ram) + + def reset(self): + self.romBank= ROM_BANK_SIZE + self.romBank = 0 + + self.memoryModel = 0 + self.ramEnable = False + + def read(self, address): + if address <= 0x3FFF: + # 0000-3FFF + return self.rom[address] & 0xFF + elif (address <= 0x7FFF): + # 4000-7FFF + return self.rom[romBank + (address & 0x3FFF)] & 0xFF; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramEnable): + return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; + return 0xFF; + + def write(self, address, data): + if (address <= 0x1FFF): + # 0000-1FFF + if (self.ramSize > 0): + self.ramEnable = ((data & 0x0A) == 0x0A) + elif (address <= 0x3FFF): + # 2000-3FFF + if ((data & 0x1F) == 0): + data = 1; + if (self.memoryModel == 0): + self.romBank = ((self.romBank & 0x180000) + ((data & 0x1F) << 14)) & self.romSize; + else: + self.romBank = ((data & 0x1F) << 14) & self.romSize; + elif (address <= 0x5FFF): + # 4000-5FFF + if (self.memoryModel == 0): + self.romBank = ((self.romBank & 0x07FFFF) + ((data & 0x03) << 19)) & self.romSize; + else: + self.ramBank = ((data & 0x03) << 13) & self.ramSize; + elif (address <= 0x7FFF): + # 6000-7FFF + self.memoryModel = data & 0x01 + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramEnable): + self.ram[self.ramBank + (address & 0x1FFF)] = data; + + def setROM(self, buffer): + banks = len(buffer) / ROM_BANK_SIZE; + + if (banks < 2 or banks > 128): + raise Exception("Invalid MBC1 ROM size"); + + self.rom = buffer; + self.romSize = ROM_BANK_SIZEbanks - 1; + + def setRAM(buffer): + banks = len(buffer) / RAM_BANK_SIZE; + + if (banks < 0 or banks > 4): + raise Exception("Invalid MBC1 RAM size"); + + self.ram = buffer; + self.ramSize = RAM_BANK_SIZEbanks - 1; + + + +""" +Mario GameBoy (TM) Emulator + +Memory Bank Controller 2 (256KB ROM, 512x4bit RAM) + +0000-3FFF ROM Bank 0 (16KB) +4000-7FFF ROM Bank 1-15 (16KB) +A000-A1FF RAM Bank (512x4bit) + """ + +class MBC2(MBC): + RAM_BANK_SIZE = 512; + + rom + ram + + romSize + romBank + ramEnable + + def __init__(self, rom, ram): + self.setROM(rom); + self.setRAM(ram); + + def reset(self): + self.romBank = ROM_BANK_SIZE; + self.ramEnable = false; + + def read(self, address): + if (address <= 0x3FFF): + # 0000-3FFF + return self.rom[address] & 0xFF; + elif (address <= 0x7FFF): + # 4000-7FFF + return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; + elif (address >= 0xA000 and address <= 0xA1FF): + # A000-A1FF + return self.ram[address & 0x01FF] & 0x0F; + return 0xFF; + + def write(self, address, data): + if (address <= 0x1FFF): + # 0000-1FFF + if ((address & 0x0100) == 0): + self.ramEnable = ((data & 0x0A) == 0x0A); + elif (address <= 0x3FFF): + # 2000-3FFF + if ((address & 0x0100) != 0): + if ((data & 0x0F) == 0): + data = 1; + self.romBank = ((data & 0x0F) << 14) & self.romSize; + elif (address >= 0xA000 and address <= 0xA1FF): + # A000-A1FF + if (self.ramEnable): + self.ram[address & 0x01FF] = (byte) (data & 0x0F); + + def setROM(self, buffer): + banks = buffer.length / ROM_BANK_SIZE; + + if (banks < 2 or banks > 16): + raise Exception("Invalid MBC2 ROM size"); + + self.rom = buffer; + self.romSize = ROM_BANK_SIZEbanks - 1; + + def setRAM(self, buffer): + if (buffer.length != RAM_BANK_SIZE): + raise Exception("Invalid MBC2 RAM size"); + + self.ram = buffer; + + +""" +Mario GameBoy (TM) Emulator + +Memory Bank Controller 3 (2MB ROM, 32KB RAM, Real Time Clock) + +0000-3FFF ROM Bank 0 (16KB) +4000-7FFF ROM Bank 1-127 (16KB) +A000-BFFF RAM Bank 0-3 (8KB) +""" + +class MBC3(MBC): + #ClockDriver + clock; + + rom; + ram; + + romSize; + ramSize; + + romBank; + ramBank; + + ramEnable; + + clockRegister; + clockLatch; + clockTime; + + clockSeconds + clockMinutes + clockHours + clockDays, + clockControl; + clockLSeconds + clockLMinutes + clockLHours + clockLDaysclockLControl; + + def __init__(self, rom, ram, clock): + self.clock = clock; + + self.setROM(rom); + self.setRAM(ram); + + def reset(): + self.romBank = ROM_BANK_SIZE; + self.ramBank = 0; + + self.ramEnable = false; + + self.clockTime = self.clock.getTime(); + + self.clockLatch = self.clockRegister = 0; + + self.clockSeconds = self.clockMinutes = self.clockHours = self.clockDays = self.clockControl = 0; + self.clockLSeconds = self.clockLMinutes = self.clockLHours = self.clockLDays = self.clockLControl = 0; + + def read(self, address): + if (address <= 0x3FFF): + # 0000-3FFF + return self.rom[address] & 0xFF; + elif (address <= 0x7FFF): + # 4000-5FFF + return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramBank >= 0): + return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; + else: + if (self.clockRegister == 0x08): + return self.clockLSeconds; + if (self.clockRegister == 0x09): + return self.clockLMinutes; + if (self.clockRegister == 0x0A): + return self.clockLHours; + if (self.clockRegister == 0x0B): + return self.clockLDays; + if (self.clockRegister == 0x0C): + return self.clockLControl; + return 0xFF; + + def write(self, address, data): + if (address <= 0x1FFF): + # 0000-1FFF + if (self.ramSize > 0): + self.ramEnable = ((data & 0x0A) == 0x0A); + elif (address <= 0x3FFF): + # 2000-3FFF + if (data == 0): + data = 1; + self.romBank = ((data & 0x7F) << 14) & self.romSize; + elif (address <= 0x5FFF): + # 4000-5FFF + if (data >= 0x00 and data <= 0x03): + self.ramBank = (data << 13) & self.ramSize; + else: + self.ramBank = -1; + self.clockRegister = data; + elif (address <= 0x7FFF): + # 6000-7FFF + if (self.clockLatch == 0 and data == 1): + self.latchClock(); + if (data == 0 or data == 1): + self.clockLatch = data; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramEnable): + if (self.ramBank >= 0): + # TODO conversion to byte + self.ram[self.ramBank + (address & 0x1FFF)] = data; + else: + self.updateClock(); + + if (self.clockRegister == 0x08): + self.clockSeconds = data; + if (self.clockRegister == 0x09): + self.clockMinutes = data; + if (self.clockRegister == 0x0A): + self.clockHours = data; + if (self.clockRegister == 0x0B): + self.clockDays = data; + if (self.clockRegister == 0x0C): + self.clockControl = (self.clockControl & 0x80) | data; + + def latchClock(self): + self.updateClock(); + + self.clockLSeconds = self.clockSeconds; + self.clockLMinutes = self.clockMinutes; + self.clockLHours = self.clockHours; + self.clockLDays = self.clockDays & 0xFF; + self.clockLControl = (self.clockControl & 0xFE) | ((self.clockDays >> 8) & 0x01); + + def updateClock(): + now = self.clock.getTime(); + + if ((self.clockControl & 0x40) == 0): + elapsed = now - self.clockTime; + + while (elapsed >= 246060): + elapsed -= 246060 + self.clockDays+=1 + + while (elapsed >= 6060): + elapsed -= 6060; + self.clockHours+=1 + + while (elapsed >= 60): + elapsed -= 60; + self.clockMinutes+=1 + + self.clockSeconds += elapsed; + + while (self.clockSeconds >= 60): + self.clockSeconds -= 60; + self.clockMinutes+=1 + + while (self.clockMinutes >= 60): + self.clockMinutes -= 60; + self.clockHours+=1 + + while (self.clockHours >= 24): + self.clockHours -= 24; + self.clockDays+=1 + + while (self.clockDays >= 512): + self.clockDays -= 512; + self.clockControl |= 0x80; + + self.clockTime = now; + + def setROM(self, buffer): + banks = buffer.length / ROM_BANK_SIZE; + + if (banks < 2 or banks > 128): + raise Exception("Invalid MCB3 ROM size"); + + self.rom = buffer; + self.romSize = ROM_BANK_SIZE * banks - 1; + + def setRAM(self, buffer): + banks = buffer.length / RAM_BANK_SIZE; + + if (banks < 0 or banks > 4): + raise Exception("Invalid MBC3 RAM size"); + + self.ram = buffer; + self.ramSize = RAM_BANK_SIZE * banks - 1; + + + +""" +Mario GameBoy (TM) Emulator + +Memory Bank Controller 5 (8MB ROM, 128KB RAM) + * +0000-3FFF ROM Bank 0 (16KB) +4000-7FFF ROM Bank 1-511 (16KB) +A000-BFFF RAM Bank 0-15 (8KB) +""" + +class MBC5(MBC): + rom; + ram; + + romSize; + ramSize; + + romBank; + ramBank; + + ramEnable; + rumble; + + def __init__(self, rom, ram, rumble): + self.rumble = rumble; + + self.setROM(rom); + self.setRAM(ram); + + def reset(): + self.romBank = ROM_BANK_SIZE; + self.ramBank = 0; + + self.ramEnable = false; + + def read(self, address): + if (address <= 0x3FFF): + # 0000-3FFF + return self.rom[address] & 0xFF; + elif (address <= 0x7FFF): + # 4000-7FFF + return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; + return 0xFF; + + def write(self, address, data): + if (address <= 0x1FFF): + # 0000-1FFF + if (self.ramSize > 0): + self.ramEnable = ((data & 0x0A) == 0x0A); + elif (address <= 0x2FFF): + # 2000-2FFF + self.romBank = ((self.romBank & (0x01 << 22)) + ((data & 0xFF) << 14)) & self.romSize; + elif (address <= 0x3FFF): + # 3000-3FFF + self.romBank = ((self.romBank & (0xFF << 14)) + ((data & 0x01) << 22)) & self.romSize; + elif (address <= 0x4FFF): + # 4000-4FFF + if (self.rumble): + self.ramBank = ((data & 0x07) << 13) & self.ramSize; + else: + self.ramBank = ((data & 0x0F) << 13) & self.ramSize; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramEnable): + #TODO byte conversion + self.ram[self.ramBank + (address & 0x1FFF)] = data; + + def setROM(self, buffer): + banks = buffer.length / ROM_BANK_SIZE; + + if (banks < 2 or banks > 512): + raise Exception("Invalid MBC5 ROM size"); + + self.rom = buffer; + self.romSize = ROM_BANK_SIZE * banks - 1; + + def setRAM(self, buffer): + banks = buffer.length / RAM_BANK_SIZE; + + if (banks < 0 or banks > 16): + raise Exception("Invalid MBC5 RAM size"); + + self.ram = buffer; + self.ramSize = RAM_BANK_SIZE * banks - 1; + + +class HuC1(MBC): + def __init__(self, ram, rom): + super.__init__(self, ram, rom) + + +""" +Mario GameBoy (TM) Emulator + +Hudson Memory Bank Controller 3 (2MB ROM, 128KB RAM, RTC) + +0000-3FFF ROM Bank 0 (16KB) +4000-7FFF ROM Bank 1-127 (16KB) +A000-BFFF RAM Bank 0-15 (8KB) +""" +class HuC3(MBC): + clock; + rom; + ram; + romBank; + ramBank; + romSize; + ramSize; + ramFlag; + ramValue; + clockRegister; + clockShift; + clockTime; + + def __init__(self, rom, ram, clock): + self.clock = clock; + + self.setROM(rom); + self.setRAM(ram); + + def reset(): + self.romBank = ROM_BANK_SIZE; + self.ramBank = 0; + + self.ramFlag = 0; + self.ramValue = 0; + + self.clockRegister = 0; + self.clockShift = 0; + + self.clockTime = self.clock.getTime(); + + def read(self, address): + if (address <= 0x3FFF): + # 0000-3FFF + return self.rom[address] & 0xFF; + elif (address <= 0x7FFF): + # 4000-5FFF + return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramFlag == 0x0C): + return self.ramValue; + elif (self.ramFlag == 0x0D): + return 0x01; + elif (self.ramFlag == 0x0A or self.ramFlag == 0x00): + if (self.ramSize > 0): + return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; + return 0xFF; + + def write(self, address, data): + if (address <= 0x1FFF): + # 0000-1FFF + self.ramFlag = data; + elif (address <= 0x3FFF): + # 2000-3FFF + if ((data & 0x7F) == 0): + data = 1; + self.romBank = ((data & 0x7F) << 14) & self.romSize; + elif (address <= 0x5FFF): + # 4000-5FFF + self.ramBank = ((data & 0x0F) << 13) & self.ramSize; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramFlag == 0x0B): + if ((data & 0xF0) == 0x10): + if (self.clockShift <= 24): + self.ramValue = (self.clockRegister >> self.clockShift) & 0x0F; + self.clockShift += 4; + elif ((data & 0xF0) == 0x30): + if (self.clockShift <= 24): + self.clockRegister &= ~(0x0F << self.clockShift); + self.clockRegister |= ((data & 0x0F) << self.clockShift); + self.clockShift += 4; + elif ((data & 0xF0) == 0x40): + self.updateClock(); + + if ((data & 0x0F) == 0x00): + self.clockShift = 0; + elif ((data & 0x0F) == 0x03): + self.clockShift = 0; + elif ((data & 0x0F) == 0x07): + self.clockShift = 0; + elif ((data & 0xF0) == 0x50): + pass + elif ((data & 0xF0) == 0x60): + self.ramValue = 0x01; + elif (self.ramFlag >= 0x0C and self.ramFlag <= 0x0E): + pass + elif (self.ramFlag == 0x0A): + if (self.ramSize > 0): + #TODO byte conversion + self.ram[self.ramBank + (address & 0x1FFF)] = data; + + def updateClock(self): + now = self.clock.getTime(); + + elapsed = now - self.clockTime; + + # years (4 bits) + while (elapsed >= 365246060): + self.clockRegister += 1 << 24; + elapsed -= 365246060; + + # days (12 bits) + while (elapsed >= 246060): + self.clockRegister += 1 << 12; + elapsed -= 246060; + + # minutes (12 bits) + while (elapsed >= 60): + self.clockRegister += 1; + elapsed -= 60; + + if ((self.clockRegister & 0x0000FFF) >= 2460): + self.clockRegister += (1 << 12) - 2460; + + if ((self.clockRegister & 0x0FFF000) >= (365 << 12)): + self.clockRegister += (1 << 24) - (365 << 12); + + self.clockTime = now - elapsed; + + def setROM(self, buffer): + banks = buffer.length / ROM_BANK_SIZE; + + if (banks < 2 or banks > 128): + raise Exception("Invalid HuC3 ROM size"); + + self.rom = buffer; + self.romSize = ROM_BANK_SIZE*banks - 1; + + def setRAM(self, buffer): + banks = buffer.length / RAM_BANK_SIZE; + + if (banks < 0 or banks > 4): + raise Exception("Invalid HuC3 RAM size"); + + self.ram = buffer; + self.ramSize = RAM_BANK_SIZE * banks - 1; + Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- (empty file) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Mon Mar 10 23:45:47 2008 @@ -0,0 +1,3226 @@ +""" +Mario GameBoy (TM) Emulator + +Central Unit Processor (Sharp LR35902 CPU) +""" + +class CPU(object): + + # Flags + + Z_FLAG = 0x80 + N_FLAG = 0x40 + H_FLAG = 0x20 + C_FLAG = 0x10 + + + # Registers + a + b + c + d + f + d + l + sp; + pc; + + + # Interrupt Flags + + ime; + halted; + cycles; + + + # Interrupt Controller + + #Interrupt + interrupt; + + + # Memory Access + #Memory + memory; + + + # ROM Access + rom; + + def __init__(self, interrupt, memory): + self.interrupt = interrupt; + self.memory = memory; + + self.reset(); + + + def getBC(): + return (self.b << 8) + self.c; + + + def getDE(): + return (self.d << 8) + self.e; + + + def getHL(): + return (self.h << 8) + self.l; + + + def getSP(): + return self.sp; + + + def getPC(): + return self.pc; + + + def getAF(): + return (self.a << 8) + self.f; + + + def getIF(): + val = 0x00 + #if (self.ime ? 0x01 : 0x00) + (self.halted ? 0x80 : 0x00); + if self.ime: + val = 0x01 + if self.halted: + val += 0x80 + return val + + + + def setROM(self, banks): + self.rom = banks; + + + def reset(): + self.a = 0x01; + self.f = 0x80; + self.b = 0x00; + self.c = 0x13; + self.d = 0x00; + self.e = 0xD8; + self.h = 0x01; + self.l = 0x4D; + self.sp = 0xFFFE; + self.pc = 0x0100; + + self.ime = false; + self.halted = false; + + self.cycles = 0; + + + def emulate(self, ticks): + self.cycles += ticks; + + self.interrupt(); + + while (self.cycles > 0): + self.execute(); + + + + # Interrupts + + def interrupt(): + if (self.halted): + if (self.interrupt.isPending()): + self.halted = false; + # Zerd no Densetsu + self.cycles -= 4; + elif (self.cycles > 0): + self.cycles = 0; + + if (self.ime): + if (self.interrupt.isPending()): + if (self.interrupt.isPending(Interrupt.VBLANK)): + self.interrupt(0x40); + self.interrupt.lower(Interrupt.VBLANK); + elif (self.interrupt.isPending(Interrupt.LCD)): + self.interrupt(0x48); + self.interrupt.lower(Interrupt.LCD); + elif (self.interrupt.isPending(Interrupt.TIMER)): + self.interrupt(0x50); + self.interrupt.lower(Interrupt.TIMER); + elif (self.interrupt.isPending(Interrupt.SERIAL)): + self.interrupt(0x58); + self.interrupt.lower(Interrupt.SERIAL); + elif (self.interrupt.isPending(Interrupt.JOYPAD)): + self.interrupt(0x60); + self.interrupt.lower(Interrupt.JOYPAD); + + + + def interrupt(self, address): + self.ime = false; + + self.call(address); + + + + # Execution + + def execute(): + self.execute(self.fetch()); + + + def execute(self, opcode): + result = { 0x00:self.nop(), + # LD (nnnn),SP + 0x08:self.load_mem_SP(), + + # STOP + 0x10:self.stop(), + + # JR nn + 0x18:self.jr_nn(), + + # JR cc,nn + 0x20:self.jr_NZ_nn(), + 0x28:self.jr_Z_nn(), + 0x30:self.jr_NC_nn(), + 0x38:self.jr_C_nn(), + + # LD rr,nnnn + 0x01:self.ld_BC_nnnn(), + 0x11:self.ld_DE_nnnn(), + 0x21:self.ld_HL_nnnn(), + 0x31:self.ld_SP_nnnn(), + + # ADD HL,rr + 0x09:self.add_HL_BC(), + 0x19:self.add_HL_DE(), + 0x29:self.add_HL_HL(), + 0x39:self.add_HL_SP(), + + # LD (BC),A + 0x02:self.ld_BCi_A(), + + # LD A,(BC) + 0x0A:self.ld_A_BCi(), + + # LD (DE),A + 0x12:self.ld_DEi_A(), + + # LD A,(DE) + 0x1A:self.load_A_DEi(), + + # LDI (HL),A + 0x22:self.ldi_HLi_A(), + + # LDI A,(HL) + 0x2A:self.ldi_A_HLi(), + + # LDD (HL),A + 0x32:self.ldd_HLi_A(), + + # LDD A,(HL) + 0x3A:self.ldd_A_HLi(), + + # INC rr + 0x03:self.inc_BC(), + 0x13:self.inc_DE(), + 0x23:self.inc_HL(), + 0x33:self.inc_SP(), + + # DEC rr + 0x0B:self.dec_BC(), + 0x1B:self.dec_DE(), + 0x2B:self.dec_HL(), + 0x3B:self.dec_SP(), + + # INC r + 0x04:self.inc_B(), + 0x0C:self.inc_C(), + 0x14:self.inc_D(), + 0x1C:self.inc_E(), + 0x24:self.inc_H(), + 0x2C:self.inc_L(), + 0x34:self.inc_HLi(), + 0x3C:self.inc_A(), + + # DEC r + 0x05:self.dec_B(), + 0x0D:self.dec_C(), + 0x15:self.dec_D(), + 0x1D:self.dec_E(), + 0x25:self.dec_H(), + 0x2D:self.dec_L(), + 0x35:self.dec_HLi(), + 0x3D:self.dec_A(), + + # LD r,nn + 0x06:self.ld_B_nn(), + 0x0E:self.ld_C_nn(), + 0x16:self.ld_D_nn(), + 0x1E:self.ld_E_nn(), + 0x26:self.ld_H_nn(), + 0x2E:self.ld_L_nn(), + 0x36:self.ld_HLi_nn(), + 0x3E:self.ld_A_nn(), + + # RLCA + 0x07:self.rlca(), + + # RRCA + 0x0F:self.rrca(), + + # RLA + 0x17:self.rla(), + + # RRA + 0x1F:self.rra(), + + # DAA + 0x27:self.daa(), + + # CPL + 0x2F:self.cpl(), + + # SCF + 0x37:self.scf(), + + # CCF + 0x3F:self.ccf(), + + # HALT + 0x76:self.halt(), + + # LD r,s + 0x40:self.ld_B_B(), + 0x41:self.ld_B_C(), + 0x42:self.ld_B_D(), + 0x43:self.ld_B_E(), + 0x44:self.ld_B_H(), + 0x45:self.ld_B_L(), + 0x46:self.ld_B_HLi(), + 0x47:self.ld_B_A(), + + 0x48:self.ld_C_B(), + 0x49:self.ld_C_C(), + 0x4A:self.ld_C_D(), + 0x4B:self.ld_C_E(), + 0x4C:self.ld_C_H(), + 0x4D:self.ld_C_L(), + 0x4E:self.ld_C_HLi(), + 0x4F:self.ld_C_A(), + + 0x50:self.ld_D_B(), + 0x51:self.ld_D_C(), + 0x52:self.ld_D_D(), + 0x53:self.ld_D_E(), + 0x54:self.ld_D_H(), + 0x55:self.ld_D_L(), + 0x56:self.ld_D_HLi(), + 0x57:self.ld_D_A(), + + 0x58:self.ld_E_B(), + 0x59:self.ld_E_C(), + 0x5A:self.ld_E_D(), + 0x5B:self.ld_E_E(), + 0x5C:self.ld_E_H(), + 0x5D:self.ld_E_L(), + 0x5E:self.ld_E_HLi(), + 0x5F:self.ld_E_A(), + + 0x60:self.ld_H_B(), + 0x61:self.ld_H_C(), + 0x62:self.ld_H_D(), + 0x63:self.ld_H_E(), + 0x64:self.ld_H_H(), + 0x65:self.ld_H_L(), + 0x66:self.ld_H_HLi(), + 0x67:self.ld_H_A(), + + 0x68:self.ld_L_B(), + 0x69:self.ld_L_C(), + 0x6A:self.ld_L_D(), + 0x6B:self.ld_L_E(), + 0x6C:self.ld_L_H(), + 0x6D:self.ld_L_L(), + 0x6E:self.ld_L_HLi(), + 0x6F:self.ld_L_A(), + + 0x70:self.ld_HLi_B(), + 0x71:self.ld_HLi_C(), + 0x72:self.ld_HLi_D(), + 0x73:self.ld_HLi_E(), + 0x74:self.ld_HLi_H(), + 0x75:self.ld_HLi_L(), + 0x77:self.ld_HLi_A(), + + 0x78:self.ld_A_B(), + 0x79:self.ld_A_C(), + 0x7A:self.ld_A_D(), + 0x7B:self.ld_A_E(), + 0x7C:self.ld_A_H(), + 0x7D:self.ld_A_L(), + 0x7E:self.ld_A_HLi(), + 0x7F:self.ld_A_A(), + + # ADD A,r + 0x80:self.add_A_B(), + 0x81:self.add_A_C(), + 0x82:self.add_A_D(), + 0x83:self.add_A_E(), + 0x84:self.add_A_H(), + 0x85:self.add_A_L(), + 0x86:self.add_A_HLi(), + 0x87:self.add_A_A(), + + # ADC A,r + 0x88:self.adc_A_B(), + 0x89:self.adc_A_C(), + 0x8A:self.adc_A_D(), + 0x8B:self.adc_A_E(), + 0x8C:self.adc_A_H(), + 0x8D:self.adc_A_L(), + 0x8E:self.adc_A_HLi(), + 0x8F:self.adc_A_A(), + + # SUB A,r + 0x90:self.sub_A_B(), + 0x91:self.sub_A_C(), + 0x92:self.sub_A_D(), + 0x93:self.sub_A_E(), + 0x94:self.sub_A_H(), + 0x95:self.sub_A_L(), + 0x96:self.sub_A_HLi(), + 0x97:self.sub_A_A(), + + # SBC A,r + 0x98:self.sbc_A_B(), + 0x99:self.sbc_A_C(), + 0x9A:self.sbc_A_D(), + 0x9B:self.sbc_A_E(), + 0x9C:self.sbc_A_H(), + 0x9D:self.sbc_A_L(), + 0x9E:self.sbc_A_HLi(), + 0x9F:self.sbc_A_A(), + + # AND A,r + 0xA0:self.and_A_B(), + 0xA1:self.and_A_C(), + 0xA2:self.and_A_D(), + 0xA3:self.and_A_E(), + 0xA4:self.and_A_H(), + 0xA5:self.and_A_L(), + 0xA6:self.and_A_HLi(), + 0xA7:self.and_A_A(), + + # XOR A,r + 0xA8:self.xor_A_B(), + 0xA9:self.xor_A_C(), + 0xAA:self.xor_A_D(), + 0xAB:self.xor_A_E(), + 0xAC:self.xor_A_H(), + 0xAD:self.xor_A_L(), + 0xAE:self.xor_A_HLi(), + 0xAF:self.xor_A_A(), + + # OR A,r + 0xB0:self.or_A_B(), + 0xB1:self.or_A_C(), + 0xB2:self.or_A_D(), + 0xB3:self.or_A_E(), + 0xB4:self.or_A_H(), + 0xB5:self.or_A_L(), + 0xB6:self.or_A_HLi(), + 0xB7:self.or_A_A(), + + # CP A,r + 0xB8:self.cp_A_B(), + 0xB9:self.cp_A_C(), + 0xBA:self.cp_A_D(), + 0xBB:self.cp_A_E(), + 0xBC:self.cp_A_H(), + 0xBD:self.cp_A_L(), + 0xBE:self.cp_A_HLi(), + 0xBF:self.cp_A_A(), + + # RET cc + 0xC0:self.ret_NZ(), + 0xC8:self.ret_Z(), + 0xD0:self.ret_NC(), + 0xD8:self.ret_C(), + + # LDH (nn),A + 0xE0:self.ldh_mem_A(), + + # ADD SP,nn + 0xE8:self.add_SP_nn(), + + # LDH A,(nn) + 0xF0:self.ldh_A_mem(), + + # LD HL,SP+nn + 0xF8:self.ld_HP_SP_nn(), + + # POP rr + 0xC1:self.pop_BC(), + 0xD1:self.pop_DE(), + 0xE1:self.pop_HL(), + 0xF1:self.pop_AF(), + + # RET + 0xC9:self.ret(), + + # RETI + 0xD9:self.reti(), + + # LD PC,HL + 0xE9:self.ld_PC_HL(), + + # LD SP,HL + 0xF9:self.ld_SP_HL(), + + # JP cc,nnnn + 0xC2:self.jp_NZ_nnnn(), + 0xCA:self.jp_Z_nnnn(), + 0xD2:self.jp_NC_nnnn(), + 0xDA:self.jp_C_nnnn(), + + # LDH (C),A + 0xE2:self.ldh_Ci_A(), + + # LD (nnnn),A + 0xEA:self.ld_mem_A(), + + # LDH A,(C) + 0xF2:self.ldh_A_Ci(), + + # LD A,(nnnn) + 0xFA:self.ld_A_mem(), + + # JP nnnn + 0xC3:self.jp_nnnn(), + + 0xCB:self.fetchExecute(), + + # DI + 0xF3:self.di(), + + # EI + 0xFB:self.ei(), + + # CALL cc,nnnn + 0xC4:self.call_NZ_nnnn(), + 0xCC:self.call_Z_nnnn(), + 0xD4:self.call_NC_nnnn(), + 0xDC:self.call_C_nnnn(), + + # PUSH rr + 0xC5:self.push_BC(), + 0xD5:self.push_DE(), + 0xE5:self.push_HL(), + 0xF5:self.push_AF(), + + # CALL nnnn + 0xCD:self.call_nnnn(), + + # ADD A,nn + 0xC6:self.add_A_nn(), + + # ADC A,nn + 0xCE:self.adc_A_nn(), + + # SUB A,nn + 0xD6:self.sub_A_nn(), + + # SBC A,nn + 0xDE:self.sbc_A_nn(), + + # AND A,nn + 0xE6:self.and_A_nn(), + + # XOR A,nn + 0xEE:self.xor_A_nn(), + + # OR A,nn + 0xF6:self.or_A_nn(), + + # CP A,nn + 0xFE:self.cp_A_nn(), + + # RST nn + 0xC7:self.rst(0x00), + 0xCF:self.rst(0x08), + 0xD7:self.rst(0x10), + 0xDF:self.rst(0x18), + 0xE7:self.rst(0x20), + 0xEF:self.rst(0x28), + 0xF7:self.rst(0x30), + 0xFF:self.rst(0x38) + }[opcode]() + + + def fetchExecute(self): + result = { + # RLC r + 0x00:self.rlc_B(), + 0x01:self.rlc_C(), + 0x02:self.rlc_D(), + 0x03:self.rlc_E(), + 0x04:self.rlc_H(), + 0x05:self.rlc_L(), + 0x06:self.rlc_HLi(), + 0x07:self.rlc_A(), + + # RRC r + 0x08:self.rrc_B(), + 0x09:self.rrc_C(), + 0x0A:self.rrc_D(), + 0x0B:self.rrc_E(), + 0x0C:self.rrc_H(), + 0x0D:self.rrc_L(), + 0x0E:self.rrc_HLi(), + 0x0F:self.rrc_A(), + + # RL r + 0x10:self.rl_B(), + 0x11:self.rl_C(), + 0x12:self.rl_D(), + 0x13:self.rl_E(), + 0x14:self.rl_H(), + 0x15:self.rl_L(), + 0x16:self.rl_HLi(), + 0x17:self.rl_A(), + + # RR r + 0x18:self.rr_B(), + 0x19:self.rr_C(), + 0x1A:self.rr_D(), + 0x1B:self.rr_E(), + 0x1C:self.rr_H(), + 0x1D:self.rr_L(), + 0x1E:self.rr_HLi(), + 0x1F:self.rr_A(), + + # SLA r + 0x20:self.sla_B(), + 0x21:self.sla_C(), + 0x22:self.sla_D(), + 0x23:self.sla_E(), + 0x24:self.sla_H(), + 0x25:self.sla_L(), + 0x26:self.sla_HLi(), + 0x27:self.sla_A(), + + # SRA r + 0x28:self.sra_B(), + 0x29:self.sra_C(), + 0x2A:self.sra_D(), + 0x2B:self.sra_E(), + 0x2C:self.sra_H(), + 0x2D:self.sra_L(), + 0x2E:self.sra_HLi(), + 0x2F:self.sra_A(), + + # SWAP r + 0x30:self.swap_B(), + 0x31:self.swap_C(), + 0x32:self.swap_D(), + 0x33:self.swap_E(), + 0x34:self.swap_H(), + 0x35:self.swap_L(), + 0x36:self.swap_HLi(), + 0x37:self.swap_A(), + + # SRL r + 0x38:self.srl_B(), + 0x39:self.srl_C(), + 0x3A:self.srl_D(), + 0x3B:self.srl_E(), + 0x3C:self.srl_H(), + 0x3D:self.srl_L(), + 0x3E:self.srl_HLi(), + 0x3F:self.srl_A(), + + # BIT 0,r + 0x40:self.bit_B(0), + 0x41:self.bit_C(0), + 0x42:self.bit_D(0), + 0x43:self.bit_E(0), + 0x44:self.bit_H(0), + 0x45:self.bit_L(0), + 0x46:self.bit_HLi(0), + 0x47:self.bit_A(0), + + # BIT 1,r + 0x48:self.bit_B(1), + 0x49:self.bit_C(1), + 0x4A:self.bit_D(1), + 0x4B:self.bit_E(1), + 0x4C:self.bit_H(1), + 0x4D:self.bit_L(1), + 0x4E:self.bit_HLi(1), + 0x4F:self.bit_A(1), + + # BIT 2,r + 0x50:self.bit_B(2), + 0x51:self.bit_C(2), + 0x52:self.bit_D(2), + 0x53:self.bit_E(2), + 0x54:self.bit_H(2), + 0x55:self.bit_L(2), + 0x56:self.bit_HLi(2), + 0x57:self.bit_A(2), + + # BIT 3,r + 0x58:self.bit_B(3), + 0x59:self.bit_C(3), + 0x5A:self.bit_D(3), + 0x5B:self.bit_E(3), + 0x5C:self.bit_H(3), + 0x5D:self.bit_L(3), + 0x5E:self.bit_HLi(3), + 0x5F:self.bit_A(3), + + # BIT 4,r + 0x60:self.bit_B(4), + 0x61:self.bit_C(4), + 0x62:self.bit_D(4), + 0x63:self.bit_E(4), + 0x64:self.bit_H(4), + 0x65:self.bit_L(4), + 0x66:self.bit_HLi(4), + 0x67:self.bit_A(4), + + # BIT 5,r + 0x68:self.bit_B(5), + 0x69:self.bit_C(5), + 0x6A:self.bit_D(5), + 0x6B:self.bit_E(5), + 0x6C:self.bit_H(5), + 0x6D:self.bit_L(5), + 0x6E:self.bit_HLi(5), + 0x6F:self.bit_A(5), + + # BIT 6,r + 0x70:self.bit_B(6), + 0x71:self.bit_C(6), + 0x72:self.bit_D(6), + 0x73:self.bit_E(6), + 0x74:self.bit_H(6), + 0x75:self.bit_L(6), + 0x76:self.bit_HLi(6), + 0x77:self.bit_A(6), + + # BIT 7,r + 0x78:self.bit_B(7), + 0x79:self.bit_C(7), + 0x7A:self.bit_D(7), + 0x7B:self.bit_E(7), + 0x7C:self.bit_H(7), + 0x7D:self.bit_L(7), + 0x7E:self.bit_HLi(7), + 0x7F:self.bit_A(7), + + # SET 0,r + 0xC0:self.set_B(0), + 0xC1:self.set_C(0), + 0xC2:self.set_D(0), + 0xC3:self.set_E(0), + 0xC4:self.set_H(0), + 0xC5:self.set_L(0), + 0xC6:self.set_HLi(0), + 0xC7:self.set_A(0), + + # SET 1,r + 0xC8:self.set_B(1), + 0xC9:self.set_C(1), + 0xCA:self.set_D(1), + 0xCB:self.set_E(1), + 0xCC:self.set_H(1), + 0xCD:self.set_L(1), + 0xCE:self.set_HLi(1), + 0xCF:self.set_A(1), + + # SET 2,r + 0xD0:self.set_B(2), + 0xD1:self.set_C(2), + 0xD2:self.set_D(2), + 0xD3:self.set_E(2), + 0xD4:self.set_H(2), + 0xD5:self.set_L(2), + 0xD6:self.set_HLi(2), + 0xD7:self.set_A(2), + + # SET 3,r + 0xD8:self.set_B(3), + 0xD9:self.set_C(3), + 0xDA:self.set_D(3), + 0xDB:self.set_E(3), + 0xDC:self.set_H(3), + 0xDD:self.set_L(3), + 0xDE:self.set_HLi(3), + 0xDF:self.set_A(3), + + # SET 4,r + 0xE0:self.set_B(4), + 0xE1:self.set_C(4), + 0xE2:self.set_D(4), + 0xE3:self.set_E(4), + 0xE4:self.set_H(4), + 0xE5:self.set_L(4), + 0xE6:self.set_HLi(4), + 0xE7:self.set_A(4), + + # SET 5,r + 0xE8:self.set_B(5), + 0xE9:self.set_C(5), + 0xEA:self.set_D(5), + 0xEB:self.set_E(5), + 0xEC:self.set_H(5), + 0xED:self.set_L(5), + 0xEE:self.set_HLi(5), + 0xEF:self.set_A(5), + + # SET 6,r + 0xF0:self.set_B(6), + 0xF1:self.set_C(6), + 0xF2:self.set_D(6), + 0xF3:self.set_E(6), + 0xF4:self.set_H(6), + 0xF5:self.set_L(6), + 0xF6:self.set_HLi(6), + 0xF7:self.set_A(6), + + # SET 7,r + 0xF8:self.set_B(7), + 0xF9:self.set_C(7), + 0xFA:self.set_D(7), + 0xFB:self.set_E(7), + 0xFC:self.set_H(7), + 0xFD:self.set_L(7), + 0xFE:self.set_HLi(7), + 0xFF:self.set_A(7), + + # RES 0,r + 0x80:self.res_B(0), + 0x81:self.res_C(0), + 0x82:self.res_D(0), + 0x83:self.res_E(0), + 0x84:self.res_H(0), + 0x85:self.res_L(0), + 0x86:self.res_HLi(0), + 0x87:self.res_A(0), + + # RES 1,r + 0x88:self.res_B(1), + 0x89:self.res_C(1), + 0x8A:self.res_D(1), + 0x8B:self.res_E(1), + 0x8C:self.res_H(1), + 0x8D:self.res_L(1), + 0x8E:self.res_HLi(1), + 0x8F:self.res_A(1), + + # RES 2,r + 0x90:self.res_B(2), + 0x91:self.res_C(2), + 0x92:self.res_D(2), + 0x93:self.res_E(2), + 0x94:self.res_H(2), + 0x95:self.res_L(2), + 0x96:self.res_HLi(2), + 0x97:self.res_A(2), + + # RES 3,r + 0x98:self.res_B(3), + 0x99:self.res_C(3), + 0x9A:self.res_D(3), + 0x9B:self.res_E(3), + 0x9C:self.res_H(3), + 0x9D:self.res_L(3), + 0x9E:self.res_HLi(3), + 0x9F:self.res_A(3), + + # RES 4,r + 0xA0:self.res_B(4), + 0xA1:self.res_C(4), + 0xA2:self.res_D(4), + 0xA3:self.res_E(4), + 0xA4:self.res_H(4), + 0xA5:self.res_L(4), + 0xA6:self.res_HLi(4), + 0xA7:self.res_A(4), + + # RES 5,r + 0xA8:self.res_B(5), + 0xA9:self.res_C(5), + 0xAA:self.res_D(5), + 0xAB:self.res_E(5), + 0xAC:self.res_H(5), + 0xAD:self.res_L(5), + 0xAE:self.res_HLi(5), + 0xAF:self.res_A(5), + + # RES 6,r + 0xB0:self.res_B(6), + 0xB1:self.res_C(6), + 0xB2:self.res_D(6), + 0xB3:self.res_E(6), + 0xB4:self.res_H(6), + 0xB5:self.res_L(6), + 0xB6:self.res_HLi(6), + 0xB7:self.res_A(6), + + # RES 7,r + 0xB8:self.res_B(7), + 0xB9:self.res_C(7), + 0xBA:self.res_D(7), + 0xBB:self.res_E(7), + 0xBC:self.res_H(7), + 0xBD:self.res_L(7), + 0xBE:self.res_HLi(7), + 0xBF:self.res_A(7) + }[self.fetch()]() + + + # Memory Access + + def read(self, address): + return self.memory.read(address); + + + def write(self, address, data): + self.memory.write(address, data); + + + def read(self, hi, lo): + return self.read((hi << 8) + lo); + + + def write(self, hi, lo, data): + self.write((hi << 8) + lo, data); + + + + # Fetching + + def fetch(): + if (self.pc <= 0x3FFF): + self.pc+=1 + return self.rom[self.pc] & 0xFF; + + data = self.memory.read(self.pc); + self.pc = (self.pc + 1) & 0xFFFF; + return data; + + + + # Stack + + def push(self, data): + self.sp = (self.sp - 1) & 0xFFFF; + self.memory.write(self.sp, data); + + + def pop(): + data = self.memory.read(self.sp); + self.sp = (self.sp + 1) & 0xFFFF; + return data; + + + def call(self, address): + self.push(self.pc >> 8); + self.push(self.pc & 0xFF); + self.pc = address; + + + + # ALU + + def add(self, data): + s = (self.a + data) & 0xFF; + self.f = 0 + if s == 0: + self.f = Z_FLAG + if s < self.a: + self.f += C_FLAG + if (s & 0x0F) < (self.a & 0x0F): + self.f += H_FLAG + self.a = s; + + + def adc(self, data): + s = self.a + data + ((self.f & C_FLAG) >> 4); + self.f = 0 + if (s & 0xFF) == 0: + self.f += Z_FLAG + if s >= 0x100: + self.f += C_FLAG + if ((s ^ self.a ^ data) & 0x10) != 0: + self.f += H_FLAG + self.a = s & 0xFF; + + + def sub(self, data): + s = (self.a - data) & 0xFF; + self.f = N_FLAG + if s == 0: + self.f += Z_FLAG + if s > self.a: + self.f += C_FLAG + if (s & 0x0F) > (self.a & 0x0F): + self.f += H_FLAG + + self.a = s; + + + def sbc(self, data): + s = self.a - data - ((self.f & C_FLAG) >> 4); + self.f = N_FLAG + if (s & 0xFF) == 0: + self.f += Z_FLAG + if (s & 0xFF00) != 0: + self.f += C_FLAG + if ((s ^ self.a ^ data) & 0x10) != 0: + self.f += H_FLAG + self.a = s & 0xFF; + + + def and(self, data): + self.a &= data; + self.f = 0 + if self.a == 0: + self.f = Z_FLAG + + + def xor(self, data): + self.a ^= data; + self.f = 0 + if self.a == 0: + self.f = Z_FLAG + + + def or(self, data): + self.a |= data; + self.f = 0 + if self.a == 0: + self.f = Z_FLAG + + + def cp(self, data): + s = (self.a - data) & 0xFF; + self.f = N_FLAG + if s==0: + self.f += Z_FLAG + if s > self.a: + self.f += C_FLAG + if (s & 0x0F) > (self.a & 0x0F): + self.f += H_FLAG + + + def inc(self, data): + data = (data + 1) & 0xFF; + self.f = 0 + if data == 0: + self.f += Z_FLAG + if (data & 0x0F) == 0x00: + self.f += H_FLAG + self.f += (self.f & C_FLAG); + return data; + + + def dec(self, data): + data = (data - 1) & 0xFF; + self.f = 0 + if data == 0: + self.f += Z_FLAG + if (data & 0x0F) == 0x0F: + self.f += H_FLAG + self.f += (self.f & C_FLAG) + N_FLAG; + return data; + + + def rlc(self, data): + s = ((data & 0x7F) << 1) + ((data & 0x80) >> 7); + self.f = 0 + if s == 0: + self.f += Z_FLAG + if (data & 0x80) != 0: + self.f += C_FLAG + return s; + + + def rl(self, data): + s = ((data & 0x7F) << 1) + if (self.f & C_FLAG) != 0: + self.f += 0x01; + self.f =0 + if (s == 0): + self.f += Z_FLAG + if (data & 0x80) != 0: + self.f += C_FLAG + return s; + + + def rrc(self, data): + s = (data >> 1) + ((data & 0x01) << 7); + self.f = 0 + if s == 0: + self.f += Z_FLAG + if (data & 0x01) != 0: + self.f += C_FLAG + return s; + + + def rr(self, data): + s = (data >> 1) + ((self.f & C_FLAG) << 3); + self.f = 0 + if s == 0: + self.f += Z_FLAG + if (data & 0x01) != 0: + self.f += C_FLAG + return s; + + + def sla(self, data): + s = (data << 1) & 0xFF; + self.f = 0 + if s == 0: + self.f += Z_FLAG + if (data & 0x80) != 0: + self.f += C_FLAG + return s; + + + def sra(self, data): + s = (data >> 1) + (data & 0x80); + self.f = 0 + if s == 0: + self.f += Z_FLAG + if (data & 0x01) != 0: + self.f += C_FLAG + return s; + + + def srl(self, data): + s = (data >> 1); + self.f = 0 + if s == 0 : + self.f += Z_FLAG + if (data & 0x01) != 0: + self.f += C_FLAG + return s; + + + def swap(self, data): + s = ((data << 4) & 0xF0) + ((data >> 4) & 0x0F); + self.f = 0 + if s == 0: + self.f += Z_FLAG + return s; + + + def bit(self, n, data): + self.f = (self.f & C_FLAG) + H_FLAG + if (data & (1 << n)) == 0: + self.f += Z_FLAG + + + def add(self, hi, lo): + s = ((self.h << 8) + self.l + (hi << 8) + lo) & 0xFFFF; + self.f = (self.f & Z_FLAG) + if ((s >> 8) & 0x0F) < (self.h & 0x0F): + self.f += H_FLAG + self.f += s < (self.h << 8) + if self.l: + self.f += C_FLAG + self.l = s & 0xFF; + self.h = s >> 8; + + + + # LD r,r + + def ld_B_B(): + # b = b; + self.cycles -= 1; + + + def ld_B_C(): + self.b = self.c; + self.cycles -= 1; + + + def ld_B_D(): + self.b = self.d; + self.cycles -= 1; + + + def ld_B_E(): + self.b = self.e; + self.cycles -= 1; + + + def ld_B_H(): + self.b = self.h; + self.cycles -= 1; + + + def ld_B_L(): + self.b = self.l; + self.cycles -= 1; + + + def ld_B_A(): + self.b = self.a; + self.cycles -= 1; + + + def ld_C_B(): + self.c = self.b; + self.cycles -= 1; + + + def ld_C_C(): + # c = c; + self.cycles -= 1; + + + def ld_C_D(): + self.c = self.d; + self.cycles -= 1; + + + def ld_C_E(): + self.c = self.e; + self.cycles -= 1; + + + def ld_C_H(): + self.c = self.h; + self.cycles -= 1; + + + def ld_C_L(): + self.c = self.l; + self.cycles -= 1; + + + def ld_C_A(): + self.c = self.a; + self.cycles -= 1; + + + def ld_D_B(): + self.d = self.b; + self.cycles -= 1; + + + def ld_D_C(): + self.d = self.c; + self.cycles -= 1; + + + def ld_D_D(): + # d = d; + self.cycles -= 1; + + + def ld_D_E(): + self.d = self.e; + self.cycles -= 1; + + + def ld_D_H(): + self.d = self.h; + self.cycles -= 1; + + + def ld_D_L(): + self.d = self.l; + self.cycles -= 1; + + + def ld_D_A(): + self.d = self.a; + self.cycles -= 1; + + + def ld_E_B(): + self.e = self.b; + self.cycles -= 1; + + + def ld_E_C(): + self.e = self.c; + self.cycles -= 1; + + + def ld_E_D(): + self.e = self.d; + self.cycles -= 1; + + + def ld_E_E(): + # e = e; + self.cycles -= 1; + + + def ld_E_H(): + self.e = self.h; + self.cycles -= 1; + + + def ld_E_L(): + self.e = self.l; + self.cycles -= 1; + + + def ld_E_A(): + self.e = self.a; + self.cycles -= 1; + + + def ld_H_B(): + self.h = self.b; + self.cycles -= 1; + + + def ld_H_C(): + self.h = self.c; + self.cycles -= 1; + + + def ld_H_D(): + self.h = self.d; + self.cycles -= 1; + + + def ld_H_E(): + self.h = self.e; + self.cycles -= 1; + + + def ld_H_H(): + # h = h; + self.cycles -= 1; + + + def ld_H_L(): + self.h = self.l; + self.cycles -= 1; + + + def ld_H_A(): + self.h = self.a; + self.cycles -= 1; + + + def ld_L_B(): + self.l = self.b; + self.cycles -= 1; + + + def ld_L_C(): + self.l = self.c; + self.cycles -= 1; + + + def ld_L_D(): + self.l = self.d; + self.cycles -= 1; + + + def ld_L_E(): + self.l = self.e; + self.cycles -= 1; + + + def ld_L_H(): + self.l = self.h; + self.cycles -= 1; + + + def ld_L_L(): + # l = l; + self.cycles -= 1; + + + def ld_L_A(): + self.l = self.a; + self.cycles -= 1; + + + def ld_A_B(): + self.a = self.b; + self.cycles -= 1; + + + def ld_A_C(): + self.a = self.c; + self.cycles -= 1; + + + def ld_A_D(): + self.a = self.d; + self.cycles -= 1; + + + def ld_A_E(): + self.a = self.e; + self.cycles -= 1; + + + def ld_A_H(): + self.a = self.h; + self.cycles -= 1; + + + def ld_A_L(): + self.a = self.l; + self.cycles -= 1; + + + def ld_A_A(): + # a = a; + self.cycles -= 1; + + + + # LD r,nn + + def ld_B_nn(): + self.b = self.fetch(); + self.cycles -= 2; + + + def ld_C_nn(): + self.c = self.fetch(); + self.cycles -= 2; + + + def ld_D_nn(): + self.d = self.fetch(); + self.cycles -= 2; + + + def ld_E_nn(): + self.e = self.fetch(); + self.cycles -= 2; + + + def ld_H_nn(): + self.h = self.fetch(); + self.cycles -= 2; + + + def ld_L_nn(): + self.l = self.fetch(); + self.cycles -= 2; + + + def ld_A_nn(): + self.a = self.fetch(); + self.cycles -= 2; + + + + # LD r,(HL) + + def ld_B_HLi(): + self.b = self.read(self.h, self.l); + self.cycles -= 2; + + + def ld_C_HLi(): + self.c = self.read(self.h, self.l); + self.cycles -= 2; + + + def ld_D_HLi(): + self.d = self.read(self.h, self.l); + self.cycles -= 2; + + + def ld_E_HLi(): + self.e = self.read(self.h, self.l); + self.cycles -= 2; + + + def ld_H_HLi(): + self.h = self.read(self.h, self.l); + self.cycles -= 2; + + + def ld_L_HLi(): + self.l = self.read(self.h, self.l); + self.cycles -= 2; + + + def ld_A_HLi(): + self.a = self.read(self.h, self.l); + self.cycles -= 2; + + + + # LD (HL),r + + def ld_HLi_B(): + self.write(self.h, self.l, self.b); + self.cycles -= 2; + + + def ld_HLi_C(): + self.write(self.h, self.l, self.c); + self.cycles -= 2; + + + def ld_HLi_D(): + self.write(self.h, self.l, self.d); + self.cycles -= 2; + + + def ld_HLi_E(): + self.write(self.h, self.l, self.e); + self.cycles -= 2; + + + def ld_HLi_H(): + self.write(self.h, self.l, self.h); + self.cycles -= 2; + + + def ld_HLi_L(): + self.write(self.h, self.l, self.l); + self.cycles -= 2; + + + def ld_HLi_A(): + self.write(self.h, self.l, self.a); + self.cycles -= 2; + + + + # LD (HL),nn + + def ld_HLi_nn(): + self.write(self.h, self.l, self.fetch()); + self.cycles -= 3; + + + + # LD A,(rr) + + def ld_A_BCi(): + self.a = self.read(self.b, self.c); + self.cycles -= 2; + + + def load_A_DEi(): + self.a = self.read(self.d, self.e); + self.cycles -= 2; + + + + # LD A,(nnnn) + + def ld_A_mem(): + lo = self.fetch(); + hi = self.fetch(); + self.a = self.read(hi, lo); + self.cycles -= 4; + + + + # LD (rr),A + + def ld_BCi_A(): + self.write(self.b, self.c, self.a); + self.cycles -= 2; + + + def ld_DEi_A(): + self.write(self.d, self.e, self.a); + self.cycles -= 2; + + + + # LD (nnnn),SP + + def load_mem_SP(): + lo = self.fetch(); + hi = self.fetch(); + address = (hi << 8) + lo; + + self.write(address, self.sp & 0xFF); + self.write((address + 1) & 0xFFFF, self.sp >> 8); + + self.cycles -= 5; + + + + # LD (nnnn),A + + def ld_mem_A(): + lo = self.fetch(); + hi = self.fetch(); + self.write(hi, lo, self.a); + self.cycles -= 4; + + + + # LDH A,(nn) + + def ldh_A_mem(): + self.a = self.read(0xFF00 + self.fetch()); + self.cycles -= 3; + + + + # LDH (nn),A + + def ldh_mem_A(): + self.write(0xFF00 + self.fetch(), self.a); + self.cycles -= 3; + + + + # LDH A,(C) + + def ldh_A_Ci(): + self.a = self.read(0xFF00 + self.c); + self.cycles -= 2; + + + + # LDH (C),A + + def ldh_Ci_A(): + self.write(0xFF00 + self.c, self.a); + self.cycles -= 2; + + + + # LDI (HL),A + + def ldi_HLi_A(): + self.write(self.h, self.l, self.a); + self.l = (self.l + 1) & 0xFF; + if (self.l == 0): + self.h = (self.h + 1) & 0xFF; + self.cycles -= 2; + + + + # LDI A,(HL) + + def ldi_A_HLi(): + self.a = self.read(self.h, self.l); + self.l = (self.l + 1) & 0xFF; + if (self.l == 0): + self.h = (self.h + 1) & 0xFF; + self.cycles -= 2; + + + + # LDD (HL),A + + def ldd_HLi_A(): + self.write(self.h, self.l, self.a); + self.l = (self.l - 1) & 0xFF; + if (self.l == 0xFF): + self.h = (self.h - 1) & 0xFF; + self.cycles -= 2; + + + + # LDD A,(HL) + + def ldd_A_HLi(): + self.a = self.read(self.h, self.l); + self.l = (self.l - 1) & 0xFF; + if (self.l == 0xFF): + self.h = (self.h - 1) & 0xFF; + self.cycles -= 2; + + + + # LD rr,nnnn + + def ld_BC_nnnn(): + self.c = self.fetch(); + self.b = self.fetch(); + self.cycles -= 3; + + + def ld_DE_nnnn(): + self.e = self.fetch(); + self.d = self.fetch(); + self.cycles -= 3; + + + def ld_HL_nnnn(): + self.l = self.fetch(); + self.h = self.fetch(); + self.cycles -= 3; + + + def ld_SP_nnnn(): + lo = self.fetch(); + hi = self.fetch(); + self.sp = (hi << 8) + lo; + self.cycles -= 3; + + + + # LD SP,HL + + def ld_SP_HL(): + self.sp = (self.h << 8) + self.l; + self.cycles -= 2; + + + + # PUSH rr + + def push_BC(): + self.push(self.b); + self.push(self.c); + self.cycles -= 4; + + + def push_DE(): + self.push(self.d); + self.push(self.e); + self.cycles -= 4; + + + def push_HL(): + self.push(self.h); + self.push(self.l); + self.cycles -= 4; + + + def push_AF(): + self.push(self.a); + self.push(self.f); + self.cycles -= 4; + + + + # POP rr + + def pop_BC(): + self.c = self.pop(); + self.b = self.pop(); + self.cycles -= 3; + + + def pop_DE(): + self.e = self.pop(); + self.d = self.pop(); + self.cycles -= 3; + + + def pop_HL(): + self.l = self.pop(); + self.h = self.pop(); + self.cycles -= 3; + + + def pop_AF(): + self.f = self.pop(); + self.a = self.pop(); + self.cycles -= 3; + + + + # ADD A,r + + def add_A_B(): + self.add(self.b); + self.cycles -= 1; + + + def add_A_C(): + self.add(self.c); + self.cycles -= 1; + + + def add_A_D(): + self.add(self.d); + self.cycles -= 1; + + + def add_A_E(): + self.add(self.e); + self.cycles -= 1; + + + def add_A_H(): + self.add(self.h); + self.cycles -= 1; + + + def add_A_L(): + self.add(self.l); + self.cycles -= 1; + + + def add_A_A(): + self.add(self.a); + self.cycles -= 1; + + + + # ADD A,nn + + def add_A_nn(): + self.add(self.fetch()); + self.cycles -= 2; + + + + # ADD A,(HL) + + def add_A_HLi(): + self.add(self.read(self.h, self.l)); + self.cycles -= 2; + + + + # ADC A,r + + def adc_A_B(): + self.adc(self.b); + self.cycles -= 1; + + + def adc_A_C(): + self.adc(self.c); + self.cycles -= 1; + + + def adc_A_D(): + self.adc(self.d); + self.cycles -= 1; + + + def adc_A_E(): + self.adc(self.e); + self.cycles -= 1; + + + def adc_A_H(): + self.adc(self.h); + self.cycles -= 1; + + + def adc_A_L(): + self.adc(self.l); + self.cycles -= 1; + + + def adc_A_A(): + self.adc(self.a); + self.cycles -= 1; + + + + # ADC A,nn + + def adc_A_nn(): + self.adc(self.fetch()); + self.cycles -= 2; + + + + # ADC A,(HL) + + def adc_A_HLi(): + self.adc(self.read(self.h, self.l)); + self.cycles -= 2; + + + + # SUB A,r + + def sub_A_B(): + self.sub(self.b); + self.cycles -= 1; + + + def sub_A_C(): + self.sub(self.c); + self.cycles -= 1; + + + def sub_A_D(): + self.sub(self.d); + self.cycles -= 1; + + + def sub_A_E(): + self.sub(self.e); + self.cycles -= 1; + + + def sub_A_H(): + self.sub(self.h); + self.cycles -= 1; + + + def sub_A_L(): + self.sub(self.l); + self.cycles -= 1; + + + def sub_A_A(): + self.sub(self.a); + self.cycles -= 1; + + + + # SUB A,nn + + def sub_A_nn(): + self.sub(self.fetch()); + self.cycles -= 2; + + + + # SUB A,(HL) + + def sub_A_HLi(): + self.sub(self.read(self.h, self.l)); + self.cycles -= 2; + + + + # SBC A,r + + def sbc_A_B(): + self.sbc(self.b); + self.cycles -= 1; + + + def sbc_A_C(): + self.sbc(self.c); + self.cycles -= 1; + + + def sbc_A_D(): + self.sbc(self.d); + self.cycles -= 1; + + + def sbc_A_E(): + self.sbc(self.e); + self.cycles -= 1; + + + def sbc_A_H(): + self.sbc(self.h); + self.cycles -= 1; + + + def sbc_A_L(): + self.sbc(self.l); + self.cycles -= 1; + + + def sbc_A_A(): + self.sbc(self.a); + self.cycles -= 1; + + + + # SBC A,nn + + def sbc_A_nn(): + self.sbc(self.fetch()); + self.cycles -= 2; + + + + # SBC A,(HL) + + def sbc_A_HLi(): + self.sbc(self.read(self.h, self.l)); + self.cycles -= 2; + + + + # AND A,r + + def and_A_B(): + self.and(self.b); + self.cycles -= 1; + + + def and_A_C(): + self.and(self.c); + self.cycles -= 1; + + + def and_A_D(): + self.and(self.d); + self.cycles -= 1; + + + def and_A_E(): + self.and(self.e); + self.cycles -= 1; + + + def and_A_H(): + self.and(self.h); + self.cycles -= 1; + + + def and_A_L(): + self.and(self.l); + self.cycles -= 1; + + + def and_A_A(): + self.and(self.a); + self.cycles -= 1; + + + + # AND A,nn + + def and_A_nn(): + self.and(self.fetch()); + self.cycles -= 2; + + + + # AND A,(HL) + + def and_A_HLi(): + self.and(self.read(self.h, self.l)); + self.cycles -= 2; + + + + # XOR A,r + + def xor_A_B(): + self.xor(self.b); + self.cycles -= 1; + + + def xor_A_C(): + self.xor(self.c); + self.cycles -= 1; + + + def xor_A_D(): + self.xor(self.d); + self.cycles -= 1; + + + def xor_A_E(): + self.xor(self.e); + self.cycles -= 1; + + + def xor_A_H(): + self.xor(self.h); + self.cycles -= 1; + + + def xor_A_L(): + self.xor(self.l); + self.cycles -= 1; + + + def xor_A_A(): + self.xor(self.a); + self.cycles -= 1; + + + + # XOR A,nn + + def xor_A_nn(): + self.xor(self.fetch()); + self.cycles -= 2; + + + + # XOR A,(HL) + + def xor_A_HLi(): + self.xor(self.read(self.h, self.l)); + self.cycles -= 2; + + + + # OR A,r + + def or_A_B(): + self.or(self.b); + self.cycles -= 1; + + + def or_A_C(): + self.or(self.c); + self.cycles -= 1; + + + def or_A_D(): + self.or(self.d); + self.cycles -= 1; + + + def or_A_E(): + self.or(self.e); + self.cycles -= 1; + + + def or_A_H(): + self.or(self.h); + self.cycles -= 1; + + + def or_A_L(): + self.or(self.l); + self.cycles -= 1; + + + def or_A_A(): + self.or(self.a); + self.cycles -= 1; + + + + # OR A,nn + + def or_A_nn(): + self.or(self.fetch()); + self.cycles -= 2; + + + + # OR A,(HL) + + def or_A_HLi(): + self.or(self.read(self.h, self.l)); + self.cycles -= 2; + + + + # CP A,r + + def cp_A_B(): + self.cp(self.b); + self.cycles -= 1; + + + def cp_A_C(): + self.cp(self.c); + self.cycles -= 1; + + + def cp_A_D(): + self.cp(self.d); + self.cycles -= 1; + + + def cp_A_E(): + self.cp(self.e); + self.cycles -= 1; + + + def cp_A_H(): + self.cp(self.h); + self.cycles -= 1; + + + def cp_A_L(): + self.cp(self.l); + self.cycles -= 1; + + + def cp_A_A(): + self.cp(self.a); + self.cycles -= 1; + + + + # CP A,nn + + def cp_A_nn(): + self.cp(self.fetch()); + self.cycles -= 2; + + + + # CP A,(HL) + + def cp_A_HLi(): + self.cp(self.read(self.h, self.l)); + self.cycles -= 2; + + + + # INC r + + def inc_B(): + self.b = self.inc(self.b); + self.cycles -= 1; + + + def inc_C(): + self.c = self.inc(self.c); + self.cycles -= 1; + + + def inc_D(): + self.d = self.inc(self.d); + self.cycles -= 1; + + + def inc_E(): + self.e = self.inc(self.e); + self.cycles -= 1; + + + def inc_H(): + self.h = self.inc(self.h); + self.cycles -= 1; + + + def inc_L(): + self.l = self.inc(self.l); + self.cycles -= 1; + + + def inc_A(): + self.a = self.inc(self.a); + self.cycles -= 1; + + + + # INC (HL) + + def inc_HLi(): + self.write(self.h, self.l, self.inc(self.read(self.h, self.l))); + self.cycles -= 3; + + + + # DEC r + + def dec_B(): + self.b = self.dec(self.b); + self.cycles -= 1; + + + def dec_C(): + self.c = self.dec(self.c); + self.cycles -= 1; + + + def dec_D(): + self.d = self.dec(self.d); + self.cycles -= 1; + + + def dec_E(): + self.e = self.dec(self.e); + self.cycles -= 1; + + + def dec_H(): + self.h = self.dec(self.h); + self.cycles -= 1; + + + def dec_L(): + self.l = self.dec(self.l); + self.cycles -= 1; + + + def dec_A(): + self.a = self.dec(self.a); + self.cycles -= 1; + + + + # DEC (HL) + + def dec_HLi(): + self.write(self.h, self.l, self.dec(self.read(self.h, self.l))); + self.cycles -= 3; + + + + # CPL + + def cpl(): + self.a ^= 0xFF; + self.f |= N_FLAG + H_FLAG; + + + + # DAA + + def daa(): + delta = 0; + + if ((self.f & H_FLAG) != 0 or (self.a & 0x0F) > 0x09): + delta |= 0x06; + + if ((self.f & C_FLAG) != 0 or (self.a & 0xF0) > 0x90): + delta |= 0x60; + + if ((self.a & 0xF0) > 0x80 and (self.a & 0x0F) > 0x09): + delta |= 0x60; + + if ((self.f & N_FLAG) == 0): + self.a = (self.a + delta) & 0xFF; + else: + self.a = (self.a - delta) & 0xFF; + + self.f = (self.f & N_FLAG) + if delta >= 0x60: + self.f += C_FLAG + if self.a == 0: + self.f += Z_FLAG + + self.cycles -= 1; + + + + # ADD HL,rr + + def add_HL_BC(): + self.add(self.b, self.c); + self.cycles -= 2; + + + def add_HL_DE(): + self.add(self.d, self.e); + self.cycles -= 2; + + + def add_HL_HL(): + self.add(self.h, self.l); + self.cycles -= 2; + + + def add_HL_SP(): + self.add(self.sp >> 8, self.sp & 0xFF); + self.cycles -= 2; + + + + # INC rr + + def inc_BC(): + self.c = (self.c + 1) & 0xFF; + if (self.c == 0x00): + self.b = (self.b + 1) & 0xFF; + self.cycles -= 2; + + + def inc_DE(): + self.e = (self.e + 1) & 0xFF; + if (self.e == 0x00): + self.d = (self.d + 1) & 0xFF; + self.cycles -= 2; + + + def inc_HL(): + self.l = (self.l + 1) & 0xFF; + if (self.l == 0x00): + self.h = (self.h + 1) & 0xFF; + self.cycles -= 2; + + + def inc_SP(): + self.sp = (self.sp + 1) & 0xFFFF; + self.cycles -= 2; + + + + # DEC rr + + def dec_BC(): + self.c = (self.c - 1) & 0xFF; + if (self.c == 0xFF): + self.b = (self.b - 1) & 0xFF; + self.cycles -= 2; + + + def dec_DE(): + self.e = (self.e - 1) & 0xFF; + if (self.e == 0xFF): + self.d = (self.d - 1) & 0xFF; + self.cycles -= 2; + + + def dec_HL(): + self.l = (self.l - 1) & 0xFF; + if (self.l == 0xFF): + self.h = (self.h - 1) & 0xFF; + self.cycles -= 2; + + + def dec_SP(): + self.sp = (self.sp - 1) & 0xFFFF; + self.cycles -= 2; + + + + # ADD SP,nn + + def add_SP_nn(): + # TODO convert to byte + offset = self.fetch(); + + s = (self.sp + offset) & 0xFFFF; + self.updateFRegisterAfterSP_nn(offset, s) + + + self.sp = s; + self.cycles -= 4; + + + + # LD HL,SP+nn + + def ld_HP_SP_nn(): + #TODO convert to byte + + s = (self.sp + offset) & 0xFFFF; + self.updateFRegisterAfterSP_nn(offset, s) + + self.l = s & 0xFF; + self.h = s >> 8; + + self.cycles -= 3; + + + def updateFRegisterAfterSP_nn(self, offset, s): + if (offset >= 0): + self.f = 0 + if s < self.sp: + self.f += C_FLAG + if (s & 0x0F00) < (self.sp & 0x0F00): + self.f += H_FLAG + else: + self.f = 0 + if s > self.sp: + self.f += C_FLAG + if (s & 0x0F00) > (self.sp & 0x0F00): + self.f += H_FLAG + # RLCA + + def rlca(): + self.f = 0 + if (self.a & 0x80) != 0: + self.f += C_FLAG + self.a = ((self.a & 0x7F) << 1) + ((self.a & 0x80) >> 7); + self.cycles -= 1; + + + + # RLA + + def rla(): + s = ((self.a & 0x7F) << 1) + if (self.f & C_FLAG) != 0: + s += 0x01 + self.f = 0 + if (self.a & 0x80) != 0: + self.f += C_FLAG + self.a = s; + self.cycles -= 1; + + + + # RRCA + + def rrca(): + self.f = 0 + if (self.a & 0x01) != 0: + self.f += C_FLAG + self.a = ((self.a >> 1) & 0x7F) + ((self.a << 7) & 0x80); + self.cycles -= 1; + + + + # RRA + + def rra(): + s = ((self.a >> 1) & 0x7F) + if (self.f & C_FLAG) != 0: + se += 0x80 + self.f = 0 + if (self.a & 0x01) != 0: + self.f += C_FLAG + self.a = s; + self.cycles -= 1; + + + + # RLC r + + def rlc_B(): + self.b = self.rlc(self.b); + self.cycles -= 2; + + + def rlc_C(): + self.c = self.rlc(self.c); + self.cycles -= 2; + + + def rlc_D(): + self.d = self.rlc(self.d); + self.cycles -= 2; + + + def rlc_E(): + self.e = self.rlc(self.e); + self.cycles -= 2; + + + def rlc_H(): + self.h = self.rlc(self.h); + self.cycles -= 2; + + + def rlc_L(): + self.l = self.rlc(self.l); + self.cycles -= 2; + + + def rlc_A(): + self.a = self.rlc(self.a); + self.cycles -= 2; + + + + # RLC (HL) + + def rlc_HLi(): + self.write(self.h, self.l, self.rlc(self.read(self.h, self.l))); + self.cycles -= 4; + + + + # RL r + + def rl_B(): + self.b = self.rl(self.b); + self.cycles -= 2; + + + def rl_C(): + self.c = self.rl(self.c); + self.cycles -= 2; + + + def rl_D(): + self.d = self.rl(self.d); + self.cycles -= 2; + + + def rl_E(): + self.e = self.rl(self.e); + self.cycles -= 2; + + + def rl_H(): + self.h = self.rl(self.h); + self.cycles -= 2; + + + def rl_L(): + self.l = self.rl(self.l); + self.cycles -= 2; + + + def rl_A(): + self.a = self.rl(self.a); + self.cycles -= 2; + + + + # RL (HL) + + def rl_HLi(): + self.write(self.h, self.l, self.rl(self.read(self.h, self.l))); + self.cycles -= 4; + + + + # RRC r + + def rrc_B(): + self.b = self.rrc(self.b); + self.cycles -= 2; + + + def rrc_C(): + self.c = self.rrc(self.c); + self.cycles -= 2; + + + def rrc_D(): + self.d = self.rrc(self.d); + self.cycles -= 2; + + + def rrc_E(): + self.e = self.rrc(self.e); + self.cycles -= 2; + + + def rrc_H(): + self.h = self.rrc(self.h); + self.cycles -= 2; + + + def rrc_L(): + self.l = self.rrc(self.l); + self.cycles -= 2; + + + def rrc_A(): + self.a = self.rrc(self.a); + self.cycles -= 2; + + + + # RRC (HL) + + def rrc_HLi(): + self.write(self.h, self.l, self.rrc(self.read(self.h, self.l))); + self.cycles -= 4; + + + + # RR r + + def rr_B(): + self.b = self.rr(self.b); + self.cycles -= 2; + + + def rr_C(): + self.c = self.rr(self.c); + self.cycles -= 2; + + + def rr_D(): + self.d = self.rr(self.d); + self.cycles -= 2; + + + def rr_E(): + self.e = self.rr(self.e); + self.cycles -= 2; + + + def rr_H(): + self.h = self.rr(self.h); + self.cycles -= 2; + + + def rr_L(): + self.l = self.rr(self.l); + self.cycles -= 2; + + + def rr_A(): + self.a = self.rr(self.a); + self.cycles -= 2; + + + + # RR (HL) + + def rr_HLi(): + self.write(self.h, self.l, self.rr(self.read(self.h, self.l))); + self.cycles -= 4; + + + + # SLA r + + def sla_B(): + self.b = self.sla(self.b); + self.cycles -= 2; + + + def sla_C(): + self.c = self.sla(self.c); + self.cycles -= 2; + + + def sla_D(): + self.d = self.sla(self.d); + self.cycles -= 2; + + + def sla_E(): + self.e = self.sla(self.e); + self.cycles -= 2; + + + def sla_H(): + self.h = self.sla(self.h); + self.cycles -= 2; + + + def sla_L(): + self.l = self.sla(self.l); + self.cycles -= 2; + + + def sla_A(): + self.a = self.sla(self.a); + self.cycles -= 2; + + + + # SLA (HL) + + def sla_HLi(): + self.write(self.h, self.l, self.sla(self.read(self.h, self.l))); + self.cycles -= 4; + + + + # SWAP r + + def swap_B(): + self.b = self.swap(self.b); + self.cycles -= 2; + + + def swap_C(): + self.c = self.swap(self.c); + self.cycles -= 2; + + + def swap_D(): + self.d = self.swap(self.d); + self.cycles -= 2; + + + def swap_E(): + self.e = self.swap(self.e); + self.cycles -= 2; + + + def swap_H(): + self.h = self.swap(self.h); + self.cycles -= 2; + + + def swap_L(): + self.l = self.swap(self.l); + self.cycles -= 2; + + + def swap_A(): + self.a = self.swap(self.a); + self.cycles -= 2; + + + + # SWAP (HL) + + def swap_HLi(): + self.write(self.h, self.l, self.swap(self.read(self.h, self.l))); + self.cycles -= 4; + + + + # SRA r + + def sra_B(): + self.b = self.sra(self.b); + self.cycles -= 2; + + + def sra_C(): + self.c = self.sra(self.c); + self.cycles -= 2; + + + def sra_D(): + self.d = self.sra(self.d); + self.cycles -= 2; + + + def sra_E(): + self.e = self.sra(self.e); + self.cycles -= 2; + + + def sra_H(): + self.h = self.sra(self.h); + self.cycles -= 2; + + + def sra_L(): + self.l = self.sra(self.l); + self.cycles -= 2; + + + def sra_A(): + self.a = self.sra(self.a); + self.cycles -= 2; + + + + # SRA (HL) + + def sra_HLi(): + self.write(self.h, self.l, self.sra(self.read(self.h, self.l))); + self.cycles -= 4; + + + + # SRL r + + def srl_B(): + self.b = self.srl(self.b); + self.cycles -= 2; + + + def srl_C(): + self.c = self.srl(self.c); + self.cycles -= 2; + + + def srl_D(): + self.d = self.srl(self.d); + self.cycles -= 2; + + + def srl_E(): + self.e = self.srl(self.e); + self.cycles -= 2; + + + def srl_H(): + self.h = self.srl(self.h); + self.cycles -= 2; + + + def srl_L(): + self.l = self.srl(self.l); + self.cycles -= 2; + + + def srl_A(): + self.a = self.srl(self.a); + self.cycles -= 2; + + + + # SRL (HL) + + def srl_HLi(): + self.write(self.h, self.l, self.srl(self.read(self.h, self.l))); + self.cycles -= 4; + + + + # BIT n,r + + def bit_B(self, n): + self.bit(n, self.b); + self.cycles -= 2; + + + def bit_C(self, n): + self.bit(n, self.c); + self.cycles -= 2; + + + def bit_D(self, n): + self.bit(n, self.d); + self.cycles -= 2; + + + def bit_E(self, n): + self.bit(n, self.e); + self.cycles -= 2; + + + def bit_H(self, n): + self.bit(n, self.h); + self.cycles -= 2; + + + def bit_L(self, n): + self.bit(n, self.l); + self.cycles -= 2; + + + def bit_A(self, n): + self.bit(n, self.a); + self.cycles -= 2; + + + + # BIT n,(HL) + + def bit_HLi(self, n): + self.bit(n, self.read(self.h, self.l)); + self.cycles -= 3; + + + + # SET n,r + + def set_B(self, n): + self.b |= 1 << n; + self.cycles -= 2; + + + def set_C(self, n): + self.c |= 1 << n; + self.cycles -= 2; + + + def set_D(self, n): + self.d |= 1 << n; + self.cycles -= 2; + + + def set_E(self, n): + self.e |= 1 << n; + self.cycles -= 2; + + + def set_H(self, n): + self.h |= 1 << n; + self.cycles -= 2; + + + def set_L(self, n): + self.l |= 1 << n; + self.cycles -= 2; + + + def set_A(self, n): + self.a |= 1 << n; + self.cycles -= 2; + + + + # SET n,(HL) + + def set_HLi(self, n): + self.write(self.h, self.l, self.read(self.h, self.l) | (1 << n)); + self.cycles -= 4; + + + + # RES n,r + + def res_B(self, n): + self.b &= ~(1 << n); + self.cycles -= 2; + + + def res_C(self, n): + self.c &= ~(1 << n); + self.cycles -= 2; + + + def res_D(self, n): + self.d &= ~(1 << n); + self.cycles -= 2; + + + def res_E(self, n): + self.e &= ~(1 << n); + self.cycles -= 2; + + + def res_H(self, n): + self.h &= ~(1 << n); + self.cycles -= 2; + + + def res_L(self, n): + self.l &= ~(1 << n); + self.cycles -= 2; + + + def res_A(self, n): + self.a &= ~(1 << n); + self.cycles -= 2; + + + + # RES n,(HL) + + def res_HLi(self, n): + self.write(self.h, self.l, self.read(self.h, self.l) & ~(1 << n)); + self.cycles -= 4; + + + + # CCF/SCF + + def ccf(): + self.f = (self.f & (Z_FLAG | C_FLAG)) ^ C_FLAG; + + + def scf(): + self.f = (self.f & Z_FLAG) | C_FLAG; + + + + # NOP + + def nop(): + self.cycles -= 1; + + + + # JP nnnn + + def jp_nnnn(): + lo = self.fetch(); + hi = self.fetch(); + self.pc = (hi << 8) + lo; + self.cycles -= 4; + + + + # LD PC,HL + + def ld_PC_HL(): + self.pc = (self.h << 8) + self.l; + self.cycles -= 1; + + + + # JP cc,nnnn + + def jp_cc_nnnn(cc): + if (cc): + lo = self.fetch(); + hi = self.fetch(); + self.pc = (hi << 8) + lo; + self.cycles -= 4; + else: + self.pc = (self.pc + 2) & 0xFFFF; + self.cycles -= 3; + + + + def jp_NZ_nnnn(): + self.jp_cc_nnnn((self.f & Z_FLAG) == 0); + + + def jp_NC_nnnn(): + self.jp_cc_nnnn((self.f & C_FLAG) == 0); + + + def jp_Z_nnnn(): + self.jp_cc_nnnn((self.f & Z_FLAG) != 0); + + + def jp_C_nnnn(): + self.jp_cc_nnnn((self.f & C_FLAG) != 0); + + + + # JR +nn + + def jr_nn(): + # TODO convert to byte + offset = self.fetch(); + self.pc = (self.pc + offset) & 0xFFFF; + self.cycles -= 3; + + + + # JR cc,+nn + + def jr_cc_nn(cc): + if (cc): + # TODO convert to byte + offset = self.fetch(); + + self.pc = (self.pc + offset) & 0xFFFF; + self.cycles -= 3; + else: + self.pc = (self.pc + 1) & 0xFFFF; + self.cycles -= 2; + + + + def jr_NZ_nn(): + self.jr_cc_nn((self.f & Z_FLAG) == 0); + + + def jr_Z_nn(): + self.jr_cc_nn((self.f & Z_FLAG) != 0); + + + def jr_NC_nn(): + self.jr_cc_nn((self.f & C_FLAG) == 0); + + + def jr_C_nn(): + self.jr_cc_nn((self.f & C_FLAG) != 0); + + + + # CALL nnnn + + def call_nnnn(): + lo = self.fetch(); + hi = self.fetch(); + self.call((hi << 8) + lo); + self.cycles -= 6; + + + + # CALL cc,nnnn + + def call_cc_nnnn(cc): + if (cc): + lo = self.fetch(); + hi = self.fetch(); + self.call((hi << 8) + lo); + self.cycles -= 6; + else: + self.pc = (self.pc + 2) & 0xFFFF; + self.cycles -= 3; + + + + def call_NZ_nnnn(): + self.call_cc_nnnn((self.f & Z_FLAG) == 0); + + + def call_NC_nnnn(): + self.call_cc_nnnn((self.f & C_FLAG) == 0); + + + def call_Z_nnnn(): + self.call_cc_nnnn((self.f & Z_FLAG) != 0); + + + def call_C_nnnn(): + self.call_cc_nnnn((self.f & C_FLAG) != 0); + + + + # RET + + def ret(): + lo = self.pop(); + hi = self.pop(); + self.pc = (hi << 8) + lo; + self.cycles -= 4; + + + + # RET cc + + def ret_cc(cc): + if (cc): + lo = self.pop(); + hi = self.pop(); + self.pc = (hi << 8) + lo; + self.cycles -= 5; + else: + self.cycles -= 2; + + + def ret_NZ(): + self.ret_cc((self.f & Z_FLAG) == 0); + + + def ret_NC(): + self.ret_cc((self.f & C_FLAG) == 0); + + + def ret_Z(): + self.ret_cc((self.f & Z_FLAG) != 0); + + + def ret_C(): + self.ret_cc((self.f & C_FLAG) != 0); + + + + # RST nn + + def rst(self, nn): + self.call(nn); + self.cycles -= 4; + + + + # RETI + + def reti(): + lo = self.pop(); + hi = self.pop(); + self.pc = (hi << 8) + lo; + + # enable interrupts + self.ime = true; + self.cycles -= 4; + + # execute next instruction + self.execute(); + + # check pending interrupts + self.interrupt(); + + + + # DI/EI + + def di(): + # disable interrupts + self.ime = false; + self.cycles -= 1; + + + def ei(): + # enable interrupts + self.ime = true; + self.cycles -= 1; + + # execute next instruction + self.execute(); + + # check pending interrupts + self.interrupt(); + + + + # HALT/STOP + + def halt(): + self.halted = true; + + # emulate bug when interrupts are pending + if (not self.ime and self.interrupt.isPending()): + self.execute(self.memory.read(self.pc)); + + # check pending interrupts + self.interrupt(); + + + def stop(): + self.fetch(); + Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py ============================================================================== --- (empty file) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py Mon Mar 10 23:45:47 2008 @@ -0,0 +1,68 @@ +""" +Mario GameBoy (TM) Emulator + +Interrupt Controller +""" + +class Interrupt(object): + + # Interrupt Registers + IE = 0xFFFF # Interrupt Enable */ + IF = 0xFF0F # Interrupt Flag */ + + + # Interrupt Flags + VBLANK = 0x01 # V-Blank Interrupt (INT 40h) */ + LCD = 0x02 # LCD STAT Interrupt (INT 48h) */ + TIMER = 0x04 # Timer Interrupt (INT 50h) */ + SERIAL = 0x08 # Serial Interrupt (INT 58h) */ + JOYPAD = 0x10 # Joypad Interrupt (INT 60h) */ + + + # Registers + enable; + flag; + + def __init__(self): + self.reset(); + + def reset(self): + self.enable = 0; + self.flag = VBLANK; + + def isPending(self): + return (self.enable & self.flag) != 0; + + def isPending(self, mask): + return (self.enable & self.flag & mask) != 0; + + def raise(self, mask): + self.flag |= mask; + + def lower(self, mask): + self.flag &= ~mask; + + def write(self, address, data): + if address == IE: + self.setInterruptEnable(data); + elif address==IF: + self.setInterruptFlag(data); + + def read(self, address): + if address==IE: + return self.getInterruptEnable(); + elif address== IF: + return self.getInterruptFlag(); + return 0xFF; + + def getInterruptEnable(self): + return self.enable; + + def getInterruptFlag(self): + return 0xE0 | self.flag; + + def setInterruptEnable(self, data): + self.enable = data; + + def setInterruptFlag(self, data): + self.flag = data; Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py ============================================================================== --- (empty file) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py Mon Mar 10 23:45:47 2008 @@ -0,0 +1,73 @@ +""" +Mario GameBoy (TM) Emulator + +Joypad Input +""" + +class Joypad(object): + # Joypad Registers + JOYP = 0xFF00; # P1 */ + + # Gameboy Clock Speed (1048576 Hz) + GAMEBOY_CLOCK = 1 << 20; + + # Joypad Poll Speed (64 Hz) + JOYPAD_CLOCK = GAMEBOY_CLOCK >> 6; + + # Registers + joyp; + cycles; + + # Interrupt Controller + interrupt; + + # Driver JoypadDriver + driver; + + def __init__(self, joypadDriver, interrupt): + self.driver = joypadDriver; + self.interrupt = interrupt; + + self.reset(); + + def reset(self): + self.joyp = 0xFF; + self.cycles = JOYPAD_CLOCK; + + def cycles(self): + return self.cycles; + + def emulate(self, ticks): + self.cycles -= ticks; + if (self.cycles <= 0): + if (self.driver.isRaised()): + self.update(); + + self.cycles = JOYPAD_CLOCK; + + def write(self, address, data): + if (address == JOYP): + self.joyp = (self.joyp & 0xCF) + (data & 0x30); + self.update(); + + def read(self, address): + if (address == JOYP): + return self.joyp; + return 0xFF; + + def update(self): + data = self.joyp & 0xF0; + + switch = (data & 0x30) + if switch==0x10: + data |= self.driver.getButtons(); + elif switch==0x20: + data |= self.driver.getDirections(); + elif switch==0x30: + data |= 0x0F; + + if ((self.joyp & ~data & 0x0F) != 0): + self.interrupt.raise(Interrupt.JOYPAD); + + self.joyp = data; + Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py ============================================================================== --- (empty file) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py Mon Mar 10 23:45:47 2008 @@ -0,0 +1,50 @@ +""" +Mario GameBoy (TM) Emulator + +Work and High RAM +""" +class RAM(object): + + WRAM_SIZE = 8192 + HIGH_SIZE = 128 + + # Work RAM + wram + + # High RAM + hram + + def __init__(self): + self.reset(); + + def reset(self): + self.wram = range(0, WRAM_SIZE) + for index in range(0, WRAM_SIZE): + #TODO convert to byte + self.wram[index] = 0x00; + + self.hram = range(0, HIGH_SIZE) + for index in range(0, HIGH_SIZE): + #TODO convert to byte + self.hram[index] = 0x00; + + def write(self, address, data): + if (address >= 0xC000 and address <= 0xFDFF): + # C000-DFFF Work RAM (8KB) + # E000-FDFF Echo RAM + #TODO convert to byte + self.wram[address & 0x1FFF] = data; + elif (address >= 0xFF80 and address <= 0xFFFE): + # FF80-FFFE High RAM + #TODO convert to byte + self.hram[address & 0x7F] = data; + + def read(self, address): + if (address >= 0xC000 and address <= 0xFDFF): + # C000-DFFF Work RAM + # E000-FDFF Echo RAM + return self.wram[address & 0x1FFF] & 0xFF; + elif (address >= 0xFF80 and address <= 0xFFFE): + # FF80-FFFE High RAM + return self.hram[address & 0x7F] & 0xFF; + return 0xFF; Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py ============================================================================== --- (empty file) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py Mon Mar 10 23:45:47 2008 @@ -0,0 +1,65 @@ +""" +Mario GameBoy (TM) Emulator +Serial Link Controller + """ +class Serial(object): + # Gameboy Clock Speed (1048576 Hz) + GAMEBOY_CLOCK = 1 << 20; + + # Serial Clock Speed (8 x 1024 bits/sec) + SERIAL_CLOCK = GAMEBOY_CLOCK >> 16; + + # Serial Idle Speed (128 Hz) + SERIAL_IDLE_CLOCK = GAMEBOY_CLOCK >> 7; + + # Serial Register Addresses + + SB = 0xFF01; #Serial Transfer Data */ + SC = 0xFF02; # Serial Transfer Control */ + + # Registers + sb; + sc; + cycles; + + # Interrupt Controller #Interrupt + interrupt; + + def __init__(self, interrupt): + self.interrupt = interrupt; + self.reset(); + + def reset(self): + self.cycles = SERIAL_CLOCK; + self.sb = 0x00; + self.sc = 0x00; + + def cycles(self): + return self.cycles; + + def emulate(self, ticks): + if ((self.sc & 0x81) == 0x81): + self.cycles -= ticks; + + if (self.cycles <= 0): + self.sb = 0xFF; + self.sc &= 0x7F; + self.cycles = SERIAL_IDLE_CLOCK; + + self.interrupt.raise(Interrupt.SERIAL); + + + def setSerialData(self, data): + self.sb = data; + + def setSerialControl(self, data): + self.sc = data; + + # HACK: delay the serial interrupt (Shin Nihon Pro Wrestling) + self.cycles = SERIAL_IDLE_CLOCK + SERIAL_CLOCK; + + def getSerialData(self): + return self.sb; + + def getSerialControl(self): + return self.sc; Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py ============================================================================== --- (empty file) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py Mon Mar 10 23:45:47 2008 @@ -0,0 +1,872 @@ +""" +Mario GameBoy (TM) Emulator + +Audio Processor Unit (Sharp LR35902 APU) +""" + + +class Sound(object): + + # Gameboy Clock Speed (1048576 Hz) + + GAMEBOY_CLOCK = 1 << 20; + + + # Sound Clock (256 Hz) + + SOUND_CLOCK = 256; + + + # Sound Register Addresses + + NR10 = 0xFF10 # AUD1SWEEP */ + NR11 = 0xFF11 # AUD1LEN */ + NR12 = 0xFF12 # AUD1ENV */ + NR13 = 0xFF13 # AUD1LOW */ + NR14 = 0xFF14 # AUD1HIGH */ + + NR21 = 0xFF16 # AUD2LEN */ + NR22 = 0xFF17 # AUD2ENV */ + NR23 = 0xFF18 # AUD2LOW */ + NR24 = 0xFF19 # AUD2HIGH */ + + NR30 = 0xFF1A # AUD3ENA */ + NR31 = 0xFF1B # AUD3LEN */ + NR32 = 0xFF1C # AUD3LEVEL */ + NR33 = 0xFF1D # AUD3LOW */ + NR34 = 0xFF1E # AUD3HIGH */ + + NR41 = 0xFF20 # AUD4LEN */ + NR42 = 0xFF21 # AUD4ENV */ + NR43 = 0xFF22 # AUD4POLY */ + NR44 = 0xFF23 # AUD4GO */ + + NR50 = 0xFF24 # AUDVOL */ + NR51 = 0xFF25 # AUDTERM */ + NR52 = 0xFF26 # AUDENA */ + + AUD3WAVERAM = 0xFF30; + + + # Audio Channel 1 int + nr10; + nr11; + nr12; + nr13; + nr14; + audio1Index; + audio1Length; + audio1Volume; + audio1EnvelopeLength; + audio1SweepLength; + audio1Frequency; + + + # Audio Channel 2 int + nr21; + nr22; + nr23; + nr24; + audio2Index; + audio2Length; + audio2Volume; + audio2EnvelopeLength; + audio2Frequency; + + + # Audio Channel 3 int + nr30; + nr31; + nr32; + nr33; + nr34; + audio3Index; + audio3Length; + audio3Frequency; + audio3WavePattern# = new byte[16]; + + # Audio Channel 4 int + nr41; + nr42; + nr43; + nr44; + audio4Index; + audio4Length; + audio4Volume; + audio4EnvelopeLength; + audio4Frequency; + + # Output Control int + nr50; + nr51; + nr52; + + # Sound DriverSoundDriver + driver; + buffer# = new byte[512]; + #int + frames; + cycles; + + # Frequency Table + frequencyTable #= new int[2048]; + noiseFreqRatioTable #= new int[8]; + + # Noise Tables + noiseStep7Table #= new int[128 / 32]; + noiseStep15Table #= new int[32768 / 32]; + + def __init__(self, soundDriver): + self.driver = soundDriver; + self.generateFrequencyTables(); + self.generateNoiseTables(); + self.reset(); + + + def start(self): + self.driver.start(); + + + def stop(self): + self.driver.stop(); + + + def cycles(self): + return self.cycles; + + + def emulate(self, ticks): + self.cycles -= ticks; + while (self.cycles <= 0): + self.updateAudio(); + if (self.driver.isEnabled()): + self.frames += self.driver.getSampleRate(); + length = (self.frames / SOUND_CLOCK) << 1; + self.mixAudio(self.buffer, length); + self.driver.write(self.buffer, length); + self.frames %= SOUND_CLOCK; + + self.cycles += GAMEBOY_CLOCK / SOUND_CLOCK; + + + + def reset(self): + self.cycles = GAMEBOY_CLOCK / SOUND_CLOCK; + self.frames = 0; + self.audio1Index = self.audio2Index = self.audio3Index = self.audio4Index = 0; + self.write(NR10, 0x80); + self.write(NR11, 0x3F); # 0xBF + self.write(NR12, 0x00); # 0xF3 + self.write(NR13, 0xFF); + self.write(NR14, 0xBF); + + self.write(NR21, 0x3F); + self.write(NR22, 0x00); + self.write(NR23, 0xFF); + self.write(NR24, 0xBF); + + self.write(NR30, 0x7F); + self.write(NR31, 0xFF); + self.write(NR32, 0x9F); + self.write(NR33, 0xFF); + self.write(NR34, 0xBF); + + self.write(NR41, 0xFF); + self.write(NR42, 0x00); + self.write(NR43, 0x00); + self.write(NR44, 0xBF); + + self.write(NR50, 0x00); # 0x77 + self.write(NR51, 0xF0); + self.write(NR52, 0xFF); # 0xF0 + + for address in range(0xFF30, 0xFF3F): + write = 0xFF + if (address & 1) == 0: + write = 0x00 + self.write(address, write); + + + def read(self, address): + if address==NR10: + return self.getAudio1Sweep(); + elif address == NR11: + return self.getAudio1Length(); + elif address == NR12: + return self.getAudio1Envelope(); + elif address == NR13: + return self.getAudio1Frequency(); + elif address == NR14: + return self.getAudio1Playback(); + + elif address == NR21: + return self.getAudio2Length(); + elif address == NR22: + return self.getAudio2Envelope(); + elif address==NR23: + return self.getAudio2Frequency(); + elif address==NR24: + return self.getAudio2Playback(); + + elif address==NR30: + return self.getAudio3Enable(); + elif address==NR31: + return self.getAudio3Length(); + elif address==NR32: + return self.getAudio3Level(); + elif address==NR33: + return self.getAudio4Frequency(); + elif address==NR34: + return self.getAudio3Playback(); + + elif address==NR41: + return self.getAudio4Length(); + elif address==NR42: + return self.getAudio4Envelope(); + elif address==NR43: + return self.getAudio4Polynomial(); + elif address==NR44: + return self.getAudio4Playback(); + + elif address==NR50: + return self.getOutputLevel(); + elif address==NR51: + return self.getOutputTerminal(); + elif address==NR52: + return self.getOutputEnable(); + + else: + if (address >= AUD3WAVERAM and address <= AUD3WAVERAM + 0x3F): + return self.getAudio3WavePattern(address); + + return 0xFF; + + + def write(self, address, data): + if address==NR10: + self.setAudio1Sweep(data); + elif address == NR11: + self.setAudio1Length(data); + elif address == NR12: + self.setAudio1Envelope(data); + elif address == NR13: + self.setAudio1Frequency(data); + elif address == NR14: + self.setAudio1Playback(data); + + elif address == NR21: + self.setAudio2Length(data); + elif address == NR22: + self.setAudio2Envelope(data); + elif address == NR23: + self.setAudio2Frequency(data); + elif address == NR24: + self.setAudio2Playback(data); + + elif address == NR30: + self.setAudio3Enable(data); + elif address == NR31: + self.setAudio3Length(data); + elif address == NR32: + self.setAudio3Level(data); + elif address == NR33: + self.setAudio3Frequency(data); + elif address == NR34: + self.setAudio3Playback(data); + + elif address == NR41: + self.setAudio4Length(data); + elif address == NR42: + self.setAudio4Envelope(data); + elif address == NR43: + self.setAudio4Polynomial(data); + elif address == NR44: + self.setAudio4Playback(data); + + elif address == NR50: + self.setOutputLevel(data); + elif address == NR51: + self.setOutputTerminal(data); + elif address == NR52: + self.setOutputEnable(data); + + else: + if (address >= AUD3WAVERAM and address <= AUD3WAVERAM + 0x3F): + self.setAudio3WavePattern(address, data); + break; + + + + def updateAudio(self): + if ((self.nr52 & 0x80) != 0): + if ((self.nr52 & 0x01) != 0): + self.updateAudio1(); + + if ((self.nr52 & 0x02) != 0): + self.updateAudio2(); + + if ((self.nr52 & 0x04) != 0): + self.updateAudio3(); + + if ((self.nr52 & 0x08) != 0): + self.updateAudio4(); + + + + def mixAudio(self,buffer, length): + for index in range(0, length): + buffer[index] = 0; + + if ((self.nr52 & 0x80) != 0): + if ((self.nr52 & 0x01) != 0): + self.mixAudio1(buffer, length); + + if ((self.nr52 & 0x02) != 0): + self.mixAudio2(buffer, length); + + if ((self.nr52 & 0x04) != 0): + self.mixAudio3(buffer, length); + + if ((self.nr52 & 0x08) != 0): + self.mixAudio4(buffer, length); + + + + + # Audio Channel 1 + + def getAudio1Sweep(self): + return self.nr10; + + + def getAudio1Length(self): + return self.nr11; + + + def getAudio1Envelope(self): + return self.nr12; + + + def getAudio1Frequency(self): + return self.nr13; + + + def getAudio1Playback(self): + return self.nr14; + + + def setAudio1Sweep(self, data): + self.nr10 = data; + self.audio1SweepLength = (SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); + + + def setAudio1Length(self, data): + self.nr11 = data; + self.audio1Length = (SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)); + + + def setAudio1Envelope(self, data): + self.nr12 = data; + if ((self.nr14 & 0x40) == 0): + if ((self.nr12 >> 4) == 0): + self.audio1Volume = 0; + elif (self.audio1EnvelopeLength == 0 and (self.nr12 & 0x07) == 0): + self.audio1Volume = (self.audio1Volume + 1) & 0x0F; + else: + self.audio1Volume = (self.audio1Volume + 2) & 0x0F; + + + def setAudio1Frequency(self, data): + self.nr13 = data; + + self.audio1Frequency = self.frequencyTable[self.nr13 + + ((self.nr14 & 0x07) << 8)]; + + + def setAudio1Playback(self, data): + self.nr14 = data; + + self.audio1Frequency = self.frequencyTable[self.nr13 + + ((self.nr14 & 0x07) << 8)]; + + if ((self.nr14 & 0x80) != 0): + self.nr52 |= 0x01; + + if ((self.nr14 & 0x40) != 0 and self.audio1Length == 0): + self.audio1Length = (SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)); + + self.audio1SweepLength = (SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); + + self.audio1Volume = self.nr12 >> 4; + self.audio1EnvelopeLength = (SOUND_CLOCK / 64) * (self.nr12 & 0x07); + + + + def updateAudio1(self): + if ((self.nr14 & 0x40) != 0): + if (self.audio1Length > 0): + self.audio1Length-=1; + + if (self.audio1Length <= 0): + self.nr52 &= ~0x01; + + + if (self.audio1EnvelopeLength > 0): + self.audio1EnvelopeLength-=1; + + if (self.audio1EnvelopeLength <= 0): + if ((self.nr12 & 0x08) != 0): + if (self.audio1Volume < 15): + self.audio1Volume+=1; + elif (self.audio1Volume > 0): + self.audio1Volume-=1; + self.audio1EnvelopeLength += (SOUND_CLOCK / 64) * (self.nr12 & 0x07); + + + + if (self.audio1SweepLength > 0): + self.audio1SweepLength-=1; + + if (self.audio1SweepLength <= 0): + sweepSteps = (self.nr10 & 0x07); + + if (sweepSteps != 0): + frequency = ((self.nr14 & 0x07) << 8) + self.nr13; + + if ((self.nr10 & 0x08) != 0): + frequency -= frequency >> sweepSteps; + else: + frequency += frequency >> sweepSteps; + + if (frequency < 2048): + self.audio1Frequency = self.frequencyTable[frequency]; + self.nr13 = frequency & 0xFF; + self.nr14 = (self.nr14 & 0xF8) + ((frequency >> 8) & 0x07); + else: + self.audio1Frequency = 0; + self.nr52 &= ~0x01; + + self.audio1SweepLength += (SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); + + + + + def mixAudio1(self, buffer, length): + wavePattern = 0x18 + if (self.nr11 & 0xC0) == 0x00: + wavePattern = 0x04 + elif (self.nr11 & 0xC0) == 0x40: + wavePattern = 0x08 + elif (self.nr11 & 0xC0) == 0x80: + wavePattern = 0x10 + wavePattern << 22; + + for index in range(0, length, 3): + self.audio1Index += self.audio1Frequency; + if ((self.audio1Index & (0x1F << 22)) >= wavePattern): + if ((self.nr51 & 0x10) != 0): + buffer[index + 0] -= self.audio1Volume; + if ((self.nr51 & 0x01) != 0): + buffer[index + 1] -= self.audio1Volume; + else: + if ((self.nr51 & 0x10) != 0): + buffer[index + 0] += self.audio1Volume; + if ((self.nr51 & 0x01) != 0): + buffer[index + 1] += self.audio1Volume; + + + + + + # Audio Channel 2 + + def getAudio2Length(self): + return self.nr21; + + + def getAudio2Envelope(self): + return self.nr22; + + + def getAudio2Frequency(self): + return self.nr23; + + + def getAudio2Playback(self): + return self.nr24; + + + def setAudio2Length(self, data): + self.nr21 = data; + + self.audio2Length = (SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); + + + def setAudio2Envelope(self, data): + self.nr22 = data; + + if ((self.nr24 & 0x40) == 0): + if ((self.nr22 >> 4) == 0): + self.audio2Volume = 0; + elif (self.audio2EnvelopeLength == 0 and (self.nr22 & 0x07) == 0): + self.audio2Volume = (self.audio2Volume + 1) & 0x0F; + else: + self.audio2Volume = (self.audio2Volume + 2) & 0x0F; + + + def setAudio2Frequency(self, data): + self.nr23 = data; + + self.audio2Frequency = self.frequencyTable[self.nr23 + + ((self.nr24 & 0x07) << 8)]; + + + def setAudio2Playback(self, data): + self.nr24 = data; + + self.audio2Frequency = self.frequencyTable[self.nr23 + + ((self.nr24 & 0x07) << 8)]; + + if ((self.nr24 & 0x80) != 0): + self.nr52 |= 0x02; + + if ((self.nr24 & 0x40) != 0 and self.audio2Length == 0): + self.audio2Length = (SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); + + self.audio2Volume = self.nr22 >> 4; + self.audio2EnvelopeLength = (SOUND_CLOCK / 64) * (self.nr22 & 0x07); + + + + def updateAudio2(self): + if ((self.nr24 & 0x40) != 0): + if (self.audio2Length > 0): + self.audio2Length-=1; + if (self.audio2Length <= 0): + self.nr52 &= ~0x02; + + if (self.audio2EnvelopeLength > 0): + self.audio2EnvelopeLength-=1; + + if (self.audio2EnvelopeLength <= 0): + if ((self.nr22 & 0x08) != 0): + if (self.audio2Volume < 15): + self.audio2Volume+=1; + elif (self.audio2Volume > 0): + self.audio2Volume-=1; + self.audio2EnvelopeLength += (SOUND_CLOCK / 64) * (self.nr22 & 0x07); + + + + + def mixAudio2(self, buffer, length): + wavePattern = 0x18 + if (self.nr21 & 0xC0) == 0x00: + wavePattern = 0x04 + elif (self.nr21 & 0xC0) == 0x40: + wavePattern = 0x08 + elif (self.nr21 & 0xC0) == 0x80: + wavePattern = 0x10 + wavePattern << 22; + + for index in range(0, length): + self.audio2Index += self.audio2Frequency; + + if ((self.audio2Index & (0x1F << 22)) >= wavePattern): + if ((self.nr51 & 0x20) != 0): + buffer[index + 0] -= self.audio2Volume; + if ((self.nr51 & 0x02) != 0): + buffer[index + 1] -= self.audio2Volume; + else: + if ((self.nr51 & 0x20) != 0): + buffer[index + 0] += self.audio2Volume; + if ((self.nr51 & 0x02) != 0): + buffer[index + 1] += self.audio2Volume; + + + + + + # Audio Channel 3 + + def getAudio3Enable(self): + return self.nr30; + + + def getAudio3Length(self): + return self.nr31; + + + def getAudio3Level(self): + return self.nr32; + + + def getAudio4Frequency(self): + return self.nr33; + + + def getAudio3Playback(self): + return self.nr34; + + + def setAudio3Enable(self, data): + self.nr30 = data & 0x80; + if ((self.nr30 & 0x80) == 0): + self.nr52 &= ~0x04; + + + def setAudio3Length(self, data): + self.nr31 = data; + self.audio3Length = (SOUND_CLOCK / 256) * (256 - self.nr31); + + + def setAudio3Level(self, data): + self.nr32 = data; + + + def setAudio3Frequency(self, data): + self.nr33 = data; + self.audio3Frequency = self.frequencyTable[((self.nr34 & 0x07) << 8) + self.nr33] >> 1; + + + def setAudio3Playback(self, data): + self.nr34 = data; + + self.audio3Frequency = self.frequencyTable[((self.nr34 & 0x07) << 8) + self.nr33] >> 1; + + if ((self.nr34 & 0x80) != 0 and (self.nr30 & 0x80) != 0): + self.nr52 |= 0x04; + if ((self.nr34 & 0x40) != 0 and self.audio3Length == 0): + self.audio3Length = (SOUND_CLOCK / 256) * (256 - self.nr31); + + + + def setAudio3WavePattern(self, address, data): + #TODO convert to byte + self.audio3WavePattern[address & 0x0F] = data; + + + def getAudio3WavePattern(self, address): + return self.audio3WavePattern[address & 0x0F] & 0xFF; + + + def updateAudio3(self): + if ((self.nr34 & 0x40) != 0): + if (self.audio3Length > 0): + self.audio3Length-=1; + if (self.audio3Length <= 0): + self.nr52 &= ~0x04; + + + + def mixAudio3(self, buffer, length): + wavePattern = 2 + if (self.nr32 & 0x60) == 0x00: + wavePattern = 8 + elif (self.nr32 & 0x60) == 0x40: + wavePattern = 0 + elif (self.nr32 & 0x60) == 0x80: + wavePattern = 1 + + for index in range(0, length, 2): + self.audio3Index += self.audio3Frequency; + sample = self.audio3WavePattern[(self.audio3Index >> 23) & 0x0F]; + if ((self.audio3Index & (1 << 22)) != 0): + sample = (sample >> 0) & 0x0F; + else: + sample = (sample >> 4) & 0x0F; + + sample = ((sample - 8) << 1) >> level; + + if ((self.nr51 & 0x40) != 0): + buffer[index + 0] += sample; + if ((self.nr51 & 0x04) != 0): + buffer[index + 1] += sample; + + + + + # Audio Channel 4 + + def getAudio4Length(self): + return self.nr41; + + + def getAudio4Envelope(self): + return self.nr42; + + + def getAudio4Polynomial(self): + return self.nr43; + + + def getAudio4Playback(self): + return self.nr44; + + + def setAudio4Length(self, data): + self.nr41 = data; + + self.audio4Length = (SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); + + + def setAudio4Envelope(self, data): + self.nr42 = data; + if ((self.nr44 & 0x40) == 0): + if ((self.nr42 >> 4) == 0): + self.audio4Volume = 0; + elif (self.audio4EnvelopeLength == 0 and (self.nr42 & 0x07) == 0): + self.audio4Volume = (self.audio4Volume + 1) & 0x0F; + else: + self.audio4Volume = (self.audio4Volume + 2) & 0x0F; + + + def setAudio4Polynomial(self, data): + self.nr43 = data; + if ((self.nr43 >> 4) <= 12): + self.audio4Frequency = self.noiseFreqRatioTable[self.nr43 & 0x07] >> ((self.nr43 >> 4) + 1); + else: + self.audio4Frequency = 0; + + + def setAudio4Playback(self, data): + self.nr44 = data; + + if ((self.nr44 & 0x80) != 0): + self.nr52 |= 0x08; + + if ((self.nr44 & 0x40) != 0 and self.audio4Length == 0): + self.audio4Length = (SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); + + self.audio4Volume = self.nr42 >> 4; + self.audio4EnvelopeLength = (SOUND_CLOCK / 64) * (self.nr42 & 0x07); + + self.audio4Index = 0; + + + + def updateAudio4(self): + if ((self.nr44 & 0x40) != 0): + if (self.audio4Length > 0): + self.audio4Length-=1; + if (self.audio4Length <= 0): + self.nr52 &= ~0x08; + + if (self.audio4EnvelopeLength > 0): + self.audio4EnvelopeLength-=1; + + if (self.audio4EnvelopeLength <= 0): + if ((self.nr42 & 0x08) != 0): + if (self.audio4Volume < 15): + self.audio4Volume+=1; + elif (self.audio4Volume > 0): + self.audio4Volume-=1; + + self.audio4EnvelopeLength += (SOUND_CLOCK / 64) * (self.nr42 & 0x07); + + + + + def mixAudio4(self, buffer, length): + for index in range(0, length, 2): + self.audio4Index += self.audio4Frequency; + polynomial; + + if ((self.nr43 & 0x08) != 0): + # 7 steps + self.audio4Index &= 0x7FFFFF; + polynomial = self.noiseStep7Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31); + else: + # 15 steps + self.audio4Index &= 0x7FFFFFFF; + polynomial = self.noiseStep15Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31); + + + if ((polynomial & 1) != 0): + if ((self.nr51 & 0x80) != 0): + buffer[index + 0] -= self.audio4Volume; + if ((self.nr51 & 0x08) != 0): + buffer[index + 1] -= self.audio4Volume; + else: + if ((self.nr51 & 0x80) != 0): + buffer[index + 0] += self.audio4Volume; + if ((self.nr51 & 0x08) != 0): + buffer[index + 1] += self.audio4Volume; + + + + + + # Output Control + + def getOutputLevel(self): + return self.nr50; + + + def getOutputTerminal(self): + return self.nr51; + + + def getOutputEnable(self): + return self.nr52; + + + def setOutputLevel(self, data): + self.nr50 = data; + + + def setOutputTerminal(self, data): + self.nr51 = data; + + + def setOutputEnable(self, data): + self.nr52 = (self.nr52 & 0x7F) | (data & 0x80); + if ((self.nr52 & 0x80) == 0x00): + self.nr52 &= 0xF0; + + + + # Frequency Table Generation + + def generateFrequencyTables(self): + sampleRate = self.driver.getSampleRate(); + + # frequency = (4194304 / 32) / (2048 - period) Hz + for period in range(0, 2048): + skip = (((GAMEBOY_CLOCK << 10) / sampleRate) << (22 - 8)) / (2048 - period); + if (skip >= (32 << 22)): + self.frequencyTable[period] = 0; + else: + self.frequencyTable[period] = skip; + + + # Polynomial Noise Frequency Ratios + # + # 4194304 Hz * 1/2^3 * 2 4194304 Hz * 1/2^3 * 1 4194304 Hz * 1/2^3 * + # 1/2 4194304 Hz * 1/2^3 * 1/3 4194304 Hz * 1/2^3 * 1/4 4194304 Hz * + # 1/2^3 * 1/5 4194304 Hz * 1/2^3 * 1/6 4194304 Hz * 1/2^3 * 1/7 + for ratio in range(0, 8): + divider = 1 + if ratio != 0: + divider = 2 * ratio + self.noiseFreqRatioTable[ratio] = (GAMEBOY_CLOCK / divider) * ((1 << 16) / sampleRate); + + + + # Noise Generation + def generateNoiseTables(self): + polynomial = 0x7F + # 7 steps + for index in range(0, 0x7F): + polynomial = (((polynomial << 6) ^ (polynomial << 5)) & 0x40) | (polynomial >> 1); + if ((index & 31) == 0): + self.noiseStep7Table[index >> 5] = 0; + self.noiseStep7Table[index >> 5] |= (polynomial & 1) << (index & 31); + + # 15 steps& + polynomial = 0x7FFF + for index in range(0, 0x7FFF): + polynomial = (((polynomial << 14) ^ (polynomial << 13)) & 0x4000) | (polynomial >> 1); + if ((index & 31) == 0): + self.noiseStep15Table[index >> 5] = 0; + self.noiseStep15Table[index >> 5] |= (polynomial & 1) << (index & 31); Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py ============================================================================== --- (empty file) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py Mon Mar 10 23:45:47 2008 @@ -0,0 +1,153 @@ +""" +Mario GameBoy (TM) Emulator + +Timer and Divider +""" + +class Timer(object): + + # Gameboy Clock Speed (1048576 Hz) + + GAMEBOY_CLOCK = 1 << 20; + + + # DIV Timer Speed (16384 Hz) + + DIV_CLOCK = GAMEBOY_CLOCK >> 14; + + + # Timer Clock Speeds (4096, 262144, 65536 and 16384 Hz) + + TIMER_CLOCK = [ GAMEBOY_CLOCK >> 12, + GAMEBOY_CLOCK >> 18, + GAMEBOY_CLOCK >> 16, + GAMEBOY_CLOCK >> 14 ]; + + + # Timer Register Addresses + + DIV = 0xFF04 # Divider Register */ + TIMA = 0xFF05 # Timer Counter */ + TMA = 0xFF06 # Timer Modulo */ + TAC = 0xFF07 # Timer Control */ + + + # Registers + #int + div; + tima; + tma; + tac; + + dividerCycles; + timerCycles; + timerClock; + + + # Interrupt Controller Interrupt + interrupt; + + def __init__(self, interrupt): + self.interrupt = interrupt; + + self.reset(); + + + def reset(self): + self.div = 0; + self.dividerCycles = DIV_CLOCK; + self.tima = self.tma = self.tac = 0x00; + self.timerCycles = self.timerClock = TIMER_CLOCK[self.tac & 0x03]; + + + def write(self, address, data): + if address==DIV: + self.setDivider(data); + elif address==TIMA: + self.setTimerCounter(data); + elif address==TMA: + self.setTimerModulo(data); + elif address==TAC: + self.setTimerControl(data); + + + + def read(self, address): + if address==DIV: + return self.getDivider(); + elif address==TIMA: + return self.getTimerCounter(); + elif address==TMA: + return self.getTimerModulo(); + elif address==TAC: + return self.getTimerControl(); + return 0xFF; + + + def setDivider(self, data): + #DIV register resets on write + self.div = 0; + + + def setTimerCounter(self, data): + self.tima = data; + + + def setTimerModulo(self, data): + self.tma = data; + + + def setTimerControl(self, data): + if ((self.tac & 0x03) != (data & 0x03)): + self.timerCycles = self.timerClock = TIMER_CLOCK[data & 0x03]; + self.tac = data; + + + def getDivider(self): + return self.div; + + + def getTimerCounter(self): + return self.tima; + + + def getTimerModulo(self): + return self.tma; + + + def getTimerControl(self): + return 0xF8 | self.tac; + + + def cycles(self): + if ((self.tac & 0x04) != 0): + if (self.timerCycles < self.dividerCycles): + return self.timerCycles; + return self.dividerCycles; + + + def emulate(self, ticks): + self.emulateDivider(ticks); + self.emulateTimer(ticks); + + + def emulateDivider(self, ticks): + self.dividerCycles -= ticks; + while (self.dividerCycles <= 0): + self.div = (self.div + 1) & 0xFF; + self.dividerCycles += DIV_CLOCK; + + + + def emulateTimer(self, ticks): + if ((self.tac & 0x04) != 0): + self.timerCycles -= ticks; + + while (self.timerCycles <= 0): + self.tima = (self.tima + 1) & 0xFF; + self.timerCycles += self.timerClock; + + if (self.tima == 0x00): + self.tima = self.tma; + self.interrupt.raise(Interrupt.TIMER); + Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py ============================================================================== --- (empty file) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Mon Mar 10 23:45:47 2008 @@ -0,0 +1,769 @@ +""" + Mario GameBoy (TM) Emulator + LCD Video Display Processor +""" + + +class Video(object): + # LCD Register Addresses + LCDC = 0xFF40 #LCD Control */ + STAT = 0xFF41 #LCD Status */ + SCY = 0xFF42 #BG Scroll Y (0-255) */ + SCX = 0xFF43 #BG Scroll X (0-255) */ + LY = 0xFF44 #LCDC Y-Coordinate (0-153) */ + LYC = 0xFF45 #LY Compare */ + DMA = 0xFF46 #OAM DMA Transfer */ + BGP = 0xFF47 #BG Palette Data */ + OBP0 = 0xFF48 #Object Palette 0 Data */ + OBP1 = 0xFF49 #Object Palette 1 Data */ + WY = 0xFF4A #Window Y Position (0-143) */ + WX = 0xFF4B #Window X Position (0-166) */ + + # OAM Register Addresses + OAM_ADDR = 0xFE00; + # OAM Object Attribute Map + # (FE00..FE9F) + OAM_SIZE = 0xA0; + + # Video RAM Addresses + VRAM_ADDR = 0x8000 #8KB Video RAM (8000..9FFF) */ + VRAM_SIZE = 0x2000; + + # VRAM Tile Data/Maps Addresses + VRAM_DATA_A = 0x0000 + # 4KB Tile Data + # (8000..8FFF) + + VRAM_DATA_B = 0x0800 + # 4KB Tile Data + # (8800..97FF) + + + VRAM_MAP_A = 0x1800 + # 1KB BG Tile Map 0 + # (9800..9BFF) + + VRAM_MAP_B = 0x1C00 + # 1KB BG Tile Map 1 + # (9C00..9FFF) + + + # Gameboy Clock Speed (1048576 Hz) + GAMEBOY_CLOCK = 1 << 20; + + # LCD Mode Durations + MODE_0_TICKS = 50 #H-Blank */ + MODE_1_TICKS = 114 #V-Blank */ + MODE_2_TICKS = 20 #OAM */ + MODE_3_BEGIN_TICKS = 12 #Display */ + MODE_3_END_TICKS = 32 #Display */ + MODE_1_BEGIN_TICKS = 8 #V-Blank Line 144 */ + MODE_1_END_TICKS = 1 #V-Blank Line 153 */ + + # Objects per Line + OBJECTS_PER_LINE = 10; + + # LCD Color Palette + COLOR_MAP = [ 0x9CB916, 0x8CAA14, 0x306430, + 0x103F10 + # 0xE0F8D0, 0x88C070, 0x386850, 0x081820 + # 0xFFFFFF, 0xAAAAAA, 0x555555, 0x000000 + ]; + + # OAM Registers + oam #= new byte[OAM_SIZE]; + + # Video RAM + vram #= new byte[VRAM_SIZE]; + + + # LCD Registers int + lcdc; + stat; + scy; + scx; + ly; + lyc; + dma; + bgp; + obp0; + obp1; + wy; + wx; + wly; + + cycles; + + frames; + frameSkip; + + #boolean + transfer; + display; + vblank; + dirty; + + # Line Buffer, OAM Cache and Color Palette + line #= new int[8 + 160 + 8]; + objects #= new int[OBJECTS_PER_LINE]; + palette #= new int[1024]; + + # Video Driver VideoDriver + driver; + + # Interrupt Controller Interrupt + interrupt; + + # Memory Interface Memory + memory; + + def __init__(self, videDriver, interrupt, memory): + self.driver = videoDriver; + self.interrupt = interrupt; + self.memory = memory; + self.reset(); + + + def getFrameSkip(self): + return self.frameSkip; + + + def setFrameSkip(self, frameSkip): + self.frameSkip = frameSkip; + + + def reset(self): + self.cycles = MODE_2_TICKS; + + self.lcdc = 0x91; + self.stat = 2; + self.ly = 0; + self.lyc = 0; + self.dma = 0xFF; + self.scy = 0; + self.scx = 0; + self.wy = self.wly = 0; + self.wx = 0; + self.bgp = 0xFC; + self.obp0 = self.obp1 = 0xFF; + + self.transfer = true; + self.display = true; + self.vblank = true; + self.dirty = true; + + for index in range(0, VRAM_SIZE): + self.vram[index] = 0x00; + + for index in range(0, OAM_SIZE): + self.oam[index] = 0x00; + + + def write(self, address, data): + # assert data >= 0x00 and data <= 0xFF; + + if address == LCDC : + self.setControl(data); + elif address == STAT: + self.setStatus(data); + elif address == SCY: + self.setScrollY(data); + elif address == SCX: + self.setScrollX(data); + elif address == LY: + # Read Only + pass + elif address == LYC: + self.setLYCompare(data); + elif address == DMA: + self.setDMA(data); + elif address == BGP: + self.setBackgroundPalette(data); + elif address == OBP0: + self.setObjectPalette0(data); + elif address == OBP1: + self.setObjectPalette1(data); + elif address == WY: + self.setWindowY(data); + elif address == WX: + self.setWindowX(data); + else: + if (address >= OAM_ADDR and address < OAM_ADDR + OAM_SIZE): + #TODO convert to byte + self.oam[address - OAM_ADDR] = data; + elif (address >= VRAM_ADDR and address < VRAM_ADDR + VRAM_SIZE): + #TODO convert to byte + self.vram[address - VRAM_ADDR] =data; + break; + + + + def read(self, address): + if address == LCDC: + return self.getControl(); + elif address == STAT: + return self.getStatus(); + elif address == SCY: + return self.getScrollY(); + elif address == SCX: + return self.getScrollX(); + elif address == LY: + return self.getLineY(); + elif address == LYC: + return self.getLineYCompare(); + elif address == DMA: + return self.getDMA(); + elif address == BGP: + return self.getBackgroundPalette(); + elif address == OBP0: + return self.getObjectPalette0(); + elif address == OBP1: + return self.getObjectPalette1(); + elif address == WY: + return self.getWindowY(); + elif address == WX: + return self.getWindowX(); + else: + if (address >= OAM_ADDR and address < OAM_ADDR + OAM_SIZE): + return self.oam[address - OAM_ADDR] & 0xFF; + elif (address >= VRAM_ADDR and address < VRAM_ADDR + VRAM_SIZE): + return self.vram[address - VRAM_ADDR] & 0xFF; + return 0xFF; + + + def cycles(self): + return self.cycles; + + + def emulate(self, ticks): + if ((self.lcdc & 0x80) != 0): + self.cycles -= ticks; + while (self.cycles <= 0): + switch = self.stat & 0x03 + if switch == 0: + self.emulateHBlank(); + elif switch == 1: + self.emulateVBlank(); + elif switch == 2: + self.emulateOAM(); + elif switch == 3: + self.emulateTransfer(); + + + def getControl(self): + return self.lcdc; + + + def getStatus(self): + return 0x80 | self.stat; + + + def getScrollY(self): + return self.scy; + + + def getScrollX(self): + return self.scx; + + + def getLineY(self): + return self.ly; + + + def getLineYCompare(self): + return self.lyc; + + + def getDMA(self): + return self.dma; + + + def getBackgroundPalette(self): + return self.bgp; + + + def getObjectPalette0(self): + return self.obp0; + + + def getObjectPalette1(self): + return self.obp1; + + def getWindowY(self): + return self.wy; + + def getWindowX(self): + return self.wx; + + def setControl(self, data): + if ((self.lcdc & 0x80) != (data & 0x80)): + # NOTE: do not reset LY=LYC flag (bit 2) of the STAT register (Mr. + # Do!) + if ((data & 0x80) != 0): + self.stat = (self.stat & 0xFC) | 0x02; + self.cycles = MODE_2_TICKS; + self.ly = 0; + + self.display = false; + else: + self.stat = (self.stat & 0xFC) | 0x00; + self.cycles = MODE_1_TICKS; + self.ly = 0; + + self.clearFrame(); + + + # don't draw window if it was not enabled and not being drawn before + if ((self.lcdc & 0x20) == 0 and (data & 0x20) != 0 and self.wly == 0 and self.ly > self.wy): + self.wly = 144; + + self.lcdc = data; + + + def setStatus(self, data): + self.stat = (self.stat & 0x87) | (data & 0x78); + + # Gameboy Bug + if ((self.lcdc & 0x80) != 0 and (self.stat & 0x03) == 0x01 and (self.stat & 0x44) != 0x44): + self.interrupt.raise(Interrupt.LCD); + + + def setScrollY(self, data): + self.scy = data; + + + def setScrollX(self, data): + self.scx = data; + + + def setLYCompare(self, data): + self.lyc = data; + if ((self.lcdc & 0x80) != 0): + if (self.ly == self.lyc): + # NOTE: raise interrupt once per line (Prehistorik Man, The + # Jetsons, Muhammad Ali) + if ((self.stat & 0x04) == 0): + # LYC=LY interrupt + self.stat |= 0x04; + + if ((self.stat & 0x40) != 0): + self.interrupt.raise(Interrupt.LCD); + else: + self.stat &= 0xFB; + + + def setDMA(self, data): + self.dma = data; + for index in range(0, OAM_SIZE): + #TODO convert to byte + self.oam[index] = self.memory.read((self.dma << 8) + index); + + + def setBackgroundPalette(self, data): + if (self.bgp != data): + self.bgp = data; + self.dirty = true; + + + def setObjectPalette0(self, data): + if (self.obp0 != data): + self.obp0 = data; + self.dirty = true; + + + def setObjectPalette1(self, data): + if (self.obp1 != data): + self.obp1 = data; + self.dirty = true; + + + def setWindowY(self, data): + self.wy = data; + + + def setWindowX(self, data): + self.wx = data; + + + def emulateOAM(self): + self.stat = (self.stat & 0xFC) | 0x03; + self.cycles += MODE_3_BEGIN_TICKS; + self.transfer = true; + + + def emulateTransfer(self): + if (self.transfer): + if (self.display): + self.drawLine(); + + self.stat = (self.stat & 0xFC) | 0x03; + self.cycles += MODE_3_END_TICKS; + self.transfer = false; + else: + self.stat = (self.stat & 0xFC) | 0x00; + self.cycles += MODE_0_TICKS; + # H-Blank interrupt + if ((self.stat & 0x08) != 0 and (self.stat & 0x44) != 0x44): + self.interrupt.raise(Interrupt.LCD); + + + def emulateHBlank(self): + self.ly+=1; + + if (self.ly == self.lyc): + # LYC=LY interrupt + self.stat |= 0x04; + if ((self.stat & 0x40) != 0): + self.interrupt.raise(Interrupt.LCD); + else: + self.stat &= 0xFB; + if (self.ly < 144): + self.stat = (self.stat & 0xFC) | 0x02; + self.cycles += MODE_2_TICKS; + # OAM interrupt + if ((self.stat & 0x20) != 0 and (self.stat & 0x44) != 0x44): + self.interrupt.raise(Interrupt.LCD); + else: + if (self.display): + self.drawFrame(); + self.frames += 1 + if (self.frames >= self.frameSkip): + self.display = true; + self.frames = 0; + else: + self.display = false; + + self.stat = (self.stat & 0xFC) | 0x01; + self.cycles += MODE_1_BEGIN_TICKS; + self.vblank = true; + + + def emulateVBlank(self): + if (self.vblank): + self.vblank = false; + + self.stat = (self.stat & 0xFC) | 0x01; + self.cycles += MODE_1_TICKS - MODE_1_BEGIN_TICKS; + + # V-Blank interrupt + if ((self.stat & 0x10) != 0): + self.interrupt.raise(Interrupt.LCD); + + # V-Blank interrupt + self.interrupt.raise(Interrupt.VBLANK); + elif (self.ly == 0): + self.stat = (self.stat & 0xFC) | 0x02; + self.cycles += MODE_2_TICKS; + + # OAM interrupt + if ((self.stat & 0x20) != 0 and (self.stat & 0x44) != 0x44): + self.interrupt.raise(Interrupt.LCD); + else: + if (self.ly < 153): + self.ly+=1; + + self.stat = (self.stat & 0xFC) | 0x01; + + if (self.ly == 153): + self.cycles += MODE_1_END_TICKS; + else: + self.cycles += MODE_1_TICKS; + else: + self.ly = self.wly = 0; + + self.stat = (self.stat & 0xFC) | 0x01; + self.cycles += MODE_1_TICKS - MODE_1_END_TICKS; + + if (self.ly == self.lyc): + # LYC=LY interrupt + self.stat |= 0x04; + + if ((self.stat & 0x40) != 0): + self.interrupt.raise(Interrupt.LCD); + else: + self.stat &= 0xFB; + + + def drawFrame(self): + self.driver.display(); + + + def clearFrame(self): + self.clearPixels(); + self.driver.display(); + + + def drawLine(self): + if ((self.lcdc & 0x01) != 0): + self.drawBackground(); + else: + self.drawCleanBackground(); + + if ((self.lcdc & 0x20) != 0): + self.drawWindow(); + if ((self.lcdc & 0x02) != 0): + self.drawObjects(); + self.drawPixels(); + + + def drawCleanBackground(self): + for x in range(0, 8+160+8): + self.line[x] = 0x00; + + + def drawBackground(self): + y = (self.scy + self.ly) & 0xFF; + x = self.scx & 0xFF; + + tileMap = VRAM_MAP_A + if (self.lcdc & 0x08) != 0: + tileMap = VRAM_MAP_B + tileData = VRAM_DATA_B + if (self.lcdc & 0x10) != 0: + tileData = VRAM_DATA_A + + tileMap += ((y >> 3) << 5) + (x >> 3); + tileData += (y & 7) << 1; + self.drawTiles(8 - (x & 7), tileMap, tileData); + + + def drawWindow(self): + if (self.ly >= self.wy and self.wx < 167 and self.wly < 144): + tileMap = VRAM_MAP_A + if (self.lcdc & 0x40) != 0: + tileMap = VRAM_MAP_B + tileData = VRAM_DATA_B + if (self.lcdc & 0x10) != 0: + tileData = VRAM_DATA_A + + tileMap += (self.wly >> 3) << 5; + tileData += (self.wly & 7) << 1; + + self.drawTiles(self.wx + 1, tileMap, tileData); + self.wly+=1; + + + def drawObjects(self): + count = self.scanObjects(); + lastx = 176 + for index in range(176, count): + data = self.objects[index]; + x = (data >> 24) & 0xFF; + flags = (data >> 12) & 0xFF; + address = data & 0xFFF; + if (x + 8 <= lastx): + self.drawObjectTile(x, address, flags); + else: + self.drawOverlappedObjectTile(x, address, flags); + lastx = x; + + + def scanObjects(self): + count = 0; + # search active objects + for offset in range(0, 4*40, 4): + y = self.oam[offset + 0] & 0xFF; + x = self.oam[offset + 1] & 0xFF; + if (y <= 0 or y >= 144 + 16 or x <= 0 or x >= 168): + continue; + tile = self.oam[offset + 2] & 0xFF; + flags = self.oam[offset + 3] & 0xFF; + + y = self.ly - y + 16; + + if ((self.lcdc & 0x04) != 0): + # 8x16 tile size + if (y < 0 or y > 15): + continue; + # Y flip + if ((flags & 0x40) != 0): + y = 15 - y; + tile &= 0xFE; + else: + # 8x8 tile size + if (y < 0 or y > 7): + continue; + # Y flip + if ((flags & 0x40) != 0): + y = 7 - y; + self.objects[count] = (x << 24) + (count << 20) + (flags << 12) + ((tile << 4) + (y << 1)); + if (++count >= OBJECTS_PER_LINE): + break; + + # sort objects from lower to higher priority + for index in range(0, count): + rightmost = index; + for number in range(index+1, count): + if ((self.objects[number] >> 20) > (self.objects[rightmost] >> 20)): + rightmost = number; + + if (rightmost != index): + data = self.objects[index]; + self.objects[index] = self.objects[rightmost]; + self.objects[rightmost] = data; + return count; + + + def drawTiles(self, x, tileMap, tileData): + if ((self.lcdc & 0x10) != 0): + while (x < 168): + tile = self.vram[tileMap] & 0xFF; + self.drawTile(x, tileData + (tile << 4)); + tileMap = (tileMap & 0x1FE0) + ((tileMap + 1) & 0x001F); + x += 8; + else: + while (x < 168): + tile = (self.vram[tileMap] ^ 0x80) & 0xFF; + self.drawTile(x, tileData + (tile << 4)); + tileMap = (tileMap & 0x1FE0) + ((tileMap + 1) & 0x001F); + x += 8; + + + def drawTile(self, x, address): + pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8); + self.line[x + 0] = (pattern >> 7) & 0x0101; + self.line[x + 1] = (pattern >> 6) & 0x0101; + self.line[x + 2] = (pattern >> 5) & 0x0101; + self.line[x + 3] = (pattern >> 4) & 0x0101; + self.line[x + 4] = (pattern >> 3) & 0x0101; + self.line[x + 5] = (pattern >> 2) & 0x0101; + self.line[x + 6] = (pattern >> 1) & 0x0101; + self.line[x + 7] = (pattern >> 0) & 0x0101; + + + def drawObjectTile(self, x, address, flags): + pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8); + mask = 0; + # priority + if (flags & 0x80) != 0: + mask |= 0x0008; + # palette + if (flags & 0x10) != 0: + mask |= 0x0004; + # X flip + if (flags & 0x20) != 0: + if (color = (pattern << 1) & 0x0202) != 0: + self.line[x + 0] |= color | mask; + if ((color = (pattern >> 0) & 0x0202) != 0): + self.line[x + 1] |= color | mask; + if ((color = (pattern >> 1) & 0x0202) != 0): + self.line[x + 2] |= color | mask; + if ((color = (pattern >> 2) & 0x0202) != 0): + self.line[x + 3] |= color | mask; + if ((color = (pattern >> 3) & 0x0202) != 0): + self.line[x + 4] |= color | mask; + if ((color = (pattern >> 4) & 0x0202) != 0): + self.line[x + 5] |= color | mask; + if ((color = (pattern >> 5) & 0x0202) != 0): + self.line[x + 6] |= color | mask; + if ((color = (pattern >> 6) & 0x0202) != 0): + self.line[x + 7] |= color | mask; + else: + if ((color = (pattern >> 6) & 0x0202) != 0): + self.line[x + 0] |= color | mask; + if ((color = (pattern >> 5) & 0x0202) != 0): + self.line[x + 1] |= color | mask; + if ((color = (pattern >> 4) & 0x0202) != 0): + self.line[x + 2] |= color | mask; + if ((color = (pattern >> 3) & 0x0202) != 0): + self.line[x + 3] |= color | mask; + if ((color = (pattern >> 2) & 0x0202) != 0): + self.line[x + 4] |= color | mask; + if ((color = (pattern >> 1) & 0x0202) != 0): + self.line[x + 5] |= color | mask; + if ((color = (pattern >> 0) & 0x0202) != 0): + self.line[x + 6] |= color | mask; + if ((color = (pattern << 1) & 0x0202) != 0): + self.line[x + 7] |= color | mask; + + + def drawOverlappedObjectTile(self, x, address, flags): + pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8); + mask = 0; + # priority + if ((flags & 0x80) != 0) + mask |= 0x0008; + # palette + if ((flags & 0x10) != 0) + mask |= 0x0004; + # X flip + if ((flags & 0x20) != 0): + if ((color = (pattern << 1) & 0x0202) != 0): + self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask; + if ((color = (pattern >> 0) & 0x0202) != 0): + self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask; + if ((color = (pattern >> 1) & 0x0202) != 0): + self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask; + if ((color = (pattern >> 2) & 0x0202) != 0): + self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask; + if ((color = (pattern >> 3) & 0x0202) != 0): + self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask; + if ((color = (pattern >> 4) & 0x0202) != 0): + self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask; + if ((color = (pattern >> 6) & 0x0202) != 0): + self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask; + if ((color = (pattern >> 5) & 0x0202) != 0): + self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask; + else: + if ((color = (pattern >> 6) & 0x0202) != 0): + self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask; + if ((color = (pattern >> 5) & 0x0202) != 0): + self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask; + if ((color = (pattern >> 4) & 0x0202) != 0): + self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask; + if ((color = (pattern >> 3) & 0x0202) != 0): + self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask; + if ((color = (pattern >> 2) & 0x0202) != 0): + self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask; + if ((color = (pattern >> 1) & 0x0202) != 0) + self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask; + if ((color = (pattern >> 0) & 0x0202) != 0): + self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask; + if ((color = (pattern << 1) & 0x0202) != 0): + self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask; + + + def drawPixels(self): + self.updatePalette(); + pixels = self.driver.getPixels(); + offset = self.ly * self.driver.getWidth(); + for x in range(8, 168, 4) + int pattern0 = self.line[x + 0]; + int pattern1 = self.line[x + 1]; + int pattern2 = self.line[x + 2]; + int pattern3 = self.line[x + 3]; + + pixels[offset + 0] = self.palette[pattern0]; + pixels[offset + 1] = self.palette[pattern1]; + pixels[offset + 2] = self.palette[pattern2]; + pixels[offset + 3] = self.palette[pattern3]; + + offset += 4; + + + def clearPixels(self): + pixels = self.driver.getPixels(); + length = self.driver.getWidth() * self.driver.getHeight(); + for offset in range(0, length) + pixels[offset] = COLOR_MAP[0]; + + + def updatePalette(self): + if (self.dirty): + # bit 4/0 = BG color, bit 5/1 = OBJ color, bit 2 = OBJ palette, bit + # 3 = OBJ priority + for pattern in range(0, 64) + int color; + + if ((pattern & 0x22) == 0 or ((pattern & 0x08) != 0 and (pattern & 0x11) != 0)) + # OBJ behind BG color 1-3 + color = (self.bgp >> ((((pattern >> 3) & 0x02) + (pattern & 0x01)) << 1)) & 0x03; + # OBJ above BG + elif ((pattern & 0x04) == 0): + color = (self.obp0 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03; + else: + color = (self.obp1 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03; + + self.palette[((pattern & 0x30) << 4) + (pattern & 0x0F)] = COLOR_MAP[color]; + + self.dirty = false; From cami at codespeak.net Tue Mar 11 09:25:09 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Tue, 11 Mar 2008 09:25:09 +0100 (CET) Subject: [pypy-svn] r52368 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080311082509.8CA37168450@codespeak.net> Author: cami Date: Tue Mar 11 09:25:07 2008 New Revision: 52368 Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Log: fixed some compiler errors, ported gameboy.py Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Tue Mar 11 09:25:07 2008 @@ -29,25 +29,25 @@ TYPE_HUC1_RAM_BATTERY = 0xFF CATRIDGE_TYPE_MAPPING = { - TYPE_ROM_ONLY: MBC1, - TYPE_MBC1: MBC1, - TYPE_MBC1_RAM: MBC1, - TYPE_MBC1_RAM_BATTERY: MBC1, - TYPE_MBC2: MBC2, - TYPE_MBC2_BATTERY: MBC2, - TYPE_MBC3_RTC_BATTERY: MBC3, - TYPE_MBC3_RTC_RAM_BATTERY: MBC3, - TYPE_MBC3: MBC3, - TYPE_MBC3_RAM: MBC3, - TYPE_MBC3_RAM_BATTERY: MBC3, - TYPE_MBC5: MBC5, - TYPE_MBC5_RAM: MBC5, - TYPE_MBC5_RAM_BATTERY: MBC5, - TYPE_MBC5_RUMBLE: MBC5, - TYPE_MBC5_RUMBLE_RAM: MBC5, - TYPE_MBC5_RUMBLE_RAM_BATTERY: MBC5, - TYPE_HUC3_RTC_RAM: HuC3, - TYPE_HUC1_RAM_BATTERY: HuC1 + TYPE_ROM_ONLY: "MBC1", + TYPE_MBC1: "MBC1", + TYPE_MBC1_RAM: "MBC1", + TYPE_MBC1_RAM_BATTERY: "MBC1", + TYPE_MBC2: "MBC2", + TYPE_MBC2_BATTERY: "MBC2", + TYPE_MBC3_RTC_BATTERY: "MBC3", + TYPE_MBC3_RTC_RAM_BATTERY: "MBC3", + TYPE_MBC3: "MBC3", + TYPE_MBC3_RAM: "MBC3", + TYPE_MBC3_RAM_BATTERY: "MBC3", + TYPE_MBC5: "MBC5", + TYPE_MBC5_RAM: "MBC5", + TYPE_MBC5_RAM_BATTERY: "MBC5", + TYPE_MBC5_RUMBLE: "MBC5", + TYPE_MBC5_RUMBLE_RAM: "MBC5", + TYPE_MBC5_RUMBLE_RAM_BATTERY: "MBC5", + TYPE_HUC3_RTC_RAM: "HuC3", + TYPE_HUC1_RAM_BATTERY: "HuC1" }; @@ -220,9 +220,9 @@ """ class MBC1(MBC): - rom - ram - ramEnable + rom = [] + ram = [] + ramEnable = False def __init__(self, rom, ram): self.setRom(rom) @@ -309,12 +309,12 @@ class MBC2(MBC): RAM_BANK_SIZE = 512; - rom - ram + rom = [] + ram = [] - romSize - romBank - ramEnable + romSize = 0 + romBank =0 + ramEnable = False def __init__(self, rom, ram): self.setROM(rom); @@ -322,7 +322,7 @@ def reset(self): self.romBank = ROM_BANK_SIZE; - self.ramEnable = false; + self.ramEnable = False; def read(self, address): if (address <= 0x3FFF): @@ -380,32 +380,32 @@ class MBC3(MBC): #ClockDriver - clock; + clock = None; - rom; - ram; + rom = []; + ram = []; - romSize; - ramSize; + romSize = 0; + ramSize = 0; - romBank; - ramBank; - - ramEnable; - - clockRegister; - clockLatch; - clockTime; - - clockSeconds - clockMinutes - clockHours - clockDays, - clockControl; - clockLSeconds - clockLMinutes - clockLHours - clockLDaysclockLControl; + romBank = 0; + ramBank = 0; + + ramEnable = False; + + clockRegister = 0; + clockLatch = 0; + clockTime = 0; + + clockSeconds = 0 + clockMinutes = 0 + clockHours = 0 + clockDays = 0 + clockControl = None + clockLSeconds = 0 + clockLMinutes = 0 + clockLHours = 0 + clockLDaysclockLControl = None def __init__(self, rom, ram, clock): self.clock = clock; @@ -571,17 +571,17 @@ """ class MBC5(MBC): - rom; - ram; + rom = []; + ram = []; - romSize; - ramSize; + romSize = 0; + ramSize = 0; - romBank; - ramBank; + romBank = 0; + ramBank = 0; - ramEnable; - rumble; + ramEnable = False; + rumble = False; def __init__(self, rom, ram, rumble): self.rumble = rumble; @@ -589,12 +589,14 @@ self.setROM(rom); self.setRAM(ram); + def reset(): self.romBank = ROM_BANK_SIZE; self.ramBank = 0; self.ramEnable = false; + def read(self, address): if (address <= 0x3FFF): # 0000-3FFF @@ -607,6 +609,7 @@ return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; return 0xFF; + def write(self, address, data): if (address <= 0x1FFF): # 0000-1FFF @@ -630,6 +633,7 @@ #TODO byte conversion self.ram[self.ramBank + (address & 0x1FFF)] = data; + def setROM(self, buffer): banks = buffer.length / ROM_BANK_SIZE; @@ -639,6 +643,7 @@ self.rom = buffer; self.romSize = ROM_BANK_SIZE * banks - 1; + def setRAM(self, buffer): banks = buffer.length / RAM_BANK_SIZE; @@ -664,18 +669,18 @@ A000-BFFF RAM Bank 0-15 (8KB) """ class HuC3(MBC): - clock; - rom; - ram; - romBank; - ramBank; - romSize; - ramSize; - ramFlag; - ramValue; - clockRegister; - clockShift; - clockTime; + clock = None; + rom = []; + ram = []; + romBank = 0; + ramBank = 0; + romSize = 0; + ramSize = 0; + ramFlag = 0; + ramValue = 0; + clockRegister = 0; + clockShift = 0; + clockTime = 0; def __init__(self, rom, ram, clock): self.clock = clock; @@ -683,6 +688,7 @@ self.setROM(rom); self.setRAM(ram); + def reset(): self.romBank = ROM_BANK_SIZE; self.ramBank = 0; @@ -695,6 +701,7 @@ self.clockTime = self.clock.getTime(); + def read(self, address): if (address <= 0x3FFF): # 0000-3FFF @@ -713,6 +720,7 @@ return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; return 0xFF; + def write(self, address, data): if (address <= 0x1FFF): # 0000-1FFF @@ -757,6 +765,7 @@ #TODO byte conversion self.ram[self.ramBank + (address & 0x1FFF)] = data; + def updateClock(self): now = self.clock.getTime(); @@ -785,6 +794,7 @@ self.clockTime = now - elapsed; + def setROM(self, buffer): banks = buffer.length / ROM_BANK_SIZE; @@ -794,6 +804,7 @@ self.rom = buffer; self.romSize = ROM_BANK_SIZE*banks - 1; + def setRAM(self, buffer): banks = buffer.length / RAM_BANK_SIZE; Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Tue Mar 11 09:25:07 2008 @@ -1,56 +1,47 @@ """ -Mario GameBoy (TM) Emulator +Mario GameBoy (TM) EmulatOR -Central Unit Processor (Sharp LR35902 CPU) +Central Unit ProcessOR (Sharp LR35902 CPU) """ class CPU(object): - # Flags - Z_FLAG = 0x80 N_FLAG = 0x40 H_FLAG = 0x20 C_FLAG = 0x10 - # Registers - a - b - c - d - f - d - l - sp; - pc; - + a = 0 + b = 0 + c = 0 + d = 0 + f = 0 + d = 0 + l = 0 + sp = 0; + pc = 0; # Interrupt Flags - - ime; - halted; - cycles; - + ime = False; + halted = False; + cycles = 0; # Interrupt Controller - #Interrupt - interrupt; - + interrupt = None; - # Memory Access - #Memory - memory; + # memory Access + #memory + memory = None; # ROM Access - rom; + rom = []; def __init__(self, interrupt, memory): self.interrupt = interrupt; self.memory = memory; - self.reset(); @@ -88,7 +79,6 @@ return val - def setROM(self, banks): self.rom = banks; @@ -120,9 +110,7 @@ self.execute(); - # Interrupts - def interrupt(): if (self.halted): if (self.interrupt.isPending()): @@ -131,7 +119,6 @@ self.cycles -= 4; elif (self.cycles > 0): self.cycles = 0; - if (self.ime): if (self.interrupt.isPending()): if (self.interrupt.isPending(Interrupt.VBLANK)): @@ -151,16 +138,12 @@ self.interrupt.lower(Interrupt.JOYPAD); - def interrupt(self, address): self.ime = false; - self.call(address); - # Execution - def execute(): self.execute(self.fetch()); @@ -400,34 +383,34 @@ 0x9F:self.sbc_A_A(), # AND A,r - 0xA0:self.and_A_B(), - 0xA1:self.and_A_C(), - 0xA2:self.and_A_D(), - 0xA3:self.and_A_E(), - 0xA4:self.and_A_H(), - 0xA5:self.and_A_L(), - 0xA6:self.and_A_HLi(), - 0xA7:self.and_A_A(), + 0xA0:self.AND_A_B(), + 0xA1:self.AND_A_C(), + 0xA2:self.AND_A_D(), + 0xA3:self.AND_A_E(), + 0xA4:self.AND_A_H(), + 0xA5:self.AND_A_L(), + 0xA6:self.AND_A_HLi(), + 0xA7:self.AND_A_A(), # XOR A,r - 0xA8:self.xor_A_B(), - 0xA9:self.xor_A_C(), - 0xAA:self.xor_A_D(), - 0xAB:self.xor_A_E(), - 0xAC:self.xor_A_H(), - 0xAD:self.xor_A_L(), - 0xAE:self.xor_A_HLi(), - 0xAF:self.xor_A_A(), + 0xA8:self.xOR_A_B(), + 0xA9:self.xOR_A_C(), + 0xAA:self.xOR_A_D(), + 0xAB:self.xOR_A_E(), + 0xAC:self.xOR_A_H(), + 0xAD:self.xOR_A_L(), + 0xAE:self.xOR_A_HLi(), + 0xAF:self.xOR_A_A(), # OR A,r - 0xB0:self.or_A_B(), - 0xB1:self.or_A_C(), - 0xB2:self.or_A_D(), - 0xB3:self.or_A_E(), - 0xB4:self.or_A_H(), - 0xB5:self.or_A_L(), - 0xB6:self.or_A_HLi(), - 0xB7:self.or_A_A(), + 0xB0:self.OR_A_B(), + 0xB1:self.OR_A_C(), + 0xB2:self.OR_A_D(), + 0xB3:self.OR_A_E(), + 0xB4:self.OR_A_H(), + 0xB5:self.OR_A_L(), + 0xB6:self.OR_A_HLi(), + 0xB7:self.OR_A_A(), # CP A,r 0xB8:self.cp_A_B(), @@ -532,13 +515,13 @@ 0xDE:self.sbc_A_nn(), # AND A,nn - 0xE6:self.and_A_nn(), + 0xE6:self.AND_A_nn(), # XOR A,nn - 0xEE:self.xor_A_nn(), + 0xEE:self.xOR_A_nn(), # OR A,nn - 0xF6:self.or_A_nn(), + 0xF6:self.OR_A_nn(), # CP A,nn 0xFE:self.cp_A_nn(), @@ -554,7 +537,6 @@ 0xFF:self.rst(0x38) }[opcode]() - def fetchExecute(self): result = { # RLC r @@ -879,8 +861,7 @@ }[self.fetch()]() - # Memory Access - + # memory Access def read(self, address): return self.memory.read(address); @@ -897,9 +878,7 @@ self.write((hi << 8) + lo, data); - # Fetching - def fetch(): if (self.pc <= 0x3FFF): self.pc+=1 @@ -910,9 +889,7 @@ return data; - # Stack - def push(self, data): self.sp = (self.sp - 1) & 0xFFFF; self.memory.write(self.sp, data); @@ -930,9 +907,7 @@ self.pc = address; - # ALU - def add(self, data): s = (self.a + data) & 0xFF; self.f = 0 @@ -982,21 +957,21 @@ self.a = s & 0xFF; - def and(self, data): + def AND(self, data): self.a &= data; self.f = 0 if self.a == 0: self.f = Z_FLAG - def xor(self, data): + def xOR(self, data): self.a ^= data; self.f = 0 if self.a == 0: self.f = Z_FLAG - def or(self, data): + def cpuOR(self, data): self.a |= data; self.f = 0 if self.a == 0: @@ -1134,9 +1109,7 @@ self.h = s >> 8; - # LD r,r - def ld_B_B(): # b = b; self.cycles -= 1; @@ -1382,9 +1355,7 @@ self.cycles -= 1; - # LD r,nn - def ld_B_nn(): self.b = self.fetch(); self.cycles -= 2; @@ -1420,9 +1391,7 @@ self.cycles -= 2; - # LD r,(HL) - def ld_B_HLi(): self.b = self.read(self.h, self.l); self.cycles -= 2; @@ -1458,9 +1427,7 @@ self.cycles -= 2; - # LD (HL),r - def ld_HLi_B(): self.write(self.h, self.l, self.b); self.cycles -= 2; @@ -1496,17 +1463,13 @@ self.cycles -= 2; - # LD (HL),nn - def ld_HLi_nn(): self.write(self.h, self.l, self.fetch()); self.cycles -= 3; - # LD A,(rr) - def ld_A_BCi(): self.a = self.read(self.b, self.c); self.cycles -= 2; @@ -1517,9 +1480,7 @@ self.cycles -= 2; - # LD A,(nnnn) - def ld_A_mem(): lo = self.fetch(); hi = self.fetch(); @@ -1527,9 +1488,7 @@ self.cycles -= 4; - # LD (rr),A - def ld_BCi_A(): self.write(self.b, self.c, self.a); self.cycles -= 2; @@ -1540,9 +1499,7 @@ self.cycles -= 2; - # LD (nnnn),SP - def load_mem_SP(): lo = self.fetch(); hi = self.fetch(); @@ -1554,9 +1511,7 @@ self.cycles -= 5; - # LD (nnnn),A - def ld_mem_A(): lo = self.fetch(); hi = self.fetch(); @@ -1564,41 +1519,31 @@ self.cycles -= 4; - # LDH A,(nn) - def ldh_A_mem(): self.a = self.read(0xFF00 + self.fetch()); self.cycles -= 3; - # LDH (nn),A - def ldh_mem_A(): self.write(0xFF00 + self.fetch(), self.a); self.cycles -= 3; - # LDH A,(C) - def ldh_A_Ci(): self.a = self.read(0xFF00 + self.c); self.cycles -= 2; - # LDH (C),A - def ldh_Ci_A(): self.write(0xFF00 + self.c, self.a); self.cycles -= 2; - # LDI (HL),A - def ldi_HLi_A(): self.write(self.h, self.l, self.a); self.l = (self.l + 1) & 0xFF; @@ -1607,9 +1552,7 @@ self.cycles -= 2; - # LDI A,(HL) - def ldi_A_HLi(): self.a = self.read(self.h, self.l); self.l = (self.l + 1) & 0xFF; @@ -1618,9 +1561,7 @@ self.cycles -= 2; - # LDD (HL),A - def ldd_HLi_A(): self.write(self.h, self.l, self.a); self.l = (self.l - 1) & 0xFF; @@ -1629,9 +1570,7 @@ self.cycles -= 2; - # LDD A,(HL) - def ldd_A_HLi(): self.a = self.read(self.h, self.l); self.l = (self.l - 1) & 0xFF; @@ -1640,9 +1579,7 @@ self.cycles -= 2; - # LD rr,nnnn - def ld_BC_nnnn(): self.c = self.fetch(); self.b = self.fetch(); @@ -1668,17 +1605,13 @@ self.cycles -= 3; - # LD SP,HL - def ld_SP_HL(): self.sp = (self.h << 8) + self.l; self.cycles -= 2; - # PUSH rr - def push_BC(): self.push(self.b); self.push(self.c); @@ -1703,9 +1636,7 @@ self.cycles -= 4; - # POP rr - def pop_BC(): self.c = self.pop(); self.b = self.pop(); @@ -1730,9 +1661,7 @@ self.cycles -= 3; - # ADD A,r - def add_A_B(): self.add(self.b); self.cycles -= 1; @@ -1768,25 +1697,19 @@ self.cycles -= 1; - # ADD A,nn - def add_A_nn(): self.add(self.fetch()); self.cycles -= 2; - # ADD A,(HL) - def add_A_HLi(): self.add(self.read(self.h, self.l)); self.cycles -= 2; - # ADC A,r - def adc_A_B(): self.adc(self.b); self.cycles -= 1; @@ -1822,25 +1745,19 @@ self.cycles -= 1; - # ADC A,nn - def adc_A_nn(): self.adc(self.fetch()); self.cycles -= 2; - # ADC A,(HL) - def adc_A_HLi(): self.adc(self.read(self.h, self.l)); self.cycles -= 2; - # SUB A,r - def sub_A_B(): self.sub(self.b); self.cycles -= 1; @@ -1876,25 +1793,19 @@ self.cycles -= 1; - # SUB A,nn - def sub_A_nn(): self.sub(self.fetch()); self.cycles -= 2; - # SUB A,(HL) - def sub_A_HLi(): self.sub(self.read(self.h, self.l)); self.cycles -= 2; - # SBC A,r - def sbc_A_B(): self.sbc(self.b); self.cycles -= 1; @@ -1930,187 +1841,163 @@ self.cycles -= 1; - # SBC A,nn - def sbc_A_nn(): self.sbc(self.fetch()); self.cycles -= 2; - # SBC A,(HL) - def sbc_A_HLi(): self.sbc(self.read(self.h, self.l)); self.cycles -= 2; - # AND A,r - - def and_A_B(): - self.and(self.b); + def AND_A_B(): + self.AND(self.b); self.cycles -= 1; - def and_A_C(): - self.and(self.c); + def AND_A_C(): + self.AND(self.c); self.cycles -= 1; - def and_A_D(): - self.and(self.d); + def AND_A_D(): + self.AND(self.d); self.cycles -= 1; - def and_A_E(): - self.and(self.e); + def AND_A_E(): + self.AND(self.e); self.cycles -= 1; - def and_A_H(): - self.and(self.h); + def AND_A_H(): + self.AND(self.h); self.cycles -= 1; - def and_A_L(): - self.and(self.l); + def AND_A_L(): + self.AND(self.l); self.cycles -= 1; - def and_A_A(): - self.and(self.a); + def AND_A_A(): + self.AND(self.a); self.cycles -= 1; - # AND A,nn - - def and_A_nn(): - self.and(self.fetch()); + def AND_A_nn(): + self.AND(self.fetch()); self.cycles -= 2; - # AND A,(HL) - - def and_A_HLi(): - self.and(self.read(self.h, self.l)); + def AND_A_HLi(): + self.AND(self.read(self.h, self.l)); self.cycles -= 2; - # XOR A,r - - def xor_A_B(): - self.xor(self.b); + def xOR_A_B(): + self.xOR(self.b); self.cycles -= 1; - def xor_A_C(): - self.xor(self.c); + def xOR_A_C(): + self.xOR(self.c); self.cycles -= 1; - def xor_A_D(): - self.xor(self.d); + def xOR_A_D(): + self.xOR(self.d); self.cycles -= 1; - def xor_A_E(): - self.xor(self.e); + def xOR_A_E(): + self.xOR(self.e); self.cycles -= 1; - def xor_A_H(): - self.xor(self.h); + def xOR_A_H(): + self.xOR(self.h); self.cycles -= 1; - def xor_A_L(): - self.xor(self.l); + def xOR_A_L(): + self.xOR(self.l); self.cycles -= 1; - def xor_A_A(): - self.xor(self.a); + def xOR_A_A(): + self.xOR(self.a); self.cycles -= 1; - # XOR A,nn - - def xor_A_nn(): - self.xor(self.fetch()); + def xOR_A_nn(): + self.xOR(self.fetch()); self.cycles -= 2; - # XOR A,(HL) - - def xor_A_HLi(): - self.xor(self.read(self.h, self.l)); + def xOR_A_HLi(): + self.xOR(self.read(self.h, self.l)); self.cycles -= 2; - # OR A,r - - def or_A_B(): - self.or(self.b); + def OR_A_B(): + self.OR(self.b); self.cycles -= 1; - def or_A_C(): - self.or(self.c); + def OR_A_C(): + self.OR(self.c); self.cycles -= 1; - def or_A_D(): - self.or(self.d); + def OR_A_D(): + self.OR(self.d); self.cycles -= 1; - def or_A_E(): - self.or(self.e); + def OR_A_E(): + self.OR(self.e); self.cycles -= 1; - def or_A_H(): - self.or(self.h); + def OR_A_H(): + self.OR(self.h); self.cycles -= 1; - def or_A_L(): - self.or(self.l); + def OR_A_L(): + self.OR(self.l); self.cycles -= 1; - def or_A_A(): - self.or(self.a); + def OR_A_A(): + self.OR(self.a); self.cycles -= 1; - # OR A,nn - - def or_A_nn(): - self.or(self.fetch()); + def OR_A_nn(): + self.OR(self.fetch()); self.cycles -= 2; - # OR A,(HL) - - def or_A_HLi(): - self.or(self.read(self.h, self.l)); + def OR_A_HLi(): + self.OR(self.read(self.h, self.l)); self.cycles -= 2; - # CP A,r - def cp_A_B(): self.cp(self.b); self.cycles -= 1; @@ -2146,25 +2033,19 @@ self.cycles -= 1; - # CP A,nn - def cp_A_nn(): self.cp(self.fetch()); self.cycles -= 2; - # CP A,(HL) - def cp_A_HLi(): self.cp(self.read(self.h, self.l)); self.cycles -= 2; - # INC r - def inc_B(): self.b = self.inc(self.b); self.cycles -= 1; @@ -2200,17 +2081,13 @@ self.cycles -= 1; - # INC (HL) - def inc_HLi(): self.write(self.h, self.l, self.inc(self.read(self.h, self.l))); self.cycles -= 3; - # DEC r - def dec_B(): self.b = self.dec(self.b); self.cycles -= 1; @@ -2246,37 +2123,27 @@ self.cycles -= 1; - # DEC (HL) - def dec_HLi(): self.write(self.h, self.l, self.dec(self.read(self.h, self.l))); self.cycles -= 3; - # CPL - def cpl(): self.a ^= 0xFF; self.f |= N_FLAG + H_FLAG; - # DAA - def daa(): delta = 0; - if ((self.f & H_FLAG) != 0 or (self.a & 0x0F) > 0x09): delta |= 0x06; - if ((self.f & C_FLAG) != 0 or (self.a & 0xF0) > 0x90): delta |= 0x60; - if ((self.a & 0xF0) > 0x80 and (self.a & 0x0F) > 0x09): delta |= 0x60; - if ((self.f & N_FLAG) == 0): self.a = (self.a + delta) & 0xFF; else: @@ -2291,9 +2158,7 @@ self.cycles -= 1; - # ADD HL,rr - def add_HL_BC(): self.add(self.b, self.c); self.cycles -= 2; @@ -2314,9 +2179,7 @@ self.cycles -= 2; - # INC rr - def inc_BC(): self.c = (self.c + 1) & 0xFF; if (self.c == 0x00): @@ -2343,9 +2206,7 @@ self.cycles -= 2; - # DEC rr - def dec_BC(): self.c = (self.c - 1) & 0xFF; if (self.c == 0xFF): @@ -2372,27 +2233,21 @@ self.cycles -= 2; - # ADD SP,nn - def add_SP_nn(): # TODO convert to byte offset = self.fetch(); - s = (self.sp + offset) & 0xFFFF; self.updateFRegisterAfterSP_nn(offset, s) - self.sp = s; self.cycles -= 4; # LD HL,SP+nn - def ld_HP_SP_nn(): #TODO convert to byte - s = (self.sp + offset) & 0xFFFF; self.updateFRegisterAfterSP_nn(offset, s) @@ -2415,8 +2270,8 @@ self.f += C_FLAG if (s & 0x0F00) > (self.sp & 0x0F00): self.f += H_FLAG - # RLCA + # RLCA def rlca(): self.f = 0 if (self.a & 0x80) != 0: @@ -2425,9 +2280,7 @@ self.cycles -= 1; - # RLA - def rla(): s = ((self.a & 0x7F) << 1) if (self.f & C_FLAG) != 0: @@ -2439,9 +2292,7 @@ self.cycles -= 1; - # RRCA - def rrca(): self.f = 0 if (self.a & 0x01) != 0: @@ -2450,9 +2301,7 @@ self.cycles -= 1; - # RRA - def rra(): s = ((self.a >> 1) & 0x7F) if (self.f & C_FLAG) != 0: @@ -2464,9 +2313,7 @@ self.cycles -= 1; - # RLC r - def rlc_B(): self.b = self.rlc(self.b); self.cycles -= 2; @@ -2502,17 +2349,13 @@ self.cycles -= 2; - # RLC (HL) - def rlc_HLi(): self.write(self.h, self.l, self.rlc(self.read(self.h, self.l))); self.cycles -= 4; - # RL r - def rl_B(): self.b = self.rl(self.b); self.cycles -= 2; @@ -2548,17 +2391,13 @@ self.cycles -= 2; - # RL (HL) - def rl_HLi(): self.write(self.h, self.l, self.rl(self.read(self.h, self.l))); self.cycles -= 4; - # RRC r - def rrc_B(): self.b = self.rrc(self.b); self.cycles -= 2; @@ -2594,17 +2433,13 @@ self.cycles -= 2; - # RRC (HL) - def rrc_HLi(): self.write(self.h, self.l, self.rrc(self.read(self.h, self.l))); self.cycles -= 4; - # RR r - def rr_B(): self.b = self.rr(self.b); self.cycles -= 2; @@ -2640,17 +2475,13 @@ self.cycles -= 2; - # RR (HL) - def rr_HLi(): self.write(self.h, self.l, self.rr(self.read(self.h, self.l))); self.cycles -= 4; - # SLA r - def sla_B(): self.b = self.sla(self.b); self.cycles -= 2; @@ -2686,17 +2517,13 @@ self.cycles -= 2; - # SLA (HL) - def sla_HLi(): self.write(self.h, self.l, self.sla(self.read(self.h, self.l))); self.cycles -= 4; - # SWAP r - def swap_B(): self.b = self.swap(self.b); self.cycles -= 2; @@ -2732,17 +2559,13 @@ self.cycles -= 2; - # SWAP (HL) - def swap_HLi(): self.write(self.h, self.l, self.swap(self.read(self.h, self.l))); self.cycles -= 4; - # SRA r - def sra_B(): self.b = self.sra(self.b); self.cycles -= 2; @@ -2778,17 +2601,13 @@ self.cycles -= 2; - # SRA (HL) - def sra_HLi(): self.write(self.h, self.l, self.sra(self.read(self.h, self.l))); self.cycles -= 4; - # SRL r - def srl_B(): self.b = self.srl(self.b); self.cycles -= 2; @@ -2824,17 +2643,13 @@ self.cycles -= 2; - # SRL (HL) - def srl_HLi(): self.write(self.h, self.l, self.srl(self.read(self.h, self.l))); self.cycles -= 4; - # BIT n,r - def bit_B(self, n): self.bit(n, self.b); self.cycles -= 2; @@ -2870,17 +2685,13 @@ self.cycles -= 2; - # BIT n,(HL) - def bit_HLi(self, n): self.bit(n, self.read(self.h, self.l)); self.cycles -= 3; - # SET n,r - def set_B(self, n): self.b |= 1 << n; self.cycles -= 2; @@ -2916,17 +2727,13 @@ self.cycles -= 2; - # SET n,(HL) - def set_HLi(self, n): self.write(self.h, self.l, self.read(self.h, self.l) | (1 << n)); self.cycles -= 4; - # RES n,r - def res_B(self, n): self.b &= ~(1 << n); self.cycles -= 2; @@ -2962,17 +2769,13 @@ self.cycles -= 2; - # RES n,(HL) - def res_HLi(self, n): self.write(self.h, self.l, self.read(self.h, self.l) & ~(1 << n)); self.cycles -= 4; - # CCF/SCF - def ccf(): self.f = (self.f & (Z_FLAG | C_FLAG)) ^ C_FLAG; @@ -2981,16 +2784,12 @@ self.f = (self.f & Z_FLAG) | C_FLAG; - # NOP - def nop(): self.cycles -= 1; - # JP nnnn - def jp_nnnn(): lo = self.fetch(); hi = self.fetch(); @@ -2998,17 +2797,13 @@ self.cycles -= 4; - # LD PC,HL - def ld_PC_HL(): self.pc = (self.h << 8) + self.l; self.cycles -= 1; - # JP cc,nnnn - def jp_cc_nnnn(cc): if (cc): lo = self.fetch(); @@ -3020,7 +2815,6 @@ self.cycles -= 3; - def jp_NZ_nnnn(): self.jp_cc_nnnn((self.f & Z_FLAG) == 0); @@ -3037,9 +2831,7 @@ self.jp_cc_nnnn((self.f & C_FLAG) != 0); - # JR +nn - def jr_nn(): # TODO convert to byte offset = self.fetch(); @@ -3047,9 +2839,7 @@ self.cycles -= 3; - # JR cc,+nn - def jr_cc_nn(cc): if (cc): # TODO convert to byte @@ -3062,7 +2852,6 @@ self.cycles -= 2; - def jr_NZ_nn(): self.jr_cc_nn((self.f & Z_FLAG) == 0); @@ -3079,9 +2868,7 @@ self.jr_cc_nn((self.f & C_FLAG) != 0); - # CALL nnnn - def call_nnnn(): lo = self.fetch(); hi = self.fetch(); @@ -3089,9 +2876,7 @@ self.cycles -= 6; - # CALL cc,nnnn - def call_cc_nnnn(cc): if (cc): lo = self.fetch(); @@ -3120,9 +2905,7 @@ self.call_cc_nnnn((self.f & C_FLAG) != 0); - # RET - def ret(): lo = self.pop(); hi = self.pop(); @@ -3130,9 +2913,7 @@ self.cycles -= 4; - # RET cc - def ret_cc(cc): if (cc): lo = self.pop(); @@ -3159,36 +2940,27 @@ self.ret_cc((self.f & C_FLAG) != 0); - # RST nn - def rst(self, nn): self.call(nn); self.cycles -= 4; - # RETI - def reti(): lo = self.pop(); hi = self.pop(); self.pc = (hi << 8) + lo; - # enable interrupts self.ime = true; self.cycles -= 4; - # execute next instruction self.execute(); - # check pending interrupts self.interrupt(); - # DI/EI - def di(): # disable interrupts self.ime = false; @@ -3199,24 +2971,18 @@ # enable interrupts self.ime = true; self.cycles -= 1; - # execute next instruction self.execute(); - # check pending interrupts self.interrupt(); - # HALT/STOP - def halt(): self.halted = true; - # emulate bug when interrupts are pending if (not self.ime and self.interrupt.isPending()): self.execute(self.memory.read(self.pc)); - # check pending interrupts self.interrupt(); Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py ============================================================================== --- (empty file) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py Tue Mar 11 09:25:07 2008 @@ -0,0 +1,216 @@ +""" +Mario GameBoy (TM) Emulator + +Gameboy Scheduler and Memory Mapper + +""" + +class GameBoy(object): + + # Registered Symbol, convert to byte + REGISTERED_BITMAP = [0x3C, 0x42, 0xB9, 0xA5, 0xB9, 0xA5, 0x42, 0x3C ]; + + # RAM + ram = None; + cartridge = None; + interrupt = None; + cpu = None; + serial = None; + timer = None; + joypad = None; + video = None; + sound = None; + + def __init__(self, videoDriver, soundDriver, joypadDriver, storeDriver, clockDriver): + self.ram = RAM(); + self.cartridge = Cartridge(storeDriver, clockDriver); + self.interrupt = Interrupt(); + self.cpu = CPU(self.interrupt, this); + self.serial = Serial(self.interrupt); + self.timer = Timer(self.interrupt); + self.joypad = Joypad(joypadDriver, self.interrupt); + self.video = Video(videoDriver, self.interrupt, this); + self.sound = Sound(soundDriver); + + + def getCartridge(self): + return self.cartridge; + + def getFrameSkip(self): + return self.video.getFrameSkip(); + + + def setFrameSkip(self, frameSkip): + self.video.setFrameSkip(frameSkip); + + + def load(self, cartridgeName): + self.cartridge.load(cartridgeName); + + + def save(self, cartridgeName): + self.cartridge.save(cartridgeName); + + + def start(self): + self.sound.start(); + + + def stop(self): + self.sound.stop(); + + + def reset(self): + self.ram.reset(); + self.cartridge.reset(); + self.interrupt.reset(); + self.cpu.reset(); + self.serial.reset(); + self.timer.reset(); + self.joypad.reset(); + self.video.reset(); + self.sound.reset(); + self.cpu.setROM(self.cartridge.getROM()); + self.drawLogo(); + + + def cycles(self): + return min(self.video.cycles(), self.serial.cycles(), + self.timer.cycles(), self.sound.cycles(), + self.joypad.cycles()); + + + def emulate(self, ticks): + while (ticks > 0): + count = self.cycles(); + + self.cpu.emulate(count); + self.serial.emulate(count); + self.timer.emulate(count); + self.video.emulate(count); + self.sound.emulate(count); + self.joypad.emulate(count); + + ticks -= count; + + + + def write(self, address, data): + if (address <= 0x7FFF): + # 0000-7FFF ROM Bank + self.cartridge.write(address, data); + elif (address <= 0x9FFF): + # 8000-9FFF Video RAM + self.video.write(address, data); + elif (address <= 0xBFFF): + # A000-BFFF External RAM + self.cartridge.write(address, data); + elif (address <= 0xFDFF): + # C000-FDFF Work RAM + self.ram.write(address, data); + elif (address <= 0xFEFF): + # FE00-FEFF OAM + self.video.write(address, data); + elif (address == 0xFF00): + # FF00-FF00 Joypad + self.joypad.write(address, data); + elif (address >= 0xFF01 and address <= 0xFF02): + # FF01-FF02 Serial + self.serial.write(address, data); + elif (address >= 0xFF04 and address <= 0xFF07): + # FF04-FF07 Timer + self.timer.write(address, data); + elif (address == 0xFF0F): + # FF0F-FF0F Interrupt + self.interrupt.write(address, data); + # check pending interrupts when IF is changed + self.cpu.interrupt(); + elif (address >= 0xFF10 and address <= 0xFF3F): + # FF10-FF3F Sound + self.sound.write(address, data); + elif (address >= 0xFF40 and address <= 0xFF4B): + # FF40-FF4B Video + self.video.write(address, data); + # check pending interrupts when STAT is changed + if (address == Video.STAT): + self.cpu.interrupt(); + elif (address >= 0xFF80 and address <= 0xFFFE): + # FF80-FFFE High RAM + self.ram.write(address, data); + elif (address == 0xFFFF): + # FFFF-FFFF Interrupt + self.interrupt.write(address, data); + # check pending interrupts when IE is changed + self.cpu.interrupt(); + + + + def read(self, address): + if (address <= 0x7FFF): + # 0000-7FFF ROM Bank + return self.cartridge.read(address); + elif (address <= 0x9FFF): + # 8000-9FFF Video RAM + return self.video.read(address); + elif (address <= 0xBFFF): + # A000-BFFF External RAM + return self.cartridge.read(address); + elif (address <= 0xFDFF): + # C000-FDFF Work RAM + return self.ram.read(address); + elif (address <= 0xFEFF): + # FE00-FEFF OAM + return self.video.read(address); + elif (address == 0xFF00): + # FF00-FF00 Joypad + return self.joypad.read(address); + elif (address >= 0xFF01 and address <= 0xFF02): + # FF01-FF02 Serial + return self.serial.read(address); + elif (address >= 0xFF04 and address <= 0xFF07): + # FF04-FF07 Timer + return self.timer.read(address); + elif (address == 0xFF0F): + # FF0F-FF0F Interrupt + return self.interrupt.read(address); + elif (address >= 0xFF10 and address <= 0xFF3F): + # FF10-FF3F Sound + return self.sound.read(address); + elif (address >= 0xFF40 and address <= 0xFF4B): + # FF40-FF4B Video + return self.video.read(address); + elif (address >= 0xFF80 and address <= 0xFFFE): + # FF80-FFFE High RAM + return self.ram.read(address); + elif (address == 0xFFFF): + # FFFF-FFFF Interrupt + return self.interrupt.read(address); + else: + return 0xFF; + + + def drawLogo(self): + for index in range(0, 48): + bits = self.cartridge.read(0x0104 + index); + pattern0 = ((bits >> 0) & 0x80) + ((bits >> 1) & 0x60)\ + + ((bits >> 2) & 0x18) + ((bits >> 3) & 0x06)\ + + ((bits >> 4) & 0x01); + + pattern1 = ((bits << 4) & 0x80) + ((bits << 3) & 0x60)\ + + ((bits << 2) & 0x18) + ((bits << 1) & 0x06)\ + + ((bits << 0) & 0x01); + + self.video.write(0x8010 + (index << 3), pattern0); + self.video.write(0x8012 + (index << 3), pattern0); + + self.video.write(0x8014 + (index << 3), pattern1); + self.video.write(0x8016 + (index << 3), pattern1); + + for index in range(0, 8): + self.video.write(0x8190 + (index << 1), REGISTERED_BITMAP[index]); + + for tile in range(0, 12): + self.video.write(0x9904 + tile, tile + 1); + self.video.write(0x9924 + tile, tile + 13); + + self.video.write(0x9904 + 12, 25); Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py Tue Mar 11 09:25:07 2008 @@ -10,7 +10,6 @@ IE = 0xFFFF # Interrupt Enable */ IF = 0xFF0F # Interrupt Flag */ - # Interrupt Flags VBLANK = 0x01 # V-Blank Interrupt (INT 40h) */ LCD = 0x02 # LCD STAT Interrupt (INT 48h) */ @@ -18,10 +17,9 @@ SERIAL = 0x08 # Serial Interrupt (INT 58h) */ JOYPAD = 0x10 # Joypad Interrupt (INT 60h) */ - # Registers - enable; - flag; + enable = 0; + flag = 0; def __init__(self): self.reset(); @@ -36,7 +34,7 @@ def isPending(self, mask): return (self.enable & self.flag & mask) != 0; - def raise(self, mask): + def raiseInterrupt(self, mask): self.flag |= mask; def lower(self, mask): Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py Tue Mar 11 09:25:07 2008 @@ -15,19 +15,18 @@ JOYPAD_CLOCK = GAMEBOY_CLOCK >> 6; # Registers - joyp; - cycles; + joyp = 0; + cycles = 0; # Interrupt Controller - interrupt; + interrupt = None; # Driver JoypadDriver - driver; + driver = None; def __init__(self, joypadDriver, interrupt): self.driver = joypadDriver; self.interrupt = interrupt; - self.reset(); def reset(self): @@ -67,7 +66,7 @@ data |= 0x0F; if ((self.joyp & ~data & 0x0F) != 0): - self.interrupt.raise(Interrupt.JOYPAD); + self.interrupt.raiseInterrupt(Interrupt.JOYPAD); self.joyp = data; Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py Tue Mar 11 09:25:07 2008 @@ -9,10 +9,10 @@ HIGH_SIZE = 128 # Work RAM - wram + wram = [] # High RAM - hram + hram = [] def __init__(self): self.reset(); Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py Tue Mar 11 09:25:07 2008 @@ -18,12 +18,12 @@ SC = 0xFF02; # Serial Transfer Control */ # Registers - sb; - sc; - cycles; + sb = 0; + sc = 0; + cycles = 0; # Interrupt Controller #Interrupt - interrupt; + interrupt = None; def __init__(self, interrupt): self.interrupt = interrupt; @@ -46,7 +46,7 @@ self.sc &= 0x7F; self.cycles = SERIAL_IDLE_CLOCK; - self.interrupt.raise(Interrupt.SERIAL); + self.interrupt.raiseInterrupt(Interrupt.SERIAL); def setSerialData(self, data): Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py Tue Mar 11 09:25:07 2008 @@ -49,72 +49,72 @@ # Audio Channel 1 int - nr10; - nr11; - nr12; - nr13; - nr14; - audio1Index; - audio1Length; - audio1Volume; - audio1EnvelopeLength; - audio1SweepLength; - audio1Frequency; + nr10=0; + nr11=0; + nr12=0; + nr13=0; + nr14=0; + audio1Index=0; + audio1Length=0; + audio1Volume=0; + audio1EnvelopeLength=0; + audio1SweepLength=0; + audio1Frequency=0; # Audio Channel 2 int - nr21; - nr22; - nr23; - nr24; - audio2Index; - audio2Length; - audio2Volume; - audio2EnvelopeLength; - audio2Frequency; + nr21=0; + nr22=0; + nr23=0; + nr24=0; + audio2Index=0; + audio2Length=0; + audio2Volume=0; + audio2EnvelopeLength=0; + audio2Frequency=0; # Audio Channel 3 int - nr30; - nr31; - nr32; - nr33; - nr34; - audio3Index; - audio3Length; - audio3Frequency; - audio3WavePattern# = new byte[16]; + nr30=0; + nr31=0; + nr32=0; + nr33=0; + nr34=0; + audio3Index=0; + audio3Length=0; + audio3Frequency=0; + audio3WavePattern = []# = new byte[16]; # Audio Channel 4 int - nr41; - nr42; - nr43; - nr44; - audio4Index; - audio4Length; - audio4Volume; - audio4EnvelopeLength; - audio4Frequency; + nr41=0; + nr42=0; + nr43=0; + nr44=0; + audio4Index=0; + audio4Length=0; + audio4Volume=0; + audio4EnvelopeLength=0; + audio4Frequency=0; # Output Control int - nr50; - nr51; - nr52; + nr50=0; + nr51=0; + nr52=0; # Sound DriverSoundDriver - driver; - buffer# = new byte[512]; + #driver; + buffer = []# = new byte[512]; #int - frames; - cycles; + #frames; + #cycles; # Frequency Table - frequencyTable #= new int[2048]; - noiseFreqRatioTable #= new int[8]; + frequencyTable = []#= new int[2048]; + noiseFreqRatioTable = [] #= new int[8]; # Noise Tables - noiseStep7Table #= new int[128 / 32]; - noiseStep15Table #= new int[32768 / 32]; + noiseStep7Table = [] #= new int[128 / 32]; + noiseStep15Table = [] #= new int[32768 / 32]; def __init__(self, soundDriver): self.driver = soundDriver; @@ -293,8 +293,6 @@ else: if (address >= AUD3WAVERAM and address <= AUD3WAVERAM + 0x3F): self.setAudio3WavePattern(address, data); - break; - def updateAudio(self): @@ -310,7 +308,6 @@ if ((self.nr52 & 0x08) != 0): self.updateAudio4(); - def mixAudio(self,buffer, length): @@ -329,12 +326,9 @@ if ((self.nr52 & 0x08) != 0): self.mixAudio4(buffer, length); - - # Audio Channel 1 - def getAudio1Sweep(self): return self.nr10; @@ -401,19 +395,14 @@ self.audio1EnvelopeLength = (SOUND_CLOCK / 64) * (self.nr12 & 0x07); - def updateAudio1(self): if ((self.nr14 & 0x40) != 0): if (self.audio1Length > 0): self.audio1Length-=1; - if (self.audio1Length <= 0): self.nr52 &= ~0x01; - - if (self.audio1EnvelopeLength > 0): self.audio1EnvelopeLength-=1; - if (self.audio1EnvelopeLength <= 0): if ((self.nr12 & 0x08) != 0): if (self.audio1Volume < 15): @@ -421,23 +410,16 @@ elif (self.audio1Volume > 0): self.audio1Volume-=1; self.audio1EnvelopeLength += (SOUND_CLOCK / 64) * (self.nr12 & 0x07); - - - if (self.audio1SweepLength > 0): self.audio1SweepLength-=1; - if (self.audio1SweepLength <= 0): sweepSteps = (self.nr10 & 0x07); - if (sweepSteps != 0): frequency = ((self.nr14 & 0x07) << 8) + self.nr13; - if ((self.nr10 & 0x08) != 0): frequency -= frequency >> sweepSteps; else: frequency += frequency >> sweepSteps; - if (frequency < 2048): self.audio1Frequency = self.frequencyTable[frequency]; self.nr13 = frequency & 0xFF; @@ -448,8 +430,6 @@ self.audio1SweepLength += (SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); - - def mixAudio1(self, buffer, length): wavePattern = 0x18 @@ -475,11 +455,7 @@ buffer[index + 1] += self.audio1Volume; - - - # Audio Channel 2 - def getAudio2Length(self): return self.nr21; @@ -498,13 +474,11 @@ def setAudio2Length(self, data): self.nr21 = data; - self.audio2Length = (SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); def setAudio2Envelope(self, data): self.nr22 = data; - if ((self.nr24 & 0x40) == 0): if ((self.nr22 >> 4) == 0): self.audio2Volume = 0; @@ -516,15 +490,14 @@ def setAudio2Frequency(self, data): self.nr23 = data; - - self.audio2Frequency = self.frequencyTable[self.nr23 + self.audio2Frequency = self.frequencyTable[self.nr23\ + ((self.nr24 & 0x07) << 8)]; def setAudio2Playback(self, data): self.nr24 = data; - self.audio2Frequency = self.frequencyTable[self.nr23 + self.audio2Frequency = self.frequencyTable[self.nr23\ + ((self.nr24 & 0x07) << 8)]; if ((self.nr24 & 0x80) != 0): @@ -556,8 +529,6 @@ self.audio2Volume-=1; self.audio2EnvelopeLength += (SOUND_CLOCK / 64) * (self.nr22 & 0x07); - - def mixAudio2(self, buffer, length): wavePattern = 0x18 @@ -582,13 +553,9 @@ buffer[index + 0] += self.audio2Volume; if ((self.nr51 & 0x02) != 0): buffer[index + 1] += self.audio2Volume; - - - # Audio Channel 3 - def getAudio3Enable(self): return self.nr30; @@ -656,7 +623,6 @@ self.audio3Length-=1; if (self.audio3Length <= 0): self.nr52 &= ~0x04; - def mixAudio3(self, buffer, length): @@ -684,10 +650,7 @@ buffer[index + 1] += sample; - - # Audio Channel 4 - def getAudio4Length(self): return self.nr41; @@ -706,7 +669,6 @@ def setAudio4Length(self, data): self.nr41 = data; - self.audio4Length = (SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); @@ -765,8 +727,6 @@ self.audio4EnvelopeLength += (SOUND_CLOCK / 64) * (self.nr42 & 0x07); - - def mixAudio4(self, buffer, length): for index in range(0, length, 2): self.audio4Index += self.audio4Frequency; @@ -781,7 +741,6 @@ self.audio4Index &= 0x7FFFFFFF; polynomial = self.noiseStep15Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31); - if ((polynomial & 1) != 0): if ((self.nr51 & 0x80) != 0): buffer[index + 0] -= self.audio4Volume; @@ -792,13 +751,9 @@ buffer[index + 0] += self.audio4Volume; if ((self.nr51 & 0x08) != 0): buffer[index + 1] += self.audio4Volume; - - - # Output Control - def getOutputLevel(self): return self.nr50; @@ -825,9 +780,7 @@ self.nr52 &= 0xF0; - # Frequency Table Generation - def generateFrequencyTables(self): sampleRate = self.driver.getSampleRate(); @@ -838,8 +791,6 @@ self.frequencyTable[period] = 0; else: self.frequencyTable[period] = skip; - - # Polynomial Noise Frequency Ratios # # 4194304 Hz * 1/2^3 * 2 4194304 Hz * 1/2^3 * 1 4194304 Hz * 1/2^3 * @@ -862,7 +813,6 @@ if ((index & 31) == 0): self.noiseStep7Table[index >> 5] = 0; self.noiseStep7Table[index >> 5] |= (polynomial & 1) << (index & 31); - # 15 steps& polynomial = 0x7FFF for index in range(0, 0x7FFF): Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py Tue Mar 11 09:25:07 2008 @@ -34,22 +34,21 @@ # Registers #int - div; - tima; - tma; - tac; - - dividerCycles; - timerCycles; - timerClock; + div = 0; + tima = 0; + tma = 0; + tac = 0; + + dividerCycles = 0; + timerCycles = 0; + timerClock = 0; # Interrupt Controller Interrupt - interrupt; + interrupt = None; def __init__(self, interrupt): self.interrupt = interrupt; - self.reset(); @@ -149,5 +148,5 @@ if (self.tima == 0x00): self.tima = self.tma; - self.interrupt.raise(Interrupt.TIMER); + self.interrupt.raiseInterrupt(Interrupt.TIMER); Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Tue Mar 11 09:25:07 2008 @@ -71,51 +71,51 @@ ]; # OAM Registers - oam #= new byte[OAM_SIZE]; + oam = [] #= new byte[OAM_SIZE]; # Video RAM - vram #= new byte[VRAM_SIZE]; + vram = []#= new byte[VRAM_SIZE]; # LCD Registers int - lcdc; - stat; - scy; - scx; - ly; - lyc; - dma; - bgp; - obp0; - obp1; - wy; - wx; - wly; + lcdc = 0; + stat = 0; + scy = 0; + scx = 0; + ly = 0; + lyc = 0; + dma = 0; + bgp = 0; + obp0 = 0; + obp1 = 0; + wy = 0; + wx = 0; + wly = 0; - cycles; + cycles = 0; - frames; - frameSkip; + frames = 0; + frameSkip = 0; #boolean - transfer; - display; - vblank; - dirty; + transfer = False; + display = False; + vblank = False; + dirty = False; # Line Buffer, OAM Cache and Color Palette - line #= new int[8 + 160 + 8]; - objects #= new int[OBJECTS_PER_LINE]; - palette #= new int[1024]; + line = []#= new int[8 + 160 + 8]; + objects = []#= new int[OBJECTS_PER_LINE]; + palette = []#= new int[1024]; # Video Driver VideoDriver - driver; + driver = None; # Interrupt Controller Interrupt - interrupt; + interrupt = None; # Memory Interface Memory - memory; + memory = None; def __init__(self, videDriver, interrupt, memory): self.driver = videoDriver; @@ -194,8 +194,6 @@ elif (address >= VRAM_ADDR and address < VRAM_ADDR + VRAM_SIZE): #TODO convert to byte self.vram[address - VRAM_ADDR] =data; - break; - def read(self, address): @@ -325,7 +323,7 @@ # Gameboy Bug if ((self.lcdc & 0x80) != 0 and (self.stat & 0x03) == 0x01 and (self.stat & 0x44) != 0x44): - self.interrupt.raise(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD); def setScrollY(self, data): @@ -347,7 +345,7 @@ self.stat |= 0x04; if ((self.stat & 0x40) != 0): - self.interrupt.raise(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD); else: self.stat &= 0xFB; @@ -404,7 +402,7 @@ self.cycles += MODE_0_TICKS; # H-Blank interrupt if ((self.stat & 0x08) != 0 and (self.stat & 0x44) != 0x44): - self.interrupt.raise(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD); def emulateHBlank(self): @@ -414,7 +412,7 @@ # LYC=LY interrupt self.stat |= 0x04; if ((self.stat & 0x40) != 0): - self.interrupt.raise(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD); else: self.stat &= 0xFB; if (self.ly < 144): @@ -422,7 +420,7 @@ self.cycles += MODE_2_TICKS; # OAM interrupt if ((self.stat & 0x20) != 0 and (self.stat & 0x44) != 0x44): - self.interrupt.raise(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD); else: if (self.display): self.drawFrame(); @@ -444,42 +442,34 @@ self.stat = (self.stat & 0xFC) | 0x01; self.cycles += MODE_1_TICKS - MODE_1_BEGIN_TICKS; - # V-Blank interrupt if ((self.stat & 0x10) != 0): - self.interrupt.raise(Interrupt.LCD); - + self.interrupt.raiseInterrupt(Interrupt.LCD); # V-Blank interrupt - self.interrupt.raise(Interrupt.VBLANK); + self.interrupt.raiseInterrupt(Interrupt.VBLANK); elif (self.ly == 0): self.stat = (self.stat & 0xFC) | 0x02; self.cycles += MODE_2_TICKS; - # OAM interrupt if ((self.stat & 0x20) != 0 and (self.stat & 0x44) != 0x44): - self.interrupt.raise(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD); else: if (self.ly < 153): self.ly+=1; - self.stat = (self.stat & 0xFC) | 0x01; - if (self.ly == 153): self.cycles += MODE_1_END_TICKS; else: self.cycles += MODE_1_TICKS; else: self.ly = self.wly = 0; - self.stat = (self.stat & 0xFC) | 0x01; self.cycles += MODE_1_TICKS - MODE_1_END_TICKS; - if (self.ly == self.lyc): # LYC=LY interrupt self.stat |= 0x04; - if ((self.stat & 0x40) != 0): - self.interrupt.raise(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD); else: self.stat &= 0xFB; @@ -642,38 +632,54 @@ mask |= 0x0004; # X flip if (flags & 0x20) != 0: - if (color = (pattern << 1) & 0x0202) != 0: + color = (pattern << 1) + if ((color & 0x0202) != 0): self.line[x + 0] |= color | mask; - if ((color = (pattern >> 0) & 0x0202) != 0): + color = (pattern >> 0) + if ((color & 0x0202) != 0): self.line[x + 1] |= color | mask; - if ((color = (pattern >> 1) & 0x0202) != 0): + color = (pattern >> 1) + if ((color & 0x0202) != 0): self.line[x + 2] |= color | mask; - if ((color = (pattern >> 2) & 0x0202) != 0): + color = (pattern >> 2) + if ((color & 0x0202) != 0): self.line[x + 3] |= color | mask; - if ((color = (pattern >> 3) & 0x0202) != 0): + color = (pattern >> 3) + if ((color & 0x0202) != 0): self.line[x + 4] |= color | mask; - if ((color = (pattern >> 4) & 0x0202) != 0): + color = (pattern >> 4) + if ((color & 0x0202) != 0): self.line[x + 5] |= color | mask; - if ((color = (pattern >> 5) & 0x0202) != 0): + color = (pattern >> 5) + if ((color & 0x0202) != 0): self.line[x + 6] |= color | mask; - if ((color = (pattern >> 6) & 0x0202) != 0): + color = (pattern >> 6) + if ((color & 0x0202) != 0): self.line[x + 7] |= color | mask; else: - if ((color = (pattern >> 6) & 0x0202) != 0): + color = (pattern >> 6) + if ((color & 0x0202) != 0): self.line[x + 0] |= color | mask; - if ((color = (pattern >> 5) & 0x0202) != 0): + color = (pattern >> 5) + if ((color & 0x0202) != 0): self.line[x + 1] |= color | mask; - if ((color = (pattern >> 4) & 0x0202) != 0): + color = (pattern >> 4) + if ((color & 0x0202) != 0): self.line[x + 2] |= color | mask; - if ((color = (pattern >> 3) & 0x0202) != 0): + color = (pattern >> 3) + if ((color & 0x0202) != 0): self.line[x + 3] |= color | mask; - if ((color = (pattern >> 2) & 0x0202) != 0): + color = (pattern >> 2) + if ((color & 0x0202) != 0): self.line[x + 4] |= color | mask; - if ((color = (pattern >> 1) & 0x0202) != 0): + color = (pattern >> 1) + if ((color & 0x0202) != 0): self.line[x + 5] |= color | mask; - if ((color = (pattern >> 0) & 0x0202) != 0): + color = (pattern >> 0) + if ((color & 0x0202) != 0): self.line[x + 6] |= color | mask; - if ((color = (pattern << 1) & 0x0202) != 0): + color = (pattern << 1) + if ((color & 0x0202) != 0): self.line[x + 7] |= color | mask; @@ -681,45 +687,61 @@ pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8); mask = 0; # priority - if ((flags & 0x80) != 0) + if ((flags & 0x80) != 0): mask |= 0x0008; # palette - if ((flags & 0x10) != 0) + if ((flags & 0x10) != 0): mask |= 0x0004; # X flip if ((flags & 0x20) != 0): - if ((color = (pattern << 1) & 0x0202) != 0): + color = (pattern << 1) + if ((color & 0x0202) != 0): self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask; - if ((color = (pattern >> 0) & 0x0202) != 0): + color = (pattern >> 0) + if ((color & 0x0202) != 0): self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask; - if ((color = (pattern >> 1) & 0x0202) != 0): + color = (pattern >> 1) + if ((color & 0x0202) != 0): self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask; - if ((color = (pattern >> 2) & 0x0202) != 0): + color = (pattern >> 2) + if ((color & 0x0202) != 0): self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask; - if ((color = (pattern >> 3) & 0x0202) != 0): + color = (pattern >> 3) + if ((color & 0x0202) != 0): self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask; - if ((color = (pattern >> 4) & 0x0202) != 0): + color = (pattern >> 4) + if ((color & 0x0202) != 0): self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask; - if ((color = (pattern >> 6) & 0x0202) != 0): + color = (pattern >> 6) + if ((color & 0x0202) != 0): self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask; - if ((color = (pattern >> 5) & 0x0202) != 0): + color = (pattern >> 5) + if ((color & 0x0202) != 0): self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask; else: - if ((color = (pattern >> 6) & 0x0202) != 0): + color = (pattern >> 6) + if ((color & 0x0202) != 0): self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask; - if ((color = (pattern >> 5) & 0x0202) != 0): + color = (pattern >> 5) + if ((color & 0x0202) != 0): self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask; - if ((color = (pattern >> 4) & 0x0202) != 0): + color = (pattern >> 4) + if ((color & 0x0202) != 0): self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask; - if ((color = (pattern >> 3) & 0x0202) != 0): + color = (pattern >> 3) + if ((color & 0x0202) != 0): self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask; - if ((color = (pattern >> 2) & 0x0202) != 0): + color = (pattern >> 2) + if ((color & 0x0202) != 0): self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask; - if ((color = (pattern >> 1) & 0x0202) != 0) + color = (pattern >> 1) + if ((color & 0x0202) != 0): self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask; - if ((color = (pattern >> 0) & 0x0202) != 0): + color = (pattern >> 0) + if ((color & 0x0202) != 0): self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask; - if ((color = (pattern << 1) & 0x0202) != 0): + color = (pattern << 1) + if ((color & 0x0202) != 0): self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask; @@ -727,11 +749,11 @@ self.updatePalette(); pixels = self.driver.getPixels(); offset = self.ly * self.driver.getWidth(); - for x in range(8, 168, 4) - int pattern0 = self.line[x + 0]; - int pattern1 = self.line[x + 1]; - int pattern2 = self.line[x + 2]; - int pattern3 = self.line[x + 3]; + for x in range(8, 168, 4): + pattern0 = self.line[x + 0]; + pattern1 = self.line[x + 1]; + pattern2 = self.line[x + 2]; + pattern3 = self.line[x + 3]; pixels[offset + 0] = self.palette[pattern0]; pixels[offset + 1] = self.palette[pattern1]; @@ -744,7 +766,7 @@ def clearPixels(self): pixels = self.driver.getPixels(); length = self.driver.getWidth() * self.driver.getHeight(); - for offset in range(0, length) + for offset in range(0, length): pixels[offset] = COLOR_MAP[0]; @@ -752,10 +774,10 @@ if (self.dirty): # bit 4/0 = BG color, bit 5/1 = OBJ color, bit 2 = OBJ palette, bit # 3 = OBJ priority - for pattern in range(0, 64) - int color; + for pattern in range(0, 64): + #color; - if ((pattern & 0x22) == 0 or ((pattern & 0x08) != 0 and (pattern & 0x11) != 0)) + if ((pattern & 0x22) == 0 or ((pattern & 0x08) != 0 and (pattern & 0x11) != 0)): # OBJ behind BG color 1-3 color = (self.bgp >> ((((pattern >> 3) & 0x02) + (pattern & 0x01)) << 1)) & 0x03; # OBJ above BG From fijal at codespeak.net Tue Mar 11 10:36:04 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 11 Mar 2008 10:36:04 +0100 (CET) Subject: [pypy-svn] r52370 - pypy/extradoc/talk/pycon2008 Message-ID: <20080311093604.23DDD168457@codespeak.net> Author: fijal Date: Tue Mar 11 10:35:58 2008 New Revision: 52370 Added: pypy/extradoc/talk/pycon2008/status.txt (contents, props changed) Log: PyPy status talk (draft) Added: pypy/extradoc/talk/pycon2008/status.txt ============================================================================== --- (empty file) +++ pypy/extradoc/talk/pycon2008/status.txt Tue Mar 11 10:35:58 2008 @@ -0,0 +1,162 @@ + +============== +Status of PyPy +============== + +:Author: Maciej Fijalkowski, merlinux GmbH +:Title: PyPy from the user perspective +:Date: XXX + +Next half an hour +================= + +* PyPy motivation and status + +* What we're working on + +* Few examples why it work + +* Where we're going + +* Why you should not use RPython + +* Implementation details available on sunday's evening + +PyPy - motivation +================================= + +* CPython is nice, but not very flexible + +* IronPython, Jython - bound to specific VM + +* Separate language specification from low-level details, + such as gc or just in time compilation + +* Psyco hard to maintain + +PyPy - user motivation +======================= + +* One shall never be forced to write anything in C + for performance reasons (with exception to embedded + devices etc.) + +* Just-in-time compiler should make number-crunching + and static-enough code fast enough + +* One shall never care about low-level details + +Status of PyPy +============== + +* Very compliant language (to Python 2.4/2.5) + +* Some modules from stdlib missing, no 3rd party + modules at all + +* Recently - ctypes + +Status of PyPy backends +======================= + +* We can compile to C and LLVM including threads (GIL), + stackless (but not both), different gcs and all modules + +* We can compile to CLI and JVM with reduced set of modules, + no threads + +* Some bindings to .NET for CLI, working on getting + Java libraries to JVM + +Status of speed in PyPy +======================= + +* Hard to find decent python-only benchmarks in the wild + +* Pystone 1.5, Richards 1., gcbench 0.9 (compared to CPython 2.5) + +* Real world apps usually 1.5-2., sometimes as slow as 3x. + +Status of JIT in PyPy +===================== + +* A lot of work has happened + +* Even more needs to happen + +* If your problem is similiar enough to counting fibonnaci numbers, + we're as fast as psyco + +* PyPy's JIT is way easier to extend (think PPC, think 64 bit, + think floats) + +RPython +======= + +* The static subset of Python which we user for implementing + interpreter + +* Our compiler toolchain analyzes RPython (ie interpreter source code, + like C), not the user program + +* Our interpreter is normal Python interpreter + +* User has nothing to do with RPython + +RPython (2) +=========== + +* It's not a general purpose language + +* One has to have a very good reason to use it + +* Clunky error messages (XXX demo) + +* It's fast, helps us not to code in C + +* Ideally, JIT will achieve same level of speed + +RPython - language +================== + +* Usually tons of metaprogramming + +* Like C++ - you can write books about tricks + +* Hard to extend + +XXX this slides needs to fit somewhere + +Example of useful feature - sanboxing +===================================== + +XXX fill + +Example of useful feature - tproxy & distribution +================================================= + +XXX fill + +PyPy - future +============= + +* Making 3rd party modules run on PyPy - you can help, + notably by porting some to ctypes + +* Making different programs run on PyPy - you can help + +* We're thinking about providing different ways of getting + 3rd party modules + +PyPy - JIT future +================= + +* A lot of work happening (demos on sunday) + +* Short term goal - support for floats, better assembler + +* More general Python programs seeing speedups + +* A lot of benchmarking and tweaking + +* Yes, you can help as well From fijal at codespeak.net Tue Mar 11 10:42:56 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 11 Mar 2008 10:42:56 +0100 (CET) Subject: [pypy-svn] r52371 - in pypy/branch/jit-refactoring/pypy/lang/js: . bench test test/ecma Message-ID: <20080311094256.B8D05168456@codespeak.net> Author: fijal Date: Tue Mar 11 10:42:56 2008 New Revision: 52371 Added: pypy/branch/jit-refactoring/pypy/lang/js/bench/ pypy/branch/jit-refactoring/pypy/lang/js/bench/f1.js pypy/branch/jit-refactoring/pypy/lang/js/execution.py (contents, props changed) pypy/branch/jit-refactoring/pypy/lang/js/test/test_frames.py (contents, props changed) pypy/branch/jit-refactoring/pypy/lang/js/test/test_numbers.py (contents, props changed) pypy/branch/jit-refactoring/pypy/lang/js/test_scope.py (contents, props changed) Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/ecma/conftest.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_operations.py Log: * Refactor number handling to be more efficient (and correct) * (in-progress) Refactor scope handling * Some tests * Generl progress Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py Tue Mar 11 10:42:56 2008 @@ -80,18 +80,19 @@ def visit_DECIMALLITERAL(self, node): pos = self.get_pos(node) - number = operations.Number(pos, float(node.additional_info)) - return number + try: + int(node.additional_info) + except ValueError: + return operations.FloatNumber(pos, float(node.additional_info)) + return operations.IntNumber(pos, int(node.additional_info)) def visit_HEXINTEGERLITERAL(self, node): pos = self.get_pos(node) - number = operations.Number(pos, float(int(node.additional_info, 16))) - return number + return operations.IntNumber(pos, int(node.additional_info, 16)) def visit_OCTALLITERAL(self, node): pos = self.get_pos(node) - number = operations.Number(pos, float(int(node.additional_info, 8))) - return number + return operations.IntNumber(pos, int(node.additional_info, 8)) def string(self,node): pos = self.get_pos(node) @@ -395,4 +396,4 @@ identifier = self.dispatch(node.children[0]) body = self.dispatch(node.children[1]) return operations.With(pos, identifier, body) - \ No newline at end of file + Added: pypy/branch/jit-refactoring/pypy/lang/js/bench/f1.js ============================================================================== --- (empty file) +++ pypy/branch/jit-refactoring/pypy/lang/js/bench/f1.js Tue Mar 11 10:42:56 2008 @@ -0,0 +1,22 @@ + +// some simple number-crunching benchmarks + +function f1(n) { + var i = 0; + var x = 1; + while (i < n) { + var j = 0; + while (j <= i) { + j++; + x = x + (i&j); + } + i++; + } + return x; +} + +a = new Date(); +f1(2117); +b = new Date(); +print(b - a); + Added: pypy/branch/jit-refactoring/pypy/lang/js/execution.py ============================================================================== --- (empty file) +++ pypy/branch/jit-refactoring/pypy/lang/js/execution.py Tue Mar 11 10:42:56 2008 @@ -0,0 +1,26 @@ + +class JsBaseExcept(Exception): + pass + +#XXX Just an idea for now +class JsRuntimeExcept(Exception): + def __init__(self, pos, message, exception_object): + self.pos = pos + self.message = message + self.exception_object = exception_object # JS Exception Object + +class ExecutionReturned(JsBaseExcept): + def __init__(self, type='normal', value=None, identifier=None): + self.type = type + self.value = value + self.identifier = identifier + +class ThrowException(JsBaseExcept): + def __init__(self, exception): + self.exception = exception + self.args = [exception] + +class JsTypeError(JsBaseExcept): + pass + +class RangeError(JsBaseExcept): pass Modified: pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py Tue Mar 11 10:42:56 2008 @@ -2,8 +2,11 @@ import math from pypy.lang.js.jsparser import parse, ParseError from pypy.lang.js.astbuilder import ASTBuilder -from pypy.lang.js.operations import * -from pypy.lang.js.jsobj import ThrowException +from pypy.lang.js.jsobj import global_context, W_Object,\ + w_Undefined, W_NewBuiltin, W_IntNumber, w_Null, create_object, W_Boolean,\ + W_FloatNumber, NaN, Infinity, W_String, W_Builtin, W_Array, w_Null,\ + isnull_or_undefined, W_PrimitiveObject, W_ListObject +from pypy.lang.js.execution import ThrowException, JsTypeError from pypy.rlib.objectmodel import we_are_translated from pypy.rlib.streamio import open_file_as_stream @@ -37,8 +40,8 @@ return self.Construct(ctx) def Construct(self, ctx, args=[]): - if len(args) >= 1 and not (isinstance(args[0], W_Undefined) \ - or isinstance(args[0], W_Null)): + if (len(args) >= 1 and not args[0] is w_Undefined and not + args[0] is w_Null): # XXX later we could separate builtins and normal objects return args[0].ToObject(ctx) return create_object(ctx, 'Object') @@ -59,15 +62,15 @@ class W_NumberObject(W_NativeObject): def Call(self, ctx, args=[], this=None): if len(args) >= 1 and not isnull_or_undefined(args[0]): - return W_Number(args[0].ToNumber()) + return W_FloatNumber(args[0].ToNumber()) else: - return W_Number(0.0) + return W_FloatNumber(0.0) def Construct(self, ctx, args=[]): if len(args) >= 1 and not isnull_or_undefined(args[0]): - Value = W_Number(args[0].ToNumber()) + Value = W_FloatNumber(args[0].ToNumber()) return create_object(ctx, 'Number', Value = Value) - return create_object(ctx, 'Number', Value = W_Number(0.0)) + return create_object(ctx, 'Number', Value = W_FloatNumber(0.0)) class W_StringObject(W_NativeObject): def Call(self, ctx, args=[], this=None): @@ -87,7 +90,6 @@ proto = ctx.get_global().Get('Array').Get('prototype') array = W_Array(ctx, Prototype=proto, Class = proto.Class) for i in range(len(args)): - print "yeahh" array.Put(str(i), args[0]) return array @@ -119,7 +121,7 @@ def parseIntjs(ctx, args, this): if len(args) < 1: - return W_Number(NaN) + return W_FloatNumber(NaN) s = args[0].ToString(ctx).strip(" ") if len(args) > 1: radix = args[1].ToInt32() @@ -129,22 +131,22 @@ radix = 16 s = s[2:] if s == '' or radix < 2 or radix > 36: - return W_Number(NaN) + return W_FloatNumber(NaN) try: n = int(s, radix) except ValueError: - n = NaN - return W_Number(n) + return W_FloatNumber(NaN) + return W_IntNumber(n) def parseFloatjs(ctx, args, this): if len(args) < 1: - return W_Number(NaN) + return W_FloatNumber(NaN) s = args[0].ToString(ctx).strip(" ") try: n = float(s) except ValueError: n = NaN - return W_Number(n) + return W_FloatNumber(n) def printjs(ctx, args, this): @@ -184,20 +186,25 @@ def numberjs(ctx, args, this): if len(args) > 0: - return W_Number(args[0].ToNumber()) - return W_Number(0) + return W_FloatNumber(args[0].ToNumber()) + return W_IntNumber(0) def absjs(ctx, args, this): - return W_Number(abs(args[0].ToNumber())) + val = args[0] + if isinstance(val, W_IntNumber): + if val.intval > 0: + return val # fast path + return W_IntNumber(-val.intval) + return W_FloatNumber(abs(args[0].ToNumber())) def floorjs(ctx, args, this): - return W_Number(math.floor(args[0].ToNumber())) + return W_IntNumber(int(math.floor(args[0].ToNumber()))) def powjs(ctx, args, this): - return W_Number(math.pow(args[0].ToNumber(), args[1].ToNumber())) + return W_FloatNumber(math.pow(args[0].ToNumber(), args[1].ToNumber())) def sqrtjs(ctx, args, this): - return W_Number(math.sqrt(args[0].ToNumber())) + return W_FloatNumber(math.sqrt(args[0].ToNumber())) def versionjs(ctx, args, this): return w_Undefined @@ -280,8 +287,7 @@ arrayArgs = args[1] if isinstance(arrayArgs, W_ListObject): callargs = arrayArgs.tolist() - elif isinstance(arrayArgs, W_Undefined) \ - or isinstance(arrayArgs, W_Null): + elif isnull_or_undefined(arrayArgs): callargs = [] else: raise JsTypeError('arrayArgs is not an Array or Arguments object') @@ -334,7 +340,7 @@ def Call(self, ctx, args=[], this=None): string = this.ToString(ctx) if len(args) < 1: - return W_Number(-1.0) + return W_IntNumber(-1) substr = args[0].ToString(ctx) size = len(string) subsize = len(substr) @@ -343,7 +349,7 @@ else: pos = args[1].ToInt32() pos = min(max(pos, 0), size) - return W_Number(string.find(substr, pos)) + return W_IntNumber(string.find(substr, pos)) class W_Substring(W_NewBuiltin): def Call(self, ctx, args=[], this=None): @@ -377,6 +383,9 @@ def Construct(self, ctx, args=[]): return create_object(ctx, 'Object') +def pypy_repr(ctx, repr, w_arg): + return W_String(w_arg.__class__.__name__) + class Interpreter(object): """Creates a js interpreter""" def __init__(self): @@ -403,7 +412,7 @@ w_Function.Put('prototype', w_FncPrototype, dd=True, de=True, ro=True) w_Function.Put('constructor', w_Function) - w_Object.Put('length', W_Number(1), ro=True, dd=True) + w_Object.Put('length', W_IntNumber(1), ro=True, dd=True) toString = W_ToString(ctx) @@ -447,7 +456,7 @@ #Number w_Number = W_NumberObject('Number', w_FncPrototype) - w_NumPrototype = create_object(ctx, 'Object', Value=W_Number(0.0)) + w_NumPrototype = create_object(ctx, 'Object', Value=W_FloatNumber(0.0)) w_NumPrototype.Class = 'Number' put_values(w_NumPrototype, { 'constructor': w_FncPrototype, @@ -459,9 +468,9 @@ put_values(w_Number, { 'constructor': w_FncPrototype, 'prototype': w_NumPrototype, - 'NaN': W_Number(NaN), - 'POSITIVE_INFINITY': W_Number(Infinity), - 'NEGATIVE_INFINITY': W_Number(-Infinity), + 'NaN': W_FloatNumber(NaN), + 'POSITIVE_INFINITY': W_FloatNumber(Infinity), + 'NEGATIVE_INFINITY': W_FloatNumber(-Infinity), }) w_Global.Put('Number', w_Number) @@ -511,8 +520,8 @@ w_math.Put('floor', W_Builtin(floorjs, Class='function')) w_math.Put('pow', W_Builtin(powjs, Class='function')) w_math.Put('sqrt', W_Builtin(sqrtjs, Class='function')) - w_math.Put('E', W_Number(math.e)) - w_math.Put('PI', W_Number(math.pi)) + w_math.Put('E', W_FloatNumber(math.e)) + w_math.Put('PI', W_FloatNumber(math.pi)) w_Global.Put('version', W_Builtin(versionjs)) @@ -520,8 +529,8 @@ w_Date = W_DateFake(ctx, Class='Date') w_Global.Put('Date', w_Date) - w_Global.Put('NaN', W_Number(NaN)) - w_Global.Put('Infinity', W_Number(Infinity)) + w_Global.Put('NaN', W_FloatNumber(NaN)) + w_Global.Put('Infinity', W_FloatNumber(Infinity)) w_Global.Put('undefined', w_Undefined) w_Global.Put('eval', W_Builtin(evaljs)) w_Global.Put('parseInt', W_Builtin(parseIntjs)) @@ -531,7 +540,10 @@ w_Global.Put('print', W_Builtin(printjs)) w_Global.Put('this', w_Global) - + + # DEBUGGING + if 1: + w_Global.Put('pypy_repr', W_Builtin(pypy_repr)) self.global_context = ctx self.w_Global = w_Global @@ -549,9 +561,12 @@ res.append(arg) elif isinstance(arg, str): res.append(W_String(arg)) - elif isinstance(arg, int) or isinstance(arg, float) \ - or isinstance(arg, long): - res.append(W_Number(arg)) + elif isinstance(arg, int): + res.append(W_IntNumber(arg)) + elif isinstance(arg, float): + res.append(W_FloatNumber(arg)) elif isinstance(arg, bool): res.append(W_Boolean(arg)) - return res \ No newline at end of file + else: + raise Exception("Cannot wrap %s" % (arg,)) + return res Modified: pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py Tue Mar 11 10:42:56 2008 @@ -1,36 +1,12 @@ # encoding: utf-8 -from pypy.rlib.rarithmetic import r_uint, intmask - +from pypy.rlib.rarithmetic import r_uint, intmask, isnan, isinf,\ + ovfcheck_float_to_int +from pypy.lang.js.execution import ThrowException, JsTypeError,\ + ExecutionReturned, RangeError class SeePage(NotImplementedError): pass -class JsBaseExcept(Exception): - pass - -#XXX Just an idea for now -class JsRuntimeExcept(Exception): - def __init__(self, pos, message, exception_object): - self.pos = pos - self.message = message - self.exception_object = exception_object # JS Exception Object - -class ExecutionReturned(JsBaseExcept): - def __init__(self, type='normal', value=None, identifier=None): - self.type = type - self.value = value - self.identifier = identifier - -class ThrowException(JsBaseExcept): - def __init__(self, exception): - self.exception = exception - self.args = [exception] - -class JsTypeError(JsBaseExcept): - pass - -class RangeError(JsBaseExcept): pass - Infinity = 1e300 * 1e300 NaN = Infinity/Infinity @@ -312,7 +288,7 @@ W_PrimitiveObject.__init__(self, Class='Arguments') del self.propdict["prototype"] self.Put('callee', callee) - self.Put('length', W_Number(len(args))) + self.Put('length', W_IntNumber(len(args))) for i in range(len(args)): self.Put(str(i), args[i]) self.length = len(args) @@ -330,7 +306,7 @@ def __init__(self, ctx=None, Prototype=None, Class='Array', Value=w_Undefined, callfunc=None): W_PrimitiveObject.__init__(self, ctx, Prototype, Class, Value, callfunc) - self.Put('length', W_Number(0)) + self.Put('length', W_IntNumber(0)) self.length = r_uint(0) def Put(self, P, V, dd=False, @@ -343,7 +319,7 @@ res = V.ToUInt32() if V.ToNumber() < 0: raise RangeError() - self.propdict['length'].value = W_Number(res) + self.propdict['length'].value = W_IntNumber(res) self.length = res return except ValueError: @@ -355,14 +331,14 @@ dd = dd, ro = ro, it = it) try: - index = r_uint(float(P)) + index = r_uint(int(P)) except ValueError: return if index < self.length: return - self.length = index+1 - self.propdict['length'].value = W_Number(index+1) + self.length = index+1 + self.propdict['length'].value = W_IntNumber(index+1) return @@ -414,71 +390,87 @@ def GetPropertyName(self): return self.ToString() -class W_Number(W_Primitive): +class W_BaseNumber(W_Primitive): + """ Base class for numbers, both known to be floats + and those known to be integers + """ + def ToObject(self, ctx): + return create_object(ctx, 'Number', Value=self) + + def Get(self, name): + return w_Undefined + + def type(self): + return 'number' + +class W_IntNumber(W_BaseNumber): + """ Number known to be an integer + """ + def __init__(self, intval): + self.intval = intmask(intval) + + def __str__(self): + return str(self.intval)+"W" + + def ToString(self, ctx=None): + return str(self.intval) + + def ToBoolean(self): + return bool(self.intval) + + def ToNumber(self): + # XXX + return float(self.intval) + + def ToInt32(self): + return self.intval + + def ToUInt32(self): + return r_uint(self.intval) + + def GetPropertyName(self): + return self.ToString() + +class W_FloatNumber(W_BaseNumber): + """ Number known to be a float + """ def __init__(self, floatval): - try: - self.floatval = float(floatval) - except OverflowError: - # XXX this should not be happening, there is an error somewhere else - #an ecma test to stress this is GlobalObject/15.1.2.2-2.js - self.floatval = Infinity + self.floatval = floatval def __str__(self): return str(self.floatval)+"W" - - def ToObject(self, ctx): - return create_object(ctx, 'Number', Value=self) - + def ToString(self, ctx = None): - floatstr = str(self.floatval) - if floatstr == str(NaN): + if isnan(self.floatval): return 'NaN' - if floatstr == str(Infinity): - return 'Infinity' - if floatstr == str(-Infinity): - return '-Infinity' + if isinf(self.floatval): + if self.floatval > 0: + return 'Infinity' + else: + return '-Infinity' try: - if float(int(self.floatval)) == self.floatval: - return str(int(self.floatval)) - except OverflowError, e: - pass - return floatstr + return str(ovfcheck_float_to_int(self.floatval)) + except OverflowError: + return str(self.floatval) def ToBoolean(self): - if self.floatval == 0.0 or str(self.floatval) == str(NaN): + if isnan(self.floatval): return False return bool(self.floatval) def ToNumber(self): return self.floatval - - def Get(self, name): - return w_Undefined - - def type(self): - return 'number' - + def ToInt32(self): - strval = str(self.floatval) - if strval == str(NaN) or \ - strval == str(Infinity) or \ - strval == str(-Infinity): - return 0 - + if isnan(self.floatval) or isinf(self.floatval): + return 0 return int(self.floatval) def ToUInt32(self): - strval = str(self.floatval) - if strval == str(NaN) or \ - strval == str(Infinity) or \ - strval == str(-Infinity): + if isnan(self.floatval) or isinf(self.floatval): return r_uint(0) - return r_uint(self.floatval) - - def GetPropertyName(self): - return self.ToString() - + class W_List(W_Root): def __init__(self, list_w): self.list_w = list_w @@ -496,15 +488,25 @@ return str(self.list_w) class ExecutionContext(object): + def create_fast_lookup(self, scope_elem): + fast_lookup = {} + for elem, val in self.scope[-1].propdict.iteritems(): + if val.dd: + fast_lookup[elem] = W_Reference(elem, self.scope[-1]) + return fast_lookup + def __init__(self, scope, this=None, variable=None, debug=False, jsproperty=None): assert scope is not None + assert len(scope) == 1 self.scope = scope if this is None: self.this = scope[-1] else: self.this = this - + self.fast_lookup = self.create_fast_lookup(scope[-1]) + self.scope_lookup = [self.fast_lookup] + # create a fast lookup if variable is None: self.variable = self.scope[0] else: @@ -528,14 +530,23 @@ def push_object(self, obj): """push object into scope stack""" assert isinstance(obj, W_PrimitiveObject) + # XXX O(n^2) self.scope.insert(0, obj) self.variable = obj + self.fast_lookup = self.create_fast_lookup(obj) + self.scope_lookup.append(self.fast_lookup) def pop_object(self): """remove the last pushed object""" + self.scope_lookup.pop() + self.fast_lookup = self.scope_lookup[-1] return self.scope.pop(0) def resolve_identifier(self, identifier): + try: + return self.fast_lookup[identifier] + except KeyError: + pass for obj in self.scope: assert isinstance(obj, W_PrimitiveObject) if obj.HasProperty(identifier): @@ -559,7 +570,7 @@ jsproperty = Property('', w_Undefined, dd=True)) ctx.push_object(activation) return ctx - + def eval_context(calling_context): ctx = ExecutionContext(calling_context.scope[:], this = calling_context.this, @@ -611,7 +622,6 @@ return obj def isnull_or_undefined(obj): - if isinstance(obj, W_Undefined) or isinstance(obj, W_Null): + if obj is w_Null or obj is w_Undefined: return True - else: - return False + return False Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Tue Mar 11 10:42:56 2008 @@ -4,10 +4,15 @@ Implements the javascript operations nodes for the interpretation tree """ -#XXX * imports are bad -from pypy.lang.js.jsobj import * +from pypy.lang.js.jsobj import W_IntNumber, W_FloatNumber, W_Object,\ + w_Undefined, W_NewBuiltin, W_String, create_object, W_List,\ + W_PrimitiveObject, W_Reference, ActivationObject, W_Array, W_Boolean,\ + w_Null, W_BaseNumber, isnull_or_undefined from pypy.rlib.parsing.ebnfparse import Symbol, Nonterminal -from pypy.rlib.rarithmetic import r_uint, intmask +from pypy.rlib.rarithmetic import r_uint, intmask, INFINITY, NAN, ovfcheck,\ + isnan, isinf +from pypy.lang.js.execution import ExecutionReturned, JsTypeError,\ + ThrowException from constants import unescapedict, SLASH import sys @@ -139,11 +144,11 @@ elif op == "%=": val = mod(ctx, v1.GetValue(), v3) elif op == "&=": - val = W_Number(v1.GetValue().ToInt32() & v3.ToInt32()) + val = W_IntNumber(v1.GetValue().ToInt32() & v3.ToInt32()) elif op == "|=": - val = W_Number(v1.GetValue().ToInt32() | v3.ToInt32()) + val = W_IntNumber(v1.GetValue().ToInt32() | v3.ToInt32()) elif op == "^=": - val = W_Number(v1.GetValue().ToInt32() ^ v3.ToInt32()) + val = W_IntNumber(v1.GetValue().ToInt32() ^ v3.ToInt32()) else: print op raise NotImplementedError() @@ -172,24 +177,24 @@ class BitwiseAnd(BinaryBitwiseOp): def decision(self, ctx, op1, op2): - return W_Number(op1&op2) + return W_IntNumber(op1&op2) class BitwiseNot(UnaryOp): def eval(self, ctx): op1 = self.expr.eval(ctx).GetValue().ToInt32() - return W_Number(~op1) + return W_IntNumber(~op1) class BitwiseOr(BinaryBitwiseOp): def decision(self, ctx, op1, op2): - return W_Number(op1|op2) + return W_IntNumber(op1|op2) class BitwiseXor(BinaryBitwiseOp): def decision(self, ctx, op1, op2): - return W_Number(op1^op2) + return W_IntNumber(op1^op2) class Unconditional(Statement): @@ -224,7 +229,6 @@ r7 = None else: r7 = r6 - try: res = r3.Call(ctx=ctx, args=r2.get_args(), this=r7) except JsTypeError: @@ -277,7 +281,7 @@ def eval(self, ctx): proto = ctx.get_global().Get('Function').Get('prototype') w_func = W_Object(ctx=ctx, Prototype=proto, Class='Function', callfunc=self) - w_func.Put('length', W_Number(len(self.params))) + w_func.Put('length', W_IntNumber(len(self.params))) w_obj = create_object(ctx, 'Object') w_obj.Put('constructor', w_func, de=True) w_func.Put('prototype', w_obj) @@ -332,12 +336,13 @@ Implements the Abstract Relational Comparison x < y Still not fully to the spec """ + # XXX fast path when numbers only s1 = x.ToPrimitive(ctx, 'Number') s2 = y.ToPrimitive(ctx, 'Number') if not (isinstance(s1, W_String) and isinstance(s2, W_String)): s4 = s1.ToNumber() s5 = s2.ToNumber() - if s4 == NaN or s5 == NaN: + if isnan(s4) or isnan(s5): return -1 if s4 < s5: return 1 @@ -416,19 +421,19 @@ def decision(self, ctx, op1, op2): a = op1.ToUInt32() b = op2.ToUInt32() - return W_Number(a >> (b & 0x1F)) + return W_IntNumber(a >> (b & 0x1F)) class Rsh(BinaryComparisonOp): def decision(self, ctx, op1, op2): a = op1.ToInt32() b = op2.ToUInt32() - return W_Number(a >> intmask(b & 0x1F)) + return W_IntNumber(a >> intmask(b & 0x1F)) class Lsh(BinaryComparisonOp): def decision(self, ctx, op1, op2): a = op1.ToInt32() b = op2.ToUInt32() - return W_Number(a << intmask(b & 0x1F)) + return W_IntNumber(a << intmask(b & 0x1F)) ############################################################################## # @@ -442,6 +447,7 @@ Implements the Abstract Equality Comparison x == y trying to be fully to the spec """ + # XXX think about fast paths here and there type1 = x.type() type2 = y.type() if type1 == type2: @@ -450,8 +456,7 @@ if type1 == "number": n1 = x.ToNumber() n2 = y.ToNumber() - nan_string = str(NaN) - if str(n1) == nan_string or str(n2) == nan_string: + if isnan(n1) or isnan(n2): return False if n1 == n2: return True @@ -467,13 +472,13 @@ (type1 == "null" and type2 == "undefined"): return True if type1 == "number" and type2 == "string": - return AEC(ctx, x, W_Number(y.ToNumber())) + return AEC(ctx, x, W_FloatNumber(y.ToNumber())) if type1 == "string" and type2 == "number": - return AEC(ctx, W_Number(x.ToNumber()), y) + return AEC(ctx, W_FloatNumber(x.ToNumber()), y) if type1 == "boolean": - return AEC(ctx, W_Number(x.ToNumber()), y) + return AEC(ctx, W_FloatNumber(x.ToNumber()), y) if type2 == "boolean": - return AEC(ctx, x, W_Number(y.ToNumber())) + return AEC(ctx, x, W_FloatNumber(y.ToNumber())) if (type1 == "string" or type1 == "number") and \ type2 == "object": return AEC(ctx, x, y.ToPrimitive(ctx)) @@ -524,8 +529,7 @@ if type1 == "number": n1 = x.ToNumber() n2 = y.ToNumber() - nan_string = str(NaN) - if str(n1) == nan_string or str(n2) == nan_string: + if isnan(n1) or isnan(n2): return False if n1 == n2: return True @@ -573,10 +577,11 @@ ++value (prefix) and value++ (postfix) """ def eval(self, ctx): + # XXX write down fast version thing = self.expr.eval(ctx) val = thing.GetValue() x = val.ToNumber() - resl = plus(ctx, W_Number(x), W_Number(1)) + resl = plus(ctx, W_FloatNumber(x), W_IntNumber(1)) thing.PutValue(resl, ctx) if self.postfix: return val @@ -589,10 +594,11 @@ same as increment --value and value -- """ def eval(self, ctx): + # XXX write down hot path thing = self.expr.eval(ctx) val = thing.GetValue() x = val.ToNumber() - resl = sub(ctx, W_Number(x), W_Number(1)) + resl = sub(ctx, W_FloatNumber(x), W_IntNumber(1)) thing.PutValue(resl, ctx) if self.postfix: return val @@ -632,31 +638,61 @@ sleft = nleft.ToString(ctx) sright = nright.ToString(ctx) return W_String(sleft + sright) + # hot path + if isinstance(nleft, W_IntNumber) and isinstance(nright, W_IntNumber): + ileft = nleft.ToInt32() + iright = nright.ToInt32() + try: + return W_IntNumber(ovfcheck(ileft + iright)) + except OverflowError: + return W_FloatNumber(float(ileft) + float(iright)) else: fleft = nleft.ToNumber() fright = nright.ToNumber() - return W_Number(fleft + fright) + return W_FloatNumber(fleft + fright) def mult(ctx, nleft, nright): + if isinstance(nleft, W_IntNumber) and isinstance(nright, W_IntNumber): + ileft = nleft.ToInt32() + iright = nright.ToInt32() + try: + return W_IntNumber(ovfcheck(ileft * iright)) + except OverflowError: + return W_FloatNumber(float(ileft) * float(iright)) fleft = nleft.ToNumber() fright = nright.ToNumber() - return W_Number(fleft * fright) + return W_FloatNumber(fleft * fright) def mod(ctx, nleft, nright): # XXX this one is really not following spec ileft = nleft.ToInt32() iright = nright.ToInt32() - return W_Number(ileft % iright) + return W_IntNumber(ileft % iright) def division(ctx, nleft, nright): fleft = nleft.ToNumber() fright = nright.ToNumber() - return W_Number(fleft / fright) + if fright == 0: + if fleft < 0: + val = -INFINITY + elif fleft == 0: + val = NAN + else: + val = INFINITY + else: + val = fleft / fright + return W_FloatNumber(val) def sub(ctx, nleft, nright): + if isinstance(nleft, W_IntNumber) and isinstance(nright, W_IntNumber): + ileft = nleft.ToInt32() + iright = nright.ToInt32() + try: + return W_IntNumber(ovfcheck(ileft - iright)) + except OverflowError: + return W_FloatNumber(float(ileft) - float(iright)) fleft = nleft.ToNumber() fright = nright.ToNumber() - return W_Number(fleft - fright) - + return W_FloatNumber(fleft - fright) class Plus(BinaryNumberOp): def mathop(self, ctx, n1, n2): @@ -714,17 +750,25 @@ x = self.left.eval(ctx).GetValue() args = self.right.eval(ctx).get_args() return commonnew(ctx, x, args) + +class BaseNumber(Expression): + pass +class IntNumber(BaseNumber): + def __init__(self, pos, num): + self.pos = pos + self.num = num + def eval(self, ctx): + return W_IntNumber(int(self.num)) -class Number(Expression): +class FloatNumber(BaseNumber): def __init__(self, pos, num): self.pos = pos - assert isinstance(num, float) self.num = num def eval(self, ctx): - return W_Number(self.num) + return W_FloatNumber(float(self.num)) class String(Expression): def __init__(self, pos, strval): @@ -740,6 +784,7 @@ def string_unquote(self, string): temp = [] stop = len(string)-1 + # XXX proper error assert stop >= 0 last = "" @@ -784,7 +829,7 @@ def execute(self, ctx): for varname in self.var_decl: - ctx.variable.Put(varname, w_Undefined) + ctx.variable.Put(varname, w_Undefined, dd=True) for funcname, funccode in self.func_decl.items(): ctx.variable.Put(funcname, funccode.eval(ctx)) node = self @@ -880,9 +925,9 @@ def eval(self, ctx): name = self.identifier.get_literal() if self.expr is None: - ctx.variable.Put(name, w_Undefined) + ctx.variable.Put(name, w_Undefined, dd=True) else: - ctx.variable.Put(name, self.expr.eval(ctx).GetValue()) + ctx.variable.Put(name, self.expr.eval(ctx).GetValue(), dd=True) return self.identifier.eval(ctx) @@ -1050,9 +1095,17 @@ class UMinus(UnaryOp): def eval(self, ctx): - return W_Number(-self.expr.eval(ctx).GetValue().ToNumber()) + res = self.expr.eval(ctx) + if isinstance(res, W_IntNumber): + return W_IntNumber(-res.intval) + elif isinstance(res, W_FloatNumber): + return W_FloatNumber(-res.floatval) + return W_FloatNumber(-self.expr.eval(ctx).GetValue().ToNumber()) class UPlus(UnaryOp): def eval(self, ctx): - return W_Number(+self.expr.eval(ctx).GetValue().ToNumber()) + res = self.expr.eval(ctx) + if isinstance(res, W_BaseNumber): + return res + return W_FloatNumber(self.expr.eval(ctx).GetValue().ToNumber()) Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/ecma/conftest.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/ecma/conftest.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/ecma/conftest.py Tue Mar 11 10:42:56 2008 @@ -1,10 +1,11 @@ import py from pypy.lang.js.interpreter import * -from pypy.lang.js.jsobj import W_Array, JsBaseExcept +from pypy.lang.js.jsobj import W_Array from pypy.rlib.parsing.parsing import ParseError from py.__.test.outcome import Failed, ExceptionFailure import pypy.lang.js as js from pypy.lang.js import interpreter +from pypy.lang.js.execution import JsBaseExcept interpreter.TEST = True @@ -32,7 +33,7 @@ def init_interp(cls): if hasattr(cls, 'interp'): cls.testcases.PutValue(W_Array(), cls.interp.global_context) - cls.tc.PutValue(W_Number(0), cls.interp.global_context) + cls.tc.PutValue(W_IntNumber(0), cls.interp.global_context) cls.interp = Interpreter() ctx = cls.interp.global_context @@ -81,7 +82,7 @@ def run(self): ctx = JSTestFile.interp.global_context r3 = ctx.resolve_identifier('run_test').GetValue() - w_test_number = W_Number(self.number) + w_test_number = W_IntNumber(self.number) result = r3.Call(ctx=ctx, args=[w_test_number,]).GetValue().ToString() if result != "passed": raise Failed(msg=result) Added: pypy/branch/jit-refactoring/pypy/lang/js/test/test_frames.py ============================================================================== --- (empty file) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_frames.py Tue Mar 11 10:42:56 2008 @@ -0,0 +1,4 @@ + +class TestTraceback(object): + pass + Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py Tue Mar 11 10:42:56 2008 @@ -1,13 +1,13 @@ import py from pypy.lang.js import interpreter -from pypy.lang.js.operations import AEC, Number, Position, Plus -from pypy.lang.js.jsobj import W_Number, W_Object, \ - ExecutionContext, W_Root, ThrowException, w_Null +from pypy.lang.js.operations import AEC, IntNumber, FloatNumber, Position, Plus +from pypy.lang.js.jsobj import W_Object, ExecutionContext, W_Root, w_Null +from pypy.lang.js.execution import ThrowException def test_simple(): - n1 = Number(Position(), 2.0) - n2 = Number(Position(), 4.0) + n1 = FloatNumber(Position(), 2.0) + n2 = FloatNumber(Position(), 4.0) p = Plus(Position(), n1, n2) assert p.eval(ExecutionContext([W_Object(),])).GetValue().ToNumber() == 6.0 l = [] @@ -599,3 +599,6 @@ def test_new_without_args_really(): assertv("var x = new Boolean; x.toString();", 'false') +def test_pypy_repr(): + assertv("pypy_repr(3);", 'W_IntNumber') + assertv("pypy_repr(3.0);", 'W_FloatNumber') Added: pypy/branch/jit-refactoring/pypy/lang/js/test/test_numbers.py ============================================================================== --- (empty file) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_numbers.py Tue Mar 11 10:42:56 2008 @@ -0,0 +1,10 @@ + +from pypy.lang.js.test.test_interp import assertv + +def test_infinity_nan(): + assertv('1/0', 'Infinity') + assertv('0/0', 'NaN') + assertv('-1/0', '-Infinity') + +def test_overflow_int_to_float(): + assertv('1e200', '1e+200') Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_operations.py Tue Mar 11 10:42:56 2008 @@ -1,7 +1,7 @@ import py from pypy.lang.js import interpreter from pypy.lang.js.operations import * -from pypy.lang.js.jsobj import W_Number, empty_context +from pypy.lang.js.jsobj import empty_context class MOCKNode(Node): def __init__(self, pos, ret): Added: pypy/branch/jit-refactoring/pypy/lang/js/test_scope.py ============================================================================== --- (empty file) +++ pypy/branch/jit-refactoring/pypy/lang/js/test_scope.py Tue Mar 11 10:42:56 2008 @@ -0,0 +1,8 @@ + +from pypy.lang.js.test.test_interp import assertv + +def test_variable_deletion(): + assertv("var x = 3; delete this.x;", False) + assertv("x = 3; delete this.x;", True) + assertv("var x = 3; delete this.x; x", 3) + From fijal at codespeak.net Tue Mar 11 10:53:06 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 11 Mar 2008 10:53:06 +0100 (CET) Subject: [pypy-svn] r52372 - in pypy/branch/jit-refactoring/pypy/lang/js: . test Message-ID: <20080311095306.7F15A168456@codespeak.net> Author: fijal Date: Tue Mar 11 10:53:04 2008 New Revision: 52372 Added: pypy/branch/jit-refactoring/pypy/lang/js/test/test_scope.py - copied unchanged from r52371, pypy/branch/jit-refactoring/pypy/lang/js/test_scope.py Removed: pypy/branch/jit-refactoring/pypy/lang/js/test_scope.py Log: Move this test to test dir From arigo at codespeak.net Tue Mar 11 10:58:49 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 11 Mar 2008 10:58:49 +0100 (CET) Subject: [pypy-svn] r52373 - pypy/extradoc/talk/pycon2008 Message-ID: <20080311095849.EA25F168454@codespeak.net> Author: arigo Date: Tue Mar 11 10:58:49 2008 New Revision: 52373 Modified: pypy/extradoc/talk/pycon2008/status.txt Log: A first pass over status.txt. Modified: pypy/extradoc/talk/pycon2008/status.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/status.txt (original) +++ pypy/extradoc/talk/pycon2008/status.txt Tue Mar 11 10:58:49 2008 @@ -14,13 +14,13 @@ * What we're working on -* Few examples why it work +* A few examples of why it works * Where we're going * Why you should not use RPython -* Implementation details available on sunday's evening +* Implementation details available on Sunday evening PyPy - motivation ================================= @@ -30,15 +30,15 @@ * IronPython, Jython - bound to specific VM * Separate language specification from low-level details, - such as gc or just in time compilation + such as GC or just in time compilation -* Psyco hard to maintain +* Psyco and Stackless Python hard to maintain PyPy - user motivation ======================= * One shall never be forced to write anything in C - for performance reasons (with exception to embedded + for performance reasons (with some exceptions: embedded devices etc.) * Just-in-time compiler should make number-crunching @@ -60,13 +60,13 @@ ======================= * We can compile to C and LLVM including threads (GIL), - stackless (but not both), different gcs and all modules + stackless (but not both), different GCs and all modules * We can compile to CLI and JVM with reduced set of modules, no threads * Some bindings to .NET for CLI, working on getting - Java libraries to JVM + Java libraries to the JVM PyPy Status of speed in PyPy ======================= @@ -84,7 +84,7 @@ * Even more needs to happen -* If your problem is similiar enough to counting fibonnaci numbers, +* If your problem is similiar enough to counting Fibonacci numbers, we're as fast as psyco * PyPy's JIT is way easier to extend (think PPC, think 64 bit, @@ -93,15 +93,15 @@ RPython ======= -* The static subset of Python which we user for implementing +* The static subset of Python which we used for implementing the interpreter -* Our compiler toolchain analyzes RPython (ie interpreter source code, +* Our compiler toolchain analyzes RPython (i.e. interpreter source code, like C), not the user program -* Our interpreter is normal Python interpreter +* Our interpreter is a "normal Python" interpreter -* User has nothing to do with RPython +* The user has nothing to do with RPython RPython (2) =========== @@ -114,11 +114,13 @@ * It's fast, helps us not to code in C -* Ideally, JIT will achieve same level of speed +* Ideally, our JIT will achieve the same level of speed RPython - language ================== +* It's high level but only convenient if you want to write interpreters :-) + * Usually tons of metaprogramming * Like C++ - you can write books about tricks @@ -151,11 +153,11 @@ PyPy - JIT future ================= -* A lot of work happening (demos on sunday) +* A lot of work happening (demos on Sunday) -* Short term goal - support for floats, better assembler +* Short term goal - more general Python programs seeing speedups -* More general Python programs seeing speedups +* Machine code backend: need support for floats, better assembler * A lot of benchmarking and tweaking From pypy-svn at codespeak.net Tue Mar 11 12:09:42 2008 From: pypy-svn at codespeak.net (pypy-svn at codespeak.net) Date: Tue, 11 Mar 2008 12:09:42 +0100 (CET) Subject: [pypy-svn] MensHealth id 9834422 Message-ID: <20080311130911.12935.qmail@pD95F6CDE.dip.t-dialin.net> An HTML attachment was scrubbed... URL: From arigo at codespeak.net Tue Mar 11 12:26:55 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 11 Mar 2008 12:26:55 +0100 (CET) Subject: [pypy-svn] r52374 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080311112655.2819216842C@codespeak.net> Author: arigo Date: Tue Mar 11 12:26:53 2008 New Revision: 52374 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: An ambitious test about what should occur in a hotpath run. Not sure how to write more fined-grained tests yet. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Tue Mar 11 12:26:53 2008 @@ -1,4 +1,5 @@ -from pypy.rlib.jit import jit_merge_point, can_enter_jit, we_are_jitted +import py +from pypy.rlib.jit import jit_merge_point, can_enter_jit from pypy.jit.rainbow.test import test_interpreter from pypy.jit.rainbow.hotpath import EntryPointsRewriter from pypy.jit.hintannotator.policy import HintAnnotatorPolicy @@ -8,6 +9,9 @@ novirtualcontainer=True, hotpath=True) +class Exit(Exception): + def __init__(self, result): + self.result = result class TestHotPath(test_interpreter.InterpretationTest): type_system = 'lltype' @@ -26,19 +30,17 @@ return llinterp.eval_graph(graph, main_args) def test_simple_loop(self): - class Exit(Exception): - def __init__(self, result): - self.result = result - + py.test.skip("in-progress") + # there are no greens in this test def ll_function(n): n1 = n * 2 total = 0 - while n1 > 0: + while True: can_enter_jit(red=(n1, total)) jit_merge_point(red=(n1, total)) - if we_are_jitted(): - total += 1000 total += n1 + if n1 <= 1: + break n1 -= 1 raise Exit(total) @@ -48,5 +50,38 @@ except Exit, e: return e.result - res = self.run(main, [2, 5], threshold=7) - assert res == 210 + 14*1000 + res = self.run(main, [2, 5], threshold=8) + assert res == main(2, 5) + self.check_traces([ + # running non-JITted leaves the initial profiling traces + # recorded by jit_may_enter(). We see the values of n1 and total. + "jit_not_entered 20 0", + "jit_not_entered 19 20", + "jit_not_entered 18 39", + "jit_not_entered 17 57", + "jit_not_entered 16 74", + "jit_not_entered 15 90", + "jit_not_entered 14 105", + # on the start of the next iteration, compile the 'total += n1' + "jit_enter", + "pause at hotsplit", + # execute the compiled machine code until the 'n1 <= 1'. + # It finishes in the fallback interpreter 7 times + "run_machine_code 13 119", "fallback_interp", "fb_leave 12 132", + "run_machine_code 12 132", "fallback_interp", "fb_leave 11 144", + "run_machine_code 11 144", "fallback_interp", "fb_leave 10 155", + "run_machine_code 10 155", "fallback_interp", "fb_leave 9 165", + "run_machine_code 9 165", "fallback_interp", "fb_leave 8 174", + "run_machine_code 8 174", "fallback_interp", "fb_leave 7 182", + "run_machine_code 7 182", "fallback_interp", "fb_leave 6 189", + "run_machine_code 6 189", + # now that we know which path is hot (i.e. "staying in the loop"), + # it gets compiled + "jit_resume", + "done at jit_merge_point", + # execution continues purely in machine code, from the "n1 <= 1" + # test which triggered the "jit_resume" + "resume_machine_code", + # finally, go back the fallback interpreter when "n1 <= 1" is True + "fallback_interp", + "fb_raise Exit"]) From fijal at codespeak.net Tue Mar 11 13:37:42 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 11 Mar 2008 13:37:42 +0100 (CET) Subject: [pypy-svn] r52375 - pypy/extradoc/talk/pycon2008 Message-ID: <20080311123742.3CF2916847B@codespeak.net> Author: fijal Date: Tue Mar 11 13:37:40 2008 New Revision: 52375 Modified: pypy/extradoc/talk/pycon2008/status.txt Log: Elaborate on examples Modified: pypy/extradoc/talk/pycon2008/status.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/status.txt (original) +++ pypy/extradoc/talk/pycon2008/status.txt Tue Mar 11 13:37:40 2008 @@ -27,7 +27,7 @@ * CPython is nice, but not very flexible -* IronPython, Jython - bound to specific VM +* IronPython, Jython - bound to the specific VM * Separate language specification from low-level details, such as GC or just in time compilation @@ -129,15 +129,52 @@ XXX this slides needs to fit somewhere -Example of useful feature - sanboxing -===================================== +Example of useful feature - sandboxing +====================================== -XXX fill +* we analyze interpreter source (not user code) for + all external function calls -Example of useful feature - tproxy & distribution -================================================= +* we replace them all with stubs interacting only with + stdin/stdout -XXX fill +* small piece of code to trust (no worry about 3rd party modules + or whatever) + +* very flexible policy + +* special switches for buffer overflows and common + errors in interpreters (disregard to user code!) + +* can work as well with smalltalk or prolog vm (XXX kill this?) + +XXX demo + +Example of useful feature - tproxy +=================================== + +* app-level code for controlling behavior of + any type (even frames or tracebacks) + +* very similiar concept to .NET VM transparent + proxy + +XXX demo + +Example of useful feature - distribution +========================================= + +* very simple distribution protocol built + on top of transparent proxy + +* done in smalltalk in 70s + +* can work on any types, so you can + raise remote traceback and everything will be fine + +* nice experiment, few lines of code (XXX how many exactly?) + +XXX demo PyPy - future ============= From fijal at codespeak.net Tue Mar 11 13:38:19 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 11 Mar 2008 13:38:19 +0100 (CET) Subject: [pypy-svn] r52376 - pypy/extradoc/talk/pycon2008 Message-ID: <20080311123819.7E9C416847B@codespeak.net> Author: fijal Date: Tue Mar 11 13:38:18 2008 New Revision: 52376 Added: pypy/extradoc/talk/pycon2008/pytest.txt (contents, props changed) Log: py.test talk draft Added: pypy/extradoc/talk/pycon2008/pytest.txt ============================================================================== --- (empty file) +++ pypy/extradoc/talk/pycon2008/pytest.txt Tue Mar 11 13:38:18 2008 @@ -0,0 +1,133 @@ + +XXX order of slides is a bit random, I will reorder them + +=========================================== +py.test - rapid testing with minimal effort +=========================================== + +:authors: Maciej Fijalkowski, Holger Krekel (merlinux GmbH), Brian Dorsey +:date: XXX +XXX fill details + +Intro +========== + +* if you think 5 lines are more than 2 + +* minimal boilerplate approach + +* cross-project testing tool + +* developed partly for purposes of PyPy + +Writing tests with py.test +=========================== + +* almost identical to nose + +* def test_one(): defines test function + +* class TestClass: defines test class + +* setup/teardown on many layers (module, class, function) + +Automatic test collection +========================== + +* no need of specific test runners + +* simply running py.test is enough + +* py.test --collectonly to show all tests to run + +XXX demo of --collectonly + +assert by assert +================= + +* no self.assertEqual, self.failUnlessEqual and friends + +* assert x == 3 is fine enough + +* assert reinterpretation (XXX demo) + +stdout/err capturing +===================== + +* no point in showing output of working tests + +* options to control + +test selection +=============== + +* -k selects tests + +* -k classname.methodname works as well (XXX trunk only???) + +* -k -name selects all but name + +* multiple -k are such as "and" operator + +installation +============= + +* easy_install pylib XXX check + +* run py.test on your testing directory + +* you can checkout svn trunk directory for + new cool features + +ad-hoc test distribution +========================= + +* done over py.execnet + +* can connect over Popen, Ssh, socket... + +* rsyncs local dir, no need of doing it manually + +XXX demo + +web reporter +============= + +* useful for running distributed tests + +* still needs some work (any volunteer?) + +extending +============== + +* conftest.py does the "magic" + +* you can add options per-project (XXX demo) + +* you can change the way tests are run (validating ReST, + running ecma test suite, etc.) + +pypy extenstions +================= + +* we use py.test extensively in pypy + +* few side-projects, buildbot hooks, htmlconftest + +extending - reporters +========================= + +* parsing output is not any fun in general + +* reporter hooks (trunk only) + +XXX demo + +future +========== + +* 0.9 was Feb 2007, so releasing 1.0 soon + +* cleanup a bit, more plugin architecture + +* ... From fijal at codespeak.net Tue Mar 11 13:47:23 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 11 Mar 2008 13:47:23 +0100 (CET) Subject: [pypy-svn] r52377 - pypy/branch/jit-refactoring/pypy/lang/js/test Message-ID: <20080311124723.0C5BD1684C6@codespeak.net> Author: fijal Date: Tue Mar 11 13:47:21 2008 New Revision: 52377 Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py Log: Skip this test. Needs further looking inside. Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py Tue Mar 11 13:47:21 2008 @@ -600,5 +600,6 @@ assertv("var x = new Boolean; x.toString();", 'false') def test_pypy_repr(): + py.test.skip("I don't understand, but it does not work") assertv("pypy_repr(3);", 'W_IntNumber') assertv("pypy_repr(3.0);", 'W_FloatNumber') From fijal at codespeak.net Tue Mar 11 13:48:12 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 11 Mar 2008 13:48:12 +0100 (CET) Subject: [pypy-svn] r52378 - pypy/branch/jit-refactoring/pypy/lang/js Message-ID: <20080311124812.5D1231684CA@codespeak.net> Author: fijal Date: Tue Mar 11 13:48:11 2008 New Revision: 52378 Modified: pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py Log: kill fast_lookup path. It was broken anyway and I think this needs further simplification first. Tests are passing. Modified: pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py Tue Mar 11 13:48:11 2008 @@ -488,24 +488,14 @@ return str(self.list_w) class ExecutionContext(object): - def create_fast_lookup(self, scope_elem): - fast_lookup = {} - for elem, val in self.scope[-1].propdict.iteritems(): - if val.dd: - fast_lookup[elem] = W_Reference(elem, self.scope[-1]) - return fast_lookup - def __init__(self, scope, this=None, variable=None, debug=False, jsproperty=None): assert scope is not None - assert len(scope) == 1 self.scope = scope if this is None: self.this = scope[-1] else: self.this = this - self.fast_lookup = self.create_fast_lookup(scope[-1]) - self.scope_lookup = [self.fast_lookup] # create a fast lookup if variable is None: self.variable = self.scope[0] @@ -533,20 +523,12 @@ # XXX O(n^2) self.scope.insert(0, obj) self.variable = obj - self.fast_lookup = self.create_fast_lookup(obj) - self.scope_lookup.append(self.fast_lookup) def pop_object(self): """remove the last pushed object""" - self.scope_lookup.pop() - self.fast_lookup = self.scope_lookup[-1] return self.scope.pop(0) def resolve_identifier(self, identifier): - try: - return self.fast_lookup[identifier] - except KeyError: - pass for obj in self.scope: assert isinstance(obj, W_PrimitiveObject) if obj.HasProperty(identifier): From fijal at codespeak.net Tue Mar 11 17:57:39 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 11 Mar 2008 17:57:39 +0100 (CET) Subject: [pypy-svn] r52382 - in pypy/branch/jit-refactoring/pypy/lang/js: . doc test Message-ID: <20080311165739.D3526168552@codespeak.net> Author: fijal Date: Tue Mar 11 17:57:37 2008 New Revision: 52382 Added: pypy/branch/jit-refactoring/pypy/lang/js/doc/ pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt (contents, props changed) pypy/branch/jit-refactoring/pypy/lang/js/jscode.py (contents, props changed) Modified: pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Log: Some general chaos. Almost nothing is working right now. Added: pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt ============================================================================== --- (empty file) +++ pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt Tue Mar 11 17:57:37 2008 @@ -0,0 +1,44 @@ +Bytecode specification for the pypy javascript interpreter. + +We implement stack-based machine. We'll likely extend the bytecode for +performance. + +LOAD_INTCONSTANT +LOAD_FLOATCONSTANT +LOAD_STRINGCONSTANT +... + +LOAD_VARIABLE + +simple identifier dereferencing + +LOAD_UNDEFINED, LOAD_NULL + +STORE + +stores the last value on stack into identifierx + +Arithmetic binary operations: +(all pops two values and pushes on stack the result) + +ADD, SUB, MUL, DIV, MOD +BITXOR, BITOR, BITAND +AND, OR, EQ, NE, IS, ISNOT, GT, GE, LT, LE, +RSHIT, URSHIFT, LSHIFT + +Unary arithmetic operations: +(pops one value and pushes result to the stack) + +BITNOT, +NOT, UPLUS, UMINUS + +PREDECR, POSTDECR, PREINCR, POSTINCR +decrement and increment (++, --) prefix and postfix + +control flow: + +XXX + +function control flow: + +DECLARE_FUNCTION Added: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py ============================================================================== --- (empty file) +++ pypy/branch/jit-refactoring/pypy/lang/js/jscode.py Tue Mar 11 17:57:37 2008 @@ -0,0 +1,88 @@ + +from pypy.lang.js.jsobj import W_IntNumber + +class JsCode(object): + """ That object stands for code of a single javascript function + """ + def __init__(self): + self.opcodes = [] + + def emit(self, operation, args): + try: + self.opcodes.append(OpcodeMap[operation](args)) + except KeyError: + raise ValueError("Unknown opcode %s" % (operation,)) + + def __repr__(self): + return "\n".join([repr(i) for i in self.opcodes]) + + def __eq__(self, list_of_opcodes): + if len(list_of_opcodes) != len(self.opcodes): + return False + return all([i == j for i, j in zip(self.opcodes, list_of_opcodes)]) + +class Opcode(object): + def __init__(self, args): + raise NotImplementedError("Purely abstract") + + def eval(self, ctx, stack): + """ Execute in context ctx + """ + raise NotImplementedError + + def __eq__(self, other): + return repr(self) == other + +class BaseBinaryComparison(Opcode): + def eval(self, ctx): + s2 = self.left.eval(ctx).GetValue() + s4 = self.right.eval(ctx).GetValue() + return self.decision(ctx, s2, s4) + + def decision(self, ctx, op1, op2): + raise NotImplementedError + +class BaseBinaryBitwiseOp(Opcode): + def eval(self, ctx): + s5 = self.left.eval(ctx).GetValue().ToInt32() + s6 = self.right.eval(ctx).GetValue().ToInt32() + return self.decision(ctx, s5, s6) + + def decision(self, ctx, op1, op2): + raise NotImplementedError + +class Undefined(Opcode): + def eval(self, ctx): + return w_Undefined + + def execute(self, ctx): + return w_Undefined + +class LOAD_INTCONSTANT(Opcode): + def __init__(self, args): + assert len(args) == 1 + self.w_intvalue = W_IntNumber(int(args[0])) + + def eval(self, ctx): + return self.w_intvalue + + def __repr__(self): + return 'LOAD_INTCONSTANT %s' % (self.w_intvalue.intval,) + +class LOAD_VARIABLE(Opcode): + def __init__(self, args): + assert len(args) == 1 + self.identifier = args[0] + + def eval(self, ctx): + return ctx.resolve_identifier(self.identifier) + + def __repr__(self): + return 'LOAD_VARIABLE "%s"' % (self.identifier,) + +OpcodeMap = {} + +for name, value in locals().items(): + if name.upper() == name and issubclass(value, Opcode): + OpcodeMap[name] = value + Modified: pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py Tue Mar 11 17:57:37 2008 @@ -535,7 +535,6 @@ return W_Reference(identifier, obj) return W_Reference(identifier) - def global_context(w_global): assert isinstance(w_global, W_PrimitiveObject) Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Tue Mar 11 17:57:37 2008 @@ -34,16 +34,9 @@ Initializes the content from the AST specific for each node type """ raise NotImplementedError - - def eval(self, ctx): - """ - Used for expression evaluation - """ - raise NotImplementedError - def execute(self, ctx): - """ - Called on statament execution + def emit(self, bytecode): + """ Emits bytecode """ raise NotImplementedError @@ -72,7 +65,6 @@ class UnaryOp(Expression): def __init__(self, pos, expr, postfix=False): self.pos = pos - #assert isinstance(expr, Node) self.expr = expr self.postfix = postfix @@ -81,36 +73,25 @@ self.pos = pos self.left = left self.right = right - -class BinaryComparisonOp(BinaryOp): - def eval(self, ctx): - s2 = self.left.eval(ctx).GetValue() - s4 = self.right.eval(ctx).GetValue() - return self.decision(ctx, s2, s4) - - def decision(self, ctx, op1, op2): - raise NotImplementedError -class BinaryBitwiseOp(BinaryOp): - def eval(self, ctx): - s5 = self.left.eval(ctx).GetValue().ToInt32() - s6 = self.right.eval(ctx).GetValue().ToInt32() - return self.decision(ctx, s5, s6) - - def decision(self, ctx, op1, op2): - raise NotImplementedError + def emit(self, bytecode): + self.left.emit(bytecode) + self.right.emit(bytecode) + bytecode.emit(self.operation_name) class Undefined(Statement): - def eval(self, ctx): - return w_Undefined - - def execute(self, ctx): - return w_Undefined - -astundef = Undefined(Position()) + def emit(self, bytecode): + bytecode.emit('LOAD_UNDEFINED') -class PropertyInit(BinaryOp): - pass +class PropertyInit(Expression): + def __init__(self, identifier, expr): + self.identifier = identifier + assert isinstance(identifier, str) + self.expr = expr + + def emit(self, bytecode): + self.expr.emit(bytecode) + bytecode.emit('STORE', [self.identifier]) class Array(ListOp): def eval(self, ctx): @@ -175,7 +156,7 @@ raise e -class BitwiseAnd(BinaryBitwiseOp): +class BitwiseAnd(BinaryOp): def decision(self, ctx, op1, op2): return W_IntNumber(op1&op2) @@ -186,13 +167,13 @@ return W_IntNumber(~op1) -class BitwiseOr(BinaryBitwiseOp): +class BitwiseOr(BinaryOp): def decision(self, ctx, op1, op2): return W_IntNumber(op1|op2) -class BitwiseXor(BinaryBitwiseOp): +class BitwiseXor(BinaryOp): def decision(self, ctx, op1, op2): return W_IntNumber(op1^op2) @@ -277,7 +258,7 @@ self.name = name self.body = body self.params = params - + def eval(self, ctx): proto = ctx.get_global().Get('Function').Get('prototype') w_func = W_Object(ctx=ctx, Prototype=proto, Class='Function', callfunc=self) @@ -295,12 +276,12 @@ def __init__(self, pos, name): self.pos = pos self.name = name - - def eval(self, ctx): - return ctx.resolve_identifier(self.name) - - def get_literal(self): - return self.name + + def emit(self, bytecode): + bytecode.emit('LOAD_VARIABLE', [self.name]) + +# def get_literal(self): +# return self.name class This(Identifier): @@ -308,7 +289,7 @@ class If(Statement): - def __init__(self, pos, condition, thenpart, elsepart=astundef): + def __init__(self, pos, condition, thenpart, elsepart=None): self.pos = pos self.condition = condition self.thenPart = thenpart @@ -375,7 +356,7 @@ return s4 -class Ge(BinaryComparisonOp): +class Ge(BinaryOp): def decision(self, ctx, op1, op2): s5 = ARC(ctx, op1, op2) if s5 in (-1, 1): @@ -384,7 +365,7 @@ return W_Boolean(True) -class Gt(BinaryComparisonOp): +class Gt(BinaryOp): def decision(self, ctx, op1, op2): s5 = ARC(ctx, op2, op1) if s5 == -1: @@ -393,7 +374,7 @@ return W_Boolean(s5) -class Le(BinaryComparisonOp): +class Le(BinaryOp): def decision(self, ctx, op1, op2): s5 = ARC(ctx, op2, op1) if s5 in (-1, 1): @@ -402,7 +383,7 @@ return W_Boolean(True) -class Lt(BinaryComparisonOp): +class Lt(BinaryOp): def decision(self, ctx, op1, op2): s5 = ARC(ctx, op1, op2) if s5 == -1: @@ -417,19 +398,19 @@ # ############################################################################## -class Ursh(BinaryComparisonOp): +class Ursh(BinaryOp): def decision(self, ctx, op1, op2): a = op1.ToUInt32() b = op2.ToUInt32() return W_IntNumber(a >> (b & 0x1F)) -class Rsh(BinaryComparisonOp): +class Rsh(BinaryOp): def decision(self, ctx, op1, op2): a = op1.ToInt32() b = op2.ToUInt32() return W_IntNumber(a >> intmask(b & 0x1F)) -class Lsh(BinaryComparisonOp): +class Lsh(BinaryOp): def decision(self, ctx, op1, op2): a = op1.ToInt32() b = op2.ToUInt32() @@ -499,11 +480,11 @@ r = x.ToNumber() == y.ToNumber() return r -class Eq(BinaryComparisonOp): +class Eq(BinaryOp): def decision(self, ctx, op1, op2): return W_Boolean(AEC(ctx, op1, op2)) -class Ne(BinaryComparisonOp): +class Ne(BinaryOp): def decision(self, ctx, op1, op2): return W_Boolean(not AEC(ctx, op1, op2)) @@ -540,16 +521,16 @@ return x.ToBoolean() == x.ToBoolean() return x == y -class StrictEq(BinaryComparisonOp): +class StrictEq(BinaryOp): def decision(self, ctx, op1, op2): return W_Boolean(SEC(ctx, op1, op2)) -class StrictNe(BinaryComparisonOp): +class StrictNe(BinaryOp): def decision(self, ctx, op1, op2): return W_Boolean(not SEC(ctx, op1, op2)) -class In(BinaryComparisonOp): +class In(BinaryOp): """ The in operator, eg: "property in object" """ @@ -759,8 +740,8 @@ self.pos = pos self.num = num - def eval(self, ctx): - return W_IntNumber(int(self.num)) + def emit(self, bytecode): + bytecode.emit('LOAD_INTCONSTANT', [self.num]) class FloatNumber(BaseNumber): def __init__(self, pos, num): Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Tue Mar 11 17:57:37 2008 @@ -6,6 +6,7 @@ from pypy.rlib.parsing.tree import RPythonVisitor from pypy.lang.js.jsobj import W_Object, global_context, ThrowException, empty_context from pypy.lang.js.astbuilder import ASTBuilder +from pypy.lang.js.jscode import JsCode from pypy import conftest import sys @@ -279,17 +280,19 @@ class TestToASTExpr(BaseGrammarTest): def setup_class(cls): cls.parse = parse_func('expression') - cls.ctx = empty_context() def to_ast(self, s): return ASTBuilder().dispatch(self.parse(s)) - def eval_expr(self, s): + def compile(self, s): ast = self.to_ast(s) - w_Global = W_Object() - w_Object = W_Object(Prototype=W_Object()) - w_Global.Put('Object', w_Object) - return ast.eval(global_context(w_Global)) + bytecode = JsCode() + ast.emit(bytecode) + return bytecode +# w_Global = W_Object() +# w_Object = W_Object(Prototype=W_Object()) +# w_Global.Put('Object', w_Object) +# return ast.eval(global_context(w_Global)) def test_get_pos(self): from pypy.lang.js import operations @@ -305,10 +308,12 @@ assert pos.start == 0 def test_primaryexpression(self): - w_num = self.eval_expr('(6)') - assert w_num.ToNumber() == 6 - w_num = self.eval_expr('((((6))))') - assert w_num.ToNumber() == 6 + bytecode = self.compile('(6)') + assert bytecode == ['LOAD_INTCONSTANT 6'] + bytecode = self.compile('((((6))))') + assert bytecode == ['LOAD_INTCONSTANT 6'] + bytecode = self.compile('x') + assert bytecode == ['LOAD_VARIABLE "x"'] # w_array = self.eval_expr('[1,2,3]') # assert w_array.ToString(self.ctx) == '1,2,3' w_identifier = self.eval_expr('x') From arigo at codespeak.net Tue Mar 11 18:47:56 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 11 Mar 2008 18:47:56 +0100 (CET) Subject: [pypy-svn] r52387 - in pypy/branch/jit-hotpath/pypy/jit: codegen rainbow rainbow/test Message-ID: <20080311174756.85522168573@codespeak.net> Author: arigo Date: Tue Mar 11 18:47:56 2008 New Revision: 52387 Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (contents, props changed) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/model.py pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: In-progress. Copying code from portal.py and promote(). Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/model.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/model.py Tue Mar 11 18:47:56 2008 @@ -368,6 +368,10 @@ # 'base' is the frame stack pointer captured by the operation # generated by genop_get_frame_base().""" + #@staticmethod + #def genconst_from_frame_var(kind, base, info, index): + # """Same as read_frame_var(), but returns a GenConst.""" + @staticmethod def get_python_callable(FUNC, gv): """NOT_RPYTHON Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Tue Mar 11 18:47:56 2008 @@ -318,7 +318,8 @@ self.register_redvar(arg, verbose=False) for arg in greens: self.register_greenvar(arg, verbose=False) - self.insert_merges(block) + if not self.hannotator.policy.hotpath: + self.insert_merges(block) for op in block.operations: self.serialize_op(op) self.insert_exits(block) @@ -366,7 +367,9 @@ falserenaming = self.insert_renaming(linkfalse) truerenaming = self.insert_renaming(linktrue) - if reverse is not None: + if self.hannotator.policy.hotpath and color == "red": + self.emit("red_hot_goto_iftrue") + elif reverse is not None: ptrindex = self.serialize_oparg("red", srcargs[0]) self.emit("red_goto_ifptrnonzero") self.emit(reverse) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 11 18:47:56 2008 @@ -1,12 +1,13 @@ from pypy.objspace.flow.model import Constant, Variable, SpaceOperation from pypy.rpython.annlowlevel import llhelper -from pypy.rpython.lltypesystem import lltype +from pypy.rpython.lltypesystem import lltype, lloperation from pypy.rpython.llinterp import LLInterpreter from pypy.rpython.extregistry import ExtRegistryEntry from pypy.rlib.unroll import unrolling_iterable from pypy.rlib.objectmodel import we_are_translated from pypy.jit.hintannotator.model import originalconcretetype from pypy.jit.timeshifter import rvalue +from pypy.jit.rainbow import rhotpath class EntryPointsRewriter: @@ -28,6 +29,7 @@ def rewrite_all(self): self.make_args_specification() self.make_enter_function() + self.update_interp() for graph in self.hintannotator.base_translator.graphs: for block in graph.iterblocks(): for op in block.operations: @@ -76,6 +78,11 @@ jit_may_enter._always_inline = True self.jit_enter_fn = jit_may_enter + def update_interp(self): + ERASED = self.RGenOp.erasedType(lltype.Bool) + self.interpreter.bool_hotpromotiondesc = rhotpath.HotPromotionDesc( + ERASED, self.interpreter, self.threshold) + def rewrite_can_enter_jit(self, graph, block, index): if not self.translate_support_code: # this case is used for most tests: the jit stuff should be run @@ -104,29 +111,20 @@ class HotEnterState: def __init__(self): - self.graph_compilation_queue = [] self.machine_code = lltype.nullptr(rewriter.RESIDUAL_FUNCTYPE) self.counter = 0 - def compile_more_functions(self): - while self.graph_compilation_queue: - top_jitstate, greenargs, redargs = self.graph_compilation_queue.pop() - builder = top_jitstate.curbuilder - builder.start_writing() - top_jitstate = rewriter.interpreter.run(top_jitstate, - rewriter.entryjitcode, - greenargs, redargs) - if top_jitstate is not None: - rewriter.interpreter.finish_jitstate_gray( - rewriter.sigtoken) - builder.end() - builder.show_incremental_progress() - def compile(self): - rgenop = rewriter.interpreter.rgenop + try: + self._compile() + except Exception, e: + rhotpath.report_compile_time_exception(e) + + def _compile(self): + interp = rewriter.interpreter + rgenop = interp.rgenop builder, gv_generated, inputargs_gv = rgenop.newgraph( rewriter.sigtoken, "residual") - top_jitstate = rewriter.interpreter.fresh_jitstate(builder) greenargs = () redargs = () @@ -139,9 +137,10 @@ greenargs = list(greenargs) redargs = list(redargs) - self.graph_compilation_queue.append((top_jitstate, - greenargs, redargs)) - self.compile_more_functions() + jitstate = interp.fresh_jitstate(builder) + rhotpath.setup_jitstate(interp, jitstate, greenargs, redargs, + rewriter.entryjitcode, rewriter.sigtoken) + rhotpath.compile(interp) FUNCPTR = lltype.Ptr(rewriter.RESIDUAL_FUNCTYPE) self.machine_code = gv_generated.revealconst(FUNCPTR) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Tue Mar 11 18:47:56 2008 @@ -3,6 +3,7 @@ from pypy.rlib.objectmodel import we_are_translated, CDefinedIntSymbolic from pypy.jit.timeshifter import rtimeshift, rcontainer, rvalue from pypy.jit.timeshifter.greenkey import empty_key, GreenKey, newgreendict +from pypy.jit.rainbow import rhotpath from pypy.rpython.lltypesystem import lltype, llmemory DEBUG_JITCODES = True # store a dump() of all JitCodes @@ -804,11 +805,19 @@ return true return false + # ____________________________________________________________ + # opcodes used by the 'hotpath' policy + @arguments() def opimpl_jit_merge_point(self): # xxx in-progress pass + @arguments("red", "jumptarget") + def opimpl_red_hot_goto_iftrue(self, switchbox, target): + rhotpath.hotsplit(self.jitstate, self.bool_hotpromotiondesc, switchbox) + assert False, "unreachable" + # ____________________________________________________________ # construction-time interface Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Tue Mar 11 18:47:56 2008 @@ -0,0 +1,175 @@ +""" +RPython support code for the hotpath policy. +""" + +from pypy.jit.timeshifter import rtimeshift +from pypy.rlib.objectmodel import we_are_translated +from pypy.rpython.annlowlevel import cachedtype, base_ptr_lltype +from pypy.rpython.annlowlevel import llhelper +from pypy.rpython.lltypesystem import lltype, llmemory + +import py +from pypy.tool.ansi_print import ansi_log +log = py.log.Producer('hotpath') +py.log.setconsumer('hotpath', ansi_log) + + +def setup_jitstate(interp, jitstate, greenargs, redargs, + bytecode, graphsigtoken): + frame = rtimeshift.VirtualFrame(None, None) + interp.jitstate = jitstate + interp.frame = jitstate.frame = frame + interp.frame.pc = 0 + interp.frame.bytecode = bytecode + interp.frame.local_boxes = redargs + interp.frame.local_green = greenargs + interp.graphsigtoken = graphsigtoken + +def leave_graph(interp): + jitstate = interp.jitstate + exceptiondesc = interp.exceptiondesc + builder = jitstate.curbuilder + #for virtualizable_box in jitstate.virtualizables: + # assert isinstance(virtualizable_box, rvalue.PtrRedBox) + # content = virtualizable_box.content + # assert isinstance(content, rcontainer.VirtualizableStruct) + # content.store_back(jitstate) + exceptiondesc.store_global_excdata(jitstate) + jitstate.curbuilder.finish_and_return(interp.graphsigtoken, None) + +def compile(interp): + jitstate = interp.jitstate + builder = jitstate.curbuilder + builder.start_writing() + try: + try: + interp.bytecode_loop() + except GenerateReturn: + pass + except FinishedCompiling: + pass + else: + leave_graph(interp) + builder.end() + builder.show_incremental_progress() + +def report_compile_time_exception(e): + if not we_are_translated(): + import sys, pdb, traceback + msg = str(e) + if msg: msg = ': ' + msg + msg = e.__class__.__name__ + msg + log.ERROR("*** compilation-time error ***") + log.ERROR(msg) + traceback.print_exc() + print >> sys.stderr + pdb.post_mortem(sys.exc_info()[2]) + # XXX I think compile-time errors don't have to be fatal + # any more + lloperation.llop.debug_fatalerror( + lltype.Void, "compilation-time error %s" % e) + +# ____________________________________________________________ + +class FinishedCompiling(Exception): + pass + +class GenerateReturn(Exception): + pass + +class MesurePoint(object): + pass + +class HotPromotionDesc: + __metaclass__ = cachedtype + + def __init__(self, ERASED, interpreter, threshold): + self.exceptiondesc = interpreter.exceptiondesc + + def ll_reach_fallback_point(fallback_point_ptr, value, framebase): + try: + promotion_point = _cast_base_ptr_to_promotion_point( + promotion_point_ptr) + path = [None] + root = promotion_point.promotion_path.follow_path(path) + gv_value = root.rgenop.genconst(value) + resuminginfo = ResumingInfo(promotion_point, gv_value, path) + root.reach_fallback_point(resuminginfo) + interpreter.portalstate.compile_more_functions() + except Exception, e: + report_compile_time_exception(e) + self.ll_reach_fallback_point = ll_reach_fallback_point + ll_reach_fallback_point._debugexc = True + + FUNCTYPE = lltype.FuncType([base_ptr_lltype(), ERASED, + llmemory.Address], lltype.Void) + FUNCPTRTYPE = lltype.Ptr(FUNCTYPE) + self.FUNCPTRTYPE = FUNCPTRTYPE + self.sigtoken = interpreter.rgenop.sigToken(FUNCTYPE) + + def get_gv_reach_fallback_point(builder): + fnptr = llhelper(FUNCPTRTYPE, ll_reach_fallback_point) + # ^^^ the llhelper cannot be attached on 'self' directly, because + # the translator needs to see its construction done by RPython code + return builder.rgenop.genconst(fnptr) + self.get_gv_reach_fallback_point = get_gv_reach_fallback_point + + def _freeze_(self): + return True + + +class FallbackPoint(object): + falsepath_counter = 0 # -1 after this path was compiled + truepath_counter = 0 # -1 after this path was compiled + + def __init__(self, jitstate, flexswitch, frameinfo): + self.saved_jitstate = jitstate + self.flexswitch = flexswitch + self.frameinfo = frameinfo + # ^^^ 'frameinfo' describes where the machine code stored all + # its GenVars, so that we can fish these values to pass them + # to the fallback interpreter + + # hack for testing: make the llinterpreter believe this is a Ptr to base + # instance + _TYPE = base_ptr_lltype() + + +def hotsplit(jitstate, hotpromotiondesc, switchbox): + # produce a Bool flexswitch for now + incoming = jitstate.enter_block() + switchblock = rtimeshift.enter_next_block(jitstate, incoming) + gv_switchvar = switchbox.genvar + incoming_gv = [box.genvar for box in incoming] + flexswitch, default_builder = jitstate.curbuilder.flexswitch(gv_switchvar, + incoming_gv) + jitstate.curbuilder = default_builder + # default case of the switch: + frameinfo = default_builder.get_frame_info(incoming_gv) + fbp = FallbackPoint(jitstate, flexswitch, frameinfo) + ll_fbp = fbp # XXX doesn't translate + gv_fbp = default_builder.rgenop.genconst(ll_fbp) + gv_switchvar = switchbox.genvar + gv_fnptr = hotpromotiondesc.get_gv_reach_fallback_point(default_builder) + gv_framebase = default_builder.genop_get_frame_base() + default_builder.genop_call(hotpromotiondesc.sigtoken, + gv_fnptr, + [gv_fbp, gv_switchvar, gv_framebase]) + # loop back to 'switchblock' unless an exception occurred + # (only "real" run-time exceptions should arrive here, not + # compile-time exceptions) + exceptiondesc = hotpromotiondesc.exceptiondesc + gv_exc_type = exceptiondesc.genop_get_exc_type(default_builder) + gv_occurred = default_builder.genop_ptr_nonzero( + exceptiondesc.exc_type_token, gv_exc_type) + excpath_builder = default_builder.jump_if_true(gv_occurred, []) + default_builder.finish_and_goto(incoming_gv, switchblock) + + jitstate.curbuilder = excpath_builder + excpath_builder.start_writing() + raise GenerateReturn + +# ____________________________________________________________ +# The fallback interp takes an existing suspended jitstate and +# actual values for the live red vars, and interprets the jitcode +# normally until it reaches the 'jit_merge_point' or raises. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Tue Mar 11 18:47:56 2008 @@ -82,6 +82,6 @@ # execution continues purely in machine code, from the "n1 <= 1" # test which triggered the "jit_resume" "resume_machine_code", - # finally, go back the fallback interpreter when "n1 <= 1" is True + # finally, go back to the fallback interp when "n1 <= 1" is True "fallback_interp", "fb_raise Exit"]) From arigo at codespeak.net Tue Mar 11 20:23:48 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 11 Mar 2008 20:23:48 +0100 (CET) Subject: [pypy-svn] r52390 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080311192348.3A7A2168561@codespeak.net> Author: arigo Date: Tue Mar 11 20:23:47 2008 New Revision: 52390 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Log: Roughly finished the FallbackPoint logic. Next missing piece is the fallback interpreter itself. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 11 20:23:47 2008 @@ -67,11 +67,14 @@ state = HotEnterState() def jit_may_enter(*args): - if not state.machine_code: - state.counter += 1 - if state.counter < self.threshold: + counter = state.counter + if counter >= 0: + counter += 1 + if counter < self.threshold: + state.counter = counter + return + if not state.compile(): return - state.compile() maybe_on_top_of_llinterp(self, state.machine_code)(*args) HotEnterState.compile.im_func._dont_inline_ = True @@ -112,13 +115,15 @@ class HotEnterState: def __init__(self): self.machine_code = lltype.nullptr(rewriter.RESIDUAL_FUNCTYPE) - self.counter = 0 + self.counter = 0 # -1 means "compiled" def compile(self): try: self._compile() + return True except Exception, e: rhotpath.report_compile_time_exception(e) + return False def _compile(self): interp = rewriter.interpreter @@ -144,6 +149,7 @@ FUNCPTR = lltype.Ptr(rewriter.RESIDUAL_FUNCTYPE) self.machine_code = gv_generated.revealconst(FUNCPTR) + self.counter = -1 # compiled return HotEnterState Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Tue Mar 11 20:23:47 2008 @@ -42,12 +42,11 @@ builder = jitstate.curbuilder builder.start_writing() try: - try: - interp.bytecode_loop() - except GenerateReturn: - pass + interp.bytecode_loop() except FinishedCompiling: pass + except GenerateReturn: + leave_graph(interp) else: leave_graph(interp) builder.end() @@ -64,10 +63,9 @@ traceback.print_exc() print >> sys.stderr pdb.post_mortem(sys.exc_info()[2]) - # XXX I think compile-time errors don't have to be fatal - # any more - lloperation.llop.debug_fatalerror( - lltype.Void, "compilation-time error %s" % e) + else: + msg = 'Note: the JIT got a compile-time exception: %s' % (e,) + lloperation.llop.debug_print(lltype.Void, msg) # ____________________________________________________________ @@ -85,24 +83,55 @@ def __init__(self, ERASED, interpreter, threshold): self.exceptiondesc = interpreter.exceptiondesc + self.gv_constant_one = interpreter.rgenop.constPrebuiltGlobal(1) def ll_reach_fallback_point(fallback_point_ptr, value, framebase): try: - promotion_point = _cast_base_ptr_to_promotion_point( - promotion_point_ptr) - path = [None] - root = promotion_point.promotion_path.follow_path(path) - gv_value = root.rgenop.genconst(value) - resuminginfo = ResumingInfo(promotion_point, gv_value, path) - root.reach_fallback_point(resuminginfo) - interpreter.portalstate.compile_more_functions() + fbp = fallback_point_ptr # XXX cast + assert lltype.typeOf(value) is lltype.Bool # XXX for now + if value: + counter = fbp.truepath_counter + else: + counter = fbp.falsepath_counter + assert counter >= 0, ( + "reaching a fallback point for an already-compiled path") + counter += 1 + + if counter >= threshold: + # this is a hot path, compile it + gv_value = fbp.getrgenop().genconst(value) + fbp.compile_hot_path() + if value: + fbp.truepath_counter = -1 # mean "compiled" + else: + fbp.falsepath_counter = -1 # mean "compiled" + # Done. We return 1, which causes our caller + # (machine code produced by hotsplit()) to loop back to + # the flexswitch and execute the newly-generated code. + return 1 + else: + # path is still cold + if value: + fbp.truepath_counter = counter + else: + fbp.falsepath_counter = counter + except Exception, e: report_compile_time_exception(e) + + # exceptions below at run-time exceptions, we let them propagate + fbp.run_fallback_interpreter(framebase) + # the fallback interpreter reached the next jit_merge_point(); + # we return 0, causing the machine code that called us to exit + # and go back to its own caller, which is jit_may_enter() from + # hotpath.py. + return 0 + self.ll_reach_fallback_point = ll_reach_fallback_point - ll_reach_fallback_point._debugexc = True + #ll_reach_fallback_point._debugexc = True FUNCTYPE = lltype.FuncType([base_ptr_lltype(), ERASED, - llmemory.Address], lltype.Void) + llmemory.Address], lltype.Signed) FUNCPTRTYPE = lltype.Ptr(FUNCTYPE) self.FUNCPTRTYPE = FUNCPTRTYPE self.sigtoken = interpreter.rgenop.sigToken(FUNCTYPE) @@ -123,6 +152,8 @@ truepath_counter = 0 # -1 after this path was compiled def __init__(self, jitstate, flexswitch, frameinfo): + # XXX we should probably trim down the jitstate once our caller + # is done with it, to avoid keeping too much stuff in memory self.saved_jitstate = jitstate self.flexswitch = flexswitch self.frameinfo = frameinfo @@ -130,6 +161,9 @@ # its GenVars, so that we can fish these values to pass them # to the fallback interpreter + def getrgenop(self): + return self.saved_jitstate.curbuilder.rgenop + # hack for testing: make the llinterpreter believe this is a Ptr to base # instance _TYPE = base_ptr_lltype() @@ -137,7 +171,7 @@ def hotsplit(jitstate, hotpromotiondesc, switchbox): # produce a Bool flexswitch for now - incoming = jitstate.enter_block() + incoming = jitstate.enter_block_sweep_virtualizables() switchblock = rtimeshift.enter_next_block(jitstate, incoming) gv_switchvar = switchbox.genvar incoming_gv = [box.genvar for box in incoming] @@ -152,21 +186,25 @@ gv_switchvar = switchbox.genvar gv_fnptr = hotpromotiondesc.get_gv_reach_fallback_point(default_builder) gv_framebase = default_builder.genop_get_frame_base() - default_builder.genop_call(hotpromotiondesc.sigtoken, - gv_fnptr, - [gv_fbp, gv_switchvar, gv_framebase]) - # loop back to 'switchblock' unless an exception occurred - # (only "real" run-time exceptions should arrive here, not - # compile-time exceptions) - exceptiondesc = hotpromotiondesc.exceptiondesc - gv_exc_type = exceptiondesc.genop_get_exc_type(default_builder) - gv_occurred = default_builder.genop_ptr_nonzero( - exceptiondesc.exc_type_token, gv_exc_type) - excpath_builder = default_builder.jump_if_true(gv_occurred, []) + gv_res = default_builder.genop_call(hotpromotiondesc.sigtoken, + gv_fnptr, + [gv_fbp, gv_switchvar, gv_framebase]) + # There are three ways the call above can return: + # * 1: continue running by looping back to 'switchblock' + # * 0: leave the machine code now, as with a return + # * exception: leave the machine code now, propagating the exception + # (only "real" run-time exceptions should arrive here, not + # compile-time exceptions) + # As a minor hack, we know by the way the exception transformer works + # that in the third case the return value we get is -1, so we can + # just leave the machine code if we can any value != 1. + gv_leave_flag = default_builder.genop2("int_ne", gv_res, + hotpromotiondesc.gv_constant_one) + leaving_builder = default_builder.jump_if_true(gv_leave_flag, []) default_builder.finish_and_goto(incoming_gv, switchblock) - jitstate.curbuilder = excpath_builder - excpath_builder.start_writing() + jitstate.curbuilder = leaving_builder + leaving_builder.start_writing() raise GenerateReturn # ____________________________________________________________ From arigo at codespeak.net Tue Mar 11 20:48:54 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 11 Mar 2008 20:48:54 +0100 (CET) Subject: [pypy-svn] r52395 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080311194854.0D7CF169DFC@codespeak.net> Author: arigo Date: Tue Mar 11 20:48:53 2008 New Revision: 52395 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Log: Typos in comment. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Tue Mar 11 20:48:53 2008 @@ -196,8 +196,8 @@ # (only "real" run-time exceptions should arrive here, not # compile-time exceptions) # As a minor hack, we know by the way the exception transformer works - # that in the third case the return value we get is -1, so we can - # just leave the machine code if we can any value != 1. + # that in the third case the gv_res we get is -1, so we can + # just leave the machine code if we get any value != 1. gv_leave_flag = default_builder.genop2("int_ne", gv_res, hotpromotiondesc.gv_constant_one) leaving_builder = default_builder.jump_if_true(gv_leave_flag, []) From arigo at codespeak.net Tue Mar 11 21:40:17 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 11 Mar 2008 21:40:17 +0100 (CET) Subject: [pypy-svn] r52396 - pypy/branch/jit-hotpath/pypy/jit/hintannotator Message-ID: <20080311204017.39029169E1B@codespeak.net> Author: arigo Date: Tue Mar 11 21:40:16 2008 New Revision: 52396 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Log: This is a no-op change, just some clarifications. Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Tue Mar 11 21:40:16 2008 @@ -20,6 +20,13 @@ return None def build_hotpath_types(self): + self.prepare_portal_graphs() + input_args_hs = [SomeLLAbstractConstant(v.concretetype, + {OriginFlags(): True}) + for v in self.portalgraph.getargs()] + return self.build_types(self.portalgraph, input_args_hs) + + def prepare_portal_graphs(self): # find the graph with the jit_merge_point() found_at = [] for graph in self.base_translator.graphs: @@ -29,9 +36,13 @@ if len(found_at) != 1: raise Exception("found %d graphs with a jit_merge_point()," " expected 1 (for now)" % len(found_at)) - portalgraph, _, _ = found_at[0] - # make a copy of the portalgraph before mutating it - portalgraph = copygraph(portalgraph) + origportalgraph, _, _ = found_at[0] + # + # We make a copy of origportalgraph and mutate it to make it + # the portal. The portal really starts at the jit_merge_point() + # without any block or operation before it. + # + portalgraph = copygraph(origportalgraph) _, portalblock, portalop = self.find_jit_merge_point(portalgraph) portalopindex = portalblock.operations.index(portalop) # split the block just before the jit_merge_point() @@ -50,8 +61,3 @@ # check the new graph: errors mean some live vars have not # been listed in the jit_merge_point() checkgraph(portalgraph) - # annotate! - input_args_hs = [SomeLLAbstractConstant(v.concretetype, - {OriginFlags(): True}) - for v in portalgraph.getargs()] - return self.build_types(portalgraph, input_args_hs) From fijal at codespeak.net Tue Mar 11 22:21:12 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 11 Mar 2008 22:21:12 +0100 (CET) Subject: [pypy-svn] r52400 - in pypy/branch/jit-refactoring/pypy/lang/js: . doc test Message-ID: <20080311212112.3199E169E12@codespeak.net> Author: fijal Date: Tue Mar 11 22:21:11 2008 New Revision: 52400 Modified: pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt pypy/branch/jit-refactoring/pypy/lang/js/jscode.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Log: general non-progress. showcase the problem with js parser. Modified: pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt Tue Mar 11 22:21:11 2008 @@ -18,6 +18,16 @@ stores the last value on stack into identifierx +STORE_ELEMENT + +identifier[last_element_on_the_stack] = previous_element_on_the_stack +note that in javascript a.b is exactly the same as a['b'], just that +first one can be eventually speed up + +LOAD_ARRAY + +create array out of num elements on the stack + Arithmetic binary operations: (all pops two values and pushes on stack the result) Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jscode.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jscode.py Tue Mar 11 22:21:11 2008 @@ -1,5 +1,5 @@ -from pypy.lang.js.jsobj import W_IntNumber +from pypy.lang.js.jsobj import W_IntNumber, W_FloatNumber, W_String class JsCode(object): """ That object stands for code of a single javascript function @@ -7,11 +7,12 @@ def __init__(self): self.opcodes = [] - def emit(self, operation, args): + def emit(self, operation, *args): try: - self.opcodes.append(OpcodeMap[operation](args)) + self.opcodes.append(OpcodeMap[operation](*args)) except KeyError: raise ValueError("Unknown opcode %s" % (operation,)) + emit._annspecialcase_ = 'specialize:arg(1)' def __repr__(self): return "\n".join([repr(i) for i in self.opcodes]) @@ -59,9 +60,8 @@ return w_Undefined class LOAD_INTCONSTANT(Opcode): - def __init__(self, args): - assert len(args) == 1 - self.w_intvalue = W_IntNumber(int(args[0])) + def __init__(self, value): + self.w_intvalue = W_IntNumber(int(value)) def eval(self, ctx): return self.w_intvalue @@ -69,10 +69,32 @@ def __repr__(self): return 'LOAD_INTCONSTANT %s' % (self.w_intvalue.intval,) +class LOAD_FLOATCONSTANT(Opcode): + def __init__(self, value): + self.w_floatvalue = W_FloatNumber(float(value)) + + def eval(self, ctx): + return self.w_floatvalue + + def __repr__(self): + return 'LOAD_FLOATCONSTANT %s' % (self.w_floatvalue.floatval,) + +class LOAD_STRINGCONSTANT(Opcode): + def __init__(self, value): + self.w_stringvalue = W_String(value) + + def eval(self, ctx): + return self.w_stringvalue + + def get_literal(self): + return W_String(self.strval).ToString() + + def __repr__(self): + return 'LOAD_STRINGCONSTANT "%s"' % (self.w_stringvalue.strval,) + class LOAD_VARIABLE(Opcode): - def __init__(self, args): - assert len(args) == 1 - self.identifier = args[0] + def __init__(self, identifier): + self.identifier = identifier def eval(self, ctx): return ctx.resolve_identifier(self.identifier) @@ -80,6 +102,20 @@ def __repr__(self): return 'LOAD_VARIABLE "%s"' % (self.identifier,) +class LOAD_ARRAY(Opcode): + def __init__(self, counter): + self.counter = counter + + def eval(self, ctx): + proto = ctx.get_global().Get('Array').Get('prototype') + array = W_Array(ctx, Prototype=proto, Class = proto.Class) + for i in range(len(self.nodes)): + array.Put(str(i), self.nodes[i].eval(ctx).GetValue()) + return array + + def __repr__(self): + return 'LOAD_ARRAY %d' % (self.counter,) + OpcodeMap = {} for name, value in locals().items(): Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Tue Mar 11 22:21:11 2008 @@ -84,29 +84,36 @@ bytecode.emit('LOAD_UNDEFINED') class PropertyInit(Expression): - def __init__(self, identifier, expr): - self.identifier = identifier - assert isinstance(identifier, str) + def __init__(self, pos, identifier, expr): + self.pos = pos + self.identifier = identifier.name self.expr = expr def emit(self, bytecode): + XXX # not sure what to do here, think later self.expr.emit(bytecode) - bytecode.emit('STORE', [self.identifier]) + bytecode.emit('STORE', self.identifier) class Array(ListOp): - def eval(self, ctx): - proto = ctx.get_global().Get('Array').Get('prototype') - array = W_Array(ctx, Prototype=proto, Class = proto.Class) - for i in range(len(self.nodes)): - array.Put(str(i), self.nodes[i].eval(ctx).GetValue()) - return array + def emit(self, bytecode): + for element in self.nodes: + element.emit(bytecode) + bytecode.emit('LOAD_ARRAY', len(self.nodes)) class Assignment(Expression): - def __init__(self, pos, left, right, atype): + def __init__(self, pos, left, right, operand): self.pos = pos - self.left = left + self.identifier = left.name self.right = right - self.type = atype + self.operand = operand + + def emit(self, bytecode): + op = self.operand + XXX + if op == '==': + bytecode.emit('STORE', self.identifier) + else: + XXX def eval(self, ctx): v1 = self.left.eval(ctx) @@ -278,7 +285,7 @@ self.name = name def emit(self, bytecode): - bytecode.emit('LOAD_VARIABLE', [self.name]) + bytecode.emit('LOAD_VARIABLE', self.name) # def get_literal(self): # return self.name @@ -741,28 +748,27 @@ self.num = num def emit(self, bytecode): - bytecode.emit('LOAD_INTCONSTANT', [self.num]) + bytecode.emit('LOAD_INTCONSTANT', self.num) class FloatNumber(BaseNumber): def __init__(self, pos, num): self.pos = pos self.num = num - def eval(self, ctx): - return W_FloatNumber(float(self.num)) + def emit(self, bytecode): + bytecode.emit('LOAD_FLOATCONSTANT', self.num) class String(Expression): def __init__(self, pos, strval): self.pos = pos self.strval = self.string_unquote(strval) - - def eval(self, ctx): - return W_String(self.strval) - - def get_literal(self): - return W_String(self.strval).ToString() + + def emit(self, bytecode): + bytecode.emit('LOAD_STRINGCONSTANT', self.strval) def string_unquote(self, string): + # XXX I don't think this works, it's very unlikely IMHO + # test it temp = [] stop = len(string)-1 # XXX proper error @@ -786,7 +792,6 @@ temp.append(c) last = c return ''.join(temp) - class ObjectInit(ListOp): def eval(self, ctx): Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Tue Mar 11 22:21:11 2008 @@ -138,7 +138,9 @@ result1 = self.evaluator.dispatch(tree) assert result1 == n return tree - + + def parse_raises(self, s): + py.test.raises(ParseError, self.parse, s) def parse_and_eval_all(self, l): for i in l: @@ -184,6 +186,9 @@ self.parse('{}') self.parse('{x:1}') #per spec {x:1,} should not be supported self.parse('{x:1,y:2}') + + def test_invalid_expression(self): + self.parse_raises('(1+2)=3') class TestStatements(BaseGrammarTest): def setup_class(cls): @@ -293,6 +298,10 @@ # w_Object = W_Object(Prototype=W_Object()) # w_Global.Put('Object', w_Object) # return ast.eval(global_context(w_Global)) + + def check(self, source, expected): + bytecode = self.compile(source) + assert bytecode == expected def test_get_pos(self): from pypy.lang.js import operations @@ -306,21 +315,23 @@ assert not isinstance(t, Symbol) pos = astb.get_pos(t) assert pos.start == 0 - + def test_primaryexpression(self): - bytecode = self.compile('(6)') - assert bytecode == ['LOAD_INTCONSTANT 6'] - bytecode = self.compile('((((6))))') - assert bytecode == ['LOAD_INTCONSTANT 6'] - bytecode = self.compile('x') - assert bytecode == ['LOAD_VARIABLE "x"'] - # w_array = self.eval_expr('[1,2,3]') - # assert w_array.ToString(self.ctx) == '1,2,3' - w_identifier = self.eval_expr('x') - py.test.raises(ThrowException, w_identifier.GetValue) - w_object = self.eval_expr('{x:1}') - assert w_object.ToString(self.ctx) == '[object Object]' - assert w_object.Get('x').ToNumber() == 1 + self.check('(6)', ['LOAD_INTCONSTANT 6']) + self.check('((((6))))', ['LOAD_INTCONSTANT 6']) + self.check('x', ['LOAD_VARIABLE "x"']) + self.check('[1,2,3.3,"abc"]', [ + 'LOAD_INTCONSTANT 1', + 'LOAD_INTCONSTANT 2', + 'LOAD_FLOATCONSTANT 3.3', + 'LOAD_STRINGCONSTANT "abc"', + 'LOAD_ARRAY 4']) + self.check('x = 3', [ + 'LOAD_INTCONSTANT 3', + 'STORE "x"']) + self.check('{x:1}', [ + 'LOAD_INTCONSTANT 1', + 'LOAD_OBJECT ["x"]']) def test_expression(self): w_num = self.eval_expr('1 - 1 - 1') From arigo at codespeak.net Tue Mar 11 22:29:34 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 11 Mar 2008 22:29:34 +0100 (CET) Subject: [pypy-svn] r52401 - in pypy/branch/jit-hotpath/pypy: jit/hintannotator jit/rainbow jit/rainbow/test rpython Message-ID: <20080311212934.489A3169E14@codespeak.net> Author: arigo Date: Tue Mar 11 22:29:33 2008 New Revision: 52401 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/rpython/llinterp.py Log: An oversight in the jit-refactoring.txt: after the fallback interpreter finishes we need to pass new values for the red=(..) and green=(..) variables of jit_merge_point(). Solved by splitting the portal graph in three graphs, the middle one being a wrapper that catches a ContinueRunningNormally exception carrying the new values. Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Tue Mar 11 22:29:33 2008 @@ -1,5 +1,6 @@ from pypy.objspace.flow.model import checkgraph, copygraph from pypy.translator.unsimplify import split_block +from pypy.translator.simplify import join_blocks from pypy.jit.hintannotator.annotator import HintAnnotator from pypy.jit.hintannotator.model import SomeLLAbstractConstant, OriginFlags @@ -58,6 +59,11 @@ portalgraph.startblock = link.target portalgraph.startblock.isstartblock = True self.portalgraph = portalgraph + self.origportalgraph = origportalgraph # check the new graph: errors mean some live vars have not # been listed in the jit_merge_point() checkgraph(portalgraph) + join_blocks(portalgraph) + # put the new graph back in the base_translator + portalgraph.tag = 'portal' + self.base_translator.graphs.append(portalgraph) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 11 22:29:33 2008 @@ -1,4 +1,5 @@ from pypy.objspace.flow.model import Constant, Variable, SpaceOperation +from pypy.objspace.flow.model import Link, checkgraph from pypy.rpython.annlowlevel import llhelper from pypy.rpython.lltypesystem import lltype, lloperation from pypy.rpython.llinterp import LLInterpreter @@ -29,13 +30,8 @@ def rewrite_all(self): self.make_args_specification() self.make_enter_function() + self.rewrite_graphs() self.update_interp() - for graph in self.hintannotator.base_translator.graphs: - for block in graph.iterblocks(): - for op in block.operations: - if op.opname == 'can_enter_jit': - index = block.operations.index(op) - self.rewrite_can_enter_jit(graph, block, index) def make_args_specification(self): origportalgraph = self.hintannotator.portalgraph @@ -79,14 +75,33 @@ HotEnterState.compile.im_func._dont_inline_ = True jit_may_enter._always_inline = True - self.jit_enter_fn = jit_may_enter + self.jit_may_enter_fn = jit_may_enter def update_interp(self): ERASED = self.RGenOp.erasedType(lltype.Bool) self.interpreter.bool_hotpromotiondesc = rhotpath.HotPromotionDesc( - ERASED, self.interpreter, self.threshold) + ERASED, self.interpreter, self.threshold, + self.ContinueRunningNormally) + + def rewrite_graphs(self): + for graph in self.hintannotator.base_translator.graphs: + for block in graph.iterblocks(): + for op in list(block.operations): + if op.opname == 'can_enter_jit': + index = block.operations.index(op) + self.rewrite_can_enter_jit(graph, block, index) + elif op.opname == 'jit_merge_point': + index = block.operations.index(op) + self.rewrite_jit_merge_point(graph, block, index) def rewrite_can_enter_jit(self, graph, block, index): + # + # In the original graphs, replace the 'jit_can_enter' operations + # with a call to the jit_may_enter() helper. + # + assert graph is not self.hintannotator.origportalgraph, ( + "XXX can_enter_jit() cannot appear before jit_merge_point() " + "in the portal graph") if not self.translate_support_code: # this case is used for most tests: the jit stuff should be run # directly to make these tests faster @@ -97,7 +112,7 @@ reds_v = op.args[2+numgreens:2+numgreens+numreds] FUNCPTR = lltype.Ptr(self.JIT_ENTER_FUNCTYPE) - jit_enter_graph_ptr = llhelper(FUNCPTR, self.jit_enter_fn) + jit_enter_graph_ptr = llhelper(FUNCPTR, self.jit_may_enter_fn) vlist = [Constant(jit_enter_graph_ptr, FUNCPTR)] + reds_v v_result = Variable() @@ -107,6 +122,89 @@ else: xxx + def rewrite_jit_merge_point(self, origportalgraph, origblock, origindex): + # + # Mutate the original portal graph from this: + # + # def original_portal(..): + # stuff + # jit_merge_point(*args) + # more stuff + # + # to that: + # + # def original_portal(..): + # stuff + # return portal_runner(*args) + # + # def portal_runner(*args): + # while 1: + # try: + # return portal(*args) + # except ContinueRunningNormally, e: + # *args = *e.new_args + # + # def portal(*args): + # more stuff + # + portalgraph = self.hintannotator.portalgraph + # ^^^ as computed by HotPathHintAnnotator.prepare_portal_graphs() + if origportalgraph is portalgraph: + return # only mutate the original portal graph, + # not its copy + + ARGS = [v.concretetype for v in portalgraph.getargs()] + assert portalgraph.getreturnvar().concretetype is lltype.Void + PORTALFUNC = lltype.FuncType(ARGS, lltype.Void) + + if not self.translate_support_code: + # ____________________________________________________________ + # Prepare the portal_runner() helper, in a version that + # doesn't need to be translated + # + exc_data_ptr = self.codewriter.exceptiondesc.exc_data_ptr + llinterp = LLInterpreter(self.rtyper, exc_data_ptr=exc_data_ptr) + + class ContinueRunningNormally(Exception): + _go_through_llinterp_uncaught_ = True # ugh + def __init__(self, *args): + self.args = args + self.ContinueRunningNormally = ContinueRunningNormally + + def portal_runner(*args): + while 1: + try: + llinterp.eval_graph(portalgraph, list(args)) + assert 0, "unreachable" + except ContinueRunningNormally, e: + args = e.args + + portal_runner_ptr = lltype.functionptr(PORTALFUNC, 'portal_runner', + _callable = portal_runner) + else: + xxx + # ____________________________________________________________ + # Now mutate origportalgraph to end with a call to portal_runner_ptr + # + op = origblock.operations[origindex] + assert op.opname == 'jit_merge_point' + numgreens = op.args[0].value + numreds = op.args[1].value + greens_v = op.args[2:2+numgreens] + reds_v = op.args[2+numgreens:2+numgreens+numreds] + vlist = [Constant(portal_runner_ptr, lltype.Ptr(PORTALFUNC))] + vlist += greens_v + vlist += reds_v + v_result = Variable() + v_result.concretetype = lltype.Void + newop = SpaceOperation('direct_call', vlist, v_result) + del origblock.operations[origindex:] + origblock.operations.append(newop) + origblock.exitswitch = None + origblock.recloseblock(Link([Constant(None, lltype.Void)], + origportalgraph.returnblock)) + checkgraph(origportalgraph) + def make_state_class(rewriter): # very minimal, just to make the first test pass Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Tue Mar 11 22:29:33 2008 @@ -81,7 +81,8 @@ class HotPromotionDesc: __metaclass__ = cachedtype - def __init__(self, ERASED, interpreter, threshold): + def __init__(self, ERASED, interpreter, threshold, + ContinueRunningNormally): self.exceptiondesc = interpreter.exceptiondesc self.gv_constant_one = interpreter.rgenop.constPrebuiltGlobal(1) @@ -105,10 +106,11 @@ fbp.truepath_counter = -1 # mean "compiled" else: fbp.falsepath_counter = -1 # mean "compiled" - # Done. We return 1, which causes our caller - # (machine code produced by hotsplit()) to loop back to - # the flexswitch and execute the newly-generated code. - return 1 + # Done. We return without an exception set, which causes + # our caller (the machine code produced by hotsplit()) to + # loop back to the flexswitch and execute the + # newly-generated code. + return else: # path is still cold if value: @@ -120,18 +122,18 @@ report_compile_time_exception(e) # exceptions below at run-time exceptions, we let them propagate - fbp.run_fallback_interpreter(framebase) - # the fallback interpreter reached the next jit_merge_point(); - # we return 0, causing the machine code that called us to exit - # and go back to its own caller, which is jit_may_enter() from - # hotpath.py. - return 0 + fbp.run_fallback_interpreter(framebase, ContinueRunningNormally) + # If the fallback interpreter reached the next jit_merge_point(), + # it raised ContinueRunningNormally(). This exception is + # caught by portal_runner() from hotpath.py in order to loop + # back to the beginning of the portal. + assert 0, "unreachable" self.ll_reach_fallback_point = ll_reach_fallback_point #ll_reach_fallback_point._debugexc = True FUNCTYPE = lltype.FuncType([base_ptr_lltype(), ERASED, - llmemory.Address], lltype.Signed) + llmemory.Address], lltype.Void) FUNCPTRTYPE = lltype.Ptr(FUNCTYPE) self.FUNCPTRTYPE = FUNCPTRTYPE self.sigtoken = interpreter.rgenop.sigToken(FUNCTYPE) @@ -186,25 +188,21 @@ gv_switchvar = switchbox.genvar gv_fnptr = hotpromotiondesc.get_gv_reach_fallback_point(default_builder) gv_framebase = default_builder.genop_get_frame_base() - gv_res = default_builder.genop_call(hotpromotiondesc.sigtoken, - gv_fnptr, - [gv_fbp, gv_switchvar, gv_framebase]) - # There are three ways the call above can return: - # * 1: continue running by looping back to 'switchblock' - # * 0: leave the machine code now, as with a return - # * exception: leave the machine code now, propagating the exception - # (only "real" run-time exceptions should arrive here, not - # compile-time exceptions) - # As a minor hack, we know by the way the exception transformer works - # that in the third case the gv_res we get is -1, so we can - # just leave the machine code if we get any value != 1. - gv_leave_flag = default_builder.genop2("int_ne", gv_res, - hotpromotiondesc.gv_constant_one) - leaving_builder = default_builder.jump_if_true(gv_leave_flag, []) + default_builder.genop_call(hotpromotiondesc.sigtoken, + gv_fnptr, + [gv_fbp, gv_switchvar, gv_framebase]) + # The call above may either return normally, meaning that more machine + # code was compiled and we should loop back to 'switchblock' to enter it, + # or it may have set an exception. + exceptiondesc = hotpromotiondesc.exceptiondesc + gv_exc_type = exceptiondesc.genop_get_exc_type(default_builder) + gv_noexc = default_builder.genop_ptr_iszero( + exceptiondesc.exc_type_kind, gv_exc_type) + excpath_builder = default_builder.jump_if_false(gv_noexc, []) default_builder.finish_and_goto(incoming_gv, switchblock) - jitstate.curbuilder = leaving_builder - leaving_builder.start_writing() + jitstate.curbuilder = excpath_builder + excpath_builder.start_writing() raise GenerateReturn # ____________________________________________________________ Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Tue Mar 11 22:29:33 2008 @@ -4,6 +4,7 @@ from pypy.jit.rainbow.hotpath import EntryPointsRewriter from pypy.jit.hintannotator.policy import HintAnnotatorPolicy from pypy.rpython.llinterp import LLInterpreter +from pypy import conftest P_HOTPATH = HintAnnotatorPolicy(oopspec=True, novirtualcontainer=True, @@ -16,13 +17,16 @@ class TestHotPath(test_interpreter.InterpretationTest): type_system = 'lltype' - def run(self, main, main_args, threshold, policy=P_HOTPATH): + def run(self, main, main_args, threshold, policy=P_HOTPATH, small=False): self.serialize(main, main_args, policy=policy, backendoptimize=True) rewriter = EntryPointsRewriter(self.hintannotator, self.rtyper, self.jitcode, self.RGenOp, self.writer, threshold, self.translate_support_code) self.rewriter = rewriter rewriter.rewrite_all() + if small and conftest.option.view: + self.rtyper.annotator.translator.view() + graph = self.rtyper.annotator.translator.graphs[0] assert graph.func is main llinterp = LLInterpreter( @@ -36,12 +40,12 @@ n1 = n * 2 total = 0 while True: - can_enter_jit(red=(n1, total)) jit_merge_point(red=(n1, total)) total += n1 if n1 <= 1: break n1 -= 1 + can_enter_jit(red=(n1, total)) raise Exit(total) def main(n, m): @@ -50,7 +54,7 @@ except Exit, e: return e.result - res = self.run(main, [2, 5], threshold=8) + res = self.run(main, [2, 5], threshold=8, small=True) assert res == main(2, 5) self.check_traces([ # running non-JITted leaves the initial profiling traces @@ -62,19 +66,20 @@ "jit_not_entered 16 74", "jit_not_entered 15 90", "jit_not_entered 14 105", + "jit_not_entered 13 119", # on the start of the next iteration, compile the 'total += n1' "jit_enter", "pause at hotsplit", # execute the compiled machine code until the 'n1 <= 1'. # It finishes in the fallback interpreter 7 times - "run_machine_code 13 119", "fallback_interp", "fb_leave 12 132", "run_machine_code 12 132", "fallback_interp", "fb_leave 11 144", "run_machine_code 11 144", "fallback_interp", "fb_leave 10 155", "run_machine_code 10 155", "fallback_interp", "fb_leave 9 165", "run_machine_code 9 165", "fallback_interp", "fb_leave 8 174", "run_machine_code 8 174", "fallback_interp", "fb_leave 7 182", "run_machine_code 7 182", "fallback_interp", "fb_leave 6 189", - "run_machine_code 6 189", + "run_machine_code 6 189", "fallback_interp", "fb_leave 5 195", + "run_machine_code 5 195", # now that we know which path is hot (i.e. "staying in the loop"), # it gets compiled "jit_resume", Modified: pypy/branch/jit-hotpath/pypy/rpython/llinterp.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/llinterp.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/llinterp.py Tue Mar 11 22:29:33 2008 @@ -428,6 +428,11 @@ KeyboardInterrupt, SystemExit, ImportError, SyntaxError)): raise original[0], original[1], original[2] # re-raise it + # for testing the JIT (see ContinueRunningNormally) we need + # to let some exceptions introduced by the JIT go through + # the llinterpreter uncaught + if getattr(exc, '_go_through_llinterp_uncaught_', False): + raise original[0], original[1], original[2] # re-raise it extraargs = (original,) else: extraargs = () From cami at codespeak.net Wed Mar 12 09:09:56 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Wed, 12 Mar 2008 09:09:56 +0100 (CET) Subject: [pypy-svn] r52406 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080312080956.AEB3F169E0A@codespeak.net> Author: cami Date: Wed Mar 12 09:09:55 2008 New Revision: 52406 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Log: minor refactoring of timer, video, sound, cartridge and joypad cartridge has been introduced to inheritance, needs a lot more of work to be done there Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Wed Mar 12 09:09:55 2008 @@ -99,56 +99,72 @@ self.store = storeDriver self.clock = clockDriver + def initialize(self): pass + def getTitle(self): pass + def getCartridgeType(self): return self.rom[CARTRIDGE_TYPE_ADDRESS] & 0xFF + def getRom(self): return self.rom + def getROMSize(self): romSize = self.rom[CARTRIDGE_SIZE_ADDRESS] & 0xFF if romSize>=0x00 and romSize<=0x07: return 32768 << romSize return -1 + def getRAMSize(self): return RAM_SIZE_MAPPING[self.rom[RAM_SIZE_ADDRESS]] + def getDestinationCode(self): return self.rom[DESTINATION_CODE_ADDRESS] & 0xFF; + def getLicenseeCode(): return self.rom[LICENSEE_ADDRESS] & 0xFF; + def getROMVersion(self): return self.rom[ROM_VERSION_ADDRESS] & 0xFF; + def getHeaderChecksum(self): return self.rom[HEADER_CHECKSUM_ADDRESS] & 0xFF; + def getChecksum(self): return ((rom[CHECKSUM_A_ADDRESS] & 0xFF) << 8) + (rom[CHECKSUM_B_ADDRESS] & 0xFF); + def hasBattery(self): return hasCartridgeBattery(self.getCartridgeType()) + def reset(self): if not self.hasBattery(): self.ram[0:len(self.ram):1] = 0xFF; self.mbc.reset(); + def read(self, address): return self.mbc.read(address); + def write(self, address, data): self.mbc.write(address, data); + def load(self, cartridgeName): romSize = self.store.getCartridgeSize(cartridgeName); self.rom = range(0, romSize) @@ -179,10 +195,12 @@ self.mbc = createBankController(self.getCartridgeType(), rom, ram, clock) + def save(self, cartridgeName): if self.hasBattery(): self.store.writeBattery(cartridgeName, self.ram) + def verify(self): checksum = 0; for address in range(len(self.rom)): @@ -190,6 +208,7 @@ checksum = (checksum + (self.rom[address] & 0xFF)) & 0xFFFF return (checksum == self.getChecksum()); + def verifyHeader(self): if self.rom.length < 0x0150: return false; @@ -198,6 +217,7 @@ checksum = (checksum - (rom[address] & 0xFF)) & 0xFF; return (checksum == self.getHeaderChecksum()) + # ============================================================================== # CARTRIDGE TYPES @@ -208,6 +228,44 @@ # RAM Bank Size (8KB) RAM_BANK_SIZE = 0x2000 + ramEnable = False + + rom = [] + ram = [] + + romSize = 0; + ramSize = 0; + + minRomBankSize = 0 + maxRomBankSize = 0 + + minRamBankSize = 0 + maxRamBankSize = 0 + + romBank = ROM_BANK_SIZE + ramBank = 0 + + + def reset(self): + self.romBank = ROM_BANK_SIZE; + self.ramBank = 0; + self.ramEnable = False; + + def setROM(self, buffer): + banks = len(buffer) / ROM_BANK_SIZE; + if (banks < minRomBankSize or banks > maxRomBankSize): + raise Exception("Invalid ROM size"); + self.rom = buffer; + self.romSize = ROM_BANK_SIZE*banks - 1; + + + def setRAM(buffer): + banks = len(buffer) / RAM_BANK_SIZE; + if (banks < minRamBankSize or banks > maxRamBankSize): + raise Exception("Invalid RAM size"); + self.ram = buffer; + self.ramSize = RAM_BANK_SIZE*banks - 1; + """ Mario GameBoy (TM) Emulator @@ -220,20 +278,21 @@ """ class MBC1(MBC): - rom = [] - ram = [] - ramEnable = False - def __init__(self, rom, ram): + self.minRamBankSize = 0 + self.maxRamBankSize = 4 + self.minRomBankSize = 2 + self.maxRomBankSize = 128 + self.setRom(rom) self.serRam(ram) + def reset(self): - self.romBank= ROM_BANK_SIZE - self.romBank = 0 + super.reset() self.memoryModel = 0 - self.ramEnable = False + def read(self, address): if address <= 0x3FFF: @@ -248,6 +307,7 @@ return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; return 0xFF; + def write(self, address, data): if (address <= 0x1FFF): # 0000-1FFF @@ -275,24 +335,6 @@ if (self.ramEnable): self.ram[self.ramBank + (address & 0x1FFF)] = data; - def setROM(self, buffer): - banks = len(buffer) / ROM_BANK_SIZE; - - if (banks < 2 or banks > 128): - raise Exception("Invalid MBC1 ROM size"); - - self.rom = buffer; - self.romSize = ROM_BANK_SIZEbanks - 1; - - def setRAM(buffer): - banks = len(buffer) / RAM_BANK_SIZE; - - if (banks < 0 or banks > 4): - raise Exception("Invalid MBC1 RAM size"); - - self.ram = buffer; - self.ramSize = RAM_BANK_SIZEbanks - 1; - @@ -309,20 +351,19 @@ class MBC2(MBC): RAM_BANK_SIZE = 512; - rom = [] - ram = [] - - romSize = 0 - romBank =0 - ramEnable = False - def __init__(self, rom, ram): + self.minRamBankSize = RAM_BANK_SIZE + self.maxRamBankSize = RAM_BANK_SIZE + self.minRomBankSize = 2 + self.maxRomBankSize = 16 + self.setROM(rom); self.setRAM(ram); + def reset(self): - self.romBank = ROM_BANK_SIZE; - self.ramEnable = False; + super.reset() + def read(self, address): if (address <= 0x3FFF): @@ -336,6 +377,7 @@ return self.ram[address & 0x01FF] & 0x0F; return 0xFF; + def write(self, address, data): if (address <= 0x1FFF): # 0000-1FFF @@ -352,21 +394,6 @@ if (self.ramEnable): self.ram[address & 0x01FF] = (byte) (data & 0x0F); - def setROM(self, buffer): - banks = buffer.length / ROM_BANK_SIZE; - - if (banks < 2 or banks > 16): - raise Exception("Invalid MBC2 ROM size"); - - self.rom = buffer; - self.romSize = ROM_BANK_SIZEbanks - 1; - - def setRAM(self, buffer): - if (buffer.length != RAM_BANK_SIZE): - raise Exception("Invalid MBC2 RAM size"); - - self.ram = buffer; - """ Mario GameBoy (TM) Emulator @@ -382,17 +409,9 @@ #ClockDriver clock = None; - rom = []; - ram = []; - - romSize = 0; - ramSize = 0; - romBank = 0; ramBank = 0; - ramEnable = False; - clockRegister = 0; clockLatch = 0; clockTime = 0; @@ -408,16 +427,19 @@ clockLDaysclockLControl = None def __init__(self, rom, ram, clock): + self.minRamBankSize = 0 + self.maxRamBankSize = 4 + self.minRomBankSize = 2 + self.maxRomBankSize = 128 + self.clock = clock; self.setROM(rom); self.setRAM(ram); - def reset(): - self.romBank = ROM_BANK_SIZE; - self.ramBank = 0; - self.ramEnable = false; + def reset(): + super.reset() self.clockTime = self.clock.getTime(); @@ -426,6 +448,7 @@ self.clockSeconds = self.clockMinutes = self.clockHours = self.clockDays = self.clockControl = 0; self.clockLSeconds = self.clockLMinutes = self.clockLHours = self.clockLDays = self.clockLControl = 0; + def read(self, address): if (address <= 0x3FFF): # 0000-3FFF @@ -450,6 +473,7 @@ return self.clockLControl; return 0xFF; + def write(self, address, data): if (address <= 0x1FFF): # 0000-1FFF @@ -493,6 +517,7 @@ if (self.clockRegister == 0x0C): self.clockControl = (self.clockControl & 0x80) | data; + def latchClock(self): self.updateClock(); @@ -502,6 +527,7 @@ self.clockLDays = self.clockDays & 0xFF; self.clockLControl = (self.clockControl & 0xFE) | ((self.clockDays >> 8) & 0x01); + def updateClock(): now = self.clock.getTime(); @@ -540,24 +566,6 @@ self.clockTime = now; - def setROM(self, buffer): - banks = buffer.length / ROM_BANK_SIZE; - - if (banks < 2 or banks > 128): - raise Exception("Invalid MCB3 ROM size"); - - self.rom = buffer; - self.romSize = ROM_BANK_SIZE * banks - 1; - - def setRAM(self, buffer): - banks = buffer.length / RAM_BANK_SIZE; - - if (banks < 0 or banks > 4): - raise Exception("Invalid MBC3 RAM size"); - - self.ram = buffer; - self.ramSize = RAM_BANK_SIZE * banks - 1; - """ @@ -571,30 +579,23 @@ """ class MBC5(MBC): - rom = []; - ram = []; - - romSize = 0; - ramSize = 0; - romBank = 0; - ramBank = 0; - ramEnable = False; rumble = False; def __init__(self, rom, ram, rumble): + self.minRamBankSize = 0 + self.maxRamBankSize = 16 + self.minRomBankSize = 2 + self.maxRomBankSize = 512 + self.rumble = rumble; - self.setROM(rom); self.setRAM(ram); def reset(): - self.romBank = ROM_BANK_SIZE; - self.ramBank = 0; - - self.ramEnable = false; + super.reset() def read(self, address): @@ -634,24 +635,6 @@ self.ram[self.ramBank + (address & 0x1FFF)] = data; - def setROM(self, buffer): - banks = buffer.length / ROM_BANK_SIZE; - - if (banks < 2 or banks > 512): - raise Exception("Invalid MBC5 ROM size"); - - self.rom = buffer; - self.romSize = ROM_BANK_SIZE * banks - 1; - - - def setRAM(self, buffer): - banks = buffer.length / RAM_BANK_SIZE; - - if (banks < 0 or banks > 16): - raise Exception("Invalid MBC5 RAM size"); - - self.ram = buffer; - self.ramSize = RAM_BANK_SIZE * banks - 1; class HuC1(MBC): @@ -670,28 +653,29 @@ """ class HuC3(MBC): clock = None; - rom = []; - ram = []; + romBank = 0; - ramBank = 0; - romSize = 0; - ramSize = 0; + ramFlag = 0; + ramValue = 0; + clockRegister = 0; clockShift = 0; clockTime = 0; def __init__(self, rom, ram, clock): + self.minRamBankSize = 0 + self.maxRamBankSize = 4 + self.minRomBankSize = 2 + self.maxRomBankSize = 128 self.clock = clock; - self.setROM(rom); self.setRAM(ram); def reset(): - self.romBank = ROM_BANK_SIZE; - self.ramBank = 0; + super.reset() self.ramFlag = 0; self.ramValue = 0; @@ -747,7 +731,6 @@ self.clockShift += 4; elif ((data & 0xF0) == 0x40): self.updateClock(); - if ((data & 0x0F) == 0x00): self.clockShift = 0; elif ((data & 0x0F) == 0x03): @@ -768,19 +751,15 @@ def updateClock(self): now = self.clock.getTime(); - elapsed = now - self.clockTime; - # years (4 bits) while (elapsed >= 365246060): self.clockRegister += 1 << 24; elapsed -= 365246060; - # days (12 bits) while (elapsed >= 246060): self.clockRegister += 1 << 12; elapsed -= 246060; - # minutes (12 bits) while (elapsed >= 60): self.clockRegister += 1; @@ -788,29 +767,8 @@ if ((self.clockRegister & 0x0000FFF) >= 2460): self.clockRegister += (1 << 12) - 2460; - if ((self.clockRegister & 0x0FFF000) >= (365 << 12)): self.clockRegister += (1 << 24) - (365 << 12); self.clockTime = now - elapsed; - - def setROM(self, buffer): - banks = buffer.length / ROM_BANK_SIZE; - - if (banks < 2 or banks > 128): - raise Exception("Invalid HuC3 ROM size"); - - self.rom = buffer; - self.romSize = ROM_BANK_SIZE*banks - 1; - - - def setRAM(self, buffer): - banks = buffer.length / RAM_BANK_SIZE; - - if (banks < 0 or banks > 4): - raise Exception("Invalid HuC3 RAM size"); - - self.ram = buffer; - self.ramSize = RAM_BANK_SIZE * banks - 1; - Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py Wed Mar 12 09:09:55 2008 @@ -36,6 +36,7 @@ def getCartridge(self): return self.cartridge; + def getFrameSkip(self): return self.video.getFrameSkip(); Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py Wed Mar 12 09:09:55 2008 @@ -24,28 +24,35 @@ def __init__(self): self.reset(); + def reset(self): self.enable = 0; self.flag = VBLANK; + def isPending(self): return (self.enable & self.flag) != 0; + def isPending(self, mask): return (self.enable & self.flag & mask) != 0; + def raiseInterrupt(self, mask): self.flag |= mask; + def lower(self, mask): self.flag &= ~mask; + def write(self, address, data): if address == IE: self.setInterruptEnable(data); elif address==IF: self.setInterruptFlag(data); + def read(self, address): if address==IE: return self.getInterruptEnable(); @@ -53,14 +60,18 @@ return self.getInterruptFlag(); return 0xFF; + def getInterruptEnable(self): return self.enable; + def getInterruptFlag(self): return 0xE0 | self.flag; + def setInterruptEnable(self, data): self.enable = data; + def setInterruptFlag(self, data): self.flag = data; Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py Wed Mar 12 09:09:55 2008 @@ -29,13 +29,16 @@ self.interrupt = interrupt; self.reset(); + def reset(self): self.joyp = 0xFF; self.cycles = JOYPAD_CLOCK; + def cycles(self): return self.cycles; + def emulate(self, ticks): self.cycles -= ticks; if (self.cycles <= 0): @@ -44,16 +47,19 @@ self.cycles = JOYPAD_CLOCK; + def write(self, address, data): if (address == JOYP): self.joyp = (self.joyp & 0xCF) + (data & 0x30); self.update(); + def read(self, address): if (address == JOYP): return self.joyp; return 0xFF; + def update(self): data = self.joyp & 0xF0; Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py Wed Mar 12 09:09:55 2008 @@ -235,9 +235,8 @@ elif address==NR52: return self.getOutputEnable(); - else: - if (address >= AUD3WAVERAM and address <= AUD3WAVERAM + 0x3F): - return self.getAudio3WavePattern(address); + elif (address >= AUD3WAVERAM and address <= AUD3WAVERAM + 0x3F): + return self.getAudio3WavePattern(address); return 0xFF; @@ -290,42 +289,45 @@ elif address == NR52: self.setOutputEnable(data); - else: - if (address >= AUD3WAVERAM and address <= AUD3WAVERAM + 0x3F): - self.setAudio3WavePattern(address, data); + elif (address >= AUD3WAVERAM and address <= AUD3WAVERAM + 0x3F): + self.setAudio3WavePattern(address, data); def updateAudio(self): - if ((self.nr52 & 0x80) != 0): - if ((self.nr52 & 0x01) != 0): - self.updateAudio1(); + if ((self.nr52 & 0x80) == 0): + return + + if ((self.nr52 & 0x01) != 0): + self.updateAudio1(); - if ((self.nr52 & 0x02) != 0): - self.updateAudio2(); + if ((self.nr52 & 0x02) != 0): + self.updateAudio2(); - if ((self.nr52 & 0x04) != 0): - self.updateAudio3(); + if ((self.nr52 & 0x04) != 0): + self.updateAudio3(); - if ((self.nr52 & 0x08) != 0): - self.updateAudio4(); + if ((self.nr52 & 0x08) != 0): + self.updateAudio4(); def mixAudio(self,buffer, length): for index in range(0, length): buffer[index] = 0; - if ((self.nr52 & 0x80) != 0): - if ((self.nr52 & 0x01) != 0): - self.mixAudio1(buffer, length); + if ((self.nr52 & 0x80) == 0): + return + + if ((self.nr52 & 0x01) != 0): + self.mixAudio1(buffer, length); - if ((self.nr52 & 0x02) != 0): - self.mixAudio2(buffer, length); + if ((self.nr52 & 0x02) != 0): + self.mixAudio2(buffer, length); - if ((self.nr52 & 0x04) != 0): - self.mixAudio3(buffer, length); + if ((self.nr52 & 0x04) != 0): + self.mixAudio3(buffer, length); - if ((self.nr52 & 0x08) != 0): - self.mixAudio4(buffer, length); + if ((self.nr52 & 0x08) != 0): + self.mixAudio4(buffer, length); # Audio Channel 1 @@ -361,20 +363,19 @@ def setAudio1Envelope(self, data): self.nr12 = data; - if ((self.nr14 & 0x40) == 0): - if ((self.nr12 >> 4) == 0): - self.audio1Volume = 0; - elif (self.audio1EnvelopeLength == 0 and (self.nr12 & 0x07) == 0): - self.audio1Volume = (self.audio1Volume + 1) & 0x0F; - else: - self.audio1Volume = (self.audio1Volume + 2) & 0x0F; + if ((self.nr14 & 0x40) != 0): + return + if ((self.nr12 >> 4) == 0): + self.audio1Volume = 0; + elif (self.audio1EnvelopeLength == 0 and (self.nr12 & 0x07) == 0): + self.audio1Volume = (self.audio1Volume + 1) & 0x0F; + else: + self.audio1Volume = (self.audio1Volume + 2) & 0x0F; def setAudio1Frequency(self, data): self.nr13 = data; - - self.audio1Frequency = self.frequencyTable[self.nr13 - + ((self.nr14 & 0x07) << 8)]; + self.audio1Frequency = self.frequencyTable[self.nr13 + ((self.nr14 & 0x07) << 8)]; def setAudio1Playback(self, data): @@ -396,11 +397,10 @@ def updateAudio1(self): - if ((self.nr14 & 0x40) != 0): - if (self.audio1Length > 0): - self.audio1Length-=1; - if (self.audio1Length <= 0): - self.nr52 &= ~0x01; + if ((self.nr14 & 0x40) != 0 and self.audio1Length > 0): + self.audio1Length-=1; + if (self.audio1Length <= 0): + self.nr52 &= ~0x01; if (self.audio1EnvelopeLength > 0): self.audio1EnvelopeLength-=1; if (self.audio1EnvelopeLength <= 0): @@ -512,11 +512,10 @@ def updateAudio2(self): - if ((self.nr24 & 0x40) != 0): - if (self.audio2Length > 0): - self.audio2Length-=1; - if (self.audio2Length <= 0): - self.nr52 &= ~0x02; + if ((self.nr24 & 0x40) != 0 and self.audio2Length > 0): + self.audio2Length-=1; + if (self.audio2Length <= 0): + self.nr52 &= ~0x02; if (self.audio2EnvelopeLength > 0): self.audio2EnvelopeLength-=1; @@ -618,11 +617,10 @@ def updateAudio3(self): - if ((self.nr34 & 0x40) != 0): - if (self.audio3Length > 0): - self.audio3Length-=1; - if (self.audio3Length <= 0): - self.nr52 &= ~0x04; + if ((self.nr34 & 0x40) != 0 and self.audio3Length > 0): + self.audio3Length-=1; + if (self.audio3Length <= 0): + self.nr52 &= ~0x04; def mixAudio3(self, buffer, length): @@ -693,7 +691,6 @@ def setAudio4Playback(self, data): self.nr44 = data; - if ((self.nr44 & 0x80) != 0): self.nr52 |= 0x08; @@ -708,11 +705,10 @@ def updateAudio4(self): - if ((self.nr44 & 0x40) != 0): - if (self.audio4Length > 0): - self.audio4Length-=1; - if (self.audio4Length <= 0): - self.nr52 &= ~0x08; + if ((self.nr44 & 0x40) != 0 and self.audio4Length > 0): + self.audio4Length-=1; + if (self.audio4Length <= 0): + self.nr52 &= ~0x08; if (self.audio4EnvelopeLength > 0): self.audio4EnvelopeLength-=1; Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py Wed Mar 12 09:09:55 2008 @@ -119,8 +119,7 @@ def cycles(self): - if ((self.tac & 0x04) != 0): - if (self.timerCycles < self.dividerCycles): + if ((self.tac & 0x04) != 0 and self.timerCycles < self.dividerCycles): return self.timerCycles; return self.dividerCycles; Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Wed Mar 12 09:09:55 2008 @@ -23,11 +23,11 @@ OAM_ADDR = 0xFE00; # OAM Object Attribute Map # (FE00..FE9F) - OAM_SIZE = 0xA0; + OAM_SIZE = 0xA0 # Video RAM Addresses VRAM_ADDR = 0x8000 #8KB Video RAM (8000..9FFF) */ - VRAM_SIZE = 0x2000; + VRAM_SIZE = 0x2000 # VRAM Tile Data/Maps Addresses VRAM_DATA_A = 0x0000 @@ -49,7 +49,7 @@ # Gameboy Clock Speed (1048576 Hz) - GAMEBOY_CLOCK = 1 << 20; + GAMEBOY_CLOCK = 1 << 20 # LCD Mode Durations MODE_0_TICKS = 50 #H-Blank */ @@ -61,449 +61,446 @@ MODE_1_END_TICKS = 1 #V-Blank Line 153 */ # Objects per Line - OBJECTS_PER_LINE = 10; + OBJECTS_PER_LINE = 10 # LCD Color Palette - COLOR_MAP = [ 0x9CB916, 0x8CAA14, 0x306430, - 0x103F10 + COLOR_MAP = [ 0x9CB916, 0x8CAA14, 0x306430, 0x103F10 # 0xE0F8D0, 0x88C070, 0x386850, 0x081820 # 0xFFFFFF, 0xAAAAAA, 0x555555, 0x000000 - ]; + ] # OAM Registers - oam = [] #= new byte[OAM_SIZE]; + oam = [] #= new byte[OAM_SIZE] # Video RAM - vram = []#= new byte[VRAM_SIZE]; + vram = []#= new byte[VRAM_SIZE] # LCD Registers int - lcdc = 0; - stat = 0; - scy = 0; - scx = 0; - ly = 0; - lyc = 0; - dma = 0; - bgp = 0; - obp0 = 0; - obp1 = 0; - wy = 0; - wx = 0; - wly = 0; + lcdc = 0 + stat = 0 + scy = 0 + scx = 0 + ly = 0 + lyc = 0 + dma = 0 + bgp = 0 + obp0 = 0 + obp1 = 0 + wy = 0 + wx = 0 + wly = 0 - cycles = 0; + cycles = 0 - frames = 0; - frameSkip = 0; + frames = 0 + frameSkip = 0 #boolean - transfer = False; - display = False; - vblank = False; - dirty = False; + transfer = False + display = False + vblank = False + dirty = False # Line Buffer, OAM Cache and Color Palette - line = []#= new int[8 + 160 + 8]; - objects = []#= new int[OBJECTS_PER_LINE]; - palette = []#= new int[1024]; + line = []#= new int[8 + 160 + 8] + objects = []#= new int[OBJECTS_PER_LINE] + palette = []#= new int[1024] # Video Driver VideoDriver - driver = None; + driver = None # Interrupt Controller Interrupt - interrupt = None; + interrupt = None # Memory Interface Memory - memory = None; + memory = None + def __init__(self, videDriver, interrupt, memory): - self.driver = videoDriver; - self.interrupt = interrupt; - self.memory = memory; - self.reset(); + self.driver = videoDriver + self.interrupt = interrupt + self.memory = memory + self.reset() def getFrameSkip(self): - return self.frameSkip; + return self.frameSkip def setFrameSkip(self, frameSkip): - self.frameSkip = frameSkip; + self.frameSkip = frameSkip def reset(self): - self.cycles = MODE_2_TICKS; + self.cycles = MODE_2_TICKS - self.lcdc = 0x91; - self.stat = 2; - self.ly = 0; - self.lyc = 0; - self.dma = 0xFF; - self.scy = 0; - self.scx = 0; - self.wy = self.wly = 0; - self.wx = 0; - self.bgp = 0xFC; - self.obp0 = self.obp1 = 0xFF; - - self.transfer = true; - self.display = true; - self.vblank = true; - self.dirty = true; + self.lcdc = 0x91 + self.stat = 2 + self.ly = 0 + self.lyc = 0 + self.dma = 0xFF + self.scy = 0 + self.scx = 0 + self.wy = self.wly = 0 + self.wx = 0 + self.bgp = 0xFC + self.obp0 = self.obp1 = 0xFF + + self.transfer = True + self.display = True + self.vblank = True + self.dirty = True for index in range(0, VRAM_SIZE): - self.vram[index] = 0x00; + self.vram[index] = 0x00 for index in range(0, OAM_SIZE): - self.oam[index] = 0x00; + self.oam[index] = 0x00 def write(self, address, data): - # assert data >= 0x00 and data <= 0xFF; - + # assert data >= 0x00 and data <= 0xFF if address == LCDC : - self.setControl(data); + self.setControl(data) elif address == STAT: - self.setStatus(data); + self.setStatus(data) elif address == SCY: - self.setScrollY(data); + self.setScrollY(data) elif address == SCX: - self.setScrollX(data); + self.setScrollX(data) elif address == LY: # Read Only pass elif address == LYC: - self.setLYCompare(data); + self.setLYCompare(data) elif address == DMA: - self.setDMA(data); + self.setDMA(data) elif address == BGP: - self.setBackgroundPalette(data); + self.setBackgroundPalette(data) elif address == OBP0: - self.setObjectPalette0(data); + self.setObjectPalette0(data) elif address == OBP1: - self.setObjectPalette1(data); + self.setObjectPalette1(data) elif address == WY: - self.setWindowY(data); + self.setWindowY(data) elif address == WX: - self.setWindowX(data); + self.setWindowX(data) else: if (address >= OAM_ADDR and address < OAM_ADDR + OAM_SIZE): #TODO convert to byte - self.oam[address - OAM_ADDR] = data; + self.oam[address - OAM_ADDR] = data elif (address >= VRAM_ADDR and address < VRAM_ADDR + VRAM_SIZE): #TODO convert to byte - self.vram[address - VRAM_ADDR] =data; + self.vram[address - VRAM_ADDR] =data def read(self, address): if address == LCDC: - return self.getControl(); + return self.getControl() elif address == STAT: - return self.getStatus(); + return self.getStatus() elif address == SCY: - return self.getScrollY(); + return self.getScrollY() elif address == SCX: - return self.getScrollX(); + return self.getScrollX() elif address == LY: - return self.getLineY(); + return self.getLineY() elif address == LYC: - return self.getLineYCompare(); + return self.getLineYCompare() elif address == DMA: - return self.getDMA(); + return self.getDMA() elif address == BGP: - return self.getBackgroundPalette(); + return self.getBackgroundPalette() elif address == OBP0: - return self.getObjectPalette0(); + return self.getObjectPalette0() elif address == OBP1: - return self.getObjectPalette1(); + return self.getObjectPalette1() elif address == WY: - return self.getWindowY(); + return self.getWindowY() elif address == WX: - return self.getWindowX(); + return self.getWindowX() else: if (address >= OAM_ADDR and address < OAM_ADDR + OAM_SIZE): - return self.oam[address - OAM_ADDR] & 0xFF; + return self.oam[address - OAM_ADDR] & 0xFF elif (address >= VRAM_ADDR and address < VRAM_ADDR + VRAM_SIZE): - return self.vram[address - VRAM_ADDR] & 0xFF; - return 0xFF; + return self.vram[address - VRAM_ADDR] & 0xFF + return 0xFF def cycles(self): - return self.cycles; + return self.cycles def emulate(self, ticks): if ((self.lcdc & 0x80) != 0): - self.cycles -= ticks; + self.cycles -= ticks while (self.cycles <= 0): switch = self.stat & 0x03 if switch == 0: - self.emulateHBlank(); + self.emulateHBlank() elif switch == 1: - self.emulateVBlank(); + self.emulateVBlank() elif switch == 2: - self.emulateOAM(); + self.emulateOAM() elif switch == 3: - self.emulateTransfer(); + self.emulateTransfer() def getControl(self): - return self.lcdc; + return self.lcdc def getStatus(self): - return 0x80 | self.stat; + return 0x80 | self.stat def getScrollY(self): - return self.scy; + return self.scy def getScrollX(self): - return self.scx; + return self.scx def getLineY(self): - return self.ly; + return self.ly def getLineYCompare(self): - return self.lyc; + return self.lyc def getDMA(self): - return self.dma; + return self.dma def getBackgroundPalette(self): - return self.bgp; + return self.bgp def getObjectPalette0(self): - return self.obp0; + return self.obp0 def getObjectPalette1(self): - return self.obp1; + return self.obp1 + def getWindowY(self): - return self.wy; + return self.wy + def getWindowX(self): - return self.wx; + return self.wx + def setControl(self, data): if ((self.lcdc & 0x80) != (data & 0x80)): # NOTE: do not reset LY=LYC flag (bit 2) of the STAT register (Mr. # Do!) if ((data & 0x80) != 0): - self.stat = (self.stat & 0xFC) | 0x02; - self.cycles = MODE_2_TICKS; - self.ly = 0; - - self.display = false; + self.stat = (self.stat & 0xFC) | 0x02 + self.cycles = MODE_2_TICKS + self.ly = 0 + self.display = False else: - self.stat = (self.stat & 0xFC) | 0x00; - self.cycles = MODE_1_TICKS; - self.ly = 0; + self.stat = (self.stat & 0xFC) | 0x00 + self.cycles = MODE_1_TICKS + self.ly = 0 - self.clearFrame(); + self.clearFrame() # don't draw window if it was not enabled and not being drawn before if ((self.lcdc & 0x20) == 0 and (data & 0x20) != 0 and self.wly == 0 and self.ly > self.wy): - self.wly = 144; + self.wly = 144 - self.lcdc = data; + self.lcdc = data def setStatus(self, data): - self.stat = (self.stat & 0x87) | (data & 0x78); - + self.stat = (self.stat & 0x87) | (data & 0x78) # Gameboy Bug if ((self.lcdc & 0x80) != 0 and (self.stat & 0x03) == 0x01 and (self.stat & 0x44) != 0x44): - self.interrupt.raiseInterrupt(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD) def setScrollY(self, data): - self.scy = data; + self.scy = data def setScrollX(self, data): - self.scx = data; + self.scx = data def setLYCompare(self, data): - self.lyc = data; + self.lyc = data if ((self.lcdc & 0x80) != 0): if (self.ly == self.lyc): # NOTE: raise interrupt once per line (Prehistorik Man, The # Jetsons, Muhammad Ali) if ((self.stat & 0x04) == 0): # LYC=LY interrupt - self.stat |= 0x04; - + self.stat |= 0x04 if ((self.stat & 0x40) != 0): - self.interrupt.raiseInterrupt(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD) else: - self.stat &= 0xFB; + self.stat &= 0xFB def setDMA(self, data): - self.dma = data; + self.dma = data for index in range(0, OAM_SIZE): #TODO convert to byte - self.oam[index] = self.memory.read((self.dma << 8) + index); + self.oam[index] = self.memory.read((self.dma << 8) + index) def setBackgroundPalette(self, data): if (self.bgp != data): - self.bgp = data; - self.dirty = true; + self.bgp = data + self.dirty = True def setObjectPalette0(self, data): if (self.obp0 != data): - self.obp0 = data; - self.dirty = true; + self.obp0 = data + self.dirty = True def setObjectPalette1(self, data): if (self.obp1 != data): - self.obp1 = data; - self.dirty = true; + self.obp1 = data + self.dirty = True def setWindowY(self, data): - self.wy = data; + self.wy = data def setWindowX(self, data): - self.wx = data; + self.wx = data def emulateOAM(self): - self.stat = (self.stat & 0xFC) | 0x03; - self.cycles += MODE_3_BEGIN_TICKS; - self.transfer = true; + self.stat = (self.stat & 0xFC) | 0x03 + self.cycles += MODE_3_BEGIN_TICKS + self.transfer = True def emulateTransfer(self): if (self.transfer): if (self.display): - self.drawLine(); - - self.stat = (self.stat & 0xFC) | 0x03; - self.cycles += MODE_3_END_TICKS; - self.transfer = false; + self.drawLine() + self.stat = (self.stat & 0xFC) | 0x03 + self.cycles += MODE_3_END_TICKS + self.transfer = False else: - self.stat = (self.stat & 0xFC) | 0x00; - self.cycles += MODE_0_TICKS; + self.stat = (self.stat & 0xFC) | 0x00 + self.cycles += MODE_0_TICKS # H-Blank interrupt if ((self.stat & 0x08) != 0 and (self.stat & 0x44) != 0x44): - self.interrupt.raiseInterrupt(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD) def emulateHBlank(self): - self.ly+=1; - + self.ly+=1 if (self.ly == self.lyc): # LYC=LY interrupt - self.stat |= 0x04; + self.stat |= 0x04 if ((self.stat & 0x40) != 0): - self.interrupt.raiseInterrupt(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD) else: - self.stat &= 0xFB; + self.stat &= 0xFB + if (self.ly < 144): - self.stat = (self.stat & 0xFC) | 0x02; - self.cycles += MODE_2_TICKS; + self.stat = (self.stat & 0xFC) | 0x02 + self.cycles += MODE_2_TICKS # OAM interrupt if ((self.stat & 0x20) != 0 and (self.stat & 0x44) != 0x44): - self.interrupt.raiseInterrupt(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD) else: if (self.display): - self.drawFrame(); + self.drawFrame() self.frames += 1 if (self.frames >= self.frameSkip): - self.display = true; - self.frames = 0; + self.display = True + self.frames = 0 else: - self.display = false; + self.display = False - self.stat = (self.stat & 0xFC) | 0x01; - self.cycles += MODE_1_BEGIN_TICKS; - self.vblank = true; + self.stat = (self.stat & 0xFC) | 0x01 + self.cycles += MODE_1_BEGIN_TICKS + self.vblank = True def emulateVBlank(self): if (self.vblank): - self.vblank = false; + self.vblank = False - self.stat = (self.stat & 0xFC) | 0x01; - self.cycles += MODE_1_TICKS - MODE_1_BEGIN_TICKS; + self.stat = (self.stat & 0xFC) | 0x01 + self.cycles += MODE_1_TICKS - MODE_1_BEGIN_TICKS # V-Blank interrupt if ((self.stat & 0x10) != 0): - self.interrupt.raiseInterrupt(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD) # V-Blank interrupt - self.interrupt.raiseInterrupt(Interrupt.VBLANK); + self.interrupt.raiseInterrupt(Interrupt.VBLANK) elif (self.ly == 0): - self.stat = (self.stat & 0xFC) | 0x02; - self.cycles += MODE_2_TICKS; + self.stat = (self.stat & 0xFC) | 0x02 + self.cycles += MODE_2_TICKS # OAM interrupt if ((self.stat & 0x20) != 0 and (self.stat & 0x44) != 0x44): - self.interrupt.raiseInterrupt(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD) else: if (self.ly < 153): - self.ly+=1; - self.stat = (self.stat & 0xFC) | 0x01; + self.ly+=1 + self.stat = (self.stat & 0xFC) | 0x01 if (self.ly == 153): - self.cycles += MODE_1_END_TICKS; + self.cycles += MODE_1_END_TICKS else: - self.cycles += MODE_1_TICKS; + self.cycles += MODE_1_TICKS else: - self.ly = self.wly = 0; - self.stat = (self.stat & 0xFC) | 0x01; - self.cycles += MODE_1_TICKS - MODE_1_END_TICKS; + self.ly = self.wly = 0 + self.stat = (self.stat & 0xFC) | 0x01 + self.cycles += MODE_1_TICKS - MODE_1_END_TICKS if (self.ly == self.lyc): # LYC=LY interrupt - self.stat |= 0x04; + self.stat |= 0x04 if ((self.stat & 0x40) != 0): - self.interrupt.raiseInterrupt(Interrupt.LCD); + self.interrupt.raiseInterrupt(Interrupt.LCD) else: - self.stat &= 0xFB; + self.stat &= 0xFB def drawFrame(self): - self.driver.display(); + self.driver.display() def clearFrame(self): - self.clearPixels(); - self.driver.display(); + self.clearPixels() + self.driver.display() def drawLine(self): if ((self.lcdc & 0x01) != 0): - self.drawBackground(); + self.drawBackground() else: - self.drawCleanBackground(); - + self.drawCleanBackground() if ((self.lcdc & 0x20) != 0): - self.drawWindow(); + self.drawWindow() if ((self.lcdc & 0x02) != 0): - self.drawObjects(); - self.drawPixels(); + self.drawObjects() + self.drawPixels() def drawCleanBackground(self): for x in range(0, 8+160+8): - self.line[x] = 0x00; + self.line[x] = 0x00 def drawBackground(self): - y = (self.scy + self.ly) & 0xFF; - x = self.scx & 0xFF; + y = (self.scy + self.ly) & 0xFF + x = self.scx & 0xFF tileMap = VRAM_MAP_A if (self.lcdc & 0x08) != 0: @@ -512,9 +509,9 @@ if (self.lcdc & 0x10) != 0: tileData = VRAM_DATA_A - tileMap += ((y >> 3) << 5) + (x >> 3); - tileData += (y & 7) << 1; - self.drawTiles(8 - (x & 7), tileMap, tileData); + tileMap += ((y >> 3) << 5) + (x >> 3) + tileData += (y & 7) << 1 + self.drawTiles(8 - (x & 7), tileMap, tileData) def drawWindow(self): @@ -526,266 +523,266 @@ if (self.lcdc & 0x10) != 0: tileData = VRAM_DATA_A - tileMap += (self.wly >> 3) << 5; - tileData += (self.wly & 7) << 1; + tileMap += (self.wly >> 3) << 5 + tileData += (self.wly & 7) << 1 - self.drawTiles(self.wx + 1, tileMap, tileData); - self.wly+=1; + self.drawTiles(self.wx + 1, tileMap, tileData) + self.wly+=1 def drawObjects(self): - count = self.scanObjects(); + count = self.scanObjects() lastx = 176 for index in range(176, count): - data = self.objects[index]; - x = (data >> 24) & 0xFF; - flags = (data >> 12) & 0xFF; - address = data & 0xFFF; + data = self.objects[index] + x = (data >> 24) & 0xFF + flags = (data >> 12) & 0xFF + address = data & 0xFFF if (x + 8 <= lastx): - self.drawObjectTile(x, address, flags); + self.drawObjectTile(x, address, flags) else: - self.drawOverlappedObjectTile(x, address, flags); - lastx = x; + self.drawOverlappedObjectTile(x, address, flags) + lastx = x def scanObjects(self): - count = 0; + count = 0 # search active objects for offset in range(0, 4*40, 4): - y = self.oam[offset + 0] & 0xFF; - x = self.oam[offset + 1] & 0xFF; + y = self.oam[offset + 0] & 0xFF + x = self.oam[offset + 1] & 0xFF if (y <= 0 or y >= 144 + 16 or x <= 0 or x >= 168): - continue; - tile = self.oam[offset + 2] & 0xFF; - flags = self.oam[offset + 3] & 0xFF; + continue + tile = self.oam[offset + 2] & 0xFF + flags = self.oam[offset + 3] & 0xFF - y = self.ly - y + 16; + y = self.ly - y + 16 if ((self.lcdc & 0x04) != 0): # 8x16 tile size if (y < 0 or y > 15): - continue; + continue # Y flip if ((flags & 0x40) != 0): - y = 15 - y; - tile &= 0xFE; + y = 15 - y + tile &= 0xFE else: # 8x8 tile size if (y < 0 or y > 7): - continue; + continue # Y flip if ((flags & 0x40) != 0): - y = 7 - y; - self.objects[count] = (x << 24) + (count << 20) + (flags << 12) + ((tile << 4) + (y << 1)); + y = 7 - y + self.objects[count] = (x << 24) + (count << 20) + (flags << 12) + ((tile << 4) + (y << 1)) if (++count >= OBJECTS_PER_LINE): - break; + break + self.sortScanObject(count) + return count + def sortScanObject(self, count): # sort objects from lower to higher priority for index in range(0, count): - rightmost = index; + rightmost = index for number in range(index+1, count): if ((self.objects[number] >> 20) > (self.objects[rightmost] >> 20)): - rightmost = number; - + rightmost = number if (rightmost != index): - data = self.objects[index]; - self.objects[index] = self.objects[rightmost]; - self.objects[rightmost] = data; - return count; + data = self.objects[index] + self.objects[index] = self.objects[rightmost] + self.objects[rightmost] = data def drawTiles(self, x, tileMap, tileData): if ((self.lcdc & 0x10) != 0): while (x < 168): - tile = self.vram[tileMap] & 0xFF; - self.drawTile(x, tileData + (tile << 4)); - tileMap = (tileMap & 0x1FE0) + ((tileMap + 1) & 0x001F); - x += 8; + tile = self.vram[tileMap] & 0xFF + self.drawTile(x, tileData + (tile << 4)) + tileMap = (tileMap & 0x1FE0) + ((tileMap + 1) & 0x001F) + x += 8 else: while (x < 168): - tile = (self.vram[tileMap] ^ 0x80) & 0xFF; - self.drawTile(x, tileData + (tile << 4)); - tileMap = (tileMap & 0x1FE0) + ((tileMap + 1) & 0x001F); - x += 8; + tile = (self.vram[tileMap] ^ 0x80) & 0xFF + self.drawTile(x, tileData + (tile << 4)) + tileMap = (tileMap & 0x1FE0) + ((tileMap + 1) & 0x001F) + x += 8 def drawTile(self, x, address): - pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8); - self.line[x + 0] = (pattern >> 7) & 0x0101; - self.line[x + 1] = (pattern >> 6) & 0x0101; - self.line[x + 2] = (pattern >> 5) & 0x0101; - self.line[x + 3] = (pattern >> 4) & 0x0101; - self.line[x + 4] = (pattern >> 3) & 0x0101; - self.line[x + 5] = (pattern >> 2) & 0x0101; - self.line[x + 6] = (pattern >> 1) & 0x0101; - self.line[x + 7] = (pattern >> 0) & 0x0101; + pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8) + self.line[x + 0] = (pattern >> 7) & 0x0101 + self.line[x + 1] = (pattern >> 6) & 0x0101 + self.line[x + 2] = (pattern >> 5) & 0x0101 + self.line[x + 3] = (pattern >> 4) & 0x0101 + self.line[x + 4] = (pattern >> 3) & 0x0101 + self.line[x + 5] = (pattern >> 2) & 0x0101 + self.line[x + 6] = (pattern >> 1) & 0x0101 + self.line[x + 7] = (pattern >> 0) & 0x0101 def drawObjectTile(self, x, address, flags): - pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8); - mask = 0; + pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8) + mask = 0 # priority if (flags & 0x80) != 0: - mask |= 0x0008; + mask |= 0x0008 # palette if (flags & 0x10) != 0: - mask |= 0x0004; + mask |= 0x0004 # X flip if (flags & 0x20) != 0: color = (pattern << 1) if ((color & 0x0202) != 0): - self.line[x + 0] |= color | mask; + self.line[x + 0] |= color | mask color = (pattern >> 0) if ((color & 0x0202) != 0): - self.line[x + 1] |= color | mask; + self.line[x + 1] |= color | mask color = (pattern >> 1) if ((color & 0x0202) != 0): - self.line[x + 2] |= color | mask; + self.line[x + 2] |= color | mask color = (pattern >> 2) if ((color & 0x0202) != 0): - self.line[x + 3] |= color | mask; + self.line[x + 3] |= color | mask color = (pattern >> 3) if ((color & 0x0202) != 0): - self.line[x + 4] |= color | mask; + self.line[x + 4] |= color | mask color = (pattern >> 4) if ((color & 0x0202) != 0): - self.line[x + 5] |= color | mask; + self.line[x + 5] |= color | mask color = (pattern >> 5) if ((color & 0x0202) != 0): - self.line[x + 6] |= color | mask; + self.line[x + 6] |= color | mask color = (pattern >> 6) if ((color & 0x0202) != 0): - self.line[x + 7] |= color | mask; + self.line[x + 7] |= color | mask else: color = (pattern >> 6) if ((color & 0x0202) != 0): - self.line[x + 0] |= color | mask; + self.line[x + 0] |= color | mask color = (pattern >> 5) if ((color & 0x0202) != 0): - self.line[x + 1] |= color | mask; + self.line[x + 1] |= color | mask color = (pattern >> 4) if ((color & 0x0202) != 0): - self.line[x + 2] |= color | mask; + self.line[x + 2] |= color | mask color = (pattern >> 3) if ((color & 0x0202) != 0): - self.line[x + 3] |= color | mask; + self.line[x + 3] |= color | mask color = (pattern >> 2) if ((color & 0x0202) != 0): - self.line[x + 4] |= color | mask; + self.line[x + 4] |= color | mask color = (pattern >> 1) if ((color & 0x0202) != 0): - self.line[x + 5] |= color | mask; + self.line[x + 5] |= color | mask color = (pattern >> 0) if ((color & 0x0202) != 0): - self.line[x + 6] |= color | mask; + self.line[x + 6] |= color | mask color = (pattern << 1) if ((color & 0x0202) != 0): - self.line[x + 7] |= color | mask; + self.line[x + 7] |= color | mask def drawOverlappedObjectTile(self, x, address, flags): - pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8); - mask = 0; + pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8) + mask = 0 # priority if ((flags & 0x80) != 0): - mask |= 0x0008; + mask |= 0x0008 # palette if ((flags & 0x10) != 0): - mask |= 0x0004; + mask |= 0x0004 # X flip if ((flags & 0x20) != 0): color = (pattern << 1) if ((color & 0x0202) != 0): - self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask; + self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask color = (pattern >> 0) if ((color & 0x0202) != 0): - self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask; + self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask color = (pattern >> 1) if ((color & 0x0202) != 0): - self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask; + self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask color = (pattern >> 2) if ((color & 0x0202) != 0): - self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask; + self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask color = (pattern >> 3) if ((color & 0x0202) != 0): - self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask; + self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask color = (pattern >> 4) if ((color & 0x0202) != 0): - self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask; + self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask color = (pattern >> 6) if ((color & 0x0202) != 0): - self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask; + self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask color = (pattern >> 5) if ((color & 0x0202) != 0): - self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask; + self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask else: color = (pattern >> 6) if ((color & 0x0202) != 0): - self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask; + self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask color = (pattern >> 5) if ((color & 0x0202) != 0): - self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask; + self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask color = (pattern >> 4) if ((color & 0x0202) != 0): - self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask; + self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask color = (pattern >> 3) if ((color & 0x0202) != 0): - self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask; + self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask color = (pattern >> 2) if ((color & 0x0202) != 0): - self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask; + self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask color = (pattern >> 1) if ((color & 0x0202) != 0): - self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask; + self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask color = (pattern >> 0) if ((color & 0x0202) != 0): - self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask; + self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask color = (pattern << 1) if ((color & 0x0202) != 0): - self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask; + self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask def drawPixels(self): - self.updatePalette(); - pixels = self.driver.getPixels(); - offset = self.ly * self.driver.getWidth(); + self.updatePalette() + pixels = self.driver.getPixels() + offset = self.ly * self.driver.getWidth() for x in range(8, 168, 4): - pattern0 = self.line[x + 0]; - pattern1 = self.line[x + 1]; - pattern2 = self.line[x + 2]; - pattern3 = self.line[x + 3]; - - pixels[offset + 0] = self.palette[pattern0]; - pixels[offset + 1] = self.palette[pattern1]; - pixels[offset + 2] = self.palette[pattern2]; - pixels[offset + 3] = self.palette[pattern3]; + pattern0 = self.line[x + 0] + pattern1 = self.line[x + 1] + pattern2 = self.line[x + 2] + pattern3 = self.line[x + 3] + + pixels[offset + 0] = self.palette[pattern0] + pixels[offset + 1] = self.palette[pattern1] + pixels[offset + 2] = self.palette[pattern2] + pixels[offset + 3] = self.palette[pattern3] - offset += 4; + offset += 4 def clearPixels(self): - pixels = self.driver.getPixels(); - length = self.driver.getWidth() * self.driver.getHeight(); + pixels = self.driver.getPixels() + length = self.driver.getWidth() * self.driver.getHeight() for offset in range(0, length): - pixels[offset] = COLOR_MAP[0]; + pixels[offset] = COLOR_MAP[0] def updatePalette(self): - if (self.dirty): - # bit 4/0 = BG color, bit 5/1 = OBJ color, bit 2 = OBJ palette, bit - # 3 = OBJ priority - for pattern in range(0, 64): - #color; - - if ((pattern & 0x22) == 0 or ((pattern & 0x08) != 0 and (pattern & 0x11) != 0)): - # OBJ behind BG color 1-3 - color = (self.bgp >> ((((pattern >> 3) & 0x02) + (pattern & 0x01)) << 1)) & 0x03; - # OBJ above BG - elif ((pattern & 0x04) == 0): - color = (self.obp0 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03; - else: - color = (self.obp1 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03; - - self.palette[((pattern & 0x30) << 4) + (pattern & 0x0F)] = COLOR_MAP[color]; + if (not self.dirty): + return + # bit 4/0 = BG color, bit 5/1 = OBJ color, bit 2 = OBJ palette, bit + # 3 = OBJ priority + for pattern in range(0, 64): + #color + if ((pattern & 0x22) == 0 or ((pattern & 0x08) != 0 and (pattern & 0x11) != 0)): + # OBJ behind BG color 1-3 + color = (self.bgp >> ((((pattern >> 3) & 0x02) + (pattern & 0x01)) << 1)) & 0x03 + # OBJ above BG + elif ((pattern & 0x04) == 0): + color = (self.obp0 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03 + else: + color = (self.obp1 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03 - self.dirty = false; + self.palette[((pattern & 0x30) << 4) + (pattern & 0x0F)] = COLOR_MAP[color] + self.dirty = False From arigo at codespeak.net Wed Mar 12 10:56:59 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 12 Mar 2008 10:56:59 +0100 (CET) Subject: [pypy-svn] r52407 - in pypy/branch/jit-hotpath/pypy: jit/codegen/llgraph jit/rainbow jit/timeshifter rpython/lltypesystem Message-ID: <20080312095659.B942C16857D@codespeak.net> Author: arigo Date: Wed Mar 12 10:56:57 2008 New Revision: 52407 Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (contents, props changed) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/opimpl.py Log: Start the fallback interpreter. Also share more code between dump.py and interpreter.py. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py Wed Mar 12 10:56:57 2008 @@ -785,6 +785,13 @@ setannotation(read_frame_var, lambda s_T, s_base, s_info, s_index: annmodel.lltype_to_annotation(s_T.const)) +def genconst_from_frame_var(gv_TYPE, base, info, index): + TYPE = _from_opaque(gv_TYPE).value + llvalue = read_frame_var(TYPE, base, info, index) + return genconst(llvalue) + +setannotation(genconst_from_frame_var, s_ConstOrVar) + def write_frame_var(base, info, index, value): vars = info._obj.info.args v = vars[index] Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py Wed Mar 12 10:56:57 2008 @@ -487,6 +487,11 @@ return llimpl.read_frame_var(T, base, info, index) @staticmethod + def genconst_from_frame_var(gv_TYPE, base, info, index): + v = llimpl.genconst_from_frame_var(gv_TYPE.v, base, info, index) + return LLConst(v) + + @staticmethod @specialize.arg(0) def write_frame_place(T, base, place, value): llimpl.write_frame_var(base, place.info, 0, value) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py Wed Mar 12 10:56:57 2008 @@ -27,6 +27,9 @@ def get_opname(self): return self.get(str, 2) + def getjitcode(self): + return self.jitcode + def load_2byte(self): return self.get(int, 2) @@ -64,10 +67,19 @@ keydesc = self.jitcode.keydescs[keydescnum] return keydesc - def load_jumptarget(self): + def load_4byte(self): # for jump targets tlbl = self.get(codewriter.tlabel, 4) return 'pc: %d' % self.labelpos[tlbl.name] + def red_result(self, val): + pass + + def green_result(self, val): + pass + + def green_result_from_red(self, val): + pass + class CustomRepr: def __init__(self, s): @@ -93,74 +105,11 @@ opname = src.get_opname() opcode = interpreter.find_opcode(opname) opimpl = interpreter.opcode_implementations[opcode] - argtypes = opimpl.argspec - args = [] - for argspec in argtypes: - if argspec == "red": - args.append(src.get_redarg()) - elif argspec == "green": - args.append(src.get_greenarg()) - elif argspec == "kind": - args.append(jitcode.typekinds[src.load_2byte()]) - elif argspec == "jumptarget": - args.append(src.load_jumptarget()) - elif argspec == "jumptargets": - num = src.load_2byte() - args.append([src.load_jumptarget() for i in range(num)], ) - elif argspec == "bool": - args.append(src.load_bool()) - elif argspec == "redboxcls": - args.append(jitcode.redboxclasses[src.load_2byte()]) - elif argspec == "2byte": - args.append(src.load_2byte()) - elif argspec == "greenkey": - args.append(src.get_greenkey()) - elif argspec == "promotiondesc": - promotiondescnum = src.load_2byte() - promotiondesc = jitcode.promotiondescs[promotiondescnum] - args.append(promotiondesc) - elif argspec == "green_varargs": - args.append(src.get_green_varargs()) - elif argspec == "red_varargs": - args.append(src.get_red_varargs()) - elif argspec == "bytecode": - bytecodenum = src.load_2byte() - called_bytecode = jitcode.called_bytecodes[bytecodenum] - args.append(getattr(called_bytecode, 'name', '?')) - elif argspec == "calldesc": - index = src.load_2byte() - function = jitcode.calldescs[index] - args.append(function) - elif argspec == "metacalldesc": - index = src.load_2byte() - function = jitcode.metacalldescs[index] - args.append(function) - elif argspec == "indirectcalldesc": - index = src.load_2byte() - function = jitcode.indirectcalldescs[index] - args.append(function) - elif argspec == "oopspec": - oopspecindex = src.load_2byte() - oopspec = jitcode.oopspecdescs[oopspecindex] - args.append(oopspec) - elif argspec == "structtypedesc": - td = jitcode.structtypedescs[src.load_2byte()] - args.append(td) - elif argspec == "arraydesc": - td = jitcode.arrayfielddescs[src.load_2byte()] - args.append(td) - elif argspec == "fielddesc": - d = jitcode.fielddescs[src.load_2byte()] - args.append(d) - elif argspec == "interiordesc": - d = jitcode.interiordescs[src.load_2byte()] - args.append(d) - elif argspec == "exception": - d = jitcode.exceptioninstances[src.load_2byte()] - args.append(d) - else: - assert 0, "unknown argtype declaration" + args = [] + def wrapper_callback(src, *newargs): + args.extend(newargs) + opimpl.argspec(wrapper_callback)(src) args = map(str, args) Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Wed Mar 12 10:56:57 2008 @@ -0,0 +1,289 @@ +from pypy.rlib.rarithmetic import intmask +from pypy.rlib.unroll import unrolling_iterable +from pypy.rlib.objectmodel import we_are_translated, CDefinedIntSymbolic +from pypy.rpython.lltypesystem import lltype, llmemory +from pypy.jit.rainbow.interpreter import SIGN_EXTEND2, arguments + + +class SegfaultException(AssertionError): + pass + + +class FallbackInterpreter(object): + """ + The fallback interp takes an existing suspended jitstate and + actual values for the live red vars, and interprets the jitcode + normally until it reaches the 'jit_merge_point' or raises. + """ + def __init__(self, ContinueRunningNormally): + self.ContinueRunningNormally = ContinueRunningNormally + + def run(self, fallback_point, framebase, pc): + self.fbp = fallback_point + self.framebase = framebase + self.initialize_state(pc) + self.bytecode_loop() + + def initialize_state(self, pc): + incoming_gv = self.fbp.saved_jitstate.get_locals_gv() + self.gv_to_index = {} + for i in range(len(incoming_gv)): + self.gv_to_index[incoming_gv[i]] = i + self.initialize_from_frame(self.fbp.saved_jitstate.frame) + self.pc = pc + + def initialize_from_frame(self, frame): + # note that both local_green and local_red contain GenConsts + rgenop = self.rgenop + self.pc = frame.pc + self.bytecode = frame.bytecode + self.local_green = frame.local_green[:] + self.local_red = [] + for box in frame.local_boxes: + assert box.genvar is not None, "XXX Virtuals support missing" + gv = box.genvar + if not gv.is_const: + # fetch the value from the machine code stack + gv = rgenop.genconst_from_frame_var(box.kind, self.framebase, + self.fbp.frameinfo, + self.gv_to_index[gv]) + self.local_red.append(gv) + + # ____________________________________________________________ + # XXX Lots of copy and paste from interp.py! + + def bytecode_loop(self): + while 1: + bytecode = self.load_2byte() + assert bytecode >= 0 + result = self.opcode_implementations[bytecode](self) + + # operation helper functions + def getjitcode(self): + return self.bytecode + + def load_byte(self): + pc = self.pc + assert pc >= 0 + result = ord(self.bytecode.code[pc]) + self.pc = pc + 1 + return result + + def load_2byte(self): + pc = self.pc + assert pc >= 0 + result = ((ord(self.bytecode.code[pc]) << 8) | + ord(self.bytecode.code[pc + 1])) + self.pc = pc + 2 + return intmask((result ^ SIGN_EXTEND2) - SIGN_EXTEND2) + + def load_4byte(self): + pc = self.pc + assert pc >= 0 + result = ((ord(self.bytecode.code[pc + 0]) << 24) | + (ord(self.bytecode.code[pc + 1]) << 16) | + (ord(self.bytecode.code[pc + 2]) << 8) | + (ord(self.bytecode.code[pc + 3]) << 0)) + self.pc = pc + 4 + return intmask(result) + + def load_bool(self): + return bool(self.load_byte()) + + def get_greenarg(self): + i = self.load_2byte() + if i < 0: + return self.bytecode.constants[~i] + return self.local_green[i] + + def get_green_varargs(self): + greenargs = [] + num = self.load_2byte() + for i in range(num): + greenargs.append(self.get_greenarg()) + return greenargs + + def get_red_varargs(self): + redargs = [] + num = self.load_2byte() + for i in range(num): + redargs.append(self.get_redarg()) + return redargs + + def get_redarg(self): + return self.local_red[self.load_2byte()] + + def get_greenkey(self): + keydescnum = self.load_2byte() + if keydescnum == -1: + return empty_key + else: + keydesc = self.bytecode.keydescs[keydescnum] + return GreenKey(self.local_green[:keydesc.nb_vals], keydesc) + + def red_result(self, gv): + assert gv.is_const + self.local_red.append(gv) + + def green_result(self, gv): + assert gv.is_const + self.local_green.append(gv) + + def green_result_from_red(self, gv): + self.green_result(gv) + + # ____________________________________________________________ + # Operation implementations + + @arguments() + def opimpl_trace(self): + bytecode = self.bytecode + print '*** fallback trace: in %s position %d ***' % (bytecode.name, + self.pc) + if bytecode.dump_copy is not None: + print bytecode.dump_copy + + @arguments("green", "2byte", returns="red") + def opimpl_make_redbox(self, genconst, typeid): + return genconst + + @arguments("red", returns="green_from_red") + def opimpl_revealconst(self, gv_value): + return gv_value + + @arguments("jumptarget") + def opimpl_goto(self, target): + self.pc = target + + @arguments("green", "jumptarget") + def opimpl_green_goto_iftrue(self, genconst, target): + xxx + + @arguments("green", "green_varargs", "jumptargets") + def opimpl_green_switch(self, exitcase, cases, targets): + xxx + + @arguments("red_varargs") + def opimpl_make_new_redvars(self, local_red): + self.local_red = local_red + + def opimpl_make_new_greenvars(self): + # this uses a "green_varargs" argument, but we do the decoding + # manually for the fast case + num = self.load_2byte() + if num == 0 and len(self.local_green) == 0: + # fast (very common) case + return + newgreens = [] + for i in range(num): + newgreens.append(self.get_greenarg()) + self.local_green = newgreens + opimpl_make_new_greenvars.argspec = arguments("green_varargs") + + @arguments("red", returns="red") + def opimpl_red_ptr_nonzero(self, gv_ptr): + addr = gv_ptr.revealconst(llmemory.Address) + return self.rgenop.genconst(bool(addr)) + + @arguments("red", returns="red") + def opimpl_red_ptr_iszero(self, gv_ptr): + addr = gv_ptr.revealconst(llmemory.Address) + return self.rgenop.genconst(not addr) + + @arguments() + def opimpl_gray_return(self): + xxx + + @arguments("green_varargs", "red_varargs", "bytecode") + def opimpl_red_direct_call(self, greenargs, redargs, targetbytecode): + xxx + + # exceptions + + @arguments(returns="red") + def opimpl_read_exctype(self): + xxx + + @arguments(returns="red") + def opimpl_read_excvalue(self): + xxx + + @arguments("red") + def opimpl_write_exctype(self, typebox): + xxx + + @arguments("red") + def opimpl_write_excvalue(self, valuebox): + xxx + + @arguments("red", "red") + def opimpl_setexception(self, typebox, valuebox): + xxx + + # structs and arrays + + @arguments("structtypedesc", returns="red") + def opimpl_red_malloc(self, structtypedesc): + xxx + + @arguments("red", "fielddesc", "bool", returns="red") + def opimpl_red_getfield(self, gv_struct, fielddesc, deepfrozen): + gv_res = fielddesc.getfield_if_non_null(self.rgenop, gv_struct) + if gv_res is None: + raise SegfaultException + return gv_res + + @arguments("red", "fielddesc", "red") + def opimpl_red_setfield(self, destbox, fielddesc, valuebox): + xxx + + # hotpath-specific operations + + @arguments() + def opimpl_jit_merge_point(self): + raise self.ContinueRunningNormally(self.local_green + self.local_red) + + @arguments("red", "jumptarget") + def opimpl_red_hot_goto_iftrue(self, gv_switch, target): + if gv_switch.revealconst(lltype.Bool): + self.pc = target + + # ____________________________________________________________ + # construction-time interface + + def register_opcode_impls(self, interp): + self.rgenop = interp.rgenop + impl = [None] * len(interp.opcode_implementations) + for opname, index in interp.opname_to_index.items(): + argspec = interp.opcode_implementations[index].argspec + name = 'opimpl_' + opname + if hasattr(self, name): + fbopimpl = getattr(self, name).im_func + assert fbopimpl.argspec == argspec + else: + opdesc = interp.opcode_descs[index] + if opdesc is None: + raise Exception("no fallback interpreter support for %r" % + (opname,)) + fbopimpl = self.get_opcode_implementation(name, argspec, + opdesc) + impl[index] = fbopimpl + self.opcode_implementations = impl + + def get_opcode_implementation(self, func_name, argspec, opdesc): + numargs = unrolling_iterable(range(opdesc.nb_args)) + def implementation(self, *args_gv): + args = (opdesc.RESULT, ) + for i in numargs: + arg = args_gv[i].revealconst(opdesc.ARGS[i]) + args += (arg, ) + if not we_are_translated(): + if opdesc.opname == "int_is_true": + # special case for tests, as in llinterp.py + if type(args[1]) is CDefinedIntSymbolic: + args = (args[0], args[1].default) + return self.rgenop.genconst(opdesc.llop(*args)) + implementation.func_name = func_name + # the argspec may unwrap *args_gv from local_red or local_green + # and put the result back into local_red or local_green + return argspec(implementation) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Wed Mar 12 10:56:57 2008 @@ -9,6 +9,7 @@ from pypy.jit.hintannotator.model import originalconcretetype from pypy.jit.timeshifter import rvalue from pypy.jit.rainbow import rhotpath +from pypy.jit.rainbow.fallback import FallbackInterpreter class EntryPointsRewriter: @@ -78,10 +79,11 @@ self.jit_may_enter_fn = jit_may_enter def update_interp(self): + self.fallbackinterp = FallbackInterpreter(self.ContinueRunningNormally) ERASED = self.RGenOp.erasedType(lltype.Bool) self.interpreter.bool_hotpromotiondesc = rhotpath.HotPromotionDesc( - ERASED, self.interpreter, self.threshold, - self.ContinueRunningNormally) + ERASED, self.interpreter, self.threshold, self.fallbackinterp) + self.fallbackinterp.register_opcode_impls(self.interpreter) def rewrite_graphs(self): for graph in self.hintannotator.base_translator.graphs: @@ -164,20 +166,33 @@ # exc_data_ptr = self.codewriter.exceptiondesc.exc_data_ptr llinterp = LLInterpreter(self.rtyper, exc_data_ptr=exc_data_ptr) + jit_may_enter = self.jit_may_enter_fn class ContinueRunningNormally(Exception): _go_through_llinterp_uncaught_ = True # ugh - def __init__(self, *args): - self.args = args + def __init__(self, args_gv): + assert len(args_gv) == len(ARGS) + self.args = [gv_arg.revealconst(ARG) + for gv_arg, ARG in zip(args_gv, ARGS)] + def __str__(self): + return 'ContinueRunningNormally(%s)' % ( + ', '.join(map(str, self.args)),) self.ContinueRunningNormally = ContinueRunningNormally def portal_runner(*args): + check_for_immediate_reentry = False while 1: try: + if check_for_immediate_reentry: + jit_may_enter(*args) llinterp.eval_graph(portalgraph, list(args)) assert 0, "unreachable" except ContinueRunningNormally, e: args = e.args + check_for_immediate_reentry = True + # ^^^ but should depend on whether the fallback + # interpreter reached a jit_can_enter() or just + # the jit_merge_point() portal_runner_ptr = lltype.functionptr(PORTALFUNC, 'portal_runner', _callable = portal_runner) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Wed Mar 12 10:56:57 2008 @@ -57,9 +57,13 @@ def _freeze_(self): return True + def __repr__(self): + return '' % (getattr(self, 'name', '?'),) + def dump(self, file=None): from pypy.jit.rainbow import dump dump.dump_bytecode(self, file=file) + print >> file SIGN_EXTEND2 = 1 << 15 @@ -89,11 +93,25 @@ if finaljitstate is not None: interpreter.finish_jitstate(interpreter.portalstate.sigtoken) -def arguments(*argtypes, **kwargs): - result = kwargs.pop("returns", None) - assert not kwargs - argtypes = unrolling_iterable(argtypes) - def decorator(func): +class arguments(object): + def __init__(self, *argtypes, **kwargs): + self.result = kwargs.pop("returns", None) + assert not kwargs + self.argtypes = argtypes + + def __eq__(self, other): + if not isinstance(other, arguments): + return NotImplemented + return self.argtypes == other.argtypes and self.result == other.result + + def __ne__(self, other): + if not isinstance(other, arguments): + return NotImplemented + return self.argtypes != other.argtypes or self.result != other.result + + def __call__(self, func): + result = self.result + argtypes = unrolling_iterable(self.argtypes) def wrapped(self): args = (self, ) for argspec in argtypes: @@ -102,7 +120,7 @@ elif argspec == "green": args += (self.get_greenarg(), ) elif argspec == "kind": - args += (self.frame.bytecode.typekinds[self.load_2byte()], ) + args += (self.getjitcode().typekinds[self.load_2byte()], ) elif argspec == "jumptarget": args += (self.load_4byte(), ) elif argspec == "jumptargets": @@ -111,14 +129,14 @@ elif argspec == "bool": args += (self.load_bool(), ) elif argspec == "redboxcls": - args += (self.frame.bytecode.redboxclasses[self.load_2byte()], ) + args += (self.getjitcode().redboxclasses[self.load_2byte()], ) elif argspec == "2byte": args += (self.load_2byte(), ) elif argspec == "greenkey": args += (self.get_greenkey(), ) elif argspec == "promotiondesc": promotiondescnum = self.load_2byte() - promotiondesc = self.frame.bytecode.promotiondescs[promotiondescnum] + promotiondesc = self.getjitcode().promotiondescs[promotiondescnum] args += (promotiondesc, ) elif argspec == "green_varargs": args += (self.get_green_varargs(), ) @@ -126,37 +144,37 @@ args += (self.get_red_varargs(), ) elif argspec == "bytecode": bytecodenum = self.load_2byte() - args += (self.frame.bytecode.called_bytecodes[bytecodenum], ) + args += (self.getjitcode().called_bytecodes[bytecodenum], ) elif argspec == "calldesc": index = self.load_2byte() - function = self.frame.bytecode.calldescs[index] + function = self.getjitcode().calldescs[index] args += (function, ) elif argspec == "metacalldesc": index = self.load_2byte() - function = self.frame.bytecode.metacalldescs[index] + function = self.getjitcode().metacalldescs[index] args += (function, ) elif argspec == "indirectcalldesc": index = self.load_2byte() - function = self.frame.bytecode.indirectcalldescs[index] + function = self.getjitcode().indirectcalldescs[index] args += (function, ) elif argspec == "oopspec": oopspecindex = self.load_2byte() - oopspec = self.frame.bytecode.oopspecdescs[oopspecindex] + oopspec = self.getjitcode().oopspecdescs[oopspecindex] args += (oopspec, ) elif argspec == "structtypedesc": - td = self.frame.bytecode.structtypedescs[self.load_2byte()] + td = self.getjitcode().structtypedescs[self.load_2byte()] args += (td, ) elif argspec == "arraydesc": - td = self.frame.bytecode.arrayfielddescs[self.load_2byte()] + td = self.getjitcode().arrayfielddescs[self.load_2byte()] args += (td, ) elif argspec == "fielddesc": - d = self.frame.bytecode.fielddescs[self.load_2byte()] + d = self.getjitcode().fielddescs[self.load_2byte()] args += (d, ) elif argspec == "interiordesc": - d = self.frame.bytecode.interiordescs[self.load_2byte()] + d = self.getjitcode().interiordescs[self.load_2byte()] args += (d, ) elif argspec == "exception": - d = self.frame.bytecode.exceptioninstances[self.load_2byte()] + d = self.getjitcode().exceptioninstances[self.load_2byte()] args += (d, ) else: assert 0, "unknown argtype declaration" @@ -173,10 +191,8 @@ return return val wrapped.func_name = "wrap_" + func.func_name - wrapped.argspec = tuple(argtypes) - wrapped.resultspec = result + wrapped.argspec = self return wrapped - return decorator class JitInterpreter(object): @@ -312,6 +328,9 @@ return # operation helper functions + def getjitcode(self): + return self.frame.bytecode + def load_byte(self): pc = self.frame.pc assert pc >= 0 @@ -523,8 +542,7 @@ for i in range(num): newgreens.append(self.get_greenarg()) self.frame.local_green = newgreens - opimpl_make_new_greenvars.argspec = ("green_varargs",) # for dump.py - opimpl_make_new_greenvars.resultspec = None + opimpl_make_new_greenvars.argspec = arguments("green_varargs") #for dump.py @arguments("2byte", "greenkey") def opimpl_local_merge(self, mergepointnum, key): @@ -815,7 +833,8 @@ @arguments("red", "jumptarget") def opimpl_red_hot_goto_iftrue(self, switchbox, target): - rhotpath.hotsplit(self.jitstate, self.bool_hotpromotiondesc, switchbox) + rhotpath.hotsplit(self.jitstate, self.bool_hotpromotiondesc, + switchbox, self.frame.pc, target) assert False, "unreachable" # ____________________________________________________________ @@ -849,8 +868,6 @@ args = (args[0], args[1].default) result = self.rgenop.genconst(opdesc.llop(*args)) self.green_result(result) - implementation.argspec = ("green",) * len(list(numargs)) - implementation.resultspec = "green" elif color == "red": if opdesc.nb_args == 1: impl = rtimeshift.ll_gen1 @@ -864,11 +881,14 @@ args += (self.get_redarg(), ) result = impl(*args) self.red_result(result) - implementation.argspec = ("red",) * len(list(numargs)) - implementation.resultspec = "red" else: assert 0, "unknown color" implementation.func_name = "opimpl_%s_%s" % (color, opdesc.opname) + # build an arguments() for dump.py + colorarglist = [color] * opdesc.nb_args + resultdict = {"returns": color} + implementation.argspec = arguments(*colorarglist, **resultdict) + opname = "%s_%s" % (color, opdesc.opname) index = self.opname_to_index[opname] = len(self.opcode_implementations) self.opcode_implementations.append(implementation) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Wed Mar 12 10:56:57 2008 @@ -81,8 +81,7 @@ class HotPromotionDesc: __metaclass__ = cachedtype - def __init__(self, ERASED, interpreter, threshold, - ContinueRunningNormally): + def __init__(self, ERASED, interpreter, threshold, fallbackinterp): self.exceptiondesc = interpreter.exceptiondesc self.gv_constant_one = interpreter.rgenop.constPrebuiltGlobal(1) @@ -92,8 +91,10 @@ assert lltype.typeOf(value) is lltype.Bool # XXX for now if value: counter = fbp.truepath_counter + pc = fbp.truepath_pc else: counter = fbp.falsepath_counter + pc = fbp.falsepath_pc assert counter >= 0, ( "reaching a fallback point for an already-compiled path") counter += 1 @@ -122,7 +123,7 @@ report_compile_time_exception(e) # exceptions below at run-time exceptions, we let them propagate - fbp.run_fallback_interpreter(framebase, ContinueRunningNormally) + fallbackinterp.run(fbp, framebase, pc) # If the fallback interpreter reached the next jit_merge_point(), # it raised ContinueRunningNormally(). This exception is # caught by portal_runner() from hotpath.py in order to loop @@ -153,7 +154,8 @@ falsepath_counter = 0 # -1 after this path was compiled truepath_counter = 0 # -1 after this path was compiled - def __init__(self, jitstate, flexswitch, frameinfo): + def __init__(self, jitstate, flexswitch, frameinfo, + falsepath_pc, truepath_pc): # XXX we should probably trim down the jitstate once our caller # is done with it, to avoid keeping too much stuff in memory self.saved_jitstate = jitstate @@ -162,6 +164,8 @@ # ^^^ 'frameinfo' describes where the machine code stored all # its GenVars, so that we can fish these values to pass them # to the fallback interpreter + self.falsepath_pc = falsepath_pc + self.truepath_pc = truepath_pc def getrgenop(self): return self.saved_jitstate.curbuilder.rgenop @@ -171,7 +175,7 @@ _TYPE = base_ptr_lltype() -def hotsplit(jitstate, hotpromotiondesc, switchbox): +def hotsplit(jitstate, hotpromotiondesc, switchbox, falsepath_pc, truepath_pc): # produce a Bool flexswitch for now incoming = jitstate.enter_block_sweep_virtualizables() switchblock = rtimeshift.enter_next_block(jitstate, incoming) @@ -182,7 +186,8 @@ jitstate.curbuilder = default_builder # default case of the switch: frameinfo = default_builder.get_frame_info(incoming_gv) - fbp = FallbackPoint(jitstate, flexswitch, frameinfo) + fbp = FallbackPoint(jitstate, flexswitch, frameinfo, + falsepath_pc, truepath_pc) ll_fbp = fbp # XXX doesn't translate gv_fbp = default_builder.rgenop.genconst(ll_fbp) gv_switchvar = switchbox.genvar @@ -204,8 +209,3 @@ jitstate.curbuilder = excpath_builder excpath_builder.start_writing() raise GenerateReturn - -# ____________________________________________________________ -# The fallback interp takes an existing suspended jitstate and -# actual values for the live red vars, and interprets the jitcode -# normally until it reaches the 'jit_merge_point' or raises. Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Wed Mar 12 10:56:57 2008 @@ -540,11 +540,11 @@ T = self.PTRTYPE.TO self.fieldname = name self.fieldtoken = RGenOp.fieldToken(T, name) - def getfield_if_non_null(jitstate, genvar): + def getfield_if_non_null(rgenop, genvar): ptr = genvar.revealconst(PTRTYPE) if ptr: res = getattr(ptr, name) - return rvalue.ll_gv_fromvalue(jitstate, res) + return rgenop.genconst(res) self.getfield_if_non_null = getfield_if_non_null def compact_repr(self): # goes in ll helper names Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Wed Mar 12 10:56:57 2008 @@ -145,7 +145,7 @@ assert isinstance(argbox, rvalue.PtrRedBox) if (fielddesc.immutable or deepfrozen) and argbox.is_constant(): resgv = fielddesc.getfield_if_non_null( - jitstate, argbox.getgenvar(jitstate)) + jitstate.curbuilder.rgenop, argbox.getgenvar(jitstate)) if resgv is not None: return fielddesc.makebox(jitstate, resgv) return argbox.op_getfield(jitstate, fielddesc) Modified: pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py Wed Mar 12 10:56:57 2008 @@ -452,7 +452,7 @@ 'debug_print': LLOp(canrun=True), 'debug_pdb': LLOp(), 'debug_assert': LLOp(tryfold=True), - 'debug_fatalerror': LLOp(), + 'debug_fatalerror': LLOp(canrun=True), 'debug_llinterpcall': LLOp(), # Python func call 'res=arg[0](*arg[1:])' # in backends, abort() or whatever is fine Modified: pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/opimpl.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/opimpl.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/opimpl.py Wed Mar 12 10:56:57 2008 @@ -404,7 +404,14 @@ def op_debug_print(*args): for arg in args: - print arg + print >> sys.stderr, arg, + print >> sys.stderr + +class DebugFatalError(AssertionError): + pass + +def op_debug_fatalerror(*args): + raise DebugFatalError(*args) # ____________________________________________________________ From fijal at codespeak.net Wed Mar 12 11:34:44 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 12 Mar 2008 11:34:44 +0100 (CET) Subject: [pypy-svn] r52408 - pypy/extradoc/talk/pycon2008/demo Message-ID: <20080312103444.B293A169E75@codespeak.net> Author: fijal Date: Wed Mar 12 11:34:44 2008 New Revision: 52408 Added: pypy/extradoc/talk/pycon2008/demo/ Log: demo directory for pycon stuff From arigo at codespeak.net Wed Mar 12 12:11:55 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 12 Mar 2008 12:11:55 +0100 (CET) Subject: [pypy-svn] r52409 - in pypy/branch/jit-hotpath/pypy/jit: rainbow timeshifter Message-ID: <20080312111155.F3086169E78@codespeak.net> Author: arigo Date: Wed Mar 12 12:11:54 2008 New Revision: 52409 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: Enough of the fallback interpreter to support the current test (which does not pass yet for other reasons). Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Wed Mar 12 12:11:54 2008 @@ -4,6 +4,8 @@ from pypy.objspace.flow import model as flowmodel from pypy.rpython.annlowlevel import cachedtype from pypy.rpython.lltypesystem import lltype, llmemory +from pypy.rpython.llinterp import LLInterpreter +from pypy.rpython.extregistry import ExtRegistryEntry from pypy.jit.hintannotator.model import originalconcretetype from pypy.jit.hintannotator import model as hintmodel from pypy.jit.timeshifter import rtimeshift, rvalue, rcontainer, exception @@ -26,10 +28,31 @@ rtyper, exc_classdef) jitstate.residual_ll_exception(ll_exc) +def maybe_on_top_of_llinterp(exceptiondesc, fnptr): + # Run a generated graph on top of the llinterp for testing. + # When translated, this just returns the fnptr. + exc_data_ptr = exceptiondesc.exc_data_ptr + assert exceptiondesc.rtyper is not None + llinterp = LLInterpreter(exceptiondesc.rtyper, exc_data_ptr=exc_data_ptr) + def on_top_of_llinterp(*args): + return llinterp.eval_graph(fnptr._obj.graph, list(args)) + return on_top_of_llinterp + +class Entry(ExtRegistryEntry): + _about_ = maybe_on_top_of_llinterp + + def compute_result_annotation(self, s_exceptiondesc, s_fnptr): + return s_fnptr + + def specialize_call(self, hop): + return hop.inputarg(hop.args_r[1], arg=1) + + class CallDesc: __metaclass__ = cachedtype - def __init__(self, RGenOp, rtyper, FUNCTYPE, voidargs=()): + def __init__(self, RGenOp, exceptiondesc, FUNCTYPE, voidargs=()): + self.exceptiondesc = exceptiondesc self.sigtoken = RGenOp.sigToken(FUNCTYPE.TO) self.result_kind = RGenOp.kindToken(FUNCTYPE.TO.RESULT) # xxx what if the result is virtualizable? @@ -44,8 +67,14 @@ voidargs = (None, ) * voidargcount argiter = unrolling_iterable(FUNCTYPE.TO.ARGS) RETURN = FUNCTYPE.TO.RESULT - def green_call(interpreter, fnptr_gv, greenargs): - fnptr = fnptr_gv.revealconst(FUNCTYPE) + if RETURN is lltype.Void: + self.gv_whatever_return_value = None + else: + self.gv_whatever_return_value = RGenOp.constPrebuiltGlobal( + whatever_return_value) + + def perform_call(rgenop, gv_fnptr, greenargs): + fnptr = gv_fnptr.revealconst(FUNCTYPE) assert len(greenargs) + len(voidargs) == numargs args = () j = 0 @@ -65,22 +94,31 @@ arg = genconst.revealconst(ARG) args += (arg, ) j += 1 - rgenop = interpreter.jitstate.curbuilder.rgenop - try: - result = fnptr(*args) - except Exception, e: - if not we_are_translated(): - residual_exception_nontranslated(interpreter.jitstate, e, rtyper) - else: - interpreter.jitstate.residual_exception(e) - result = whatever_return_value - if RETURN != lltype.Void: - interpreter.green_result(rgenop.genconst(result)) - self.green_call = green_call + result = maybe_on_top_of_llinterp(self.exceptiondesc, fnptr)(*args) + if RETURN is lltype.Void: + return None + else: + return rgenop.genconst(result) + + self.perform_call = perform_call def _freeze_(self): return True + def green_call(self, interpreter, gv_fnptr, greenargs): + rgenop = interpreter.jitstate.curbuilder.rgenop + try: + gv_result = self.perform_call(rgenop, gv_fnptr, greenargs) + except Exception, e: + if not we_are_translated(): + residual_exception_nontranslated(interpreter.jitstate, e, + self.exceptiondesc.rtyper) + else: + interpreter.jitstate.residual_exception(e) + gv_result = self.gv_whatever_return_value + if gv_result is not None: + interpreter.green_result(gv_result) + class IndirectCallsetDesc(object): __metaclass__ = cachedtype @@ -105,7 +143,7 @@ self.graphs = [graph for (graph, tsgraph) in graph2tsgraph] self.jitcodes = values - self.calldesc = CallDesc(codewriter.RGenOp, codewriter.rtyper, + self.calldesc = CallDesc(codewriter.RGenOp, codewriter.exceptiondesc, lltype.typeOf(fnptr)) @@ -117,7 +155,7 @@ etrafo = hannotator.exceptiontransformer type_system = self.rtyper.type_system.name self.exceptiondesc = exception.ExceptionDesc( - RGenOp, etrafo, type_system, True) + RGenOp, etrafo, type_system, True, self.rtyper) self.interpreter = JitInterpreter(self.exceptiondesc, RGenOp) self.RGenOp = RGenOp self.current_block = None @@ -213,6 +251,7 @@ bytecode = self.all_graphs[graph] labelpos = {} code = assemble_labelpos(labelpos, self.interpreter, *self.assembler) + owncalldesc, gv_ownfnptr = self.make_own_call_information(graph) bytecode.__init__(graph.name, code, self.sharelist("constants"), @@ -232,7 +271,9 @@ self.sharelist("calldescs"), self.sharelist("metacalldescs"), self.sharelist("indirectcalldescs"), - self.is_portal) + self.is_portal, + owncalldesc, + gv_ownfnptr) bytecode._source = self.assembler bytecode._interpreter = self.interpreter bytecode._labelpos = labelpos @@ -247,6 +288,17 @@ self.num_global_mergepoints) return bytecode + def make_own_call_information(self, graph): + ARGS = [v.concretetype for v in graph.getargs()] + RESULT = graph.getreturnvar().concretetype + FUNCTYPE = lltype.FuncType(ARGS, RESULT) + + owncalldesc = CallDesc(self.RGenOp, self.exceptiondesc, + lltype.Ptr(FUNCTYPE)) + ownfnptr = lltype.functionptr(FUNCTYPE, graph.name, graph=graph) + gv_ownfnptr = self.RGenOp.constPrebuiltGlobal(ownfnptr) + return owncalldesc, gv_ownfnptr + def get_jitcode(self, graph): if graph in self.all_graphs: return self.all_graphs[graph] @@ -646,7 +698,7 @@ return self.calldesc_positions[key] result = len(self.calldescs) self.calldescs.append( - CallDesc(self.RGenOp, self.rtyper, FUNCTYPE, voidargs)) + CallDesc(self.RGenOp, self.exceptiondesc, FUNCTYPE, voidargs)) self.calldesc_positions[key] = result return result Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Wed Mar 12 12:11:54 2008 @@ -5,18 +5,15 @@ from pypy.jit.rainbow.interpreter import SIGN_EXTEND2, arguments -class SegfaultException(AssertionError): - pass - - class FallbackInterpreter(object): """ The fallback interp takes an existing suspended jitstate and actual values for the live red vars, and interprets the jitcode normally until it reaches the 'jit_merge_point' or raises. """ - def __init__(self, ContinueRunningNormally): + def __init__(self, ContinueRunningNormally, exceptiondesc): self.ContinueRunningNormally = ContinueRunningNormally + self.exceptiondesc = exceptiondesc def run(self, fallback_point, framebase, pc): self.fbp = fallback_point @@ -25,29 +22,36 @@ self.bytecode_loop() def initialize_state(self, pc): - incoming_gv = self.fbp.saved_jitstate.get_locals_gv() + jitstate = self.fbp.saved_jitstate + incoming_gv = jitstate.get_locals_gv() self.gv_to_index = {} for i in range(len(incoming_gv)): self.gv_to_index[incoming_gv[i]] = i - self.initialize_from_frame(self.fbp.saved_jitstate.frame) + + self.initialize_from_frame(jitstate.frame) self.pc = pc + self.gv_exc_type = self.getinitialboxgv(jitstate.exc_type_box) + self.gv_exc_value = self.getinitialboxgv(jitstate.exc_value_box) + + def getinitialboxgv(self, box): + assert box.genvar is not None, "XXX Virtuals support missing" + gv = box.genvar + if not gv.is_const: + # fetch the value from the machine code stack + gv = self.rgenop.genconst_from_frame_var(box.kind, self.framebase, + self.fbp.frameinfo, + self.gv_to_index[gv]) + return gv def initialize_from_frame(self, frame): # note that both local_green and local_red contain GenConsts - rgenop = self.rgenop + self.current_source_jitframe = frame self.pc = frame.pc self.bytecode = frame.bytecode self.local_green = frame.local_green[:] self.local_red = [] for box in frame.local_boxes: - assert box.genvar is not None, "XXX Virtuals support missing" - gv = box.genvar - if not gv.is_const: - # fetch the value from the machine code stack - gv = rgenop.genconst_from_frame_var(box.kind, self.framebase, - self.fbp.frameinfo, - self.gv_to_index[gv]) - self.local_red.append(gv) + self.local_red.append(self.getinitialboxgv(box)) # ____________________________________________________________ # XXX Lots of copy and paste from interp.py! @@ -192,50 +196,65 @@ @arguments() def opimpl_gray_return(self): - xxx + assert self.current_source_jitframe.backframe is None # XXX for now + # at this point we should have an exception set in self.gv_exc_xxx + # and we have to really raise it. XXX non-translatable hack follows... + from pypy.rpython.llinterp import LLException + exceptiondesc = self.exceptiondesc + lltype = self.gv_exc_type.revealconst(exceptiondesc.LL_EXC_TYPE) + llvalue = self.gv_exc_value.revealconst(exceptiondesc.LL_EXC_VALUE) + assert lltype and llvalue + raise LLException(lltype, llvalue) @arguments("green_varargs", "red_varargs", "bytecode") def opimpl_red_direct_call(self, greenargs, redargs, targetbytecode): - xxx + assert not greenargs # XXX for now + calldesc = targetbytecode.owncalldesc + gv_res = calldesc.perform_call(self.rgenop, + targetbytecode.gv_ownfnptr, + redargs) + if gv_res is not None: + self.red_result(gv_res) + # XXX what occurs with exceptions raised by the called graph? # exceptions @arguments(returns="red") def opimpl_read_exctype(self): - xxx + return self.gv_exc_type @arguments(returns="red") def opimpl_read_excvalue(self): - xxx + return self.gv_exc_value @arguments("red") - def opimpl_write_exctype(self, typebox): - xxx + def opimpl_write_exctype(self, gv_type): + self.gv_exc_type = gv_type @arguments("red") - def opimpl_write_excvalue(self, valuebox): - xxx + def opimpl_write_excvalue(self, gv_value): + self.gv_exc_value = gv_value @arguments("red", "red") - def opimpl_setexception(self, typebox, valuebox): - xxx + def opimpl_setexception(self, gv_type, gv_value): + self.gv_exc_type = gv_type + self.gv_exc_value = gv_value # structs and arrays @arguments("structtypedesc", returns="red") def opimpl_red_malloc(self, structtypedesc): - xxx + return structtypedesc.allocate(self.rgenop) @arguments("red", "fielddesc", "bool", returns="red") def opimpl_red_getfield(self, gv_struct, fielddesc, deepfrozen): gv_res = fielddesc.getfield_if_non_null(self.rgenop, gv_struct) - if gv_res is None: - raise SegfaultException + assert gv_res is not None, "segfault!" return gv_res @arguments("red", "fielddesc", "red") - def opimpl_red_setfield(self, destbox, fielddesc, valuebox): - xxx + def opimpl_red_setfield(self, gv_dest, fielddesc, gv_value): + fielddesc.setfield(self.rgenop, gv_dest, gv_value) # hotpath-specific operations Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Wed Mar 12 12:11:54 2008 @@ -3,13 +3,13 @@ from pypy.rpython.annlowlevel import llhelper from pypy.rpython.lltypesystem import lltype, lloperation from pypy.rpython.llinterp import LLInterpreter -from pypy.rpython.extregistry import ExtRegistryEntry from pypy.rlib.unroll import unrolling_iterable from pypy.rlib.objectmodel import we_are_translated from pypy.jit.hintannotator.model import originalconcretetype from pypy.jit.timeshifter import rvalue from pypy.jit.rainbow import rhotpath from pypy.jit.rainbow.fallback import FallbackInterpreter +from pypy.jit.rainbow.codewriter import maybe_on_top_of_llinterp class EntryPointsRewriter: @@ -62,6 +62,7 @@ def make_enter_function(self): HotEnterState = make_state_class(self) state = HotEnterState() + exceptiondesc = self.codewriter.exceptiondesc def jit_may_enter(*args): counter = state.counter @@ -72,14 +73,15 @@ return if not state.compile(): return - maybe_on_top_of_llinterp(self, state.machine_code)(*args) + maybe_on_top_of_llinterp(exceptiondesc, state.machine_code)(*args) HotEnterState.compile.im_func._dont_inline_ = True jit_may_enter._always_inline = True self.jit_may_enter_fn = jit_may_enter def update_interp(self): - self.fallbackinterp = FallbackInterpreter(self.ContinueRunningNormally) + self.fallbackinterp = FallbackInterpreter(self.ContinueRunningNormally, + self.codewriter.exceptiondesc) ERASED = self.RGenOp.erasedType(lltype.Bool) self.interpreter.bool_hotpromotiondesc = rhotpath.HotPromotionDesc( ERASED, self.interpreter, self.threshold, self.fallbackinterp) @@ -87,14 +89,21 @@ def rewrite_graphs(self): for graph in self.hintannotator.base_translator.graphs: - for block in graph.iterblocks(): - for op in list(block.operations): - if op.opname == 'can_enter_jit': - index = block.operations.index(op) - self.rewrite_can_enter_jit(graph, block, index) - elif op.opname == 'jit_merge_point': - index = block.operations.index(op) - self.rewrite_jit_merge_point(graph, block, index) + while self.rewrite_graph(graph): + pass + + def rewrite_graph(self, graph): + for block in graph.iterblocks(): + for op in block.operations: + if op.opname == 'can_enter_jit': + index = block.operations.index(op) + if self.rewrite_can_enter_jit(graph, block, index): + return True # graph mutated, start over again + elif op.opname == 'jit_merge_point': + index = block.operations.index(op) + if self.rewrite_jit_merge_point(graph, block, index): + return True # graph mutated, start over again + return False # done def rewrite_can_enter_jit(self, graph, block, index): # @@ -123,6 +132,7 @@ block.operations[index] = newop else: xxx + return True def rewrite_jit_merge_point(self, origportalgraph, origblock, origindex): # @@ -152,8 +162,8 @@ portalgraph = self.hintannotator.portalgraph # ^^^ as computed by HotPathHintAnnotator.prepare_portal_graphs() if origportalgraph is portalgraph: - return # only mutate the original portal graph, - # not its copy + return False # only mutate the original portal graph, + # not its copy ARGS = [v.concretetype for v in portalgraph.getargs()] assert portalgraph.getreturnvar().concretetype is lltype.Void @@ -219,6 +229,7 @@ origblock.recloseblock(Link([Constant(None, lltype.Void)], origportalgraph.returnblock)) checkgraph(origportalgraph) + return True def make_state_class(rewriter): @@ -258,7 +269,10 @@ jitstate = interp.fresh_jitstate(builder) rhotpath.setup_jitstate(interp, jitstate, greenargs, redargs, rewriter.entryjitcode, rewriter.sigtoken) + builder = jitstate.curbuilder + builder.start_writing() rhotpath.compile(interp) + builder.end() FUNCPTR = lltype.Ptr(rewriter.RESIDUAL_FUNCTYPE) self.machine_code = gv_generated.revealconst(FUNCPTR) @@ -266,21 +280,3 @@ return HotEnterState - -def maybe_on_top_of_llinterp(rewriter, fnptr): - # Run a generated graph on top of the llinterp for testing. - # When translated, this just returns the fnptr. - exc_data_ptr = rewriter.codewriter.exceptiondesc.exc_data_ptr - llinterp = LLInterpreter(rewriter.rtyper, exc_data_ptr=exc_data_ptr) - def on_top_of_llinterp(*args): - return llinterp.eval_graph(fnptr._obj.graph, list(args)) - return on_top_of_llinterp - -class Entry(ExtRegistryEntry): - _about_ = maybe_on_top_of_llinterp - - def compute_result_annotation(self, s_rewriter, s_fnptr): - return s_fnptr - - def specialize_call(self, hop): - return hop.inputarg(hop.args_r[1], arg=1) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Wed Mar 12 12:11:54 2008 @@ -29,7 +29,7 @@ interiordescs, exceptioninstances, oopspecdescs, promotiondescs, called_bytecodes, num_mergepoints, graph_color, calldescs, metacalldescs, - indirectcalldescs, is_portal): + indirectcalldescs, is_portal, owncalldesc, gv_ownfnptr): # XXX quite a lot of lists of descs here... At least we # share identical lists between the numberous prebuilt # JitCode instances. @@ -53,6 +53,8 @@ self.metacalldescs = metacalldescs self.indirectcalldescs = indirectcalldescs self.is_portal = is_portal + self.owncalldesc = owncalldesc + self.gv_ownfnptr = gv_ownfnptr def _freeze_(self): return True Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Wed Mar 12 12:11:54 2008 @@ -2,7 +2,7 @@ RPython support code for the hotpath policy. """ -from pypy.jit.timeshifter import rtimeshift +from pypy.jit.timeshifter import rtimeshift, rvalue from pypy.rlib.objectmodel import we_are_translated from pypy.rpython.annlowlevel import cachedtype, base_ptr_lltype from pypy.rpython.annlowlevel import llhelper @@ -36,11 +36,11 @@ # content.store_back(jitstate) exceptiondesc.store_global_excdata(jitstate) jitstate.curbuilder.finish_and_return(interp.graphsigtoken, None) + jitstate.curbuilder = None def compile(interp): jitstate = interp.jitstate builder = jitstate.curbuilder - builder.start_writing() try: interp.bytecode_loop() except FinishedCompiling: @@ -49,7 +49,6 @@ leave_graph(interp) else: leave_graph(interp) - builder.end() builder.show_incremental_progress() def report_compile_time_exception(e): @@ -101,12 +100,12 @@ if counter >= threshold: # this is a hot path, compile it - gv_value = fbp.getrgenop().genconst(value) - fbp.compile_hot_path() + gv_value = interpreter.rgenop.genconst(value) + fbp.compile_hot_path(interpreter, gv_value, pc) if value: - fbp.truepath_counter = -1 # mean "compiled" + fbp.truepath_counter = -1 # means "compiled" else: - fbp.falsepath_counter = -1 # mean "compiled" + fbp.falsepath_counter = -1 # means "compiled" # Done. We return without an exception set, which causes # our caller (the machine code produced by hotsplit()) to # loop back to the flexswitch and execute the @@ -167,8 +166,19 @@ self.falsepath_pc = falsepath_pc self.truepath_pc = truepath_pc - def getrgenop(self): - return self.saved_jitstate.curbuilder.rgenop + def compile_hot_path(self, interpreter, gv_case, pc): + if self.falsepath_counter == -1 or self.truepath_counter == -1: + # the other path was already compiled, we can reuse the jitstate + jitstate = self.saved_jitstate + self.saved_jitstate = None + else: + # clone the jitstate + memo = rvalue.copy_memo() + jitstate = self.saved_jitstate.clone(memo) + interpreter.newjitstate(jitstate) + interpreter.frame.pc = pc + jitstate.curbuilder = self.flexswitch.add_case(gv_case) + compile(interpreter) # hack for testing: make the llinterpreter believe this is a Ptr to base # instance Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py Wed Mar 12 12:11:54 2008 @@ -4,19 +4,21 @@ class ExceptionDesc: - def __init__(self, RGenOp, etrafo, type_system, lazy_exception_path): + def __init__(self, RGenOp, etrafo, type_system, lazy_exception_path, + rtyper=None): + self.rtyper = rtyper self.etrafo = etrafo self.cexcdata = self.etrafo.cexcdata self.exc_data_ptr = self.cexcdata.value self.gv_excdata = RGenOp.constPrebuiltGlobal(self.exc_data_ptr) EXCDATA = self.etrafo.EXCDATA - LL_EXC_TYPE = self.etrafo.lltype_of_exception_type - LL_EXC_VALUE = self.etrafo.lltype_of_exception_value + self.LL_EXC_TYPE = self.etrafo.lltype_of_exception_type + self.LL_EXC_VALUE = self.etrafo.lltype_of_exception_value self.exc_type_token = RGenOp.fieldToken(EXCDATA, 'exc_type') self.exc_value_token = RGenOp.fieldToken(EXCDATA, 'exc_value') - self.exc_type_kind = RGenOp.kindToken(LL_EXC_TYPE) - self.exc_value_kind = RGenOp.kindToken(LL_EXC_VALUE) + self.exc_type_kind = RGenOp.kindToken(self.LL_EXC_TYPE) + self.exc_value_kind = RGenOp.kindToken(self.LL_EXC_VALUE) null_exc_type = self.etrafo.c_null_etype.value null_exc_value = self.etrafo.c_null_evalue.value Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Wed Mar 12 12:11:54 2008 @@ -100,6 +100,7 @@ if fixsize: self._define_devirtualize() + self._define_allocate() def _compute_fielddescs(self, RGenOp): @@ -131,7 +132,16 @@ self.fielddescs = fielddescs self.fielddesc_by_name = fielddesc_by_name - self.innermostdesc = innermostdesc + self.innermostdesc = innermostdesc + + def _define_allocate(self): + TYPE = self.TYPE + + def allocate(rgenop): + s = lltype.malloc(TYPE) + return rgenop.genconst(s) + + self.allocate = allocate def _define_devirtualize(self): TYPE = self.TYPE @@ -536,7 +546,8 @@ class NamedFieldDesc(FieldDesc): def __init__(self, RGenOp, PTRTYPE, name): - FieldDesc.__init__(self, RGenOp, PTRTYPE, getattr(PTRTYPE.TO, name)) + FIELDTYPE = getattr(PTRTYPE.TO, name) + FieldDesc.__init__(self, RGenOp, PTRTYPE, FIELDTYPE) T = self.PTRTYPE.TO self.fieldname = name self.fieldtoken = RGenOp.fieldToken(T, name) @@ -546,6 +557,17 @@ res = getattr(ptr, name) return rgenop.genconst(res) self.getfield_if_non_null = getfield_if_non_null + if not isinstance(FIELDTYPE, lltype.ContainerType): + self._define_setfield(FIELDTYPE) + + def _define_setfield(self, FIELDTYPE): + PTRTYPE = self.PTRTYPE + name = self.fieldname + def setfield(rgenop, genvar, gv_newvalue): + ptr = genvar.revealconst(PTRTYPE) + newvalue = gv_newvalue.revealconst(FIELDTYPE) + setattr(ptr, name, newvalue) + self.setfield = setfield def compact_repr(self): # goes in ll helper names return "Fld_%s_in_%s" % (self.fieldname, self.PTRTYPE._short_name()) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Wed Mar 12 12:11:54 2008 @@ -1056,6 +1056,19 @@ if virtualizable_box not in self.virtualizables: self.virtualizables.append(virtualizable_box) + def clone(self, memo): + virtualizables = [] + for virtualizable_box in self.virtualizables: + new_virtualizable_box = virtualizable_box.copy(memo) + assert isinstance(new_virtualizable_box, rvalue.PtrRedBox) + virtualizables.append(new_virtualizable_box) + return JITState(self.curbuilder, + self.frame.copy(memo), + self.exc_type_box .copy(memo), + self.exc_value_box.copy(memo), + self.greens[:], + virtualizables) + def split(self, newbuilder, newresumepoint, newgreens, memo): virtualizables = [] for virtualizable_box in self.virtualizables: From arigo at codespeak.net Wed Mar 12 12:29:54 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 12 Mar 2008 12:29:54 +0100 (CET) Subject: [pypy-svn] r52410 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080312112954.AB129169E80@codespeak.net> Author: arigo Date: Wed Mar 12 12:29:54 2008 New Revision: 52410 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: Plug the merging logic onto the 'jit_merge_point' operation. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Wed Mar 12 12:29:54 2008 @@ -471,14 +471,7 @@ for arg in self.sort_by_color(block.inputargs)[1]: TYPE = arg.concretetype key += (TYPE, ) - if not key: - keyindex = -1 # use prebuilt empty_key - elif key not in self.keydesc_positions: - keyindex = len(self.keydesc_positions) - self.keydesc_positions[key] = keyindex - self.keydescs.append(KeyDesc(self.RGenOp, *key)) - else: - keyindex = self.keydesc_positions[key] + keyindex = self.keydesc_position(key) kind = self.mergepoint_set[block] if kind == "global": @@ -619,6 +612,17 @@ self.type_positions[TYPE] = result return result + def keydesc_position(self, key): # key is a tuple of TYPEs + if not key: + keyindex = -1 # use prebuilt empty_key + elif key not in self.keydesc_positions: + keyindex = len(self.keydesc_positions) + self.keydesc_positions[key] = keyindex + self.keydescs.append(KeyDesc(self.RGenOp, *key)) + else: + keyindex = self.keydesc_positions[key] + return keyindex + def structtypedesc_position(self, TYPE): if TYPE in self.structtypedesc_positions: return self.structtypedesc_positions[TYPE] @@ -1391,12 +1395,14 @@ numreds = op.args[1].value greens_v = op.args[2:2+numgreens] reds_v = op.args[2+numgreens:2+numgreens+numreds] + key = () for i, v in enumerate(greens_v): if self.varcolor(v) != "green": raise Exception("computed color does not match declared color:" " %s is %s, but jit_merge_point() declares it" " as green" % (v, self.varcolor(v))) assert self.green_position(v) == i + key += (v.concretetype,) for i, v in enumerate(reds_v): if self.varcolor(v) != "red": raise Exception("computed color does not match declared color:" @@ -1404,6 +1410,7 @@ " as red" % (v, self.varcolor(v))) assert self.redvar_position(v) == i self.emit('jit_merge_point') + self.emit(self.keydesc_position(key)) def serialize_op_can_enter_jit(self, op): return # no need to put anything in the bytecode here Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Wed Mar 12 12:29:54 2008 @@ -2,6 +2,7 @@ from pypy.rlib.unroll import unrolling_iterable from pypy.rlib.objectmodel import we_are_translated, CDefinedIntSymbolic from pypy.rpython.lltypesystem import lltype, llmemory +from pypy.jit.timeshifter.greenkey import empty_key, GreenKey from pypy.jit.rainbow.interpreter import SIGN_EXTEND2, arguments @@ -210,12 +211,14 @@ def opimpl_red_direct_call(self, greenargs, redargs, targetbytecode): assert not greenargs # XXX for now calldesc = targetbytecode.owncalldesc - gv_res = calldesc.perform_call(self.rgenop, - targetbytecode.gv_ownfnptr, - redargs) + try: + gv_res = calldesc.perform_call(self.rgenop, + targetbytecode.gv_ownfnptr, + redargs) + except Exception, e: + XXX if gv_res is not None: self.red_result(gv_res) - # XXX what occurs with exceptions raised by the called graph? # exceptions @@ -258,8 +261,8 @@ # hotpath-specific operations - @arguments() - def opimpl_jit_merge_point(self): + @arguments("greenkey") + def opimpl_jit_merge_point(self, key): raise self.ContinueRunningNormally(self.local_green + self.local_red) @arguments("red", "jumptarget") Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Wed Mar 12 12:29:54 2008 @@ -209,6 +209,7 @@ self.portalstate = None self.num_global_mergepoints = -1 self.global_state_dicts = None + self.jit_merge_point_state_dict = newgreendict() if DEBUG_JITCODES: self.find_opcode("trace") # force it to be compiled in @@ -828,10 +829,16 @@ # ____________________________________________________________ # opcodes used by the 'hotpath' policy - @arguments() - def opimpl_jit_merge_point(self): - # xxx in-progress - pass + @arguments("greenkey") + def opimpl_jit_merge_point(self, key): + states_dic = self.jit_merge_point_state_dict + global_resumer = RainbowResumer(self, self.frame) + done = rtimeshift.retrieve_jitstate_for_merge(states_dic, + self.jitstate, + key, None) + if done: + self.newjitstate(None) + return STOP @arguments("red", "jumptarget") def opimpl_red_hot_goto_iftrue(self, switchbox, target): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Wed Mar 12 12:29:54 2008 @@ -27,6 +27,8 @@ def leave_graph(interp): jitstate = interp.jitstate + if jitstate is None: + return exceptiondesc = interp.exceptiondesc builder = jitstate.curbuilder #for virtualizable_box in jitstate.virtualizables: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Wed Mar 12 12:29:54 2008 @@ -33,8 +33,11 @@ self.rtyper, exc_data_ptr=self.writer.exceptiondesc.exc_data_ptr) return llinterp.eval_graph(graph, main_args) + def check_traces(self, expected): + py.test.skip("traces in progress") + + def test_simple_loop(self): - py.test.skip("in-progress") # there are no greens in this test def ll_function(n): n1 = n * 2 From fijal at codespeak.net Wed Mar 12 12:33:38 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 12 Mar 2008 12:33:38 +0100 (CET) Subject: [pypy-svn] r52411 - in pypy/extradoc/talk/pycon2008: . ui Message-ID: <20080312113338.0542E169E80@codespeak.net> Author: fijal Date: Wed Mar 12 12:33:38 2008 New Revision: 52411 Added: pypy/extradoc/talk/pycon2008/ui/ - copied from r52209, pypy/extradoc/talk/sfi2008/ui/ Modified: pypy/extradoc/talk/pycon2008/status.txt Log: pypy ui Modified: pypy/extradoc/talk/pycon2008/status.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/status.txt (original) +++ pypy/extradoc/talk/pycon2008/status.txt Wed Mar 12 12:33:38 2008 @@ -5,7 +5,7 @@ :Author: Maciej Fijalkowski, merlinux GmbH :Title: PyPy from the user perspective -:Date: XXX +:Date: 16 March 2008 Next half an hour ================= @@ -25,12 +25,12 @@ PyPy - motivation ================================= -* CPython is nice, but not very flexible +* CPython is nice, but not flexible enough * IronPython, Jython - bound to the specific VM * Separate language specification from low-level details, - such as GC or just in time compilation + such as GC or platform to run * Psyco and Stackless Python hard to maintain From fijal at codespeak.net Wed Mar 12 12:36:04 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 12 Mar 2008 12:36:04 +0100 (CET) Subject: [pypy-svn] r52412 - pypy/extradoc/talk/pycon2008 Message-ID: <20080312113604.AF20E169EA4@codespeak.net> Author: fijal Date: Wed Mar 12 12:36:03 2008 New Revision: 52412 Modified: pypy/extradoc/talk/pycon2008/status.txt Log: small changes. Modified: pypy/extradoc/talk/pycon2008/status.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/status.txt (original) +++ pypy/extradoc/talk/pycon2008/status.txt Wed Mar 12 12:36:03 2008 @@ -54,7 +54,7 @@ * Some modules from stdlib missing, no 3rd party modules at all -* Recently - ctypes +* Recent developement - ctypes Status of PyPy backends ======================= From arigo at codespeak.net Wed Mar 12 12:55:33 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 12 Mar 2008 12:55:33 +0100 (CET) Subject: [pypy-svn] r52413 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080312115533.34795169EFA@codespeak.net> Author: arigo Date: Wed Mar 12 12:55:31 2008 New Revision: 52413 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: Yay! The test passes :-) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Wed Mar 12 12:55:31 2008 @@ -12,11 +12,15 @@ actual values for the live red vars, and interprets the jitcode normally until it reaches the 'jit_merge_point' or raises. """ - def __init__(self, ContinueRunningNormally, exceptiondesc): + def __init__(self, interpreter, ContinueRunningNormally, exceptiondesc): + self.interpreter = interpreter + self.rgenop = interpreter.rgenop self.ContinueRunningNormally = ContinueRunningNormally self.exceptiondesc = exceptiondesc + self.register_opcode_impls(interpreter) def run(self, fallback_point, framebase, pc): + self.interpreter.debug_trace("fallback_interp") self.fbp = fallback_point self.framebase = framebase self.initialize_state(pc) @@ -143,10 +147,12 @@ @arguments() def opimpl_trace(self): bytecode = self.bytecode - print '*** fallback trace: in %s position %d ***' % (bytecode.name, + msg = '*** fallback trace: in %s position %d ***' % (bytecode.name, self.pc) + print msg if bytecode.dump_copy is not None: print bytecode.dump_copy + self.debug_trace(msg) @arguments("green", "2byte", returns="red") def opimpl_make_redbox(self, genconst, typeid): @@ -200,11 +206,12 @@ assert self.current_source_jitframe.backframe is None # XXX for now # at this point we should have an exception set in self.gv_exc_xxx # and we have to really raise it. XXX non-translatable hack follows... - from pypy.rpython.llinterp import LLException + from pypy.rpython.llinterp import LLException, type_name exceptiondesc = self.exceptiondesc lltype = self.gv_exc_type.revealconst(exceptiondesc.LL_EXC_TYPE) llvalue = self.gv_exc_value.revealconst(exceptiondesc.LL_EXC_VALUE) assert lltype and llvalue + self.interpreter.debug_trace("fb_raise", type_name(lltype)) raise LLException(lltype, llvalue) @arguments("green_varargs", "red_varargs", "bytecode") @@ -271,10 +278,9 @@ self.pc = target # ____________________________________________________________ - # construction-time interface + # construction-time helpers def register_opcode_impls(self, interp): - self.rgenop = interp.rgenop impl = [None] * len(interp.opcode_implementations) for opname, index in interp.opname_to_index.items(): argspec = interp.opcode_implementations[index].argspec Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Wed Mar 12 12:55:31 2008 @@ -63,16 +63,20 @@ HotEnterState = make_state_class(self) state = HotEnterState() exceptiondesc = self.codewriter.exceptiondesc + interpreter = self.interpreter def jit_may_enter(*args): counter = state.counter if counter >= 0: counter += 1 if counter < self.threshold: + interpreter.debug_trace("jit_not_entered", *args) state.counter = counter return + interpreter.debug_trace("jit_compile", *args) if not state.compile(): return + interpreter.debug_trace("run_machine_code", *args) maybe_on_top_of_llinterp(exceptiondesc, state.machine_code)(*args) HotEnterState.compile.im_func._dont_inline_ = True @@ -80,12 +84,13 @@ self.jit_may_enter_fn = jit_may_enter def update_interp(self): - self.fallbackinterp = FallbackInterpreter(self.ContinueRunningNormally, - self.codewriter.exceptiondesc) + self.fallbackinterp = FallbackInterpreter( + self.interpreter, + self.ContinueRunningNormally, + self.codewriter.exceptiondesc) ERASED = self.RGenOp.erasedType(lltype.Bool) self.interpreter.bool_hotpromotiondesc = rhotpath.HotPromotionDesc( ERASED, self.interpreter, self.threshold, self.fallbackinterp) - self.fallbackinterp.register_opcode_impls(self.interpreter) def rewrite_graphs(self): for graph in self.hintannotator.base_translator.graphs: @@ -199,6 +204,7 @@ assert 0, "unreachable" except ContinueRunningNormally, e: args = e.args + self.interpreter.debug_trace("fb_leave", *args) check_for_immediate_reentry = True # ^^^ but should depend on whether the fallback # interpreter reached a jit_can_enter() or just Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Wed Mar 12 12:55:31 2008 @@ -210,9 +210,14 @@ self.num_global_mergepoints = -1 self.global_state_dicts = None self.jit_merge_point_state_dict = newgreendict() + self.debug_traces = [] if DEBUG_JITCODES: self.find_opcode("trace") # force it to be compiled in + def debug_trace(self, *args): + if not we_are_translated(): + self.debug_traces.append(DebugTrace(*args)) + def set_portalstate(self, portalstate): assert self.portalstate is None self.portalstate = portalstate @@ -425,10 +430,12 @@ # attributes of JitCode objects to be included in the C # executable. bytecode = self.frame.bytecode - print '*** opimpl_trace: in %s position %d ***' % (bytecode.name, + msg = '*** opimpl_trace: in %s position %d ***' % (bytecode.name, self.frame.pc) + print msg if bytecode.dump_copy is not None: print bytecode.dump_copy + self.debug_trace(msg) @arguments("green", "2byte", returns="red") def opimpl_make_redbox(self, genconst, typeid): @@ -837,11 +844,13 @@ self.jitstate, key, None) if done: + self.debug_trace("done at jit_merge_point") self.newjitstate(None) return STOP @arguments("red", "jumptarget") def opimpl_red_hot_goto_iftrue(self, switchbox, target): + self.debug_trace("pause at hotsplit") rhotpath.hotsplit(self.jitstate, self.bool_hotpromotiondesc, switchbox, self.frame.pc, target) assert False, "unreachable" @@ -905,3 +914,12 @@ return index +class DebugTrace(object): + def __init__(self, *args): + self.args = args or ('--empty--',) + + def __repr__(self): + return '' % (self,) + + def __str__(self): + return ' '.join(map(str, self.args)) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Wed Mar 12 12:55:31 2008 @@ -102,6 +102,7 @@ if counter >= threshold: # this is a hot path, compile it + interpreter.debug_trace("jit_resume", value) gv_value = interpreter.rgenop.genconst(value) fbp.compile_hot_path(interpreter, gv_value, pc) if value: @@ -112,6 +113,7 @@ # our caller (the machine code produced by hotsplit()) to # loop back to the flexswitch and execute the # newly-generated code. + interpreter.debug_trace("resume_machine_code") return else: # path is still cold Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Wed Mar 12 12:55:31 2008 @@ -34,7 +34,16 @@ return llinterp.eval_graph(graph, main_args) def check_traces(self, expected): - py.test.skip("traces in progress") + traces = self.rewriter.interpreter.debug_traces + i = 0 + for trace, expect in zip(traces + ['--end of traces--'], + expected + ['--end of traces--']): + # 'trace' is a DebugTrace instance, reduce it to a string + got = str(trace) + assert got == expect, ("debug_trace[%d] mismatch:\n" + " got %r\n" + " expected %r" % (i, got, expect)) + i += 1 def test_simple_loop(self): @@ -62,7 +71,6 @@ self.check_traces([ # running non-JITted leaves the initial profiling traces # recorded by jit_may_enter(). We see the values of n1 and total. - "jit_not_entered 20 0", "jit_not_entered 19 20", "jit_not_entered 18 39", "jit_not_entered 17 57", @@ -71,7 +79,7 @@ "jit_not_entered 14 105", "jit_not_entered 13 119", # on the start of the next iteration, compile the 'total += n1' - "jit_enter", + "jit_compile 12 132", "pause at hotsplit", # execute the compiled machine code until the 'n1 <= 1'. # It finishes in the fallback interpreter 7 times @@ -85,7 +93,7 @@ "run_machine_code 5 195", # now that we know which path is hot (i.e. "staying in the loop"), # it gets compiled - "jit_resume", + "jit_resume False", "done at jit_merge_point", # execution continues purely in machine code, from the "n1 <= 1" # test which triggered the "jit_resume" From lac at codespeak.net Wed Mar 12 12:58:12 2008 From: lac at codespeak.net (lac at codespeak.net) Date: Wed, 12 Mar 2008 12:58:12 +0100 (CET) Subject: [pypy-svn] r52414 - pypy/extradoc/talk/pycon2008 Message-ID: <20080312115812.9BABC169F0B@codespeak.net> Author: lac Date: Wed Mar 12 12:58:12 2008 New Revision: 52414 Modified: pypy/extradoc/talk/pycon2008/status.txt Log: Add missing articles. stick 'version' before 2.5 in Cpython2.5 because otherwise it was too confusing. Rewrite another clunky sentence. Modified: pypy/extradoc/talk/pycon2008/status.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/status.txt (original) +++ pypy/extradoc/talk/pycon2008/status.txt Wed Mar 12 12:58:12 2008 @@ -37,21 +37,21 @@ PyPy - user motivation ======================= -* One shall never be forced to write anything in C +* One should never be forced to write anything in C for performance reasons (with some exceptions: embedded devices etc.) * Just-in-time compiler should make number-crunching and static-enough code fast enough -* One shall never care about low-level details +* One should never care about low-level details Status of PyPy ============== * Very compliant language (to Python 2.4/2.5) -* Some modules from stdlib missing, no 3rd party +* Some modules from the stdlib are missing, no 3rd party modules at all * Recent developement - ctypes @@ -62,7 +62,7 @@ * We can compile to C and LLVM including threads (GIL), stackless (but not both), different GCs and all modules -* We can compile to CLI and JVM with reduced set of modules, +* We can compile to CLI and JVM with a reduced set of modules, no threads * Some bindings to .NET for CLI, working on getting @@ -73,7 +73,7 @@ * Hard to find decent python-only benchmarks in the wild -* Pystone 1.5, Richards 1., gcbench 0.9 (compared to CPython 2.5) +* Pystone 1.5, Richards 1., gcbench 0.9 (compared to CPython version 2.5) * Real world apps usually 1.5-2., sometimes as slow as 3x. @@ -101,7 +101,7 @@ * Our interpreter is a "normal Python" interpreter -* The user has nothing to do with RPython +* Only PyPy implementers should know anything about RPython RPython (2) =========== @@ -112,7 +112,7 @@ * Clunky error messages (XXX demo) -* It's fast, helps us not to code in C +* It's fast, it is pleasant not to code in C * Ideally, our JIT will achieve the same level of speed @@ -156,7 +156,7 @@ * app-level code for controlling behavior of any type (even frames or tracebacks) -* very similiar concept to .NET VM transparent +* very similiar concept to the .NET VM transparent proxy XXX demo @@ -164,13 +164,13 @@ Example of useful feature - distribution ========================================= -* very simple distribution protocol built - on top of transparent proxy +* a very simple distribution protocol built + on top of a transparent proxy -* done in smalltalk in 70s +* done in smalltalk in the 70s -* can work on any types, so you can - raise remote traceback and everything will be fine +* can work on any type, so you can + raise a remote traceback and everything will be fine * nice experiment, few lines of code (XXX how many exactly?) From arigo at codespeak.net Wed Mar 12 14:19:16 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 12 Mar 2008 14:19:16 +0100 (CET) Subject: [pypy-svn] r52415 - in pypy/branch/jit-hotpath/pypy: jit/rainbow jit/rainbow/test tool Message-ID: <20080312131916.588B4169F41@codespeak.net> Author: arigo Date: Wed Mar 12 14:19:14 2008 New Revision: 52415 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/tool/ansi_print.py Log: Tweak the debug_traces and send them to a rainbow py.log. Arbitrarily picked the color green for them because it is probably more readable than, say, displaying the text with alternating red and green characters :-) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Wed Mar 12 14:19:14 2008 @@ -252,7 +252,7 @@ self._compile() return True except Exception, e: - rhotpath.report_compile_time_exception(e) + rhotpath.report_compile_time_exception(rewriter.interpreter, e) return False def _compile(self): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Wed Mar 12 14:19:14 2008 @@ -6,6 +6,11 @@ from pypy.jit.rainbow import rhotpath from pypy.rpython.lltypesystem import lltype, llmemory +import py +from pypy.tool.ansi_print import ansi_log +log = py.log.Producer('rainbow') +py.log.setconsumer('rainbow', ansi_log) + DEBUG_JITCODES = True # store a dump() of all JitCodes # in the translated program @@ -216,7 +221,9 @@ def debug_trace(self, *args): if not we_are_translated(): - self.debug_traces.append(DebugTrace(*args)) + trace = DebugTrace(*args) + log.trace(trace) + self.debug_traces.append(trace) def set_portalstate(self, portalstate): assert self.portalstate is None @@ -850,7 +857,7 @@ @arguments("red", "jumptarget") def opimpl_red_hot_goto_iftrue(self, switchbox, target): - self.debug_trace("pause at hotsplit") + self.debug_trace("pause at hotsplit in", self.frame.bytecode.name) rhotpath.hotsplit(self.jitstate, self.bool_hotpromotiondesc, switchbox, self.frame.pc, target) assert False, "unreachable" Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Wed Mar 12 14:19:14 2008 @@ -8,11 +8,6 @@ from pypy.rpython.annlowlevel import llhelper from pypy.rpython.lltypesystem import lltype, llmemory -import py -from pypy.tool.ansi_print import ansi_log -log = py.log.Producer('hotpath') -py.log.setconsumer('hotpath', ansi_log) - def setup_jitstate(interp, jitstate, greenargs, redargs, bytecode, graphsigtoken): @@ -53,8 +48,9 @@ leave_graph(interp) builder.show_incremental_progress() -def report_compile_time_exception(e): +def report_compile_time_exception(interp, e): if not we_are_translated(): + from pypy.jit.rainbow.interpreter import log import sys, pdb, traceback msg = str(e) if msg: msg = ': ' + msg @@ -67,6 +63,7 @@ else: msg = 'Note: the JIT got a compile-time exception: %s' % (e,) lloperation.llop.debug_print(lltype.Void, msg) + interp.debug_trace("ERROR:", "compile-time exception:", e) # ____________________________________________________________ @@ -102,7 +99,8 @@ if counter >= threshold: # this is a hot path, compile it - interpreter.debug_trace("jit_resume", value) + interpreter.debug_trace("jit_resume", "bool_path", value, + "in", fbp.saved_jitstate.frame.bytecode.name) gv_value = interpreter.rgenop.genconst(value) fbp.compile_hot_path(interpreter, gv_value, pc) if value: @@ -123,7 +121,7 @@ fbp.falsepath_counter = counter except Exception, e: - report_compile_time_exception(e) + report_compile_time_exception(interpreter, e) # exceptions below at run-time exceptions, we let them propagate fallbackinterp.run(fbp, framebase, pc) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Wed Mar 12 14:19:14 2008 @@ -39,10 +39,9 @@ for trace, expect in zip(traces + ['--end of traces--'], expected + ['--end of traces--']): # 'trace' is a DebugTrace instance, reduce it to a string - got = str(trace) - assert got == expect, ("debug_trace[%d] mismatch:\n" - " got %r\n" - " expected %r" % (i, got, expect)) + assert str(trace) == expect, ("debug_trace[%d] mismatch:\n" + " got %s\n" + " expected %s" % (i, trace, expect)) i += 1 @@ -80,7 +79,7 @@ "jit_not_entered 13 119", # on the start of the next iteration, compile the 'total += n1' "jit_compile 12 132", - "pause at hotsplit", + "pause at hotsplit in ll_function", # execute the compiled machine code until the 'n1 <= 1'. # It finishes in the fallback interpreter 7 times "run_machine_code 12 132", "fallback_interp", "fb_leave 11 144", @@ -93,7 +92,7 @@ "run_machine_code 5 195", # now that we know which path is hot (i.e. "staying in the loop"), # it gets compiled - "jit_resume False", + "jit_resume bool_path False in ll_function", "done at jit_merge_point", # execution continues purely in machine code, from the "n1 <= 1" # test which triggered the "jit_resume" Modified: pypy/branch/jit-hotpath/pypy/tool/ansi_print.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/tool/ansi_print.py (original) +++ pypy/branch/jit-hotpath/pypy/tool/ansi_print.py Wed Mar 12 14:19:14 2008 @@ -19,6 +19,7 @@ 'ERROR': ((1, 31), False), 'info': ((35,), False), 'stub': ((34,), False), + 'trace': ((32,), False), } def __init__(self, kw_to_color={}, file=None): From fijal at codespeak.net Wed Mar 12 15:14:38 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 12 Mar 2008 15:14:38 +0100 (CET) Subject: [pypy-svn] r52416 - in pypy/branch/jit-refactoring/pypy/lang/js: . doc test Message-ID: <20080312141438.EA462169F6E@codespeak.net> Author: fijal Date: Wed Mar 12 15:14:37 2008 New Revision: 52416 Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt pypy/branch/jit-refactoring/pypy/lang/js/jscode.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Log: first test in test_parser passes. everything else fails. progress. Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py Wed Mar 12 15:14:37 2008 @@ -1,6 +1,6 @@ from pypy.rlib.parsing.tree import RPythonVisitor, Symbol, Nonterminal from pypy.lang.js import operations - +from pypy.rlib.parsing.parsing import ParseError class ASTBuilder(RPythonVisitor): BINOP_TO_CLS = { @@ -275,11 +275,21 @@ return left def visit_assignmentexpression(self, node): + from pypy.lang.js.operations import Identifier, Member, MemberDot pos = self.get_pos(node) left = self.dispatch(node.children[0]) atype = node.children[1].additional_info right = self.dispatch(node.children[2]) - return operations.Assignment(pos, left, right, atype) + if isinstance(left, Identifier): + return operations.SimpleAssignment(pos, left, right, atype) + elif isinstance(left, Member): + return operations.MemberAssignment(pos, left.left, left.right, + right, atype) + elif isinstance(left, MemberDot): + return operations.MemberDotAssignment(pos, left.left, left.right, + right, atype) + else: + raise ParseError(left.pos, "Invalid lefthand expression") visit_assignmentexpressionnoin = visit_assignmentexpression def visit_emptystatement(self, node): Modified: pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt Wed Mar 12 15:14:37 2008 @@ -18,11 +18,11 @@ stores the last value on stack into identifierx -STORE_ELEMENT +STORE_MEMBER -identifier[last_element_on_the_stack] = previous_element_on_the_stack -note that in javascript a.b is exactly the same as a['b'], just that -first one can be eventually speed up +take from stack: right side, element and where to store and store +where[element] = right. XXX can be optimized further for direct member +assignement LOAD_ARRAY @@ -45,6 +45,13 @@ PREDECR, POSTDECR, PREINCR, POSTINCR decrement and increment (++, --) prefix and postfix +object creation: + +LOAD_OBJECT + +Takes one element per one parameter from the stack and initializes +object this way. + control flow: XXX Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jscode.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jscode.py Wed Mar 12 15:14:37 2008 @@ -23,9 +23,6 @@ return all([i == j for i, j in zip(self.opcodes, list_of_opcodes)]) class Opcode(object): - def __init__(self, args): - raise NotImplementedError("Purely abstract") - def eval(self, ctx, stack): """ Execute in context ctx """ @@ -34,6 +31,9 @@ def __eq__(self, other): return repr(self) == other + def __repr__(self): + return self.__class__.__name__ + class BaseBinaryComparison(Opcode): def eval(self, ctx): s2 = self.left.eval(ctx).GetValue() @@ -116,6 +116,27 @@ def __repr__(self): return 'LOAD_ARRAY %d' % (self.counter,) +class STORE_MEMBER(Opcode): + def eval(self, ctx): + XXX + +class STORE(Opcode): + def __init__(self, name): + self.name = name + + def eval(self, ctx): + XXX + + def __repr__(self): + return 'STORE "%s"' % self.name + +class LOAD_OBJECT(Opcode): + def __init__(self, listofnames): + self.listofnames = listofnames + + def __repr__(self): + return 'LOAD_OBJECT %r' % (self.listofnames,) + OpcodeMap = {} for name, value in locals().items(): Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Wed Mar 12 15:14:37 2008 @@ -90,9 +90,7 @@ self.expr = expr def emit(self, bytecode): - XXX # not sure what to do here, think later self.expr.emit(bytecode) - bytecode.emit('STORE', self.identifier) class Array(ListOp): def emit(self, bytecode): @@ -101,15 +99,68 @@ bytecode.emit('LOAD_ARRAY', len(self.nodes)) class Assignment(Expression): + pass + +class SimpleAssignment(Assignment): def __init__(self, pos, left, right, operand): - self.pos = pos + assert isinstance(left, Identifier) self.identifier = left.name self.right = right + self.pos = pos + self.operand = operand + + def emit(self, bytecode): + self.right.emit(bytecode) + bytecode.emit('STORE', self.identifier) + +class MemberAssignment(Assignment): + def __init__(self, pos, what, item, right, operand): + # XXX we can optimise here what happens if what is identifier, + # but let's leave it alone for now + self.pos = pos + self.what = what + self.item = item + self.right = right + self.operand = operand + + def emit(self, bytecode): + self.right.emit(bytecode) + self.item.emit(bytecode) + self.what.emit(bytecode) + bytecode.emit('STORE_MEMBER') + +class MemberDotAssignment(Assignment): + def __init__(self, pos, what, item, right, operand): + self.pos = pos + self.what = what + assert isinstance(item, Identifier) + self.itemname = item.name + self.right = right + self.operand = operand + + def emit(self, bytecode): + self.right.emit(bytecode) + bytecode.emit('LOAD_STRINGCONSTANT', self.itemname) + self.what.emit(bytecode) + bytecode.emit('STORE_MEMBER') + +class StuffAssignment(Expression): + def __init__(self, pos, left, right, operand): + self.pos = pos + # check the sanity of lefthandside + if isinstance(left, Identifier): + self.identifier = left.name + self.single_assignement = True + elif isinstance(left, Member): + import pdb + pdb.set_trace() + self.lefthandside = left + self.single_assignement = False + self.right = right self.operand = operand def emit(self, bytecode): op = self.operand - XXX if op == '==': bytecode.emit('STORE', self.identifier) else: @@ -794,6 +845,13 @@ return ''.join(temp) class ObjectInit(ListOp): + def emit(self, bytecode): + names = [] + for prop in self.nodes: + prop.emit(bytecode) + names.append(prop.identifier) + bytecode.emit('LOAD_OBJECT', names) + def eval(self, ctx): w_obj = create_object(ctx, 'Object') for prop in self.nodes: Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Wed Mar 12 15:14:37 2008 @@ -139,9 +139,6 @@ assert result1 == n return tree - def parse_raises(self, s): - py.test.raises(ParseError, self.parse, s) - def parse_and_eval_all(self, l): for i in l: self.parse_and_evaluate(i) @@ -186,9 +183,6 @@ self.parse('{}') self.parse('{x:1}') #per spec {x:1,} should not be supported self.parse('{x:1,y:2}') - - def test_invalid_expression(self): - self.parse_raises('(1+2)=3') class TestStatements(BaseGrammarTest): def setup_class(cls): @@ -326,14 +320,28 @@ 'LOAD_FLOATCONSTANT 3.3', 'LOAD_STRINGCONSTANT "abc"', 'LOAD_ARRAY 4']) + self.check('x[3] = 3', [ + 'LOAD_INTCONSTANT 3', + 'LOAD_INTCONSTANT 3', + 'LOAD_VARIABLE "x"', + 'STORE_MEMBER']) + self.check('x.x = 3', [ + 'LOAD_INTCONSTANT 3', + 'LOAD_STRINGCONSTANT "x"', + 'LOAD_VARIABLE "x"', + 'STORE_MEMBER']) self.check('x = 3', [ 'LOAD_INTCONSTANT 3', 'STORE "x"']) self.check('{x:1}', [ 'LOAD_INTCONSTANT 1', - 'LOAD_OBJECT ["x"]']) + "LOAD_OBJECT ['x']"]) + + def test_raising(self): + py.test.raises(ParseError, self.check, '1=2', []) def test_expression(self): + py.test.skip("Not yet") w_num = self.eval_expr('1 - 1 - 1') assert w_num.ToNumber() == -1 w_num = self.eval_expr('-(6 * (6 * 6)) + 6 - 6') From fijal at codespeak.net Wed Mar 12 16:03:34 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 12 Mar 2008 16:03:34 +0100 (CET) Subject: [pypy-svn] r52417 - in pypy/branch/jit-refactoring/pypy/lang/js: . test Message-ID: <20080312150334.9785F169F99@codespeak.net> Author: fijal Date: Wed Mar 12 16:03:33 2008 New Revision: 52417 Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Log: Basic expressions. Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jscode.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jscode.py Wed Mar 12 16:03:33 2008 @@ -52,6 +52,12 @@ def decision(self, ctx, op1, op2): raise NotImplementedError +class BaseBinaryOperation(Opcode): + pass + +class BaseUnaryOperation(Opcode): + pass + class Undefined(Opcode): def eval(self, ctx): return w_Undefined @@ -137,6 +143,39 @@ def __repr__(self): return 'LOAD_OBJECT %r' % (self.listofnames,) +class SUB(BaseBinaryOperation): + pass + +class ADD(BaseBinaryOperation): + pass + +class MUL(BaseBinaryOperation): + pass + +class DIV(BaseBinaryOperation): + pass + +class MOD(BaseBinaryOperation): + pass + +class UPLUS(BaseUnaryOperation): + pass + +class UMINUS(BaseUnaryOperation): + pass + +class PREINCR(BaseUnaryOperation): + pass + +class POSTINCR(BaseUnaryOperation): + pass + +class PREDECR(BaseUnaryOperation): + pass + +class POSTDECR(BaseUnaryOperation): + pass + OpcodeMap = {} for name, value in locals().items(): Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Wed Mar 12 16:03:33 2008 @@ -68,6 +68,10 @@ self.expr = expr self.postfix = postfix + def emit(self, bytecode): + self.expr.emit(bytecode) + bytecode.emit(self.operation_name) + class BinaryOp(Expression): def __init__(self, pos, left, right): self.pos = pos @@ -609,12 +613,21 @@ r3 = r1.GetBase() r4 = r1.GetPropertyName() return W_Boolean(r3.Delete(r4)) - -class Increment(UnaryOp): +class BaseIncrementDecrement(UnaryOp): + def emit(self, bytecode): + self.expr.emit(bytecode) + if self.postfix: + bytecode.emit('POST' + self.operation_name) + else: + bytecode.emit('PRE' + self.operation_name) + +class Increment(BaseIncrementDecrement): """ ++value (prefix) and value++ (postfix) """ + operation_name = 'INCR' + def eval(self, ctx): # XXX write down fast version thing = self.expr.eval(ctx) @@ -628,10 +641,12 @@ return resl -class Decrement(UnaryOp): +class Decrement(BaseIncrementDecrement): """ same as increment --value and value -- """ + operation_name = 'DECR' + def eval(self, ctx): # XXX write down hot path thing = self.expr.eval(ctx) @@ -734,26 +749,30 @@ return W_FloatNumber(fleft - fright) class Plus(BinaryNumberOp): + operation_name = 'ADD' def mathop(self, ctx, n1, n2): return plus(ctx, n1, n2) class Mult(BinaryNumberOp): + operation_name = 'MUL' def mathop(self, ctx, n1, n2): return mult(ctx, n1, n2) class Mod(BinaryNumberOp): + operation_name = 'MOD' def mathop(self, ctx, n1, n2): return mod(ctx, n1, n2) - class Division(BinaryNumberOp): def mathop(self, ctx, n1, n2): return division(ctx, n1, n2) class Sub(BinaryNumberOp): + operation_name = 'SUB' + def mathop(self, ctx, n1, n2): return sub(ctx, n1, n2) @@ -1138,6 +1157,8 @@ class UMinus(UnaryOp): + operation_name = 'UMINUS' + def eval(self, ctx): res = self.expr.eval(ctx) if isinstance(res, W_IntNumber): @@ -1147,6 +1168,8 @@ return W_FloatNumber(-self.expr.eval(ctx).GetValue().ToNumber()) class UPlus(UnaryOp): + operation_name = 'UPLUS' + def eval(self, ctx): res = self.expr.eval(ctx) if isinstance(res, W_BaseNumber): Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Wed Mar 12 16:03:33 2008 @@ -341,17 +341,33 @@ py.test.raises(ParseError, self.check, '1=2', []) def test_expression(self): - py.test.skip("Not yet") - w_num = self.eval_expr('1 - 1 - 1') - assert w_num.ToNumber() == -1 - w_num = self.eval_expr('-(6 * (6 * 6)) + 6 - 6') - assert w_num.ToNumber() == -216 - w_num = self.eval_expr('++5') - assert w_num.ToNumber() == 6 - w_num = self.eval_expr('--5') - assert w_num.ToNumber() == 4 - w_str = self.eval_expr('"hello "+\'world\'') - assert w_str.ToString(self.ctx) == 'hello world' + self.check('1 - 1 - 1', [ + 'LOAD_INTCONSTANT 1', + 'LOAD_INTCONSTANT 1', + 'SUB', + 'LOAD_INTCONSTANT 1', + 'SUB']) + self.check('-(6 * (6 * 6)) + 6 - 6', [ + 'LOAD_INTCONSTANT 6', + 'LOAD_INTCONSTANT 6', + 'LOAD_INTCONSTANT 6', + 'MUL', + 'MUL', + 'UMINUS', + 'LOAD_INTCONSTANT 6', + 'ADD', + 'LOAD_INTCONSTANT 6', + 'SUB']) + self.check('++5', [ + 'LOAD_INTCONSTANT 5', + 'PREINCR']) + self.check('5--', [ + 'LOAD_INTCONSTANT 5', + 'POSTDECR']) + self.check('"hello " + \'world\'', + ['LOAD_STRINGCONSTANT "hello "', + 'LOAD_STRINGCONSTANT "world"', + 'ADD']) from pypy.lang.js.jsparser import parse From cfbolz at codespeak.net Wed Mar 12 17:58:48 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 12 Mar 2008 17:58:48 +0100 (CET) Subject: [pypy-svn] r52424 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080312165848.4D141169F79@codespeak.net> Author: cfbolz Date: Wed Mar 12 17:58:46 2008 New Revision: 52424 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Log: two typos Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Wed Mar 12 17:58:46 2008 @@ -80,7 +80,7 @@ maybe_on_top_of_llinterp(exceptiondesc, state.machine_code)(*args) HotEnterState.compile.im_func._dont_inline_ = True - jit_may_enter._always_inline = True + jit_may_enter._always_inline_ = True self.jit_may_enter_fn = jit_may_enter def update_interp(self): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Wed Mar 12 17:58:46 2008 @@ -73,7 +73,7 @@ class GenerateReturn(Exception): pass -class MesurePoint(object): +class MeasurePoint(object): pass class HotPromotionDesc: From arigo at codespeak.net Wed Mar 12 18:23:39 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 12 Mar 2008 18:23:39 +0100 (CET) Subject: [pypy-svn] r52426 - in pypy/branch/jit-hotpath/pypy: jit/rainbow jit/rainbow/test rpython Message-ID: <20080312172339.EC76F169F0A@codespeak.net> Author: arigo Date: Wed Mar 12 18:23:39 2008 New Revision: 52426 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/rpython/llinterp.py Log: A second test and the code to make it pass. It introduces green vars and it's a real interpreter over a bytecode with loop support. Quiz: in this bytecode, what is the following function doing? 'ISRDD{ISR%?SDD*}S' Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Wed Mar 12 18:23:39 2008 @@ -378,6 +378,10 @@ self.current_block = oldblock def insert_exits(self, block): + if self.hannotator.policy.hotpath: + hp = "hp_" + else: + hp = "" if block.exits == (): returnvar, = block.inputargs color = self.graph_calling_color(self.graph) @@ -386,15 +390,15 @@ place = self.serialize_oparg("red", returnvar) assert place == 0 if color == "gray": - self.emit("gray_return") + self.emit(hp + "gray_return") else: - self.emit("red_return") + self.emit(hp + "red_return") elif color == "red": - self.emit("red_return") + self.emit(hp + "red_return") elif color == "gray": - self.emit("gray_return") + self.emit(hp + "gray_return") elif color == "yellow": - self.emit("yellow_return") + self.emit(hp + "yellow_return") else: assert 0, "unknown graph calling color %s" % (color, ) elif len(block.exits) == 1: @@ -420,7 +424,7 @@ falserenaming = self.insert_renaming(linkfalse) truerenaming = self.insert_renaming(linktrue) if self.hannotator.policy.hotpath and color == "red": - self.emit("red_hot_goto_iftrue") + self.emit("hp_red_goto_iftrue") elif reverse is not None: ptrindex = self.serialize_oparg("red", srcargs[0]) self.emit("red_goto_ifptrnonzero") @@ -1046,10 +1050,14 @@ graphindex = self.graph_position(targetgraph) args = targetgraph.getargs() emitted_args = self.args_of_call(op.args[1:], args) - self.emit("yellow_direct_call") + if not self.hannotator.policy.hotpath: + self.emit("yellow_direct_call") + else: + self.emit("hp_yellow_direct_call") self.emit(*emitted_args) self.emit(graphindex) - self.emit("yellow_retrieve_result") + if not self.hannotator.policy.hotpath: + self.emit("yellow_retrieve_result") self.register_greenvar(op.result) def handle_vable_call(self, op, withexc): @@ -1413,7 +1421,9 @@ self.emit(self.keydesc_position(key)) def serialize_op_can_enter_jit(self, op): - return # no need to put anything in the bytecode here + # no need to put anything in the bytecode here, except a marker + # that is useful for the fallback interpreter + self.emit('can_enter_jit') class GraphTransformer(object): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Wed Mar 12 18:23:39 2008 @@ -37,6 +37,7 @@ self.pc = pc self.gv_exc_type = self.getinitialboxgv(jitstate.exc_type_box) self.gv_exc_value = self.getinitialboxgv(jitstate.exc_value_box) + self.seen_can_enter_jit = False def getinitialboxgv(self, box): assert box.genvar is not None, "XXX Virtuals support missing" @@ -58,6 +59,17 @@ for box in frame.local_boxes: self.local_red.append(self.getinitialboxgv(box)) + def run_directly(self, greenargs, redargs, targetbytecode): + assert not (greenargs and redargs) # XXX for now + calldesc = targetbytecode.owncalldesc + try: + gv_res = calldesc.perform_call(self.rgenop, + targetbytecode.gv_ownfnptr, + greenargs or redargs) + except Exception, e: + XXX + return gv_res + # ____________________________________________________________ # XXX Lots of copy and paste from interp.py! @@ -141,18 +153,22 @@ def green_result_from_red(self, gv): self.green_result(gv) - # ____________________________________________________________ - # Operation implementations - - @arguments() - def opimpl_trace(self): + def trace(self): bytecode = self.bytecode msg = '*** fallback trace: in %s position %d ***' % (bytecode.name, self.pc) print msg if bytecode.dump_copy is not None: print bytecode.dump_copy - self.debug_trace(msg) + return msg + + # ____________________________________________________________ + # Operation implementations + + @arguments() + def opimpl_trace(self): + msg = self.trace() + self.interpreter.debug_trace(msg) @arguments("green", "2byte", returns="red") def opimpl_make_redbox(self, genconst, typeid): @@ -168,12 +184,41 @@ @arguments("green", "jumptarget") def opimpl_green_goto_iftrue(self, genconst, target): - xxx + if genconst.revealconst(lltype.Bool): + self.pc = target @arguments("green", "green_varargs", "jumptargets") def opimpl_green_switch(self, exitcase, cases, targets): xxx + @arguments("bool", "red", "red", "jumptarget") + def opimpl_red_goto_ifptrnonzero(self, reverse, gv_ptr, gv_switch, target): + xxx + + @arguments("red", "jumptarget") + def opimpl_goto_if_constant(self, gv_value, target): + xxx + + + @arguments("red", returns="red") + def opimpl_red_ptr_nonzero(self, gv_ptr): + addr = gv_ptr.revealconst(llmemory.Address) + return self.rgenop.genconst(bool(addr)) + + @arguments("red", returns="red") + def opimpl_red_ptr_iszero(self, gv_ptr): + addr = gv_ptr.revealconst(llmemory.Address) + return self.rgenop.genconst(not addr) + + @arguments("red", "red", returns="red") + def opimpl_red_ptr_eq(self, gv_ptr1, gv_ptr2): + xxx + + @arguments("red", "red", returns="red") + def opimpl_red_ptr_ne(self, gv_ptr1, gv_ptr2): + xxx + + @arguments("red_varargs") def opimpl_make_new_redvars(self, local_red): self.local_red = local_red @@ -191,39 +236,28 @@ self.local_green = newgreens opimpl_make_new_greenvars.argspec = arguments("green_varargs") - @arguments("red", returns="red") - def opimpl_red_ptr_nonzero(self, gv_ptr): - addr = gv_ptr.revealconst(llmemory.Address) - return self.rgenop.genconst(bool(addr)) + @arguments("green", "calldesc", "green_varargs") + def opimpl_green_call(self, fnptr_gv, calldesc, greenargs): + xxx - @arguments("red", returns="red") - def opimpl_red_ptr_iszero(self, gv_ptr): - addr = gv_ptr.revealconst(llmemory.Address) - return self.rgenop.genconst(not addr) + @arguments("green_varargs", "red_varargs", "red", "indirectcalldesc") + def opimpl_indirect_call_const(self, greenargs, redargs, + gv_funcptr, callset): + xxx - @arguments() - def opimpl_gray_return(self): - assert self.current_source_jitframe.backframe is None # XXX for now - # at this point we should have an exception set in self.gv_exc_xxx - # and we have to really raise it. XXX non-translatable hack follows... - from pypy.rpython.llinterp import LLException, type_name - exceptiondesc = self.exceptiondesc - lltype = self.gv_exc_type.revealconst(exceptiondesc.LL_EXC_TYPE) - llvalue = self.gv_exc_value.revealconst(exceptiondesc.LL_EXC_VALUE) - assert lltype and llvalue - self.interpreter.debug_trace("fb_raise", type_name(lltype)) - raise LLException(lltype, llvalue) + @arguments("red", "calldesc", "bool", "bool", "red_varargs", + "promotiondesc") + def opimpl_red_residual_call(self, gv_func, calldesc, withexc, has_result, + redargs, promotiondesc): + xxx + + @arguments("metacalldesc", "red_varargs", returns="red") + def opimpl_metacall(self, metafunc, redargs): + xxx @arguments("green_varargs", "red_varargs", "bytecode") def opimpl_red_direct_call(self, greenargs, redargs, targetbytecode): - assert not greenargs # XXX for now - calldesc = targetbytecode.owncalldesc - try: - gv_res = calldesc.perform_call(self.rgenop, - targetbytecode.gv_ownfnptr, - redargs) - except Exception, e: - XXX + gv_res = self.run_directly(greenargs, redargs, targetbytecode) if gv_res is not None: self.red_result(gv_res) @@ -256,27 +290,111 @@ def opimpl_red_malloc(self, structtypedesc): return structtypedesc.allocate(self.rgenop) + @arguments("structtypedesc", "red", returns="red") + def opimpl_red_malloc_varsize_struct(self, structtypedesc, gv_size): + xxx + + @arguments("arraydesc", "red", returns="red") + def opimpl_red_malloc_varsize_array(self, arraytypedesc, gv_size): + xxx + @arguments("red", "fielddesc", "bool", returns="red") def opimpl_red_getfield(self, gv_struct, fielddesc, deepfrozen): gv_res = fielddesc.getfield_if_non_null(self.rgenop, gv_struct) assert gv_res is not None, "segfault!" return gv_res + @arguments("red", "fielddesc", "bool", returns="green_from_red") + def opimpl_green_getfield(self, gv_struct, fielddesc, deepfrozen): + xxx + @arguments("red", "fielddesc", "red") def opimpl_red_setfield(self, gv_dest, fielddesc, gv_value): fielddesc.setfield(self.rgenop, gv_dest, gv_value) + @arguments("red", "arraydesc", "red", "bool", returns="red") + def opimpl_red_getarrayitem(self, gv_array, fielddesc, gv_index, deepfrozen): + xxx + + @arguments("red", "arraydesc", "red", "red") + def opimpl_red_setarrayitem(self, gv_dest, fielddesc, gv_index, gv_value): + xxx + + @arguments("red", "arraydesc", returns="red") + def opimpl_red_getarraysize(self, gv_array, fielddesc): + xxx + + @arguments("red", "arraydesc", returns="green_from_red") + def opimpl_green_getarraysize(self, gv_array, fielddesc): + xxx + + @arguments("red", "interiordesc", "bool", "red_varargs", returns="red") + def opimpl_red_getinteriorfield(self, gv_struct, interiordesc, deepfrozen, + indexes_gv): + xxx + + @arguments("red", "interiordesc", "bool", "red_varargs", + returns="green_from_red") + def opimpl_green_getinteriorfield(self, gv_struct, interiordesc, deepfrozen, + indexes_gv): + xxx + + @arguments("red", "interiordesc", "red_varargs", "red") + def opimpl_red_setinteriorfield(self, gv_dest, interiordesc, indexes_gv, + gv_value): + xxx + + @arguments("red", "interiordesc", "red_varargs", returns="red") + def opimpl_red_getinteriorarraysize(self, gv_array, interiordesc, indexes_gv): + xxx + + @arguments("red", "interiordesc", "red_varargs", returns="green_from_red") + def opimpl_green_getinteriorarraysize(self, gv_array, interiordesc, + indexes_gv): + xxx + + @arguments("red", "green", "green", returns="green") + def opimpl_is_constant(self, arg, true, false): + xxx + # hotpath-specific operations @arguments("greenkey") def opimpl_jit_merge_point(self, key): - raise self.ContinueRunningNormally(self.local_green + self.local_red) + raise self.ContinueRunningNormally(self.local_green + self.local_red, + self.seen_can_enter_jit) + + @arguments() + def opimpl_can_enter_jit(self): + self.seen_can_enter_jit = True @arguments("red", "jumptarget") - def opimpl_red_hot_goto_iftrue(self, gv_switch, target): + def opimpl_hp_red_goto_iftrue(self, gv_switch, target): if gv_switch.revealconst(lltype.Bool): self.pc = target + @arguments("green_varargs", "red_varargs", "bytecode") + def opimpl_hp_yellow_direct_call(self, greenargs, redargs, targetbytecode): + gv_res = self.run_directly(greenargs, redargs, targetbytecode) + self.green_result(gv_res) + + @arguments() + def opimpl_hp_gray_return(self): + assert self.current_source_jitframe.backframe is None # XXX for now + # at this point we should have an exception set in self.gv_exc_xxx + # and we have to really raise it. XXX non-translatable hack follows... + from pypy.rpython.llinterp import LLException, type_name + exceptiondesc = self.exceptiondesc + lltype = self.gv_exc_type.revealconst(exceptiondesc.LL_EXC_TYPE) + llvalue = self.gv_exc_value.revealconst(exceptiondesc.LL_EXC_VALUE) + assert lltype and llvalue + self.interpreter.debug_trace("fb_raise", type_name(lltype)) + raise LLException(lltype, llvalue) + + @arguments() + def opimpl_hp_yellow_return(self): + xxx + # ____________________________________________________________ # construction-time helpers Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Wed Mar 12 18:23:39 2008 @@ -7,6 +7,8 @@ from pypy.rlib.objectmodel import we_are_translated from pypy.jit.hintannotator.model import originalconcretetype from pypy.jit.timeshifter import rvalue +from pypy.jit.timeshifter.greenkey import KeyDesc, empty_key +from pypy.jit.timeshifter.greenkey import GreenKey, newgreendict from pypy.jit.rainbow import rhotpath from pypy.jit.rainbow.fallback import FallbackInterpreter from pypy.jit.rainbow.codewriter import maybe_on_top_of_llinterp @@ -43,17 +45,19 @@ newportalgraph = self.hintannotator.translator.graphs[0] ALLARGS = [] RESARGS = [] - self.args_specification = [] + self.red_args_spec = [] + self.green_args_spec = [] for v in newportalgraph.getargs(): TYPE = v.concretetype ALLARGS.append(TYPE) if self.hintannotator.binding(v).is_green(): - xxx + self.green_args_spec.append(TYPE) + assert len(self.red_args_spec) == 0, "bogus order of colors" else: RESARGS.append(TYPE) kind = self.RGenOp.kindToken(TYPE) boxcls = rvalue.ll_redboxcls(TYPE) - self.args_specification.append((kind, boxcls)) + self.red_args_spec.append((kind, boxcls)) self.JIT_ENTER_FUNCTYPE = lltype.FuncType(ALLARGS, lltype.Void) self.RESIDUAL_FUNCTYPE = lltype.FuncType(RESARGS, lltype.Void) @@ -64,24 +68,28 @@ state = HotEnterState() exceptiondesc = self.codewriter.exceptiondesc interpreter = self.interpreter + num_green_args = len(self.green_args_spec) - def jit_may_enter(*args): - counter = state.counter + def maybe_enter_jit(*args): + key = state.getkey(*args[:num_green_args]) + counter = state.counters.get(key, 0) if counter >= 0: counter += 1 if counter < self.threshold: interpreter.debug_trace("jit_not_entered", *args) - state.counter = counter + state.counters[key] = counter return interpreter.debug_trace("jit_compile", *args) - if not state.compile(): + if not state.compile(key): return interpreter.debug_trace("run_machine_code", *args) - maybe_on_top_of_llinterp(exceptiondesc, state.machine_code)(*args) + mc = state.machine_codes[key] + run = maybe_on_top_of_llinterp(exceptiondesc, mc) + run(*args[num_green_args:]) HotEnterState.compile.im_func._dont_inline_ = True - jit_may_enter._always_inline_ = True - self.jit_may_enter_fn = jit_may_enter + maybe_enter_jit._always_inline_ = True + self.maybe_enter_jit_fn = maybe_enter_jit def update_interp(self): self.fallbackinterp = FallbackInterpreter( @@ -112,24 +120,23 @@ def rewrite_can_enter_jit(self, graph, block, index): # - # In the original graphs, replace the 'jit_can_enter' operations - # with a call to the jit_may_enter() helper. + # In the original graphs, replace the 'can_enter_jit' operations + # with a call to the maybe_enter_jit() helper. # assert graph is not self.hintannotator.origportalgraph, ( "XXX can_enter_jit() cannot appear before jit_merge_point() " - "in the portal graph") + "in the graph of the main loop") if not self.translate_support_code: # this case is used for most tests: the jit stuff should be run # directly to make these tests faster op = block.operations[index] numgreens = op.args[0].value numreds = op.args[1].value - assert numgreens == 0 # XXX for the first test - reds_v = op.args[2+numgreens:2+numgreens+numreds] + args_v = op.args[2:2+numgreens+numreds] FUNCPTR = lltype.Ptr(self.JIT_ENTER_FUNCTYPE) - jit_enter_graph_ptr = llhelper(FUNCPTR, self.jit_may_enter_fn) - vlist = [Constant(jit_enter_graph_ptr, FUNCPTR)] + reds_v + jit_enter_graph_ptr = llhelper(FUNCPTR, self.maybe_enter_jit_fn) + vlist = [Constant(jit_enter_graph_ptr, FUNCPTR)] + args_v v_result = Variable() v_result.concretetype = lltype.Void @@ -181,14 +188,15 @@ # exc_data_ptr = self.codewriter.exceptiondesc.exc_data_ptr llinterp = LLInterpreter(self.rtyper, exc_data_ptr=exc_data_ptr) - jit_may_enter = self.jit_may_enter_fn + maybe_enter_jit = self.maybe_enter_jit_fn class ContinueRunningNormally(Exception): _go_through_llinterp_uncaught_ = True # ugh - def __init__(self, args_gv): + def __init__(self, args_gv, seen_can_enter_jit): assert len(args_gv) == len(ARGS) self.args = [gv_arg.revealconst(ARG) for gv_arg, ARG in zip(args_gv, ARGS)] + self.seen_can_enter_jit = seen_can_enter_jit def __str__(self): return 'ContinueRunningNormally(%s)' % ( ', '.join(map(str, self.args)),) @@ -199,15 +207,15 @@ while 1: try: if check_for_immediate_reentry: - jit_may_enter(*args) + maybe_enter_jit(*args) llinterp.eval_graph(portalgraph, list(args)) assert 0, "unreachable" except ContinueRunningNormally, e: args = e.args self.interpreter.debug_trace("fb_leave", *args) - check_for_immediate_reentry = True + check_for_immediate_reentry = e.seen_can_enter_jit # ^^^ but should depend on whether the fallback - # interpreter reached a jit_can_enter() or just + # interpreter reached a can_enter_jit() or just # the jit_merge_point() portal_runner_ptr = lltype.functionptr(PORTALFUNC, 'portal_runner', @@ -240,36 +248,61 @@ def make_state_class(rewriter): # very minimal, just to make the first test pass - args_specification = unrolling_iterable(rewriter.args_specification) + green_args_spec = unrolling_iterable(rewriter.green_args_spec) + red_args_spec = unrolling_iterable(rewriter.red_args_spec) + if rewriter.green_args_spec: + keydesc = KeyDesc(rewriter.RGenOp, *rewriter.green_args_spec) + else: + keydesc = None class HotEnterState: def __init__(self): - self.machine_code = lltype.nullptr(rewriter.RESIDUAL_FUNCTYPE) - self.counter = 0 # -1 means "compiled" + self.machine_codes = newgreendict() + self.counters = newgreendict() # -1 means "compiled" - def compile(self): + # XXX XXX be more clever and find a way where we don't need + # to allocate a GreenKey object for each call to + # maybe_enter_jit(). One way would be to replace the + # 'counters' with some hand-written fixed-sized hash table. + # Indeed, this is all a heuristic, so if things are designed + # correctly, the occasional mistake due to hash collision is + # not too bad. The fixed-size-ness would also let old + # recorded counters gradually disappear as they get replaced + # by more recent ones. + + def getkey(self, *greenvalues): + if keydesc is None: + return empty_key + rgenop = rewriter.interpreter.rgenop + lst_gv = [None] * len(greenvalues) + i = 0 + for _ in green_args_spec: + lst_gv[i] = rgenop.genconst(greenvalues[i]) + i += 1 + return GreenKey(lst_gv, keydesc) + + def compile(self, greenkey): try: - self._compile() + self._compile(greenkey) return True except Exception, e: rhotpath.report_compile_time_exception(rewriter.interpreter, e) return False - def _compile(self): + def _compile(self, greenkey): interp = rewriter.interpreter rgenop = interp.rgenop builder, gv_generated, inputargs_gv = rgenop.newgraph( rewriter.sigtoken, "residual") - greenargs = () + greenargs = list(greenkey.values) redargs = () red_i = 0 - for kind, boxcls in args_specification: + for kind, boxcls in red_args_spec: gv_arg = inputargs_gv[red_i] red_i += 1 box = boxcls(kind, gv_arg) redargs += (box,) - greenargs = list(greenargs) redargs = list(redargs) jitstate = interp.fresh_jitstate(builder) @@ -281,8 +314,7 @@ builder.end() FUNCPTR = lltype.Ptr(rewriter.RESIDUAL_FUNCTYPE) - self.machine_code = gv_generated.revealconst(FUNCPTR) - self.counter = -1 # compiled + self.machine_codes[greenkey] = gv_generated.revealconst(FUNCPTR) + self.counters[greenkey] = -1 # compiled return HotEnterState - Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Wed Mar 12 18:23:39 2008 @@ -427,9 +427,7 @@ else: self.frame = None - # operation implementations - @arguments() - def opimpl_trace(self): + def trace(self): # Prints the current frame position and a dump if available. # Although this opcode is not actually generated by # codewriter.py so far, it can be called manually in a C-level @@ -442,6 +440,12 @@ print msg if bytecode.dump_copy is not None: print bytecode.dump_copy + return msg + + # operation implementations + @arguments() + def opimpl_trace(self): + msg = self.trace() self.debug_trace(msg) @arguments("green", "2byte", returns="red") @@ -855,13 +859,37 @@ self.newjitstate(None) return STOP + @arguments() + def opimpl_can_enter_jit(self): + pass # useful for the fallback interpreter only + @arguments("red", "jumptarget") - def opimpl_red_hot_goto_iftrue(self, switchbox, target): + def opimpl_hp_red_goto_iftrue(self, switchbox, target): self.debug_trace("pause at hotsplit in", self.frame.bytecode.name) rhotpath.hotsplit(self.jitstate, self.bool_hotpromotiondesc, switchbox, self.frame.pc, target) assert False, "unreachable" + @arguments("green_varargs", "red_varargs", "bytecode") + def opimpl_hp_yellow_direct_call(self, greenargs, redargs, targetbytecode): + frame = rtimeshift.VirtualFrame(self.frame, None) + self.frame = self.jitstate.frame = frame + frame.pc = 0 + frame.bytecode = targetbytecode + frame.local_boxes = redargs + frame.local_green = greenargs + + @arguments() + def opimpl_hp_gray_return(self): + assert False, "unreachable for now" + + @arguments() + def opimpl_hp_yellow_return(self): + gv_result = self.frame.local_green[0] + frame = self.frame.backframe + self.frame = self.jitstate.frame = frame + self.green_result(gv_result) + # ____________________________________________________________ # construction-time interface Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Wed Mar 12 18:23:39 2008 @@ -73,9 +73,6 @@ class GenerateReturn(Exception): pass -class MeasurePoint(object): - pass - class HotPromotionDesc: __metaclass__ = cachedtype @@ -132,7 +129,7 @@ assert 0, "unreachable" self.ll_reach_fallback_point = ll_reach_fallback_point - #ll_reach_fallback_point._debugexc = True + ll_reach_fallback_point._debugexc = True FUNCTYPE = lltype.FuncType([base_ptr_lltype(), ERASED, llmemory.Address], lltype.Void) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Wed Mar 12 18:23:39 2008 @@ -1,5 +1,6 @@ import py -from pypy.rlib.jit import jit_merge_point, can_enter_jit +import re +from pypy.rlib.jit import jit_merge_point, can_enter_jit, hint from pypy.jit.rainbow.test import test_interpreter from pypy.jit.rainbow.hotpath import EntryPointsRewriter from pypy.jit.hintannotator.policy import HintAnnotatorPolicy @@ -38,10 +39,13 @@ i = 0 for trace, expect in zip(traces + ['--end of traces--'], expected + ['--end of traces--']): + # '...' in the expect string stands for any sequence of characters + regexp = '.*'.join(map(re.escape, expect.split('...'))) + '$' # 'trace' is a DebugTrace instance, reduce it to a string - assert str(trace) == expect, ("debug_trace[%d] mismatch:\n" - " got %s\n" - " expected %s" % (i, trace, expect)) + match = re.match(regexp, str(trace)) + assert match, ("debug_trace[%d] mismatch:\n" + " got: %s\n" + " expected: %s" % (i, trace, expect)) i += 1 @@ -100,3 +104,94 @@ # finally, go back to the fallback interp when "n1 <= 1" is True "fallback_interp", "fb_raise Exit"]) + + def test_greens(self): + def ll_function(code, buffer): + data = 0 + accum = 0 + pc = 0 + while True: + jit_merge_point(green=(code, pc), red=(accum, data, buffer)) + if pc == len(code): + raise Exit(accum) + c = code[pc] + pc += 1 + c = hint(c, concrete=True) + if c == 'I': + accum += 1 # increment + elif c == 'D': + accum -= 1 # decrement + elif c == 'S': + accum, data = data, accum # swap + elif c == 'W': + buffer = accum # write + elif c == 'R': + accum = buffer # read + elif c == '*': + accum *= data + elif c == '%': + accum %= data + elif c == '?': + accum = int(bool(accum)) + elif c == '{': + if accum == 0: # loop while != 0 + while code[pc] != '}': + pc += 1 + pc += 1 + elif c == '}': + if accum != 0: + pc -= 2 # end of loop + assert pc >= 0 + while code[pc] != '{': + pc -= 1 + assert pc >= 0 + pc += 1 + can_enter_jit(green=(code, pc), red=(accum, + data, buffer)) + + def main(demo, arg): + if demo == 1: + code = 'RSIS{S*SD}S' # factorial + elif demo == 2: + code = 'ISRDD{ISR%?SDD*}S' # prime number tester (for arg>=2) + else: + raise ValueError + try: + ll_function(code, arg) + except Exit, e: + return e.result + + assert main(1, 10) == 10*9*8*7*6*5*4*3*2*1 + assert ([main(2, n) + for n in [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]] + == [1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0]) + + res = self.run(main, [1, 10], threshold=3, small=True) + assert res == main(1, 10) + self.check_traces([ + # start compiling the 3rd time we loop back + "jit_not_entered * struct rpy_string {...} 5 9 10 10", + "jit_not_entered * struct rpy_string {...} 5 8 90 10", + "jit_compile * struct rpy_string {...} 5 7 720 10", + # stop compiling at the red split ending an extra iteration + "pause at hotsplit in ll_function", + # run it, finishing twice through the fallback interp + "run_machine_code * struct rpy_string {...} 5 7 720 10", + "fallback_interp", + "fb_leave * struct rpy_string {...} 5 6 5040 10", + "run_machine_code * struct rpy_string {...} 5 6 5040 10", + "fallback_interp", + "fb_leave * struct rpy_string {...} 5 5 30240 10", + "run_machine_code * struct rpy_string {...} 5 5 30240 10", + # the third time, compile the hot path, which closes the loop + # in the generated machine code + "jit_resume bool_path True in ll_function", + "done at jit_merge_point", + # continue running 100% in the machine code as long as necessary + "resume_machine_code", + # at the end, use the fallbac interp to follow the exit path + "fallback_interp", + "fb_leave * struct rpy_string {...} 10 0 3628800 10", + # finally, we interpret the final 'S' character + # which gives us the final answer + ]) Modified: pypy/branch/jit-hotpath/pypy/rpython/llinterp.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/llinterp.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/llinterp.py Wed Mar 12 18:23:39 2008 @@ -76,6 +76,8 @@ self.tracer.dump('LLException: %s\n' % (e,)) raise except Exception, e: + if getattr(e, '_go_through_llinterp_uncaught_', False): + raise log.error("AN ERROR OCCURED: %s" % (e, )) self.print_traceback() if self.tracer: @@ -455,6 +457,8 @@ except LLException, e: raise except Exception, e: + if getattr(e, '_go_through_llinterp_uncaught_', False): + raise if getattr(obj, '_debugexc', False): log.ERROR('The llinterpreter got an ' 'unexpected exception when calling') From arigo at codespeak.net Wed Mar 12 18:27:26 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 12 Mar 2008 18:27:26 +0100 (CET) Subject: [pypy-svn] r52427 - pypy/dist/pypy/doc/discussion Message-ID: <20080312172726.5685E169F10@codespeak.net> Author: arigo Date: Wed Mar 12 18:27:25 2008 New Revision: 52427 Modified: pypy/dist/pypy/doc/discussion/jit-refactoring-plan.txt Log: Update the draft to keep it in sync with the implementation. Modified: pypy/dist/pypy/doc/discussion/jit-refactoring-plan.txt ============================================================================== --- pypy/dist/pypy/doc/discussion/jit-refactoring-plan.txt (original) +++ pypy/dist/pypy/doc/discussion/jit-refactoring-plan.txt Wed Mar 12 18:27:25 2008 @@ -27,8 +27,10 @@ linked lists of frames anyway already -"Plan B" Control Flow ---------------------- +"Hot Paths Only" Control Flow +----------------------------- + +*Update: this is work in progress in the* ``jit-hotpath`` *branch* A few notes about a refactoring that I was thinking about for after the rainbow interpreter works nicely. Let's use the Python interpreter as a @@ -50,15 +52,16 @@ ++++++++++++++++ We'd replace portals and global merge points with the following variant: -two hints, "can_enter_jit" and "global_merge_point", which are where the -execution can go from interpreter to JITted and back. As before, -"global_merge_point" is present at the beginning of the main interpreter +two hints, "can_enter_jit" and "jit_merge_point", which are where the +execution can go from interpreter to JITted and back. +Very similar to the older "global_merge_point", the +"jit_merge_point" is present at the beginning of the main interpreter loop; in this model it has the additional meaning of being where the JIT can be *left* in order to go back to regular interpretation. The other hint, "can_enter_jit", is the place where some lightweight profiling occurs in order to know if we should enter the JIT. It's -important to not have one "can_enter_jit" for each opcode -- that's a +important to not execute one "can_enter_jit" for each opcode -- that's a too heavy slow-down for regularly interpreted code (but it would be correct too). A probably reasonable idea is to put it in the opcodes that close loops (JUMP_ABSOLUTE, CONTINUE). This would make the regular @@ -66,28 +69,87 @@ often executed. (In time, the JIT should follow calls too, so that means that the functions called by loops also get JITted.) -If the profiling in "can_enter_jit" finds out we should start JITting, -it calls the JIT, which compiles and executes some machine code, which -makes the current function frame progress, maybe to its end or not, but -at least to an opcode boundary; so when the call done by "can_enter_jit" -returns the regular interpreter can simply continue from the new next -opcode. For this reason it's necessary to put "can_enter_jit" and -"global_merge_point" next to each other, control-flow-wise -- +The "can_enter_jit" is transformed into a call to a helper function, +``maybe_enter_jit()``, with the following logic: + +- If we have not seen this point often enough, return and continue + running normally in the regular interpreter. + +- The first time we reach the threshold, call the JIT to compile some + machine code. + +- Execute the machine code. + +Note that to make things easier the JIT compilation really starts at the +unique "jit_merge_point". So the "can_enter_jit" hints should all be +put just before the "jit_merge_point", control-flow-wise -- i.e. "can_enter_jit" should be at the end of JUMP_ABSOLUTE and CONTINUE, -so that they are immediately followed by the "global_merge_point". +so that they are immediately followed by the "jit_merge_point" which is +at the start of the next iteration of the interpreter main loop. + +The machine code makes the current Python frame progress, maybe to its +end or not, but at least up to an opcode boundary (as explained later). +To simplify things, in all cases the machine code raises an exception +when it is done. The reasoning is that the current Python frame has +progressed, so that the original caller of ``maybe_enter_jit()`` now +contains out of sync local variables. Getting out with an exception +gets rid of these. There are three kinds of exception that can be +raised here: + +- DoneWithThisFrame; +- ContinueRunningNormally; +- any other exception (corresponding to a regular exception raised by + the original Python interpreter). + +The DoneWithThisFrame exception is raised to mean that the machine code +completed the execution of this frame (it carries the return value +computed by the machine code). The ContinueRunningNormally exception is +raised when we want to switch back from machine code to regular +non-JITted interpretation, which can only occur at a Python opcode +boundary (this exception carries the new values needed to resume the +regular interpreter, like the opcode position). + +To catch and handle these two special exceptions, we need to transform +the graph of the regular interpreter -- we split it and insert a small +wrapper. Say the original interpreter is:: + + def my_interpreter(..): + stuff + while 1: + jit_merge_point(*live_vars) + more stuff + +We (automatically) mutate it so that it becomes:: + + def my_interpreter(..): + stuff + return portal_runner(*live_vars) + + def portal_runner(*args): + """Small wrapper to handle the special JIT exceptions""" + while 1: + try: + return portal(*args) + except ContinueRunningNormally, e: + args = e.new_args + continue + except DoneWithThisFrame, e: + return e.result + + def portal(*live_vars): + while 1: + more stuff + +++++++++++++++ -Note that "can_enter_jit", in the regular interpreter, has another goal -too: it should quickly check if machine code was already emitted for the -next opcode, and if so, jump to it -- i.e. do a call to it. As above -the call to the machine code will make the current function execution -progress and when it returns we can go on interpreting it. +A few extra random notes: PyPy contains some custom logic to virtualize the frame and the value stack; in this new model it should go somewhere related to "can_enter_jit". The "can_enter_jit" hint becomes nothing in the rainbow interpreter's -bytecode. Conversely, the "global_merge_point" hint becomes nothing in +bytecode. Conversely, the "jit_merge_point" hint becomes nothing in the regular interpreter, but an important bytecode in the rainbow bytecode. @@ -121,7 +183,7 @@ to "simple if-then-else" patterns; and the "complicated" ones. We can be more clever about simple if-then-else patterns, but for all other red splits, we would just stop emitting machine code. The JIT puts in the -machine code a jump to a special "fall-back rainbow interpreter". This +machine code a jump to a special "fallback rainbow interpreter". This interpreter is a variant that considers everything as green and just interprets everything normally. The idea is that when execution reaches the red split, in the middle of the rainbow bytecode of whatever @@ -129,14 +191,14 @@ code for the hot path; so we have to do something to continue executing when we don't want to generate more code immediately. -The "something" in question, the fall-back rainbow interpreter, is quite +The "something" in question, the fallback rainbow interpreter, is quite slow, but only runs until the end of the current opcode and can directly perform all nested calls instead of interpreting them. When it reaches -the "global_merge_point", it then returns; as described in the "hints" -section this should be a return from the initial call to the JIT or the -machine code -- a call which was in "can_enter_jit" in the regular -interpreter. So the control flow is now in the regular interpreter, -which can go on interpreting at its normal speed from there. +the "jit_merge_point", it raises ContinueRunningNormally; as described +in the Hints_ section this should go all the way back to the +``portal_runner()`` wrapper and cause the control flow to come back +to the regular interpreter main loop, in ``portal()``. The regular +interpreter goes on interpreting at its normal speed from there. All in all I guess that there is a chance that the fallback rainbow interpreter is not too much of an overhead. The important point is that @@ -144,7 +206,7 @@ counters, and when enough executions have been seen, we compile the hot path (and only the hot path, unless we find out quickly that the other path is hot enough too). So after the compilation converges overall, -the fallback rainbow interpreter is only ever executed on the cold +the fallback rainbow interpreter is no longer executed except on the cold paths. As noted above, we can (later) be clever about simple if-then-else @@ -161,8 +223,8 @@ x += 1 do_more_stuff -Promotions are similar to red splits -- go to the fall-back rainbow -interpreter, which update counters, and later resumes compilation for +Promotions are similar to red splits -- update counters and go to the +fallback rainbow interpreter, and later resume compilation for the values that seem to be hot. For further improvements, this also makes it easy to decide, looking at the counters, that a site is "megamorphic", i.e. receives tons of different values with no clear @@ -188,7 +250,7 @@ Random improvement ideas ++++++++++++++++++++++++++++++++ -- in the "global_merge_point", so far we'd +- in the "jit_merge_point", so far we'd record one state snapshot for each opcode; instead, we can use the idea implemented in the flow object space of only recording the state at the beginning of an opcode that actually From arigo at codespeak.net Wed Mar 12 18:40:02 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 12 Mar 2008 18:40:02 +0100 (CET) Subject: [pypy-svn] r52428 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080312174002.DA45F169F0A@codespeak.net> Author: arigo Date: Wed Mar 12 18:40:02 2008 New Revision: 52428 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: Also test the 2nd bytecode. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Wed Mar 12 18:40:02 2008 @@ -19,7 +19,8 @@ type_system = 'lltype' def run(self, main, main_args, threshold, policy=P_HOTPATH, small=False): - self.serialize(main, main_args, policy=policy, backendoptimize=True) + # xxx caching of tests doesn't work - do we care? + self._serialize(main, main_args, policy=policy, backendoptimize=True) rewriter = EntryPointsRewriter(self.hintannotator, self.rtyper, self.jitcode, self.RGenOp, self.writer, threshold, self.translate_support_code) @@ -195,3 +196,7 @@ # finally, we interpret the final 'S' character # which gives us the final answer ]) + + res = self.run(main, [2, 1291], threshold=3, small=True) + assert res == 1 + assert len(self.rewriter.interpreter.debug_traces) < 20 From arigo at codespeak.net Thu Mar 13 09:22:57 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 13 Mar 2008 09:22:57 +0100 (CET) Subject: [pypy-svn] r52439 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080313082257.11494169F44@codespeak.net> Author: arigo Date: Thu Mar 13 09:22:56 2008 New Revision: 52439 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: The next test. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Thu Mar 13 09:22:56 2008 @@ -200,3 +200,25 @@ res = self.run(main, [2, 1291], threshold=3, small=True) assert res == 1 assert len(self.rewriter.interpreter.debug_traces) < 20 + + def test_simple_return(self): + py.test.skip("in-progress") + def ll_function(n): + total = 0 + if n <= 0: + return -1 + while True: + jit_merge_point(red=(n, total)) + total += n + if n <= 1: + return total + n -= 1 + can_enter_jit(red=(n, total)) + + res = self.run(ll_function, [0], threshold=3, small=True) + assert res == -1 + assert len(self.rewriter.interpreter.debug_traces) == 0 + + res = self.run(ll_function, [50], threshold=3, small=True) + assert res == (50*51)/2 + assert len(self.rewriter.interpreter.debug_traces) < 20 From arigo at codespeak.net Thu Mar 13 11:23:03 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 13 Mar 2008 11:23:03 +0100 (CET) Subject: [pypy-svn] r52440 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080313102303.5BABF169F5A@codespeak.net> Author: arigo Date: Thu Mar 13 11:23:02 2008 New Revision: 52440 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: Start supporting portals that exit with a 'return'. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Thu Mar 13 11:23:02 2008 @@ -12,11 +12,13 @@ actual values for the live red vars, and interprets the jitcode normally until it reaches the 'jit_merge_point' or raises. """ - def __init__(self, interpreter, ContinueRunningNormally, exceptiondesc): + def __init__(self, interpreter, exceptiondesc, + DoneWithThisFrame, ContinueRunningNormally): self.interpreter = interpreter self.rgenop = interpreter.rgenop - self.ContinueRunningNormally = ContinueRunningNormally self.exceptiondesc = exceptiondesc + self.DoneWithThisFrame = DoneWithThisFrame + self.ContinueRunningNormally = ContinueRunningNormally self.register_opcode_impls(interpreter) def run(self, fallback_point, framebase, pc): @@ -70,6 +72,21 @@ XXX return gv_res + def leave_fallback_interp(self, gv_result): + # at this point we might have an exception set in self.gv_exc_xxx + # and we have to really raise it. + exceptiondesc = self.exceptiondesc + lltype = self.gv_exc_type.revealconst(exceptiondesc.LL_EXC_TYPE) + if lltype: + # XXX non-translatable hack follows... + from pypy.rpython.llinterp import LLException, type_name + llvalue = self.gv_exc_value.revealconst(exceptiondesc.LL_EXC_VALUE) + assert lltype and llvalue + self.interpreter.debug_trace("fb_raise", type_name(lltype)) + raise LLException(lltype, llvalue) + else: + raise self.DoneWithThisFrame(gv_result) + # ____________________________________________________________ # XXX Lots of copy and paste from interp.py! @@ -381,15 +398,12 @@ @arguments() def opimpl_hp_gray_return(self): assert self.current_source_jitframe.backframe is None # XXX for now - # at this point we should have an exception set in self.gv_exc_xxx - # and we have to really raise it. XXX non-translatable hack follows... - from pypy.rpython.llinterp import LLException, type_name - exceptiondesc = self.exceptiondesc - lltype = self.gv_exc_type.revealconst(exceptiondesc.LL_EXC_TYPE) - llvalue = self.gv_exc_value.revealconst(exceptiondesc.LL_EXC_VALUE) - assert lltype and llvalue - self.interpreter.debug_trace("fb_raise", type_name(lltype)) - raise LLException(lltype, llvalue) + self.leave_fallback_interp(None) + + @arguments() + def opimpl_hp_red_return(self): + assert self.current_source_jitframe.backframe is None # XXX for now + self.leave_fallback_interp(self.local_red[0]) @arguments() def opimpl_hp_yellow_return(self): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Thu Mar 13 11:23:02 2008 @@ -38,10 +38,6 @@ def make_args_specification(self): origportalgraph = self.hintannotator.portalgraph - for block in origportalgraph.iterblocks(): - if block is origportalgraph.returnblock: - raise Exception("XXX doesn't support portal functions with" - " a 'return' yet - leave it with 'raise' :-)") newportalgraph = self.hintannotator.translator.graphs[0] ALLARGS = [] RESARGS = [] @@ -94,8 +90,9 @@ def update_interp(self): self.fallbackinterp = FallbackInterpreter( self.interpreter, - self.ContinueRunningNormally, - self.codewriter.exceptiondesc) + self.codewriter.exceptiondesc, + self.DoneWithThisFrame, + self.ContinueRunningNormally) ERASED = self.RGenOp.erasedType(lltype.Bool) self.interpreter.bool_hotpromotiondesc = rhotpath.HotPromotionDesc( ERASED, self.interpreter, self.threshold, self.fallbackinterp) @@ -178,8 +175,8 @@ # not its copy ARGS = [v.concretetype for v in portalgraph.getargs()] - assert portalgraph.getreturnvar().concretetype is lltype.Void - PORTALFUNC = lltype.FuncType(ARGS, lltype.Void) + RES = portalgraph.getreturnvar().concretetype + PORTALFUNC = lltype.FuncType(ARGS, RES) if not self.translate_support_code: # ____________________________________________________________ @@ -190,6 +187,17 @@ llinterp = LLInterpreter(self.rtyper, exc_data_ptr=exc_data_ptr) maybe_enter_jit = self.maybe_enter_jit_fn + class DoneWithThisFrame(Exception): + _go_through_llinterp_uncaught_ = True # ugh + def __init__(self, gv_result): + if RES is lltype.Void: + assert gv_result is None + self.result = None + else: + self.result = gv_result.revealconst(RES) + def __str__(self): + return 'DoneWithThisFrame(%s)' % (self.result,) + class ContinueRunningNormally(Exception): _go_through_llinterp_uncaught_ = True # ugh def __init__(self, args_gv, seen_can_enter_jit): @@ -200,6 +208,8 @@ def __str__(self): return 'ContinueRunningNormally(%s)' % ( ', '.join(map(str, self.args)),) + + self.DoneWithThisFrame = DoneWithThisFrame self.ContinueRunningNormally = ContinueRunningNormally def portal_runner(*args): @@ -208,8 +218,9 @@ try: if check_for_immediate_reentry: maybe_enter_jit(*args) - llinterp.eval_graph(portalgraph, list(args)) - assert 0, "unreachable" + return llinterp.eval_graph(portalgraph, list(args)) + except DoneWithThisFrame, e: + return e.result except ContinueRunningNormally, e: args = e.args self.interpreter.debug_trace("fb_leave", *args) @@ -235,13 +246,12 @@ vlist += greens_v vlist += reds_v v_result = Variable() - v_result.concretetype = lltype.Void + v_result.concretetype = RES newop = SpaceOperation('direct_call', vlist, v_result) del origblock.operations[origindex:] origblock.operations.append(newop) origblock.exitswitch = None - origblock.recloseblock(Link([Constant(None, lltype.Void)], - origportalgraph.returnblock)) + origblock.recloseblock(Link([v_result], origportalgraph.returnblock)) checkgraph(origportalgraph) return True Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Thu Mar 13 11:23:02 2008 @@ -881,7 +881,11 @@ @arguments() def opimpl_hp_gray_return(self): - assert False, "unreachable for now" + xxx + + @arguments() + def opimpl_hp_red_return(self): + xxx @arguments() def opimpl_hp_yellow_return(self): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Thu Mar 13 11:23:02 2008 @@ -202,7 +202,6 @@ assert len(self.rewriter.interpreter.debug_traces) < 20 def test_simple_return(self): - py.test.skip("in-progress") def ll_function(n): total = 0 if n <= 0: @@ -217,7 +216,12 @@ res = self.run(ll_function, [0], threshold=3, small=True) assert res == -1 - assert len(self.rewriter.interpreter.debug_traces) == 0 + self.check_traces([]) + + res = self.run(ll_function, [3], threshold=3, small=True) + assert res == (3*4)/2 + self.check_traces(['jit_not_entered 2 3', + 'jit_not_entered 1 5']) res = self.run(ll_function, [50], threshold=3, small=True) assert res == (50*51)/2 From arigo at codespeak.net Thu Mar 13 11:42:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 13 Mar 2008 11:42:09 +0100 (CET) Subject: [pypy-svn] r52441 - in pypy/branch/jit-hotpath/pypy: jit/hintannotator jit/rainbow jit/rainbow/test rlib Message-ID: <20080313104209.36916169F73@codespeak.net> Author: arigo Date: Thu Mar 13 11:42:09 2008 New Revision: 52441 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/rlib/jit.py Log: An exception, JitHintError, to raise when we detect a problem with the hints. Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Thu Mar 13 11:42:09 2008 @@ -3,6 +3,7 @@ from pypy.translator.simplify import join_blocks from pypy.jit.hintannotator.annotator import HintAnnotator from pypy.jit.hintannotator.model import SomeLLAbstractConstant, OriginFlags +from pypy.rlib.jit import JitHintError class HotPathHintAnnotator(HintAnnotator): @@ -14,7 +15,7 @@ if op.opname == 'jit_merge_point': found_at.append((graph, block, op)) if len(found_at) > 1: - raise Exception("multiple jit_merge_point() not supported") + raise JitHintError("multiple jit_merge_point() not supported") if found_at: return found_at[0] else: @@ -35,8 +36,8 @@ if place is not None: found_at.append(place) if len(found_at) != 1: - raise Exception("found %d graphs with a jit_merge_point()," - " expected 1 (for now)" % len(found_at)) + raise JitHintError("found %d graphs with a jit_merge_point()," + " expected 1 (for now)" % len(found_at)) origportalgraph, _, _ = found_at[0] # # We make a copy of origportalgraph and mutate it to make it @@ -62,6 +63,7 @@ self.origportalgraph = origportalgraph # check the new graph: errors mean some live vars have not # been listed in the jit_merge_point() + # (XXX should give an explicit JitHintError explaining the problem) checkgraph(portalgraph) join_blocks(portalgraph) # put the new graph back in the base_translator Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Thu Mar 13 11:42:09 2008 @@ -1,6 +1,7 @@ import py from pypy.rlib.unroll import unrolling_iterable from pypy.rlib.objectmodel import we_are_translated +from pypy.rlib.jit import JitHintError from pypy.objspace.flow import model as flowmodel from pypy.rpython.annlowlevel import cachedtype from pypy.rpython.lltypesystem import lltype, llmemory @@ -166,6 +167,7 @@ self.ptr_to_jitcode = {} self.transformer = GraphTransformer(hannotator) self._listcache = {} + self.jit_merge_point_args = None def sharelist(self, name): lst = getattr(self, name) @@ -1395,27 +1397,43 @@ c = 'red' return c - def serialize_op_jit_merge_point(self, op): - # by construction, the graph should have exactly the vars listed - # in the op as live vars. Check this. Also check the colors - # while we are at it. + def check_hp_hint_args(self, op): + # Check the colors of the jit_merge_point() and can_enter_jit() + # arguments, and check that all these hints are called with the + # same number of arguments. numgreens = op.args[0].value numreds = op.args[1].value + if self.jit_merge_point_args is None: + self.jit_merge_point_args = (numgreens, numreds) + elif self.jit_merge_point_args != (numgreens, numreds): + raise JitHintError("the number of green=() or red=() arguments" + " in can_enter_jit() don't match the ones" + " in jit_merge_point()") greens_v = op.args[2:2+numgreens] reds_v = op.args[2+numgreens:2+numgreens+numreds] + for v in greens_v: + if self.varcolor(v) != "green": + raise JitHintError( + "computed color does not match declared color:" + " %s is %s, but %s() declares it as green" % + (v, self.varcolor(v), op.opname)) + for v in reds_v: + if self.varcolor(v) != "red": + raise JitHintError( + "computed color does not match declared color:" + " %s is %s, but %s() declares it as red" + (v, self.varcolor(v), op.opname)) + return greens_v, reds_v + + def serialize_op_jit_merge_point(self, op): + # by construction, the graph should have exactly the vars listed + # in the op as live vars. Check this. + greens_v, reds_v = self.check_hp_hint_args(op) key = () for i, v in enumerate(greens_v): - if self.varcolor(v) != "green": - raise Exception("computed color does not match declared color:" - " %s is %s, but jit_merge_point() declares it" - " as green" % (v, self.varcolor(v))) assert self.green_position(v) == i key += (v.concretetype,) for i, v in enumerate(reds_v): - if self.varcolor(v) != "red": - raise Exception("computed color does not match declared color:" - " %s is %s, but jit_merge_point() declares it" - " as red" % (v, self.varcolor(v))) assert self.redvar_position(v) == i self.emit('jit_merge_point') self.emit(self.keydesc_position(key)) @@ -1423,6 +1441,7 @@ def serialize_op_can_enter_jit(self, op): # no need to put anything in the bytecode here, except a marker # that is useful for the fallback interpreter + self.check_hp_hint_args(op) self.emit('can_enter_jit') Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Thu Mar 13 11:42:09 2008 @@ -1,6 +1,6 @@ import py import re -from pypy.rlib.jit import jit_merge_point, can_enter_jit, hint +from pypy.rlib.jit import jit_merge_point, can_enter_jit, hint, JitHintError from pypy.jit.rainbow.test import test_interpreter from pypy.jit.rainbow.hotpath import EntryPointsRewriter from pypy.jit.hintannotator.policy import HintAnnotatorPolicy @@ -226,3 +226,13 @@ res = self.run(ll_function, [50], threshold=3, small=True) assert res == (50*51)/2 assert len(self.rewriter.interpreter.debug_traces) < 20 + + def test_hint_errors(self): + def ll_function(n): + jit_merge_point(red=(n,)) + can_enter_jit(red=(n,), green=(0,)) + py.test.raises(JitHintError, self.run, ll_function, [5], 3) + + def ll_function(n): + jit_merge_point(green=(n,)) + py.test.raises(JitHintError, self.run, ll_function, [5], 3) Modified: pypy/branch/jit-hotpath/pypy/rlib/jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/jit.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/jit.py Thu Mar 13 11:42:09 2008 @@ -84,6 +84,9 @@ return hop.genop('is_early_constant', [v], resulttype=lltype.Bool) +class JitHintError(Exception): + """Inconsistency in the JIT hints.""" + def jit_merge_point(green=(), red=()): pass From arigo at codespeak.net Thu Mar 13 12:05:29 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 13 Mar 2008 12:05:29 +0100 (CET) Subject: [pypy-svn] r52442 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test tl Message-ID: <20080313110529.64CDC16850F@codespeak.net> Author: arigo Date: Thu Mar 13 12:05:23 2008 New Revision: 52442 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py Log: Start working on the tlr example. No virtual list yet. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Thu Mar 13 12:05:23 2008 @@ -973,7 +973,7 @@ if hasresult: self.register_redvar(op.result) - if withexc: + if withexc and not self.hannotator.policy.hotpath: self.emit("goto_if_oopcall_was_virtual", tlabel(("oop_call", op))) self.emit("after_oop_residual_call") self.emit(self.promotiondesc_position(lltype.Signed)) @@ -1452,7 +1452,9 @@ def transform_graph(self, graph): self.graph = graph remove_same_as(graph) - self.insert_splits() + # we want native red switch support in the hotpath policy + if not self.hannotator.policy.hotpath: + self.insert_splits() def insert_splits(self): hannotator = self.hannotator Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Thu Mar 13 12:05:23 2008 @@ -262,6 +262,38 @@ gv_funcptr, callset): xxx + @arguments("oopspec", "bool", returns="red") + def opimpl_red_oopspec_call_0(self, oopspec, deepfrozen): + xxx + + @arguments("oopspec", "bool", "red", returns="red") + def opimpl_red_oopspec_call_1(self, oopspec, deepfrozen, arg1): + xxx + + @arguments("oopspec", "bool", "red", "red", returns="red") + def opimpl_red_oopspec_call_2(self, oopspec, deepfrozen, arg1, arg2): + xxx + + @arguments("oopspec", "bool", "red", "red", "red", returns="red") + def opimpl_red_oopspec_call_3(self, oopspec, deepfrozen, arg1, arg2, arg3): + xxx + + @arguments("oopspec", "bool") + def opimpl_red_oopspec_call_noresult_0(self, oopspec, deepfrozen): + xxx + + @arguments("oopspec", "bool", "red") + def opimpl_red_oopspec_call_noresult_1(self, oopspec, deepfrozen, arg1): + xxx + + @arguments("oopspec", "bool", "red", "red") + def opimpl_red_oopspec_call_noresult_2(self, oopspec, deepfrozen, arg1, arg2): + xxx + + @arguments("oopspec", "bool", "red", "red", "red") + def opimpl_red_oopspec_call_noresult_3(self, oopspec, deepfrozen, arg1, arg2, arg3): + xxx + @arguments("red", "calldesc", "bool", "bool", "red_varargs", "promotiondesc") def opimpl_red_residual_call(self, gv_func, calldesc, withexc, has_result, Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Thu Mar 13 12:05:23 2008 @@ -956,9 +956,13 @@ class DebugTrace(object): def __init__(self, *args): self.args = args or ('--empty--',) + self.captured_repr = ' '.join(map(str, self.args)) + # if 'args' contains mutable objects, computing + # map(str, self.args) several times would return different + # results, which is unexpected for a debug trace def __repr__(self): return '' % (self,) def __str__(self): - return ' '.join(map(str, self.args)) + return self.captured_repr Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Thu Mar 13 12:05:23 2008 @@ -236,3 +236,40 @@ def ll_function(n): jit_merge_point(green=(n,)) py.test.raises(JitHintError, self.run, ll_function, [5], 3) + + def test_hp_tlr(self): + from pypy.jit.tl import tlr + + def main(code, n): + if code == 1: + bytecode = tlr.SQUARE + else: + bytecode = chr(tlr.RETURN_A) + return tlr.hp_interpret(bytecode, n) + + res = self.run(main, [1, 71], threshold=4) + assert res == 5041 + self.check_traces([ + "jit_not_entered * stru...} 10 70 * array [ 70, 71, 71 ]", + "jit_not_entered * stru...} 10 69 * array [ 69, 71, 142 ]", + "jit_not_entered * stru...} 10 68 * array [ 68, 71, 213 ]", + "jit_compile * stru...} 10 67 * array [ 67, 71, 284 ]", + "pause at hotsplit in hp_interpret", + "run_machine_code * stru...} 10 67 * array [ 67, 71, 284 ]", + "fallback_interp", + "fb_leave * stru...} 10 66 * array [ 66, 71, 355 ]", + "run_machine_code * stru...} 10 66 * array [ 66, 71, 355 ]", + "fallback_interp", + "fb_leave * stru...} 10 65 * array [ 65, 71, 426 ]", + "run_machine_code * stru...} 10 65 * array [ 65, 71, 426 ]", + "fallback_interp", + "fb_leave * stru...} 10 64 * array [ 64, 71, 497 ]", + "run_machine_code * stru...} 10 64 * array [ 64, 71, 497 ]", + "jit_resume bool_path True in hp_interpret", + "done at jit_merge_point", + "resume_machine_code", + "fallback_interp", + "fb_leave * stru...} 27 0 * array [ 0, 71, 5041 ]", + ]) + py.test.skip("XXX currently the 'regs' list is not virtual." + "The test should check this and fail.") Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py Thu Mar 13 12:05:23 2008 @@ -1,4 +1,4 @@ -from pypy.rlib.jit import hint +from pypy.rlib.jit import hint, jit_merge_point, can_enter_jit MOV_A_R = 1 @@ -48,6 +48,45 @@ elif opcode == NEG_A: a = -a +def hp_interpret(bytecode, a): + """A copy of interpret() with the hints required by the hotpath policy.""" + regs = [] + pc = 0 + while True: + jit_merge_point(green=(bytecode, pc), red=(a, regs)) + opcode = hint(ord(bytecode[pc]), concrete=True) + pc += 1 + if opcode == MOV_A_R: + n = ord(bytecode[pc]) + pc += 1 + regs[n] = a + elif opcode == MOV_R_A: + n = ord(bytecode[pc]) + pc += 1 + a = regs[n] + elif opcode == JUMP_IF_A: + target = ord(bytecode[pc]) + pc += 1 + if a: + if target < pc: + can_enter_jit(green=(bytecode, target), red=(a, regs)) + pc = target + elif opcode == SET_A: + a = ord(bytecode[pc]) + pc += 1 + elif opcode == ADD_R_TO_A: + n = ord(bytecode[pc]) + pc += 1 + a += regs[n] + elif opcode == RETURN_A: + return a + elif opcode == ALLOCATE: + n = ord(bytecode[pc]) + pc += 1 + regs = [0] * n + elif opcode == NEG_A: + a = -a + # ____________________________________________________________ # example bytecode: compute the square of 'a' >= 1 From tverwaes at codespeak.net Thu Mar 13 12:22:03 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Thu, 13 Mar 2008 12:22:03 +0100 (CET) Subject: [pypy-svn] r52443 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080313112203.A1AE9169E23@codespeak.net> Author: tverwaes Date: Thu Mar 13 12:22:02 2008 New Revision: 52443 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py Log: (cami, tverwaes) cutting and cleaning... doens't work yet though. Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Thu Mar 13 12:22:02 2008 @@ -2,56 +2,6 @@ # ___________________________________________________________________________ -TYPE_ROM_ONLY = 0x00 - -TYPE_MBC1 = 0x01 -TYPE_MBC1_RAM = 0x02 -TYPE_MBC1_RAM_BATTERY = 0x03 - -TYPE_MBC2 = 0x05 -TYPE_MBC2_BATTERY = 0x06 - -TYPE_MBC3_RTC_BATTERY = 0x0F -TYPE_MBC3_RTC_RAM_BATTERY = 0x10 -TYPE_MBC3 = 0x11 -TYPE_MBC3_RAM = 0x12 -TYPE_MBC3_RAM_BATTERY = 0x13 - -TYPE_MBC5 = 0x19 -TYPE_MBC5_RAM = 0x1A -TYPE_MBC5_RAM_BATTERY = 0x1B - -TYPE_MBC5_RUMBLE = 0x1C -TYPE_MBC5_RUMBLE_RAM = 0x1D -TYPE_MBC5_RUMBLE_RAM_BATTERY = 0x1E - -TYPE_HUC3_RTC_RAM = 0xFE -TYPE_HUC1_RAM_BATTERY = 0xFF - -CATRIDGE_TYPE_MAPPING = { - TYPE_ROM_ONLY: "MBC1", - TYPE_MBC1: "MBC1", - TYPE_MBC1_RAM: "MBC1", - TYPE_MBC1_RAM_BATTERY: "MBC1", - TYPE_MBC2: "MBC2", - TYPE_MBC2_BATTERY: "MBC2", - TYPE_MBC3_RTC_BATTERY: "MBC3", - TYPE_MBC3_RTC_RAM_BATTERY: "MBC3", - TYPE_MBC3: "MBC3", - TYPE_MBC3_RAM: "MBC3", - TYPE_MBC3_RAM_BATTERY: "MBC3", - TYPE_MBC5: "MBC5", - TYPE_MBC5_RAM: "MBC5", - TYPE_MBC5_RAM_BATTERY: "MBC5", - TYPE_MBC5_RUMBLE: "MBC5", - TYPE_MBC5_RUMBLE_RAM: "MBC5", - TYPE_MBC5_RUMBLE_RAM_BATTERY: "MBC5", - TYPE_HUC3_RTC_RAM: "HuC3", - TYPE_HUC1_RAM_BATTERY: "HuC1" - }; - - - def hasCartridgeBattery(self, cartridgeType): return (cartridgeType == TYPE_MBC1_RAM_BATTERY \ or cartridgeType == TYPE_MBC2_BATTERY \ @@ -772,3 +722,51 @@ self.clockTime = now - elapsed; +TYPE_ROM_ONLY = 0x00 + +TYPE_MBC1 = 0x01 +TYPE_MBC1_RAM = 0x02 +TYPE_MBC1_RAM_BATTERY = 0x03 + +TYPE_MBC2 = 0x05 +TYPE_MBC2_BATTERY = 0x06 + +TYPE_MBC3_RTC_BATTERY = 0x0F +TYPE_MBC3_RTC_RAM_BATTERY = 0x10 +TYPE_MBC3 = 0x11 +TYPE_MBC3_RAM = 0x12 +TYPE_MBC3_RAM_BATTERY = 0x13 + +TYPE_MBC5 = 0x19 +TYPE_MBC5_RAM = 0x1A +TYPE_MBC5_RAM_BATTERY = 0x1B + +TYPE_MBC5_RUMBLE = 0x1C +TYPE_MBC5_RUMBLE_RAM = 0x1D +TYPE_MBC5_RUMBLE_RAM_BATTERY = 0x1E + +TYPE_HUC3_RTC_RAM = 0xFE +TYPE_HUC1_RAM_BATTERY = 0xFF + +CATRIDGE_TYPE_RANGES = [ + (TYPE_MBC1, TYPE_MBC1_RAM_BATTERY, MBC1), + (TYPE_MBC2, TYPE_MBC2_BATTERY, MBC2), + (TYPE_MBC3_RTC_BATTERY, TYPE_MBC3_RAM_BATTERY, MBC3), + (TYPE_MBC5, TYPE_MBC5_RUMBLE_RAM_BATTERY, MBC5), + (TYPE_HUC3_RTC_RAM, HuC3), + (TYPE_HUC1_RAM_BATTERY, HuC1) +] + +def initialize_cartridge_mapping(): + result = [None] * 256 + for entry in BYTECODE_RANGES: + if len(entry) == 2: + positions = [entry[0]] + else: + positions = range(entry[0], entry[1]+1) + for pos in positions: + result[pos] = entry[-1] + assert None not in result + return result + +CARTRIDGE_TABLE = initialize_cartridge_mapping() Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Thu Mar 13 12:22:02 2008 @@ -45,31 +45,31 @@ self.reset(); - def getBC(): + def getBC(self): return (self.b << 8) + self.c; - def getDE(): + def getDE(self): return (self.d << 8) + self.e; - def getHL(): + def getHL(self): return (self.h << 8) + self.l; - def getSP(): + def getSP(self): return self.sp; - def getPC(): + def getPC(self): return self.pc; - def getAF(): + def getAF(self): return (self.a << 8) + self.f; - def getIF(): + def getIF(self): val = 0x00 #if (self.ime ? 0x01 : 0x00) + (self.halted ? 0x80 : 0x00); if self.ime: @@ -83,7 +83,7 @@ self.rom = banks; - def reset(): + def reset(self): self.a = 0x01; self.f = 0x80; self.b = 0x00; @@ -111,7 +111,7 @@ # Interrupts - def interrupt(): + def interrupt(self): if (self.halted): if (self.interrupt.isPending()): self.halted = false; @@ -144,7 +144,7 @@ # Execution - def execute(): + def execute(self): self.execute(self.fetch()); @@ -157,7 +157,7 @@ 0x10:self.stop(), # JR nn - 0x18:self.jr_nn(), + 0x18:SELF.JR_nn(), # JR cc,nn 0x20:self.jr_NZ_nn(), @@ -213,35 +213,10 @@ 0x2B:self.dec_HL(), 0x3B:self.dec_SP(), - # INC r - 0x04:self.inc_B(), - 0x0C:self.inc_C(), - 0x14:self.inc_D(), - 0x1C:self.inc_E(), - 0x24:self.inc_H(), - 0x2C:self.inc_L(), - 0x34:self.inc_HLi(), - 0x3C:self.inc_A(), - - # DEC r - 0x05:self.dec_B(), - 0x0D:self.dec_C(), - 0x15:self.dec_D(), - 0x1D:self.dec_E(), - 0x25:self.dec_H(), - 0x2D:self.dec_L(), - 0x35:self.dec_HLi(), - 0x3D:self.dec_A(), - - # LD r,nn - 0x06:self.ld_B_nn(), - 0x0E:self.ld_C_nn(), - 0x16:self.ld_D_nn(), - 0x1E:self.ld_E_nn(), - 0x26:self.ld_H_nn(), - 0x2E:self.ld_L_nn(), - 0x36:self.ld_HLi_nn(), - 0x3E:self.ld_A_nn(), + # XXX Should be ranges + 0x04:self.inc + 0x05:self.dec + 0x06:self.ld_nn # RLCA 0x07:self.rlca(), @@ -270,157 +245,23 @@ # HALT 0x76:self.halt(), - # LD r,s - 0x40:self.ld_B_B(), - 0x41:self.ld_B_C(), - 0x42:self.ld_B_D(), - 0x43:self.ld_B_E(), - 0x44:self.ld_B_H(), - 0x45:self.ld_B_L(), - 0x46:self.ld_B_HLi(), - 0x47:self.ld_B_A(), - - 0x48:self.ld_C_B(), - 0x49:self.ld_C_C(), - 0x4A:self.ld_C_D(), - 0x4B:self.ld_C_E(), - 0x4C:self.ld_C_H(), - 0x4D:self.ld_C_L(), - 0x4E:self.ld_C_HLi(), - 0x4F:self.ld_C_A(), - - 0x50:self.ld_D_B(), - 0x51:self.ld_D_C(), - 0x52:self.ld_D_D(), - 0x53:self.ld_D_E(), - 0x54:self.ld_D_H(), - 0x55:self.ld_D_L(), - 0x56:self.ld_D_HLi(), - 0x57:self.ld_D_A(), - - 0x58:self.ld_E_B(), - 0x59:self.ld_E_C(), - 0x5A:self.ld_E_D(), - 0x5B:self.ld_E_E(), - 0x5C:self.ld_E_H(), - 0x5D:self.ld_E_L(), - 0x5E:self.ld_E_HLi(), - 0x5F:self.ld_E_A(), - - 0x60:self.ld_H_B(), - 0x61:self.ld_H_C(), - 0x62:self.ld_H_D(), - 0x63:self.ld_H_E(), - 0x64:self.ld_H_H(), - 0x65:self.ld_H_L(), - 0x66:self.ld_H_HLi(), - 0x67:self.ld_H_A(), - - 0x68:self.ld_L_B(), - 0x69:self.ld_L_C(), - 0x6A:self.ld_L_D(), - 0x6B:self.ld_L_E(), - 0x6C:self.ld_L_H(), - 0x6D:self.ld_L_L(), - 0x6E:self.ld_L_HLi(), - 0x6F:self.ld_L_A(), - - 0x70:self.ld_HLi_B(), - 0x71:self.ld_HLi_C(), - 0x72:self.ld_HLi_D(), - 0x73:self.ld_HLi_E(), - 0x74:self.ld_HLi_H(), - 0x75:self.ld_HLi_L(), - 0x77:self.ld_HLi_A(), - - 0x78:self.ld_A_B(), - 0x79:self.ld_A_C(), - 0x7A:self.ld_A_D(), - 0x7B:self.ld_A_E(), - 0x7C:self.ld_A_H(), - 0x7D:self.ld_A_L(), - 0x7E:self.ld_A_HLi(), - 0x7F:self.ld_A_A(), - - # ADD A,r - 0x80:self.add_A_B(), - 0x81:self.add_A_C(), - 0x82:self.add_A_D(), - 0x83:self.add_A_E(), - 0x84:self.add_A_H(), - 0x85:self.add_A_L(), - 0x86:self.add_A_HLi(), - 0x87:self.add_A_A(), - - # ADC A,r - 0x88:self.adc_A_B(), - 0x89:self.adc_A_C(), - 0x8A:self.adc_A_D(), - 0x8B:self.adc_A_E(), - 0x8C:self.adc_A_H(), - 0x8D:self.adc_A_L(), - 0x8E:self.adc_A_HLi(), - 0x8F:self.adc_A_A(), - - # SUB A,r - 0x90:self.sub_A_B(), - 0x91:self.sub_A_C(), - 0x92:self.sub_A_D(), - 0x93:self.sub_A_E(), - 0x94:self.sub_A_H(), - 0x95:self.sub_A_L(), - 0x96:self.sub_A_HLi(), - 0x97:self.sub_A_A(), - - # SBC A,r - 0x98:self.sbc_A_B(), - 0x99:self.sbc_A_C(), - 0x9A:self.sbc_A_D(), - 0x9B:self.sbc_A_E(), - 0x9C:self.sbc_A_H(), - 0x9D:self.sbc_A_L(), - 0x9E:self.sbc_A_HLi(), - 0x9F:self.sbc_A_A(), - - # AND A,r - 0xA0:self.AND_A_B(), - 0xA1:self.AND_A_C(), - 0xA2:self.AND_A_D(), - 0xA3:self.AND_A_E(), - 0xA4:self.AND_A_H(), - 0xA5:self.AND_A_L(), - 0xA6:self.AND_A_HLi(), - 0xA7:self.AND_A_A(), - - # XOR A,r - 0xA8:self.xOR_A_B(), - 0xA9:self.xOR_A_C(), - 0xAA:self.xOR_A_D(), - 0xAB:self.xOR_A_E(), - 0xAC:self.xOR_A_H(), - 0xAD:self.xOR_A_L(), - 0xAE:self.xOR_A_HLi(), - 0xAF:self.xOR_A_A(), - - # OR A,r - 0xB0:self.OR_A_B(), - 0xB1:self.OR_A_C(), - 0xB2:self.OR_A_D(), - 0xB3:self.OR_A_E(), - 0xB4:self.OR_A_H(), - 0xB5:self.OR_A_L(), - 0xB6:self.OR_A_HLi(), - 0xB7:self.OR_A_A(), - - # CP A,r - 0xB8:self.cp_A_B(), - 0xB9:self.cp_A_C(), - 0xBA:self.cp_A_D(), - 0xBB:self.cp_A_E(), - 0xBC:self.cp_A_H(), - 0xBD:self.cp_A_L(), - 0xBE:self.cp_A_HLi(), - 0xBF:self.cp_A_A(), + # XXX Should be ranges + 0x40:self.ld + 0x48:self.ld + 0x50:self.ld + 0x58:self.ld + 0x60:self.ld + 0x68:self.ld + 0x70:self.ld + 0x78:self.ld + 0x80:self.add + 0x88:self.adc + 0x90:self.sub + 0x98:self.sbc + 0xA0:self.AND + 0xA8:self.xOR + 0xB0:self.OR + 0xB8:self.cp # RET cc 0xC0:self.ret_NZ(), @@ -538,348 +379,60 @@ }[opcode]() def fetchExecute(self): - result = { - # RLC r - 0x00:self.rlc_B(), - 0x01:self.rlc_C(), - 0x02:self.rlc_D(), - 0x03:self.rlc_E(), - 0x04:self.rlc_H(), - 0x05:self.rlc_L(), - 0x06:self.rlc_HLi(), - 0x07:self.rlc_A(), - - # RRC r - 0x08:self.rrc_B(), - 0x09:self.rrc_C(), - 0x0A:self.rrc_D(), - 0x0B:self.rrc_E(), - 0x0C:self.rrc_H(), - 0x0D:self.rrc_L(), - 0x0E:self.rrc_HLi(), - 0x0F:self.rrc_A(), - - # RL r - 0x10:self.rl_B(), - 0x11:self.rl_C(), - 0x12:self.rl_D(), - 0x13:self.rl_E(), - 0x14:self.rl_H(), - 0x15:self.rl_L(), - 0x16:self.rl_HLi(), - 0x17:self.rl_A(), - - # RR r - 0x18:self.rr_B(), - 0x19:self.rr_C(), - 0x1A:self.rr_D(), - 0x1B:self.rr_E(), - 0x1C:self.rr_H(), - 0x1D:self.rr_L(), - 0x1E:self.rr_HLi(), - 0x1F:self.rr_A(), - - # SLA r - 0x20:self.sla_B(), - 0x21:self.sla_C(), - 0x22:self.sla_D(), - 0x23:self.sla_E(), - 0x24:self.sla_H(), - 0x25:self.sla_L(), - 0x26:self.sla_HLi(), - 0x27:self.sla_A(), - - # SRA r - 0x28:self.sra_B(), - 0x29:self.sra_C(), - 0x2A:self.sra_D(), - 0x2B:self.sra_E(), - 0x2C:self.sra_H(), - 0x2D:self.sra_L(), - 0x2E:self.sra_HLi(), - 0x2F:self.sra_A(), - - # SWAP r - 0x30:self.swap_B(), - 0x31:self.swap_C(), - 0x32:self.swap_D(), - 0x33:self.swap_E(), - 0x34:self.swap_H(), - 0x35:self.swap_L(), - 0x36:self.swap_HLi(), - 0x37:self.swap_A(), - - # SRL r - 0x38:self.srl_B(), - 0x39:self.srl_C(), - 0x3A:self.srl_D(), - 0x3B:self.srl_E(), - 0x3C:self.srl_H(), - 0x3D:self.srl_L(), - 0x3E:self.srl_HLi(), - 0x3F:self.srl_A(), - - # BIT 0,r - 0x40:self.bit_B(0), - 0x41:self.bit_C(0), - 0x42:self.bit_D(0), - 0x43:self.bit_E(0), - 0x44:self.bit_H(0), - 0x45:self.bit_L(0), - 0x46:self.bit_HLi(0), - 0x47:self.bit_A(0), - - # BIT 1,r - 0x48:self.bit_B(1), - 0x49:self.bit_C(1), - 0x4A:self.bit_D(1), - 0x4B:self.bit_E(1), - 0x4C:self.bit_H(1), - 0x4D:self.bit_L(1), - 0x4E:self.bit_HLi(1), - 0x4F:self.bit_A(1), - - # BIT 2,r - 0x50:self.bit_B(2), - 0x51:self.bit_C(2), - 0x52:self.bit_D(2), - 0x53:self.bit_E(2), - 0x54:self.bit_H(2), - 0x55:self.bit_L(2), - 0x56:self.bit_HLi(2), - 0x57:self.bit_A(2), - - # BIT 3,r - 0x58:self.bit_B(3), - 0x59:self.bit_C(3), - 0x5A:self.bit_D(3), - 0x5B:self.bit_E(3), - 0x5C:self.bit_H(3), - 0x5D:self.bit_L(3), - 0x5E:self.bit_HLi(3), - 0x5F:self.bit_A(3), - - # BIT 4,r - 0x60:self.bit_B(4), - 0x61:self.bit_C(4), - 0x62:self.bit_D(4), - 0x63:self.bit_E(4), - 0x64:self.bit_H(4), - 0x65:self.bit_L(4), - 0x66:self.bit_HLi(4), - 0x67:self.bit_A(4), - - # BIT 5,r - 0x68:self.bit_B(5), - 0x69:self.bit_C(5), - 0x6A:self.bit_D(5), - 0x6B:self.bit_E(5), - 0x6C:self.bit_H(5), - 0x6D:self.bit_L(5), - 0x6E:self.bit_HLi(5), - 0x6F:self.bit_A(5), - - # BIT 6,r - 0x70:self.bit_B(6), - 0x71:self.bit_C(6), - 0x72:self.bit_D(6), - 0x73:self.bit_E(6), - 0x74:self.bit_H(6), - 0x75:self.bit_L(6), - 0x76:self.bit_HLi(6), - 0x77:self.bit_A(6), - - # BIT 7,r - 0x78:self.bit_B(7), - 0x79:self.bit_C(7), - 0x7A:self.bit_D(7), - 0x7B:self.bit_E(7), - 0x7C:self.bit_H(7), - 0x7D:self.bit_L(7), - 0x7E:self.bit_HLi(7), - 0x7F:self.bit_A(7), - - # SET 0,r - 0xC0:self.set_B(0), - 0xC1:self.set_C(0), - 0xC2:self.set_D(0), - 0xC3:self.set_E(0), - 0xC4:self.set_H(0), - 0xC5:self.set_L(0), - 0xC6:self.set_HLi(0), - 0xC7:self.set_A(0), - - # SET 1,r - 0xC8:self.set_B(1), - 0xC9:self.set_C(1), - 0xCA:self.set_D(1), - 0xCB:self.set_E(1), - 0xCC:self.set_H(1), - 0xCD:self.set_L(1), - 0xCE:self.set_HLi(1), - 0xCF:self.set_A(1), - - # SET 2,r - 0xD0:self.set_B(2), - 0xD1:self.set_C(2), - 0xD2:self.set_D(2), - 0xD3:self.set_E(2), - 0xD4:self.set_H(2), - 0xD5:self.set_L(2), - 0xD6:self.set_HLi(2), - 0xD7:self.set_A(2), - - # SET 3,r - 0xD8:self.set_B(3), - 0xD9:self.set_C(3), - 0xDA:self.set_D(3), - 0xDB:self.set_E(3), - 0xDC:self.set_H(3), - 0xDD:self.set_L(3), - 0xDE:self.set_HLi(3), - 0xDF:self.set_A(3), - - # SET 4,r - 0xE0:self.set_B(4), - 0xE1:self.set_C(4), - 0xE2:self.set_D(4), - 0xE3:self.set_E(4), - 0xE4:self.set_H(4), - 0xE5:self.set_L(4), - 0xE6:self.set_HLi(4), - 0xE7:self.set_A(4), - - # SET 5,r - 0xE8:self.set_B(5), - 0xE9:self.set_C(5), - 0xEA:self.set_D(5), - 0xEB:self.set_E(5), - 0xEC:self.set_H(5), - 0xED:self.set_L(5), - 0xEE:self.set_HLi(5), - 0xEF:self.set_A(5), - - # SET 6,r - 0xF0:self.set_B(6), - 0xF1:self.set_C(6), - 0xF2:self.set_D(6), - 0xF3:self.set_E(6), - 0xF4:self.set_H(6), - 0xF5:self.set_L(6), - 0xF6:self.set_HLi(6), - 0xF7:self.set_A(6), - - # SET 7,r - 0xF8:self.set_B(7), - 0xF9:self.set_C(7), - 0xFA:self.set_D(7), - 0xFB:self.set_E(7), - 0xFC:self.set_H(7), - 0xFD:self.set_L(7), - 0xFE:self.set_HLi(7), - 0xFF:self.set_A(7), - - # RES 0,r - 0x80:self.res_B(0), - 0x81:self.res_C(0), - 0x82:self.res_D(0), - 0x83:self.res_E(0), - 0x84:self.res_H(0), - 0x85:self.res_L(0), - 0x86:self.res_HLi(0), - 0x87:self.res_A(0), - - # RES 1,r - 0x88:self.res_B(1), - 0x89:self.res_C(1), - 0x8A:self.res_D(1), - 0x8B:self.res_E(1), - 0x8C:self.res_H(1), - 0x8D:self.res_L(1), - 0x8E:self.res_HLi(1), - 0x8F:self.res_A(1), - - # RES 2,r - 0x90:self.res_B(2), - 0x91:self.res_C(2), - 0x92:self.res_D(2), - 0x93:self.res_E(2), - 0x94:self.res_H(2), - 0x95:self.res_L(2), - 0x96:self.res_HLi(2), - 0x97:self.res_A(2), - - # RES 3,r - 0x98:self.res_B(3), - 0x99:self.res_C(3), - 0x9A:self.res_D(3), - 0x9B:self.res_E(3), - 0x9C:self.res_H(3), - 0x9D:self.res_L(3), - 0x9E:self.res_HLi(3), - 0x9F:self.res_A(3), - - # RES 4,r - 0xA0:self.res_B(4), - 0xA1:self.res_C(4), - 0xA2:self.res_D(4), - 0xA3:self.res_E(4), - 0xA4:self.res_H(4), - 0xA5:self.res_L(4), - 0xA6:self.res_HLi(4), - 0xA7:self.res_A(4), - - # RES 5,r - 0xA8:self.res_B(5), - 0xA9:self.res_C(5), - 0xAA:self.res_D(5), - 0xAB:self.res_E(5), - 0xAC:self.res_H(5), - 0xAD:self.res_L(5), - 0xAE:self.res_HLi(5), - 0xAF:self.res_A(5), - - # RES 6,r - 0xB0:self.res_B(6), - 0xB1:self.res_C(6), - 0xB2:self.res_D(6), - 0xB3:self.res_E(6), - 0xB4:self.res_H(6), - 0xB5:self.res_L(6), - 0xB6:self.res_HLi(6), - 0xB7:self.res_A(6), - - # RES 7,r - 0xB8:self.res_B(7), - 0xB9:self.res_C(7), - 0xBA:self.res_D(7), - 0xBB:self.res_E(7), - 0xBC:self.res_H(7), - 0xBD:self.res_L(7), - 0xBE:self.res_HLi(7), - 0xBF:self.res_A(7) - }[self.fetch()]() + result = [ + self.rlc, + self.rrc, + self.rl, + self.rr, + self.sla, + self.sra, + self.swap, + self.srl, + self.bit + self.set_0 + self.set_1 + self.set_2 + self.set_3 + self.set_4 + self.set_5 + self.set_6 + self.set_7 + self.res_0, + self.res_1, + self.res_2, + self.res_3, + self.res_4, + self.res_5, + self.res_6, + self.res_7, + ][self.fetch()]() # memory Access def read(self, address): + self.cycles -= 1 return self.memory.read(address); def write(self, address, data): self.memory.write(address, data); + self.cycles -= 1 def read(self, hi, lo): + self.cycles -= 1 return self.read((hi << 8) + lo); def write(self, hi, lo, data): self.write((hi << 8) + lo, data); + self.cycles -= 2 # Fetching - def fetch(): + def fetch(self): + self.cycles -=1 + if (self.pc <= 0x3FFF): self.pc+=1 return self.rom[self.pc] & 0xFF; @@ -895,7 +448,7 @@ self.memory.write(self.sp, data); - def pop(): + def pop(self): data = self.memory.read(self.sp); self.sp = (self.sp + 1) & 0xFFFF; return data; @@ -1109,398 +662,34 @@ self.h = s >> 8; - # LD r,r - def ld_B_B(): - # b = b; - self.cycles -= 1; - - - def ld_B_C(): - self.b = self.c; - self.cycles -= 1; - - - def ld_B_D(): - self.b = self.d; - self.cycles -= 1; - - - def ld_B_E(): - self.b = self.e; - self.cycles -= 1; - - - def ld_B_H(): - self.b = self.h; - self.cycles -= 1; - - - def ld_B_L(): - self.b = self.l; - self.cycles -= 1; - - - def ld_B_A(): - self.b = self.a; - self.cycles -= 1; - - - def ld_C_B(): - self.c = self.b; - self.cycles -= 1; - - - def ld_C_C(): - # c = c; - self.cycles -= 1; - - - def ld_C_D(): - self.c = self.d; - self.cycles -= 1; - - - def ld_C_E(): - self.c = self.e; - self.cycles -= 1; - - - def ld_C_H(): - self.c = self.h; - self.cycles -= 1; - - - def ld_C_L(): - self.c = self.l; - self.cycles -= 1; - - - def ld_C_A(): - self.c = self.a; - self.cycles -= 1; - - - def ld_D_B(): - self.d = self.b; - self.cycles -= 1; - - - def ld_D_C(): - self.d = self.c; - self.cycles -= 1; - - - def ld_D_D(): - # d = d; - self.cycles -= 1; - - - def ld_D_E(): - self.d = self.e; - self.cycles -= 1; - - - def ld_D_H(): - self.d = self.h; - self.cycles -= 1; - - - def ld_D_L(): - self.d = self.l; - self.cycles -= 1; - - - def ld_D_A(): - self.d = self.a; - self.cycles -= 1; - - - def ld_E_B(): - self.e = self.b; - self.cycles -= 1; - - - def ld_E_C(): - self.e = self.c; - self.cycles -= 1; - - - def ld_E_D(): - self.e = self.d; - self.cycles -= 1; - - - def ld_E_E(): - # e = e; - self.cycles -= 1; - - - def ld_E_H(): - self.e = self.h; - self.cycles -= 1; - - - def ld_E_L(): - self.e = self.l; - self.cycles -= 1; - - - def ld_E_A(): - self.e = self.a; - self.cycles -= 1; - - - def ld_H_B(): - self.h = self.b; - self.cycles -= 1; - - - def ld_H_C(): - self.h = self.c; - self.cycles -= 1; - - - def ld_H_D(): - self.h = self.d; - self.cycles -= 1; - - - def ld_H_E(): - self.h = self.e; - self.cycles -= 1; - - - def ld_H_H(): - # h = h; - self.cycles -= 1; - - - def ld_H_L(): - self.h = self.l; - self.cycles -= 1; - - - def ld_H_A(): - self.h = self.a; - self.cycles -= 1; - - - def ld_L_B(): - self.l = self.b; - self.cycles -= 1; - - - def ld_L_C(): - self.l = self.c; - self.cycles -= 1; - - - def ld_L_D(): - self.l = self.d; - self.cycles -= 1; - - - def ld_L_E(): - self.l = self.e; - self.cycles -= 1; - - - def ld_L_H(): - self.l = self.h; - self.cycles -= 1; - - - def ld_L_L(): - # l = l; - self.cycles -= 1; - - - def ld_L_A(): - self.l = self.a; - self.cycles -= 1; - - - def ld_A_B(): - self.a = self.b; - self.cycles -= 1; - - - def ld_A_C(): - self.a = self.c; - self.cycles -= 1; - - - def ld_A_D(): - self.a = self.d; - self.cycles -= 1; - - - def ld_A_E(): - self.a = self.e; - self.cycles -= 1; - - - def ld_A_H(): - self.a = self.h; - self.cycles -= 1; - - - def ld_A_L(): - self.a = self.l; - self.cycles -= 1; - - - def ld_A_A(): - # a = a; - self.cycles -= 1; - - - # LD r,nn - def ld_B_nn(): - self.b = self.fetch(); - self.cycles -= 2; - - - def ld_C_nn(): - self.c = self.fetch(); - self.cycles -= 2; - - - def ld_D_nn(): - self.d = self.fetch(); - self.cycles -= 2; - - - def ld_E_nn(): - self.e = self.fetch(); - self.cycles -= 2; - - - def ld_H_nn(): - self.h = self.fetch(); - self.cycles -= 2; - - - def ld_L_nn(): - self.l = self.fetch(); - self.cycles -= 2; - - - def ld_A_nn(): - self.a = self.fetch(); - self.cycles -= 2; - - - # LD r,(HL) - def ld_B_HLi(): - self.b = self.read(self.h, self.l); - self.cycles -= 2; - - - def ld_C_HLi(): - self.c = self.read(self.h, self.l); - self.cycles -= 2; - - - def ld_D_HLi(): - self.d = self.read(self.h, self.l); - self.cycles -= 2; - - - def ld_E_HLi(): - self.e = self.read(self.h, self.l); - self.cycles -= 2; - - - def ld_H_HLi(): - self.h = self.read(self.h, self.l); - self.cycles -= 2; - - - def ld_L_HLi(): - self.l = self.read(self.h, self.l); - self.cycles -= 2; - - - def ld_A_HLi(): - self.a = self.read(self.h, self.l); - self.cycles -= 2; - - - # LD (HL),r - def ld_HLi_B(): - self.write(self.h, self.l, self.b); - self.cycles -= 2; - - - def ld_HLi_C(): - self.write(self.h, self.l, self.c); - self.cycles -= 2; - - - def ld_HLi_D(): - self.write(self.h, self.l, self.d); - self.cycles -= 2; - - - def ld_HLi_E(): - self.write(self.h, self.l, self.e); - self.cycles -= 2; - - - def ld_HLi_H(): - self.write(self.h, self.l, self.h); - self.cycles -= 2; - - - def ld_HLi_L(): - self.write(self.h, self.l, self.l); - self.cycles -= 2; - - - def ld_HLi_A(): - self.write(self.h, self.l, self.a); - self.cycles -= 2; - - - # LD (HL),nn - def ld_HLi_nn(): - self.write(self.h, self.l, self.fetch()); - self.cycles -= 3; + def ld(self, setter, getter): + setter(getter()); + def ld_nn(self, setter): + self(setter, self.fetch()); # LD A,(rr) - def ld_A_BCi(): - self.a = self.read(self.b, self.c); - self.cycles -= 2; - - - def load_A_DEi(): - self.a = self.read(self.d, self.e); - self.cycles -= 2; + def ld_A_BCi(self): + self.seta(self.read(self.b, self.c)); + def load_A_DEi(self): + self.seta(self.read(self.d, self.e)); # LD A,(nnnn) - def ld_A_mem(): + def ld_A_mem(self): lo = self.fetch(); hi = self.fetch(); - self.a = self.read(hi, lo); - self.cycles -= 4; - + self.seta(self.read(hi, lo)); # LD (rr),A - def ld_BCi_A(): + def ld_BCi_A(self): self.write(self.b, self.c, self.a); - self.cycles -= 2; - - def ld_DEi_A(): + def ld_DEi_A(self): self.write(self.d, self.e, self.a); - self.cycles -= 2; - # LD (nnnn),SP - def load_mem_SP(): + def load_mem_SP(self): lo = self.fetch(); hi = self.fetch(); address = (hi << 8) + lo; @@ -1512,7 +701,7 @@ # LD (nnnn),A - def ld_mem_A(): + def ld_mem_A(self): lo = self.fetch(); hi = self.fetch(); self.write(hi, lo, self.a); @@ -1520,31 +709,31 @@ # LDH A,(nn) - def ldh_A_mem(): + def ldh_A_mem(self): self.a = self.read(0xFF00 + self.fetch()); self.cycles -= 3; # LDH (nn),A - def ldh_mem_A(): + def ldh_mem_A(self): self.write(0xFF00 + self.fetch(), self.a); self.cycles -= 3; # LDH A,(C) - def ldh_A_Ci(): + def ldh_A_Ci(self): self.a = self.read(0xFF00 + self.c); self.cycles -= 2; # LDH (C),A - def ldh_Ci_A(): + def ldh_Ci_A(self): self.write(0xFF00 + self.c, self.a); self.cycles -= 2; # LDI (HL),A - def ldi_HLi_A(): + def ldi_HLi_A(self): self.write(self.h, self.l, self.a); self.l = (self.l + 1) & 0xFF; if (self.l == 0): @@ -1553,7 +742,7 @@ # LDI A,(HL) - def ldi_A_HLi(): + def ldi_A_HLi(self): self.a = self.read(self.h, self.l); self.l = (self.l + 1) & 0xFF; if (self.l == 0): @@ -1562,7 +751,7 @@ # LDD (HL),A - def ldd_HLi_A(): + def ldd_HLi_A(self): self.write(self.h, self.l, self.a); self.l = (self.l - 1) & 0xFF; if (self.l == 0xFF): @@ -1571,7 +760,7 @@ # LDD A,(HL) - def ldd_A_HLi(): + def ldd_A_HLi(self): self.a = self.read(self.h, self.l); self.l = (self.l - 1) & 0xFF; if (self.l == 0xFF): @@ -1580,25 +769,25 @@ # LD rr,nnnn - def ld_BC_nnnn(): + def ld_BC_nnnn(self): self.c = self.fetch(); self.b = self.fetch(); self.cycles -= 3; - def ld_DE_nnnn(): + def ld_DE_nnnn(self): self.e = self.fetch(); self.d = self.fetch(); self.cycles -= 3; - def ld_HL_nnnn(): + def ld_HL_nnnn(self): self.l = self.fetch(); self.h = self.fetch(); self.cycles -= 3; - def ld_SP_nnnn(): + def ld_SP_nnnn(self): lo = self.fetch(); hi = self.fetch(); self.sp = (hi << 8) + lo; @@ -1606,537 +795,392 @@ # LD SP,HL - def ld_SP_HL(): + def ld_SP_HL(self): self.sp = (self.h << 8) + self.l; self.cycles -= 2; # PUSH rr - def push_BC(): + def push_BC(self): self.push(self.b); self.push(self.c); self.cycles -= 4; - def push_DE(): + def push_DE(self): self.push(self.d); self.push(self.e); self.cycles -= 4; - def push_HL(): + def push_HL(self): self.push(self.h); self.push(self.l); self.cycles -= 4; - def push_AF(): + def push_AF(self): self.push(self.a); self.push(self.f); self.cycles -= 4; # POP rr - def pop_BC(): + def pop_BC(self): self.c = self.pop(); self.b = self.pop(); self.cycles -= 3; - def pop_DE(): + def pop_DE(self): self.e = self.pop(); self.d = self.pop(); self.cycles -= 3; - def pop_HL(): + def pop_HL(self): self.l = self.pop(); self.h = self.pop(); self.cycles -= 3; - def pop_AF(): + def pop_AF(self): self.f = self.pop(); self.a = self.pop(); self.cycles -= 3; - # ADD A,r - def add_A_B(): + # XXX ADD A,r + def add(self): self.add(self.b); - self.cycles -= 1; - - - def add_A_C(): - self.add(self.c); - self.cycles -= 1; - - - def add_A_D(): - self.add(self.d); - self.cycles -= 1; - - - def add_A_E(): - self.add(self.e); - self.cycles -= 1; - - - def add_A_H(): - self.add(self.h); - self.cycles -= 1; - - - def add_A_L(): - self.add(self.l); - self.cycles -= 1; - - - def add_A_A(): - self.add(self.a); - self.cycles -= 1; - + self.cycles -= 1; # 2 for hli # ADD A,nn - def add_A_nn(): + def add_A_nn(self): self.add(self.fetch()); self.cycles -= 2; - # ADD A,(HL) - def add_A_HLi(): - self.add(self.read(self.h, self.l)); - self.cycles -= 2; - - # ADC A,r - def adc_A_B(): + def adc_A_B(self): self.adc(self.b); self.cycles -= 1; - def adc_A_C(): + def adc_A_C(self): self.adc(self.c); self.cycles -= 1; - def adc_A_D(): + def adc_A_D(self): self.adc(self.d); self.cycles -= 1; - def adc_A_E(): + def adc_A_E(self): self.adc(self.e); self.cycles -= 1; - def adc_A_H(): + def adc_A_H(self): self.adc(self.h); self.cycles -= 1; - def adc_A_L(): + def adc_A_L(self): self.adc(self.l); self.cycles -= 1; - def adc_A_A(): + def adc_A_A(self): self.adc(self.a); self.cycles -= 1; # ADC A,nn - def adc_A_nn(): + def adc_A_nn(self): self.adc(self.fetch()); self.cycles -= 2; # ADC A,(HL) - def adc_A_HLi(): + def adc_A_HLi(self): self.adc(self.read(self.h, self.l)); self.cycles -= 2; # SUB A,r - def sub_A_B(): + def sub_A_B(self): self.sub(self.b); self.cycles -= 1; - def sub_A_C(): + def sub_A_C(self): self.sub(self.c); self.cycles -= 1; - def sub_A_D(): + def sub_A_D(self): self.sub(self.d); self.cycles -= 1; - def sub_A_E(): + def sub_A_E(self): self.sub(self.e); self.cycles -= 1; - def sub_A_H(): + def sub_A_H(self): self.sub(self.h); self.cycles -= 1; - def sub_A_L(): + def sub_A_L(self): self.sub(self.l); self.cycles -= 1; - def sub_A_A(): + def sub_A_A(self): self.sub(self.a); self.cycles -= 1; # SUB A,nn - def sub_A_nn(): + def sub_A_nn(self): self.sub(self.fetch()); self.cycles -= 2; # SUB A,(HL) - def sub_A_HLi(): + def sub_A_HLi(self): self.sub(self.read(self.h, self.l)); self.cycles -= 2; # SBC A,r - def sbc_A_B(): + def sbc_A_B(self): self.sbc(self.b); self.cycles -= 1; - def sbc_A_C(): + def sbc_A_C(self): self.sbc(self.c); self.cycles -= 1; - def sbc_A_D(): + def sbc_A_D(self): self.sbc(self.d); self.cycles -= 1; - def sbc_A_E(): + def sbc_A_E(self): self.sbc(self.e); self.cycles -= 1; - def sbc_A_H(): + def sbc_A_H(self): self.sbc(self.h); self.cycles -= 1; - def sbc_A_L(): + def sbc_A_L(self): self.sbc(self.l); self.cycles -= 1; - def sbc_A_A(): + def sbc_A_A(self): self.sbc(self.a); self.cycles -= 1; # SBC A,nn - def sbc_A_nn(): + def sbc_A_nn(self): self.sbc(self.fetch()); self.cycles -= 2; # SBC A,(HL) - def sbc_A_HLi(): + def sbc_A_HLi(self): self.sbc(self.read(self.h, self.l)); self.cycles -= 2; # AND A,r - def AND_A_B(): + def AND_A_B(self): self.AND(self.b); self.cycles -= 1; - def AND_A_C(): + def AND_A_C(self): self.AND(self.c); self.cycles -= 1; - def AND_A_D(): + def AND_A_D(self): self.AND(self.d); self.cycles -= 1; - def AND_A_E(): + def AND_A_E(self): self.AND(self.e); self.cycles -= 1; - def AND_A_H(): + def AND_A_H(self): self.AND(self.h); self.cycles -= 1; - def AND_A_L(): + def AND_A_L(self): self.AND(self.l); self.cycles -= 1; - def AND_A_A(): + def AND_A_A(self): self.AND(self.a); self.cycles -= 1; # AND A,nn - def AND_A_nn(): + def AND_A_nn(self): self.AND(self.fetch()); self.cycles -= 2; # AND A,(HL) - def AND_A_HLi(): + def AND_A_HLi(self): self.AND(self.read(self.h, self.l)); self.cycles -= 2; # XOR A,r - def xOR_A_B(): + def xOR_A_B(self): self.xOR(self.b); self.cycles -= 1; - def xOR_A_C(): + def xOR_A_C(self): self.xOR(self.c); self.cycles -= 1; - def xOR_A_D(): + def xOR_A_D(self): self.xOR(self.d); self.cycles -= 1; - def xOR_A_E(): + def xOR_A_E(self): self.xOR(self.e); self.cycles -= 1; - def xOR_A_H(): + def xOR_A_H(self): self.xOR(self.h); self.cycles -= 1; - def xOR_A_L(): + def xOR_A_L(self): self.xOR(self.l); self.cycles -= 1; - def xOR_A_A(): + def xOR_A_A(self): self.xOR(self.a); self.cycles -= 1; # XOR A,nn - def xOR_A_nn(): + def xOR_A_nn(self): self.xOR(self.fetch()); self.cycles -= 2; # XOR A,(HL) - def xOR_A_HLi(): + def xOR_A_HLi(self): self.xOR(self.read(self.h, self.l)); self.cycles -= 2; - # OR A,r - def OR_A_B(): - self.OR(self.b); - self.cycles -= 1; + # XXX OR A,r + def OR(self, getter): + self.OR(getter()); + self.cycles -= 1; # 2 for hli + + # OR A,nn + def OR_A_nn(self): + self.OR(self.fetch) - def OR_A_C(): - self.OR(self.c); + # XXX CP A,r + def cp(self, getter): + self.cp(getter()); self.cycles -= 1; - - def OR_A_D(): - self.OR(self.d); - self.cycles -= 1; - - - def OR_A_E(): - self.OR(self.e); - self.cycles -= 1; - - - def OR_A_H(): - self.OR(self.h); - self.cycles -= 1; - - - def OR_A_L(): - self.OR(self.l); - self.cycles -= 1; - - - def OR_A_A(): - self.OR(self.a); - self.cycles -= 1; - - - # OR A,nn - def OR_A_nn(): - self.OR(self.fetch()); - self.cycles -= 2; - - - # OR A,(HL) - def OR_A_HLi(): - self.OR(self.read(self.h, self.l)); - self.cycles -= 2; - - - # CP A,r - def cp_A_B(): - self.cp(self.b); - self.cycles -= 1; - - - def cp_A_C(): - self.cp(self.c); - self.cycles -= 1; - - - def cp_A_D(): - self.cp(self.d); - self.cycles -= 1; - - - def cp_A_E(): - self.cp(self.e); - self.cycles -= 1; - - - def cp_A_H(): - self.cp(self.h); - self.cycles -= 1; - - - def cp_A_L(): - self.cp(self.l); - self.cycles -= 1; - - - def cp_A_A(): - self.cp(self.a); - self.cycles -= 1; - - # CP A,nn - def cp_A_nn(): - self.cp(self.fetch()); - self.cycles -= 2; - + def cp_nn(self): + self.cp(self.fetch); # CP A,(HL) - def cp_A_HLi(): + def cp_A_HLi(self): self.cp(self.read(self.h, self.l)); self.cycles -= 2; # INC r - def inc_B(): + def inc_B(self): self.b = self.inc(self.b); - self.cycles -= 1; - - - def inc_C(): - self.c = self.inc(self.c); - self.cycles -= 1; - - - def inc_D(): - self.d = self.inc(self.d); - self.cycles -= 1; - - - def inc_E(): - self.e = self.inc(self.e); - self.cycles -= 1; - - - def inc_H(): - self.h = self.inc(self.h); - self.cycles -= 1; - - - def inc_L(): - self.l = self.inc(self.l); - self.cycles -= 1; - - - def inc_A(): - self.a = self.inc(self.a); - self.cycles -= 1; - - - # INC (HL) - def inc_HLi(): - self.write(self.h, self.l, self.inc(self.read(self.h, self.l))); - self.cycles -= 3; - + self.cycles -= 1; # XXX 1 cycle less # DEC r - def dec_B(): + def dec_B(self): self.b = self.dec(self.b); self.cycles -= 1; - def dec_C(): + def dec_C(self): self.c = self.dec(self.c); self.cycles -= 1; - def dec_D(): + def dec_D(self): self.d = self.dec(self.d); self.cycles -= 1; - def dec_E(): + def dec_E(self): self.e = self.dec(self.e); self.cycles -= 1; - def dec_H(): + def dec_H(self): self.h = self.dec(self.h); self.cycles -= 1; - def dec_L(): + def dec_L(self): self.l = self.dec(self.l); self.cycles -= 1; - def dec_A(): + def dec_A(self): self.a = self.dec(self.a); self.cycles -= 1; # DEC (HL) - def dec_HLi(): + def dec_HLi(self): self.write(self.h, self.l, self.dec(self.read(self.h, self.l))); self.cycles -= 3; # CPL - def cpl(): + def cpl(self): self.a ^= 0xFF; self.f |= N_FLAG + H_FLAG; # DAA - def daa(): + def daa(self): delta = 0; if ((self.f & H_FLAG) != 0 or (self.a & 0x0F) > 0x09): delta |= 0x06; @@ -2159,82 +1203,82 @@ # ADD HL,rr - def add_HL_BC(): + def add_HL_BC(self): self.add(self.b, self.c); self.cycles -= 2; - def add_HL_DE(): + def add_HL_DE(self): self.add(self.d, self.e); self.cycles -= 2; - def add_HL_HL(): + def add_HL_HL(self): self.add(self.h, self.l); self.cycles -= 2; - def add_HL_SP(): + def add_HL_SP(self): self.add(self.sp >> 8, self.sp & 0xFF); self.cycles -= 2; # INC rr - def inc_BC(): + def inc_BC(self): self.c = (self.c + 1) & 0xFF; if (self.c == 0x00): self.b = (self.b + 1) & 0xFF; self.cycles -= 2; - def inc_DE(): + def inc_DE(self): self.e = (self.e + 1) & 0xFF; if (self.e == 0x00): self.d = (self.d + 1) & 0xFF; self.cycles -= 2; - def inc_HL(): + def inc_HL(self): self.l = (self.l + 1) & 0xFF; if (self.l == 0x00): self.h = (self.h + 1) & 0xFF; self.cycles -= 2; - def inc_SP(): + def inc_SP(self): self.sp = (self.sp + 1) & 0xFFFF; self.cycles -= 2; # DEC rr - def dec_BC(): + def dec_BC(self): self.c = (self.c - 1) & 0xFF; if (self.c == 0xFF): self.b = (self.b - 1) & 0xFF; self.cycles -= 2; - def dec_DE(): + def dec_DE(self): self.e = (self.e - 1) & 0xFF; if (self.e == 0xFF): self.d = (self.d - 1) & 0xFF; self.cycles -= 2; - def dec_HL(): + def dec_HL(self): self.l = (self.l - 1) & 0xFF; if (self.l == 0xFF): self.h = (self.h - 1) & 0xFF; self.cycles -= 2; - def dec_SP(): + def dec_SP(self): self.sp = (self.sp - 1) & 0xFFFF; self.cycles -= 2; # ADD SP,nn - def add_SP_nn(): + def add_SP_nn(self): # TODO convert to byte offset = self.fetch(); s = (self.sp + offset) & 0xFFFF; @@ -2246,7 +1290,7 @@ # LD HL,SP+nn - def ld_HP_SP_nn(): + def ld_HP_SP_nn(self): #TODO convert to byte s = (self.sp + offset) & 0xFFFF; self.updateFRegisterAfterSP_nn(offset, s) @@ -2272,7 +1316,7 @@ self.f += H_FLAG # RLCA - def rlca(): + def rlca(self): self.f = 0 if (self.a & 0x80) != 0: self.f += C_FLAG @@ -2281,7 +1325,7 @@ # RLA - def rla(): + def rla(self): s = ((self.a & 0x7F) << 1) if (self.f & C_FLAG) != 0: s += 0x01 @@ -2293,7 +1337,7 @@ # RRCA - def rrca(): + def rrca(self): self.f = 0 if (self.a & 0x01) != 0: self.f += C_FLAG @@ -2302,7 +1346,7 @@ # RRA - def rra(): + def rra(self): s = ((self.a >> 1) & 0x7F) if (self.f & C_FLAG) != 0: se += 0x80 @@ -2312,485 +1356,22 @@ self.a = s; self.cycles -= 1; - - # RLC r - def rlc_B(): - self.b = self.rlc(self.b); - self.cycles -= 2; - - - def rlc_C(): - self.c = self.rlc(self.c); - self.cycles -= 2; - - - def rlc_D(): - self.d = self.rlc(self.d); - self.cycles -= 2; - - - def rlc_E(): - self.e = self.rlc(self.e); - self.cycles -= 2; - - - def rlc_H(): - self.h = self.rlc(self.h); - self.cycles -= 2; - - - def rlc_L(): - self.l = self.rlc(self.l); - self.cycles -= 2; - - - def rlc_A(): - self.a = self.rlc(self.a); - self.cycles -= 2; - - - # RLC (HL) - def rlc_HLi(): - self.write(self.h, self.l, self.rlc(self.read(self.h, self.l))); - self.cycles -= 4; - - - # RL r - def rl_B(): - self.b = self.rl(self.b); - self.cycles -= 2; - - - def rl_C(): - self.c = self.rl(self.c); - self.cycles -= 2; - - - def rl_D(): - self.d = self.rl(self.d); - self.cycles -= 2; - - - def rl_E(): - self.e = self.rl(self.e); - self.cycles -= 2; - - - def rl_H(): - self.h = self.rl(self.h); - self.cycles -= 2; - - - def rl_L(): - self.l = self.rl(self.l); - self.cycles -= 2; - - - def rl_A(): - self.a = self.rl(self.a); - self.cycles -= 2; - - - # RL (HL) - def rl_HLi(): - self.write(self.h, self.l, self.rl(self.read(self.h, self.l))); - self.cycles -= 4; - - - # RRC r - def rrc_B(): - self.b = self.rrc(self.b); - self.cycles -= 2; - - - def rrc_C(): - self.c = self.rrc(self.c); - self.cycles -= 2; - - - def rrc_D(): - self.d = self.rrc(self.d); - self.cycles -= 2; - - - def rrc_E(): - self.e = self.rrc(self.e); - self.cycles -= 2; - - - def rrc_H(): - self.h = self.rrc(self.h); - self.cycles -= 2; - - - def rrc_L(): - self.l = self.rrc(self.l); - self.cycles -= 2; - - - def rrc_A(): - self.a = self.rrc(self.a); - self.cycles -= 2; - - - # RRC (HL) - def rrc_HLi(): - self.write(self.h, self.l, self.rrc(self.read(self.h, self.l))); - self.cycles -= 4; - - - # RR r - def rr_B(): - self.b = self.rr(self.b); - self.cycles -= 2; - - - def rr_C(): - self.c = self.rr(self.c); - self.cycles -= 2; - - - def rr_D(): - self.d = self.rr(self.d); - self.cycles -= 2; - - - def rr_E(): - self.e = self.rr(self.e); - self.cycles -= 2; - - - def rr_H(): - self.h = self.rr(self.h); - self.cycles -= 2; - - - def rr_L(): - self.l = self.rr(self.l); - self.cycles -= 2; - - - def rr_A(): - self.a = self.rr(self.a); - self.cycles -= 2; - - - # RR (HL) - def rr_HLi(): - self.write(self.h, self.l, self.rr(self.read(self.h, self.l))); - self.cycles -= 4; - - - # SLA r - def sla_B(): - self.b = self.sla(self.b); - self.cycles -= 2; - - - def sla_C(): - self.c = self.sla(self.c); - self.cycles -= 2; - - - def sla_D(): - self.d = self.sla(self.d); - self.cycles -= 2; - - - def sla_E(): - self.e = self.sla(self.e); - self.cycles -= 2; - - - def sla_H(): - self.h = self.sla(self.h); - self.cycles -= 2; - - - def sla_L(): - self.l = self.sla(self.l); - self.cycles -= 2; - - - def sla_A(): - self.a = self.sla(self.a); - self.cycles -= 2; - - - # SLA (HL) - def sla_HLi(): - self.write(self.h, self.l, self.sla(self.read(self.h, self.l))); - self.cycles -= 4; - - - # SWAP r - def swap_B(): - self.b = self.swap(self.b); - self.cycles -= 2; - - - def swap_C(): - self.c = self.swap(self.c); - self.cycles -= 2; - - - def swap_D(): - self.d = self.swap(self.d); - self.cycles -= 2; - - - def swap_E(): - self.e = self.swap(self.e); - self.cycles -= 2; - - - def swap_H(): - self.h = self.swap(self.h); - self.cycles -= 2; - - - def swap_L(): - self.l = self.swap(self.l); - self.cycles -= 2; - - - def swap_A(): - self.a = self.swap(self.a); - self.cycles -= 2; - - - # SWAP (HL) - def swap_HLi(): - self.write(self.h, self.l, self.swap(self.read(self.h, self.l))); - self.cycles -= 4; - - - # SRA r - def sra_B(): - self.b = self.sra(self.b); - self.cycles -= 2; - - - def sra_C(): - self.c = self.sra(self.c); - self.cycles -= 2; - - - def sra_D(): - self.d = self.sra(self.d); - self.cycles -= 2; - - - def sra_E(): - self.e = self.sra(self.e); - self.cycles -= 2; - - - def sra_H(): - self.h = self.sra(self.h); - self.cycles -= 2; - - - def sra_L(): - self.l = self.sra(self.l); - self.cycles -= 2; - - - def sra_A(): - self.a = self.sra(self.a); - self.cycles -= 2; - - - # SRA (HL) - def sra_HLi(): - self.write(self.h, self.l, self.sra(self.read(self.h, self.l))); - self.cycles -= 4; - - - # SRL r - def srl_B(): - self.b = self.srl(self.b); - self.cycles -= 2; - - - def srl_C(): - self.c = self.srl(self.c); - self.cycles -= 2; - - - def srl_D(): - self.d = self.srl(self.d); - self.cycles -= 2; - - - def srl_E(): - self.e = self.srl(self.e); - self.cycles -= 2; - - - def srl_H(): - self.h = self.srl(self.h); - self.cycles -= 2; - - - def srl_L(): - self.l = self.srl(self.l); - self.cycles -= 2; - - - def srl_A(): - self.a = self.srl(self.a); - self.cycles -= 2; - - - # SRL (HL) - def srl_HLi(): - self.write(self.h, self.l, self.srl(self.read(self.h, self.l))); - self.cycles -= 4; - - - # BIT n,r - def bit_B(self, n): - self.bit(n, self.b); - self.cycles -= 2; - - - def bit_C(self, n): - self.bit(n, self.c); - self.cycles -= 2; - - - def bit_D(self, n): - self.bit(n, self.d); - self.cycles -= 2; - - - def bit_E(self, n): - self.bit(n, self.e); - self.cycles -= 2; - - - def bit_H(self, n): - self.bit(n, self.h); - self.cycles -= 2; - - - def bit_L(self, n): - self.bit(n, self.l); - self.cycles -= 2; - - - def bit_A(self, n): - self.bit(n, self.a); - self.cycles -= 2; - - - # BIT n,(HL) - def bit_HLi(self, n): - self.bit(n, self.read(self.h, self.l)); - self.cycles -= 3; - - - # SET n,r - def set_B(self, n): - self.b |= 1 << n; - self.cycles -= 2; - - - def set_C(self, n): - self.c |= 1 << n; - self.cycles -= 2; - - - def set_D(self, n): - self.d |= 1 << n; - self.cycles -= 2; - - - def set_E(self, n): - self.e |= 1 << n; - self.cycles -= 2; - - - def set_H(self, n): - self.h |= 1 << n; - self.cycles -= 2; - - - def set_L(self, n): - self.l |= 1 << n; - self.cycles -= 2; - - - def set_A(self, n): - self.a |= 1 << n; - self.cycles -= 2; - - - # SET n,(HL) - def set_HLi(self, n): - self.write(self.h, self.l, self.read(self.h, self.l) | (1 << n)); - self.cycles -= 4; - - - # RES n,r - def res_B(self, n): - self.b &= ~(1 << n); - self.cycles -= 2; - - - def res_C(self, n): - self.c &= ~(1 << n); - self.cycles -= 2; - - - def res_D(self, n): - self.d &= ~(1 << n); - self.cycles -= 2; - - - def res_E(self, n): - self.e &= ~(1 << n); - self.cycles -= 2; - - - def res_H(self, n): - self.h &= ~(1 << n); - self.cycles -= 2; - - - def res_L(self, n): - self.l &= ~(1 << n); - self.cycles -= 2; - - - def res_A(self, n): - self.a &= ~(1 << n); - self.cycles -= 2; - - - # RES n,(HL) - def res_HLi(self, n): - self.write(self.h, self.l, self.read(self.h, self.l) & ~(1 << n)); - self.cycles -= 4; - - # CCF/SCF - def ccf(): + def ccf(self): self.f = (self.f & (Z_FLAG | C_FLAG)) ^ C_FLAG; - def scf(): + def scf(self): self.f = (self.f & Z_FLAG) | C_FLAG; # NOP - def nop(): + def nop(self): self.cycles -= 1; # JP nnnn - def jp_nnnn(): + def jp_nnnn(self): lo = self.fetch(); hi = self.fetch(); self.pc = (hi << 8) + lo; @@ -2798,7 +1379,7 @@ # LD PC,HL - def ld_PC_HL(): + def ld_PC_HL(self): self.pc = (self.h << 8) + self.l; self.cycles -= 1; @@ -2815,24 +1396,24 @@ self.cycles -= 3; - def jp_NZ_nnnn(): + def jp_NZ_nnnn(self): self.jp_cc_nnnn((self.f & Z_FLAG) == 0); - def jp_NC_nnnn(): + def jp_NC_nnnn(self): self.jp_cc_nnnn((self.f & C_FLAG) == 0); - def jp_Z_nnnn(): + def jp_Z_nnnn(self): self.jp_cc_nnnn((self.f & Z_FLAG) != 0); - def jp_C_nnnn(): + def jp_C_nnnn(self): self.jp_cc_nnnn((self.f & C_FLAG) != 0); # JR +nn - def jr_nn(): + def jr_nn(self): # TODO convert to byte offset = self.fetch(); self.pc = (self.pc + offset) & 0xFFFF; @@ -2852,24 +1433,24 @@ self.cycles -= 2; - def jr_NZ_nn(): + def jr_NZ_nn(self): self.jr_cc_nn((self.f & Z_FLAG) == 0); - def jr_Z_nn(): + def jr_Z_nn(self): self.jr_cc_nn((self.f & Z_FLAG) != 0); - def jr_NC_nn(): + def jr_NC_nn(self): self.jr_cc_nn((self.f & C_FLAG) == 0); - def jr_C_nn(): + def jr_C_nn(self): self.jr_cc_nn((self.f & C_FLAG) != 0); # CALL nnnn - def call_nnnn(): + def call_nnnn(self): lo = self.fetch(); hi = self.fetch(); self.call((hi << 8) + lo); @@ -2889,24 +1470,24 @@ - def call_NZ_nnnn(): + def call_NZ_nnnn(self): self.call_cc_nnnn((self.f & Z_FLAG) == 0); - def call_NC_nnnn(): + def call_NC_nnnn(self): self.call_cc_nnnn((self.f & C_FLAG) == 0); - def call_Z_nnnn(): + def call_Z_nnnn(self): self.call_cc_nnnn((self.f & Z_FLAG) != 0); - def call_C_nnnn(): + def call_C_nnnn(self): self.call_cc_nnnn((self.f & C_FLAG) != 0); # RET - def ret(): + def ret(self): lo = self.pop(); hi = self.pop(); self.pc = (hi << 8) + lo; @@ -2924,19 +1505,19 @@ self.cycles -= 2; - def ret_NZ(): + def ret_NZ(self): self.ret_cc((self.f & Z_FLAG) == 0); - def ret_NC(): + def ret_NC(self): self.ret_cc((self.f & C_FLAG) == 0); - def ret_Z(): + def ret_Z(self): self.ret_cc((self.f & Z_FLAG) != 0); - def ret_C(): + def ret_C(self): self.ret_cc((self.f & C_FLAG) != 0); @@ -2947,7 +1528,7 @@ # RETI - def reti(): + def reti(self): lo = self.pop(); hi = self.pop(); self.pc = (hi << 8) + lo; @@ -2961,13 +1542,13 @@ # DI/EI - def di(): + def di(self): # disable interrupts self.ime = false; self.cycles -= 1; - def ei(): + def ei(self): # enable interrupts self.ime = true; self.cycles -= 1; @@ -2978,7 +1559,7 @@ # HALT/STOP - def halt(): + def halt(self): self.halted = true; # emulate bug when interrupts are pending if (not self.ime and self.interrupt.isPending()): @@ -2987,6 +1568,6 @@ self.interrupt(); - def stop(): + def stop(self): self.fetch(); Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py Thu Mar 13 12:22:02 2008 @@ -97,52 +97,20 @@ def write(self, address, data): - if (address <= 0x7FFF): - # 0000-7FFF ROM Bank - self.cartridge.write(address, data); - elif (address <= 0x9FFF): - # 8000-9FFF Video RAM - self.video.write(address, data); - elif (address <= 0xBFFF): - # A000-BFFF External RAM - self.cartridge.write(address, data); - elif (address <= 0xFDFF): - # C000-FDFF Work RAM - self.ram.write(address, data); - elif (address <= 0xFEFF): - # FE00-FEFF OAM - self.video.write(address, data); - elif (address == 0xFF00): - # FF00-FF00 Joypad - self.joypad.write(address, data); - elif (address >= 0xFF01 and address <= 0xFF02): - # FF01-FF02 Serial - self.serial.write(address, data); - elif (address >= 0xFF04 and address <= 0xFF07): - # FF04-FF07 Timer - self.timer.write(address, data); - elif (address == 0xFF0F): - # FF0F-FF0F Interrupt - self.interrupt.write(address, data); - # check pending interrupts when IF is changed - self.cpu.interrupt(); - elif (address >= 0xFF10 and address <= 0xFF3F): - # FF10-FF3F Sound - self.sound.write(address, data); - elif (address >= 0xFF40 and address <= 0xFF4B): - # FF40-FF4B Video - self.video.write(address, data); - # check pending interrupts when STAT is changed - if (address == Video.STAT): - self.cpu.interrupt(); - elif (address >= 0xFF80 and address <= 0xFFFE): - # FF80-FFFE High RAM - self.ram.write(address, data); - elif (address == 0xFFFF): - # FFFF-FFFF Interrupt - self.interrupt.write(address, data); - # check pending interrupts when IE is changed - self.cpu.interrupt(); + (0x0000, 0x7FFF,Gameboy.cartridge), + (0x8000, 0x9FFF, Gameboy.video), + (0xA000, 0xBFFF, Gameboy.cartridge), + (0xC000, 0xFDFF, Gameboy.ram), + (0xFE00, 0xFEFF, Gameboy.video), + (0xFF00, 0xFF00, Gameboy.joypad), + (0xFF01, 0xFF02, Gameboy.serial), + (0xFF04, 0xFF07, Gameboy.timer), + (0xFF0F, 0xFF0F, Gameboy.interrupt), + (0xFF10, 0xFF3F, Gameboy.sound), + (0xFF40, 0xFF4B, Gameboy.video), + (0xFF80, 0xFFFE, Gameboy.ram), + (0xFFFF, 0xFFFF, Gameboy.interrupt) +] @@ -214,4 +182,20 @@ self.video.write(0x9904 + tile, tile + 1); self.video.write(0x9924 + tile, tile + 13); - self.video.write(0x9904 + 12, 25); + self.video.write(0x9905 + 12, 25); + + + (0x0000, 0x7FFF, Gameboy.cartridge), + (0x8000, 0x9FFF, Gameboy.video), + (0xA000, 0xBFFF, Gameboy.cartridge), + (0xC000, 0xFDFF, Gameboy.ram), + (0xFE00, 0xFEFF, Gameboy.video), + (0xFF00, 0xFF00, Gameboy.joypad), + (0xFF01, 0xFF02, Gameboy.serial), + (0xFF04, 0xFF07, Gameboy.timer), + (0xFF0F, 0xFF0F, Gameboy.interrupt), + (0xFF10, 0xFF3F, Gameboy.sound), + (0xFF40, 0xFF4B, Gameboy.video), + (0xFF80, 0xFFFE, Gameboy.ram), + (0xFFFF, 0xFFFF, Gameboy.interrupt) +] From arigo at codespeak.net Thu Mar 13 13:40:31 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 13 Mar 2008 13:40:31 +0100 (CET) Subject: [pypy-svn] r52444 - in pypy/branch/jit-hotpath/pypy: jit/hintannotator jit/hintannotator/test jit/rainbow jit/rainbow/test jit/tl rlib Message-ID: <20080313124031.EEF76169F7E@codespeak.net> Author: arigo Date: Thu Mar 13 13:40:29 2008 New Revision: 52444 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py pypy/branch/jit-hotpath/pypy/rlib/jit.py Log: Change the interface to give the jit_merge_point and can_enter_jit hints. This one seems a bit less error-prone, but see also tlr.py for the motivating example. Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Thu Mar 13 13:40:29 2008 @@ -53,7 +53,7 @@ # specified by the user in the jit_merge_point() call _, portalblock, portalop = self.find_jit_merge_point(portalgraph) assert portalop is portalblock.operations[0] - livevars = portalop.args[2:] + livevars = portalop.args[1:] link = split_block(None, portalblock, 0, livevars) # rewire the graph to start at the global_merge_point portalgraph.startblock.isstartblock = False Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py Thu Mar 13 13:40:29 2008 @@ -1,5 +1,5 @@ from pypy.objspace.flow.model import summary -from pypy.rlib.jit import jit_merge_point, can_enter_jit, we_are_jitted +from pypy.rlib.jit import JitDriver, we_are_jitted from pypy.jit.hintannotator.policy import HintAnnotatorPolicy from pypy.jit.hintannotator.test.test_annotator import AbstractAnnotatorTest @@ -17,16 +17,22 @@ backendoptimize=True) def test_simple_loop(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n1', 'total'] + def ll_function(n): n1 = n * 2 total = 0 - while n1 > 0: - can_enter_jit(red=(n1, total)) - jit_merge_point(red=(n1, total)) + while True: + MyJitDriver.jit_merge_point(n1=n1, total=total) + if n1 <= 0: + break if we_are_jitted(): total += 1000 total += n1 n1 -= 1 + MyJitDriver.can_enter_jit(n1=n1, total=total) return total def main(n, m): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Thu Mar 13 13:40:29 2008 @@ -167,7 +167,6 @@ self.ptr_to_jitcode = {} self.transformer = GraphTransformer(hannotator) self._listcache = {} - self.jit_merge_point_args = None def sharelist(self, name): lst = getattr(self, name) @@ -1397,20 +1396,20 @@ c = 'red' return c + def decode_hp_hint_args(self, op): + # Returns (list-of-green-vars, list-of-red-vars). + drivercls = op.args[0].value + numgreens = len(drivercls.greens) + numreds = len(drivercls.reds) + greens_v = op.args[1:1+numgreens] + reds_v = op.args[1+numgreens:] + assert len(reds_v) == numreds + return greens_v, reds_v + def check_hp_hint_args(self, op): # Check the colors of the jit_merge_point() and can_enter_jit() - # arguments, and check that all these hints are called with the - # same number of arguments. - numgreens = op.args[0].value - numreds = op.args[1].value - if self.jit_merge_point_args is None: - self.jit_merge_point_args = (numgreens, numreds) - elif self.jit_merge_point_args != (numgreens, numreds): - raise JitHintError("the number of green=() or red=() arguments" - " in can_enter_jit() don't match the ones" - " in jit_merge_point()") - greens_v = op.args[2:2+numgreens] - reds_v = op.args[2+numgreens:2+numgreens+numreds] + # arguments. + greens_v, reds_v = self.decode_hp_hint_args(op) for v in greens_v: if self.varcolor(v) != "green": raise JitHintError( @@ -1421,7 +1420,7 @@ if self.varcolor(v) != "red": raise JitHintError( "computed color does not match declared color:" - " %s is %s, but %s() declares it as red" + " %s is %s, but %s() declares it as red" % (v, self.varcolor(v), op.opname)) return greens_v, reds_v Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Thu Mar 13 13:40:29 2008 @@ -127,9 +127,8 @@ # this case is used for most tests: the jit stuff should be run # directly to make these tests faster op = block.operations[index] - numgreens = op.args[0].value - numreds = op.args[1].value - args_v = op.args[2:2+numgreens+numreds] + greens_v, reds_v = self.codewriter.decode_hp_hint_args(op) + args_v = greens_v + reds_v FUNCPTR = lltype.Ptr(self.JIT_ENTER_FUNCTYPE) jit_enter_graph_ptr = llhelper(FUNCPTR, self.maybe_enter_jit_fn) @@ -238,10 +237,7 @@ # op = origblock.operations[origindex] assert op.opname == 'jit_merge_point' - numgreens = op.args[0].value - numreds = op.args[1].value - greens_v = op.args[2:2+numgreens] - reds_v = op.args[2+numgreens:2+numgreens+numreds] + greens_v, reds_v = self.codewriter.decode_hp_hint_args(op) vlist = [Constant(portal_runner_ptr, lltype.Ptr(PORTALFUNC))] vlist += greens_v vlist += reds_v Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Thu Mar 13 13:40:29 2008 @@ -1,6 +1,6 @@ import py import re -from pypy.rlib.jit import jit_merge_point, can_enter_jit, hint, JitHintError +from pypy.rlib.jit import JitDriver, hint, JitHintError from pypy.jit.rainbow.test import test_interpreter from pypy.jit.rainbow.hotpath import EntryPointsRewriter from pypy.jit.hintannotator.policy import HintAnnotatorPolicy @@ -52,16 +52,20 @@ def test_simple_loop(self): # there are no greens in this test + class MyJitDriver(JitDriver): + greens = [] + reds = ['n1', 'total'] + def ll_function(n): n1 = n * 2 total = 0 while True: - jit_merge_point(red=(n1, total)) + MyJitDriver.jit_merge_point(n1=n1, total=total) total += n1 if n1 <= 1: break n1 -= 1 - can_enter_jit(red=(n1, total)) + MyJitDriver.can_enter_jit(n1=n1, total=total) raise Exit(total) def main(n, m): @@ -107,12 +111,17 @@ "fb_raise Exit"]) def test_greens(self): + class MyJitDriver(JitDriver): + greens = ['code', 'pc'] + reds = ['accum', 'data', 'buffer'] + def ll_function(code, buffer): data = 0 accum = 0 pc = 0 while True: - jit_merge_point(green=(code, pc), red=(accum, data, buffer)) + MyJitDriver.jit_merge_point(code=code, pc=pc, accum=accum, + data=data, buffer=buffer) if pc == len(code): raise Exit(accum) c = code[pc] @@ -147,8 +156,9 @@ pc -= 1 assert pc >= 0 pc += 1 - can_enter_jit(green=(code, pc), red=(accum, - data, buffer)) + MyJitDriver.can_enter_jit(code=code, pc=pc, + accum=accum, data=data, + buffer=buffer) def main(demo, arg): if demo == 1: @@ -202,17 +212,21 @@ assert len(self.rewriter.interpreter.debug_traces) < 20 def test_simple_return(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'total'] + def ll_function(n): total = 0 if n <= 0: return -1 while True: - jit_merge_point(red=(n, total)) + MyJitDriver.jit_merge_point(n=n, total=total) total += n if n <= 1: return total n -= 1 - can_enter_jit(red=(n, total)) + MyJitDriver.can_enter_jit(n=n, total=total) res = self.run(ll_function, [0], threshold=3, small=True) assert res == -1 @@ -228,13 +242,18 @@ assert len(self.rewriter.interpreter.debug_traces) < 20 def test_hint_errors(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n'] + def ll_function(n): - jit_merge_point(red=(n,)) - can_enter_jit(red=(n,), green=(0,)) + MyJitDriver.jit_merge_point(n=n) + MyJitDriver.can_enter_jit(foobar=n) py.test.raises(JitHintError, self.run, ll_function, [5], 3) def ll_function(n): - jit_merge_point(green=(n,)) + MyJitDriver.jit_merge_point(n=n) # wrong color + hint(n, concrete=True) py.test.raises(JitHintError, self.run, ll_function, [5], 3) def test_hp_tlr(self): Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py Thu Mar 13 13:40:29 2008 @@ -1,4 +1,4 @@ -from pypy.rlib.jit import hint, jit_merge_point, can_enter_jit +from pypy.rlib.jit import hint, JitDriver MOV_A_R = 1 @@ -48,12 +48,26 @@ elif opcode == NEG_A: a = -a + +class TLRJitDriver(JitDriver): + greens = ['bytecode', 'pc'] + reds = ['a', 'regs'] + + def on_enter_jit(self): + xxx - "not called yet" + # make a copy of the 'regs' list to make it a VirtualList for the JIT + length = hint(len(self.regs), promote=True) + newregs = [None] * length + for i in range(length): + newregs[i] = self.regs[i] + self.regs = newregs + def hp_interpret(bytecode, a): """A copy of interpret() with the hints required by the hotpath policy.""" regs = [] pc = 0 while True: - jit_merge_point(green=(bytecode, pc), red=(a, regs)) + TLRJitDriver.jit_merge_point(bytecode=bytecode, pc=pc, a=a, regs=regs) opcode = hint(ord(bytecode[pc]), concrete=True) pc += 1 if opcode == MOV_A_R: @@ -69,7 +83,8 @@ pc += 1 if a: if target < pc: - can_enter_jit(green=(bytecode, target), red=(a, regs)) + TLRJitDriver.can_enter_jit(bytecode=bytecode, pc=target, + a=a, regs=regs) pc = target elif opcode == SET_A: a = ord(bytecode[pc]) Modified: pypy/branch/jit-hotpath/pypy/rlib/jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/jit.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/jit.py Thu Mar 13 13:40:29 2008 @@ -83,54 +83,94 @@ v, = hop.inputargs(hop.args_r[0]) return hop.genop('is_early_constant', [v], resulttype=lltype.Bool) +# ____________________________________________________________ +# Internal -class JitHintError(Exception): - """Inconsistency in the JIT hints.""" - -def jit_merge_point(green=(), red=()): - pass - -def can_enter_jit(green=(), red=()): - pass +class _JitHintClassMethod(object): + def __init__(self, name): + self.name = name + def __get__(self, instance, type): + return _JitBoundClassMethod(type, self.name) + +class _JitBoundClassMethod(object): + def __init__(self, drivercls, name): + self.drivercls = drivercls + self.name = name + def __eq__(self, other): + return (isinstance(other, _JitBoundClassMethod) and + self.drivercls is other.drivercls and + self.name == other.name) + def __ne__(self, other): + return not (self == other) + def __call__(self, **livevars): + # ignore calls to the hint class methods when running on top of CPython + pass class Entry(ExtRegistryEntry): - _about_ = jit_merge_point, can_enter_jit + _type_ = _JitBoundClassMethod - def compute_result_annotation(self, s_green=None, s_red=None): + def compute_result_annotation(self, **kwds_s): from pypy.annotation import model as annmodel - assert s_green is None or isinstance(s_green, annmodel.SomeTuple) - assert s_red is None or isinstance(s_red, annmodel.SomeTuple) + drivercls = self.instance.drivercls + drivercls._check_class() + keys = kwds_s.keys() + keys.sort() + expected = ['s_' + name for name in drivercls.greens + drivercls.reds] + expected.sort() + if keys != expected: + raise JitHintError("%s.%s(): must give exactly the same keywords" + " as the 'greens' and 'reds'" % ( + drivercls.__name__, self.instance.name)) return annmodel.s_None def specialize_call(self, hop, **kwds_i): + # replace a call to MyDriverCls.hintname(**livevars) + # with an operation 'hintname(MyDriverCls, livevars...)' + # XXX to be complete, this could also check that the concretetype + # of the variables are the same for each of the calls. from pypy.rpython.error import TyperError from pypy.rpython.lltypesystem import lltype - lst = kwds_i.values() - lst.sort() - if lst != range(hop.nb_args): - raise TyperError("%s() takes only keyword arguments" % ( - self.instance.__name__,)) + drivercls = self.instance.drivercls greens_v = [] reds_v = [] - if 'i_green' in kwds_i: - i = kwds_i['i_green'] - r_green_tuple = hop.args_r[i] - v_green_tuple = hop.inputarg(r_green_tuple, arg=i) - for j in range(len(r_green_tuple.items_r)): - v = r_green_tuple.getitem(hop.llops, v_green_tuple, j) - greens_v.append(v) - if 'i_red' in kwds_i: - i = kwds_i['i_red'] - r_red_tuple = hop.args_r[i] - v_red_tuple = hop.inputarg(r_red_tuple, arg=i) - for j in range(len(r_red_tuple.items_r)): - v = r_red_tuple.getitem(hop.llops, v_red_tuple, j) - reds_v.append(v) - + for name in drivercls.greens: + i = kwds_i['i_' + name] + r_green = hop.args_r[i] + v_green = hop.inputarg(r_green, arg=i) + greens_v.append(v_green) + for name in drivercls.reds: + i = kwds_i['i_' + name] + r_red = hop.args_r[i] + v_red = hop.inputarg(r_red, arg=i) + reds_v.append(v_red) hop.exception_cannot_occur() - vlist = [hop.inputconst(lltype.Signed, len(greens_v)), - hop.inputconst(lltype.Signed, len(reds_v))] + vlist = [hop.inputconst(lltype.Void, drivercls)] vlist.extend(greens_v) vlist.extend(reds_v) - return hop.genop(self.instance.__name__, vlist, + return hop.genop(self.instance.name, vlist, resulttype=lltype.Void) + +# ____________________________________________________________ +# User interface for the hotpath JIT policy + +class JitHintError(Exception): + """Inconsistency in the JIT hints.""" + +class JitDriver: + """Base class to declare fine-grained user control on the JIT process.""" + + # NB. one of the points of requiring subclasses of this a class is + # to support a single RPython program with several independent + # JITting interpreters in it. XXX that's not implemented yet. + + jit_merge_point = _JitHintClassMethod("jit_merge_point") + can_enter_jit = _JitHintClassMethod("can_enter_jit") + + def _check_class(cls): + if cls is JitDriver: + raise JitHintError("must subclass JitDriver") + for name in cls.greens + cls.reds: + if name.startswith('_'): + raise JitHintError("%s: the 'greens' and 'reds' names should" + " not start with an underscore" % (cls,)) + _check_class = classmethod(_check_class) From tverwaes at codespeak.net Thu Mar 13 13:57:32 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Thu, 13 Mar 2008 13:57:32 +0100 (CET) Subject: [pypy-svn] r52445 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080313125732.EC06F169F7F@codespeak.net> Author: tverwaes Date: Thu Mar 13 13:57:30 2008 New Revision: 52445 Removed: pypy/branch/gameboy-emulator/pypy/lang/gameboy/interpreter.py Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Log: Using constants from file Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Thu Mar 13 13:57:30 2008 @@ -1,16 +1,17 @@ # CATRIGE TYPES # ___________________________________________________________________________ +from pypy.lang.gameboy import constants def hasCartridgeBattery(self, cartridgeType): - return (cartridgeType == TYPE_MBC1_RAM_BATTERY \ - or cartridgeType == TYPE_MBC2_BATTERY \ - or cartridgeType == TYPE_MBC3_RTC_BATTERY \ - or cartridgeType == TYPE_MBC3_RTC_RAM_BATTERY \ - or cartridgeType == TYPE_MBC3_RAM_BATTERY \ - or cartridgeType == TYPE_MBC5_RAM_BATTERY \ - or cartridgeType == TYPE_MBC5_RUMBLE_RAM_BATTERY \ - or cartridgeType == TYPE_HUC1_RAM_BATTERY); + return (cartridgeType == constants.TYPE_MBC1_RAM_BATTERY \ + or cartridgeType == constants.TYPE_MBC2_BATTERY \ + or cartridgeType == constants.TYPE_MBC3_RTC_BATTERY \ + or cartridgeType == constants.TYPE_MBC3_RTC_RAM_BATTERY \ + or cartridgeType == constants.TYPE_MBC3_RAM_BATTERY \ + or cartridgeType == constants.TYPE_MBC5_RAM_BATTERY \ + or cartridgeType == constants.TYPE_MBC5_RUMBLE_RAM_BATTERY \ + or cartridgeType == constants.TYPE_HUC1_RAM_BATTERY); def hasCartridgeType(self, catridgeType): @@ -131,8 +132,8 @@ ramSize = self.getRAMSize() - if (getCartridgeType() >= CartridgeFactory.TYPE_MBC2 - and getCartridgeType() <= CartridgeFactory.TYPE_MBC2_BATTERY): + if (getCartridgeType() >= constants.TYPE_MBC2 + and getCartridgeType() <= constants.TYPE_MBC2_BATTERY): ramSize = 512; self.ram = [] @@ -722,51 +723,13 @@ self.clockTime = now - elapsed; -TYPE_ROM_ONLY = 0x00 - -TYPE_MBC1 = 0x01 -TYPE_MBC1_RAM = 0x02 -TYPE_MBC1_RAM_BATTERY = 0x03 - -TYPE_MBC2 = 0x05 -TYPE_MBC2_BATTERY = 0x06 - -TYPE_MBC3_RTC_BATTERY = 0x0F -TYPE_MBC3_RTC_RAM_BATTERY = 0x10 -TYPE_MBC3 = 0x11 -TYPE_MBC3_RAM = 0x12 -TYPE_MBC3_RAM_BATTERY = 0x13 - -TYPE_MBC5 = 0x19 -TYPE_MBC5_RAM = 0x1A -TYPE_MBC5_RAM_BATTERY = 0x1B - -TYPE_MBC5_RUMBLE = 0x1C -TYPE_MBC5_RUMBLE_RAM = 0x1D -TYPE_MBC5_RUMBLE_RAM_BATTERY = 0x1E - -TYPE_HUC3_RTC_RAM = 0xFE -TYPE_HUC1_RAM_BATTERY = 0xFF - CATRIDGE_TYPE_RANGES = [ - (TYPE_MBC1, TYPE_MBC1_RAM_BATTERY, MBC1), - (TYPE_MBC2, TYPE_MBC2_BATTERY, MBC2), - (TYPE_MBC3_RTC_BATTERY, TYPE_MBC3_RAM_BATTERY, MBC3), - (TYPE_MBC5, TYPE_MBC5_RUMBLE_RAM_BATTERY, MBC5), - (TYPE_HUC3_RTC_RAM, HuC3), - (TYPE_HUC1_RAM_BATTERY, HuC1) + (constants.TYPE_MBC1, constants.TYPE_MBC1_RAM_BATTERY, MBC1), + (constants.TYPE_MBC2, constants.TYPE_MBC2_BATTERY, MBC2), + (constants.TYPE_MBC3_RTC_BATTERY, constants.TYPE_MBC3_RAM_BATTERY, MBC3), + (constants.TYPE_MBC5, constants.TYPE_MBC5_RUMBLE_RAM_BATTERY, MBC5), + (constants.TYPE_HUC3_RTC_RAM, constants.TYPE_HUC3_RTC_RAM, HuC3), + (constants.TYPE_HUC1_RAM_BATTERY, constants.TYPE_HUC1_RAM_BATTERY, HuC1) ] -def initialize_cartridge_mapping(): - result = [None] * 256 - for entry in BYTECODE_RANGES: - if len(entry) == 2: - positions = [entry[0]] - else: - positions = range(entry[0], entry[1]+1) - for pos in positions: - result[pos] = entry[-1] - assert None not in result - return result - -CARTRIDGE_TABLE = initialize_cartridge_mapping() + Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Thu Mar 13 13:57:30 2008 @@ -3,13 +3,9 @@ Central Unit ProcessOR (Sharp LR35902 CPU) """ +from pypy.lang.gameboy import constants class CPU(object): - # Flags - Z_FLAG = 0x80 - N_FLAG = 0x40 - H_FLAG = 0x20 - C_FLAG = 0x10 # Registers a = 0 @@ -121,21 +117,21 @@ self.cycles = 0; if (self.ime): if (self.interrupt.isPending()): - if (self.interrupt.isPending(Interrupt.VBLANK)): + if (self.interrupt.isPending(constants.VBLANK)): self.interrupt(0x40); - self.interrupt.lower(Interrupt.VBLANK); - elif (self.interrupt.isPending(Interrupt.LCD)): + self.interrupt.lower(constants.VBLANK); + elif (self.interrupt.isPending(constants.LCD)): self.interrupt(0x48); - self.interrupt.lower(Interrupt.LCD); - elif (self.interrupt.isPending(Interrupt.TIMER)): + self.interrupt.lower(constants.LCD); + elif (self.interrupt.isPending(constants.TIMER)): self.interrupt(0x50); - self.interrupt.lower(Interrupt.TIMER); - elif (self.interrupt.isPending(Interrupt.SERIAL)): + self.interrupt.lower(constants.TIMER); + elif (self.interrupt.isPending(constants.SERIAL)): self.interrupt(0x58); - self.interrupt.lower(Interrupt.SERIAL); - elif (self.interrupt.isPending(Interrupt.JOYPAD)): + self.interrupt.lower(constants.SERIAL); + elif (self.interrupt.isPending(constants.JOYPAD)): self.interrupt(0x60); - self.interrupt.lower(Interrupt.JOYPAD); + self.interrupt.lower(constants.JOYPAD); def interrupt(self, address): @@ -465,48 +461,48 @@ s = (self.a + data) & 0xFF; self.f = 0 if s == 0: - self.f = Z_FLAG + self.f = constants.Z_FLAG if s < self.a: - self.f += C_FLAG + self.f += constants.C_FLAG if (s & 0x0F) < (self.a & 0x0F): - self.f += H_FLAG + self.f += constants.H_FLAG self.a = s; def adc(self, data): - s = self.a + data + ((self.f & C_FLAG) >> 4); + s = self.a + data + ((self.f & constants.C_FLAG) >> 4); self.f = 0 if (s & 0xFF) == 0: - self.f += Z_FLAG + self.f += constants.Z_FLAG if s >= 0x100: - self.f += C_FLAG + self.f += constants.C_FLAG if ((s ^ self.a ^ data) & 0x10) != 0: - self.f += H_FLAG + self.f += constants.H_FLAG self.a = s & 0xFF; def sub(self, data): s = (self.a - data) & 0xFF; - self.f = N_FLAG + self.f = constants.N_FLAG if s == 0: - self.f += Z_FLAG + self.f += constants.Z_FLAG if s > self.a: - self.f += C_FLAG + self.f += constants.C_FLAG if (s & 0x0F) > (self.a & 0x0F): - self.f += H_FLAG + self.f += constants.H_FLAG self.a = s; def sbc(self, data): - s = self.a - data - ((self.f & C_FLAG) >> 4); - self.f = N_FLAG + s = self.a - data - ((self.f & constants.C_FLAG) >> 4); + self.f = constants.N_FLAG if (s & 0xFF) == 0: - self.f += Z_FLAG + self.f += constants.Z_FLAG if (s & 0xFF00) != 0: - self.f += C_FLAG + self.f += constants.C_FLAG if ((s ^ self.a ^ data) & 0x10) != 0: - self.f += H_FLAG + self.f += constants.H_FLAG self.a = s & 0xFF; @@ -514,42 +510,42 @@ self.a &= data; self.f = 0 if self.a == 0: - self.f = Z_FLAG + self.f = constants.Z_FLAG def xOR(self, data): self.a ^= data; self.f = 0 if self.a == 0: - self.f = Z_FLAG + self.f = constants.Z_FLAG def cpuOR(self, data): self.a |= data; self.f = 0 if self.a == 0: - self.f = Z_FLAG + self.f = constants.Z_FLAG def cp(self, data): s = (self.a - data) & 0xFF; - self.f = N_FLAG + self.f = constants.N_FLAG if s==0: - self.f += Z_FLAG + self.f += constants.Z_FLAG if s > self.a: - self.f += C_FLAG + self.f += constants.C_FLAG if (s & 0x0F) > (self.a & 0x0F): - self.f += H_FLAG + self.f += constants.H_FLAG def inc(self, data): data = (data + 1) & 0xFF; self.f = 0 if data == 0: - self.f += Z_FLAG + self.f += constants.Z_FLAG if (data & 0x0F) == 0x00: - self.f += H_FLAG - self.f += (self.f & C_FLAG); + self.f += constants.H_FLAG + self.f += (self.f & constants.C_FLAG); return data; @@ -557,10 +553,10 @@ data = (data - 1) & 0xFF; self.f = 0 if data == 0: - self.f += Z_FLAG + self.f += constants.Z_FLAG if (data & 0x0F) == 0x0F: - self.f += H_FLAG - self.f += (self.f & C_FLAG) + N_FLAG; + self.f += constants.H_FLAG + self.f += (self.f & constants.C_FLAG) + constants.N_FLAG; return data; @@ -568,21 +564,21 @@ s = ((data & 0x7F) << 1) + ((data & 0x80) >> 7); self.f = 0 if s == 0: - self.f += Z_FLAG + self.f += constants.Z_FLAG if (data & 0x80) != 0: - self.f += C_FLAG + self.f += constants.C_FLAG return s; def rl(self, data): s = ((data & 0x7F) << 1) - if (self.f & C_FLAG) != 0: + if (self.f & constants.C_FLAG) != 0: self.f += 0x01; self.f =0 if (s == 0): - self.f += Z_FLAG + self.f += constants.Z_FLAG if (data & 0x80) != 0: - self.f += C_FLAG + self.f += constants.C_FLAG return s; @@ -590,19 +586,19 @@ s = (data >> 1) + ((data & 0x01) << 7); self.f = 0 if s == 0: - self.f += Z_FLAG + self.f += constants.Z_FLAG if (data & 0x01) != 0: - self.f += C_FLAG + self.f += constants.C_FLAG return s; def rr(self, data): - s = (data >> 1) + ((self.f & C_FLAG) << 3); + s = (data >> 1) + ((self.f & constants.C_FLAG) << 3); self.f = 0 if s == 0: - self.f += Z_FLAG + self.f += constants.Z_FLAG if (data & 0x01) != 0: - self.f += C_FLAG + self.f += constants.C_FLAG return s; @@ -610,9 +606,9 @@ s = (data << 1) & 0xFF; self.f = 0 if s == 0: - self.f += Z_FLAG + self.f += constants.Z_FLAG if (data & 0x80) != 0: - self.f += C_FLAG + self.f += constants.C_FLAG return s; @@ -620,9 +616,9 @@ s = (data >> 1) + (data & 0x80); self.f = 0 if s == 0: - self.f += Z_FLAG + self.f += constants.Z_FLAG if (data & 0x01) != 0: - self.f += C_FLAG + self.f += constants.C_FLAG return s; @@ -630,9 +626,9 @@ s = (data >> 1); self.f = 0 if s == 0 : - self.f += Z_FLAG + self.f += constants.Z_FLAG if (data & 0x01) != 0: - self.f += C_FLAG + self.f += constants.C_FLAG return s; @@ -640,24 +636,24 @@ s = ((data << 4) & 0xF0) + ((data >> 4) & 0x0F); self.f = 0 if s == 0: - self.f += Z_FLAG + self.f += constants.Z_FLAG return s; def bit(self, n, data): - self.f = (self.f & C_FLAG) + H_FLAG + self.f = (self.f & constants.C_FLAG) + constants.H_FLAG if (data & (1 << n)) == 0: - self.f += Z_FLAG + self.f += constants.Z_FLAG def add(self, hi, lo): s = ((self.h << 8) + self.l + (hi << 8) + lo) & 0xFFFF; - self.f = (self.f & Z_FLAG) + self.f = (self.f & constants.Z_FLAG) if ((s >> 8) & 0x0F) < (self.h & 0x0F): - self.f += H_FLAG + self.f += constants.H_FLAG self.f += s < (self.h << 8) if self.l: - self.f += C_FLAG + self.f += constants.C_FLAG self.l = s & 0xFF; self.h = s >> 8; @@ -1176,28 +1172,28 @@ # CPL def cpl(self): self.a ^= 0xFF; - self.f |= N_FLAG + H_FLAG; + self.f |= constants.N_FLAG + constants.H_FLAG; # DAA def daa(self): delta = 0; - if ((self.f & H_FLAG) != 0 or (self.a & 0x0F) > 0x09): + if ((self.f & constants.H_FLAG) != 0 or (self.a & 0x0F) > 0x09): delta |= 0x06; - if ((self.f & C_FLAG) != 0 or (self.a & 0xF0) > 0x90): + if ((self.f & constants.C_FLAG) != 0 or (self.a & 0xF0) > 0x90): delta |= 0x60; if ((self.a & 0xF0) > 0x80 and (self.a & 0x0F) > 0x09): delta |= 0x60; - if ((self.f & N_FLAG) == 0): + if ((self.f & constants.N_FLAG) == 0): self.a = (self.a + delta) & 0xFF; else: self.a = (self.a - delta) & 0xFF; - self.f = (self.f & N_FLAG) + self.f = (self.f & constants.N_FLAG) if delta >= 0x60: - self.f += C_FLAG + self.f += constants.C_FLAG if self.a == 0: - self.f += Z_FLAG + self.f += constants.Z_FLAG self.cycles -= 1; @@ -1305,21 +1301,21 @@ if (offset >= 0): self.f = 0 if s < self.sp: - self.f += C_FLAG + self.f += constants.C_FLAG if (s & 0x0F00) < (self.sp & 0x0F00): - self.f += H_FLAG + self.f += constants.H_FLAG else: self.f = 0 if s > self.sp: - self.f += C_FLAG + self.f += constants.C_FLAG if (s & 0x0F00) > (self.sp & 0x0F00): - self.f += H_FLAG + self.f += constants.H_FLAG # RLCA def rlca(self): self.f = 0 if (self.a & 0x80) != 0: - self.f += C_FLAG + self.f += constants.C_FLAG self.a = ((self.a & 0x7F) << 1) + ((self.a & 0x80) >> 7); self.cycles -= 1; @@ -1327,11 +1323,11 @@ # RLA def rla(self): s = ((self.a & 0x7F) << 1) - if (self.f & C_FLAG) != 0: + if (self.f & constants.C_FLAG) != 0: s += 0x01 self.f = 0 if (self.a & 0x80) != 0: - self.f += C_FLAG + self.f += constants.C_FLAG self.a = s; self.cycles -= 1; @@ -1340,7 +1336,7 @@ def rrca(self): self.f = 0 if (self.a & 0x01) != 0: - self.f += C_FLAG + self.f += constants.C_FLAG self.a = ((self.a >> 1) & 0x7F) + ((self.a << 7) & 0x80); self.cycles -= 1; @@ -1348,21 +1344,21 @@ # RRA def rra(self): s = ((self.a >> 1) & 0x7F) - if (self.f & C_FLAG) != 0: + if (self.f & constants.C_FLAG) != 0: se += 0x80 self.f = 0 if (self.a & 0x01) != 0: - self.f += C_FLAG + self.f += constants.C_FLAG self.a = s; self.cycles -= 1; # CCF/SCF def ccf(self): - self.f = (self.f & (Z_FLAG | C_FLAG)) ^ C_FLAG; + self.f = (self.f & (constants.Z_FLAG | constants.C_FLAG)) ^ constants.C_FLAG; def scf(self): - self.f = (self.f & Z_FLAG) | C_FLAG; + self.f = (self.f & constants.Z_FLAG) | constants.C_FLAG; # NOP @@ -1397,19 +1393,19 @@ def jp_NZ_nnnn(self): - self.jp_cc_nnnn((self.f & Z_FLAG) == 0); + self.jp_cc_nnnn((self.f & constants.Z_FLAG) == 0); def jp_NC_nnnn(self): - self.jp_cc_nnnn((self.f & C_FLAG) == 0); + self.jp_cc_nnnn((self.f & constants.C_FLAG) == 0); def jp_Z_nnnn(self): - self.jp_cc_nnnn((self.f & Z_FLAG) != 0); + self.jp_cc_nnnn((self.f & constants.Z_FLAG) != 0); def jp_C_nnnn(self): - self.jp_cc_nnnn((self.f & C_FLAG) != 0); + self.jp_cc_nnnn((self.f & constants.C_FLAG) != 0); # JR +nn @@ -1434,19 +1430,19 @@ def jr_NZ_nn(self): - self.jr_cc_nn((self.f & Z_FLAG) == 0); + self.jr_cc_nn((self.f & constants.Z_FLAG) == 0); def jr_Z_nn(self): - self.jr_cc_nn((self.f & Z_FLAG) != 0); + self.jr_cc_nn((self.f & constants.Z_FLAG) != 0); def jr_NC_nn(self): - self.jr_cc_nn((self.f & C_FLAG) == 0); + self.jr_cc_nn((self.f & constants.C_FLAG) == 0); def jr_C_nn(self): - self.jr_cc_nn((self.f & C_FLAG) != 0); + self.jr_cc_nn((self.f & constants.C_FLAG) != 0); # CALL nnnn @@ -1471,19 +1467,19 @@ def call_NZ_nnnn(self): - self.call_cc_nnnn((self.f & Z_FLAG) == 0); + self.call_cc_nnnn((self.f & constants.Z_FLAG) == 0); def call_NC_nnnn(self): - self.call_cc_nnnn((self.f & C_FLAG) == 0); + self.call_cc_nnnn((self.f & constants.C_FLAG) == 0); def call_Z_nnnn(self): - self.call_cc_nnnn((self.f & Z_FLAG) != 0); + self.call_cc_nnnn((self.f & constants.Z_FLAG) != 0); def call_C_nnnn(self): - self.call_cc_nnnn((self.f & C_FLAG) != 0); + self.call_cc_nnnn((self.f & constants.C_FLAG) != 0); # RET @@ -1506,19 +1502,19 @@ def ret_NZ(self): - self.ret_cc((self.f & Z_FLAG) == 0); + self.ret_cc((self.f & constants.Z_FLAG) == 0); def ret_NC(self): - self.ret_cc((self.f & C_FLAG) == 0); + self.ret_cc((self.f & constants.C_FLAG) == 0); def ret_Z(self): - self.ret_cc((self.f & Z_FLAG) != 0); + self.ret_cc((self.f & constants.Z_FLAG) != 0); def ret_C(self): - self.ret_cc((self.f & C_FLAG) != 0); + self.ret_cc((self.f & constants.C_FLAG) != 0); # RST nn Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py Thu Mar 13 13:57:30 2008 @@ -4,12 +4,10 @@ Gameboy Scheduler and Memory Mapper """ +from pypy.lang.gameboy import constants class GameBoy(object): - # Registered Symbol, convert to byte - REGISTERED_BITMAP = [0x3C, 0x42, 0xB9, 0xA5, 0xB9, 0xA5, 0x42, 0x3C ]; - # RAM ram = None; cartridge = None; @@ -176,7 +174,7 @@ self.video.write(0x8016 + (index << 3), pattern1); for index in range(0, 8): - self.video.write(0x8190 + (index << 1), REGISTERED_BITMAP[index]); + self.video.write(0x8190 + (index << 1), constants.REGISTERED_BITMAP[index]); for tile in range(0, 12): self.video.write(0x9904 + tile, tile + 1); Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py Thu Mar 13 13:57:30 2008 @@ -4,18 +4,9 @@ Interrupt Controller """ -class Interrupt(object): +from pypy.lang.gameboy import constants - # Interrupt Registers - IE = 0xFFFF # Interrupt Enable */ - IF = 0xFF0F # Interrupt Flag */ - - # Interrupt Flags - VBLANK = 0x01 # V-Blank Interrupt (INT 40h) */ - LCD = 0x02 # LCD STAT Interrupt (INT 48h) */ - TIMER = 0x04 # Timer Interrupt (INT 50h) */ - SERIAL = 0x08 # Serial Interrupt (INT 58h) */ - JOYPAD = 0x10 # Joypad Interrupt (INT 60h) */ +class Interrupt(object): # Registers enable = 0; @@ -47,16 +38,16 @@ def write(self, address, data): - if address == IE: + if address == constants.IE: self.setInterruptEnable(data); - elif address==IF: + elif address == constants.IF: self.setInterruptFlag(data); def read(self, address): - if address==IE: + if address == constants.IE: return self.getInterruptEnable(); - elif address== IF: + elif address == constants.IF: return self.getInterruptFlag(); return 0xFF; Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py Thu Mar 13 13:57:30 2008 @@ -5,14 +5,6 @@ """ class Joypad(object): - # Joypad Registers - JOYP = 0xFF00; # P1 */ - - # Gameboy Clock Speed (1048576 Hz) - GAMEBOY_CLOCK = 1 << 20; - - # Joypad Poll Speed (64 Hz) - JOYPAD_CLOCK = GAMEBOY_CLOCK >> 6; # Registers joyp = 0; @@ -32,7 +24,7 @@ def reset(self): self.joyp = 0xFF; - self.cycles = JOYPAD_CLOCK; + self.cycles = constants.JOYPAD_CLOCK; def cycles(self): @@ -45,17 +37,17 @@ if (self.driver.isRaised()): self.update(); - self.cycles = JOYPAD_CLOCK; + self.cycles = constants.JOYPAD_CLOCK; def write(self, address, data): - if (address == JOYP): + if (address == constants.JOYP): self.joyp = (self.joyp & 0xCF) + (data & 0x30); self.update(); def read(self, address): - if (address == JOYP): + if (address == constants.JOYP): return self.joyp; return 0xFF; @@ -72,7 +64,7 @@ data |= 0x0F; if ((self.joyp & ~data & 0x0F) != 0): - self.interrupt.raiseInterrupt(Interrupt.JOYPAD); + self.interrupt.raiseInterrupt(constants.JOYPAD); self.joyp = data; Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py Thu Mar 13 13:57:30 2008 @@ -3,11 +3,11 @@ Work and High RAM """ + +from pypy.lang.gameboy import constants + class RAM(object): - WRAM_SIZE = 8192 - HIGH_SIZE = 128 - # Work RAM wram = [] @@ -18,13 +18,13 @@ self.reset(); def reset(self): - self.wram = range(0, WRAM_SIZE) - for index in range(0, WRAM_SIZE): + self.wram = range(0, constants.WRAM_SIZE) + for index in range(0, constants.WRAM_SIZE): #TODO convert to byte self.wram[index] = 0x00; - self.hram = range(0, HIGH_SIZE) - for index in range(0, HIGH_SIZE): + self.hram = range(0, constants.HIGH_SIZE) + for index in range(0, constants.HIGH_SIZE): #TODO convert to byte self.hram[index] = 0x00; Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py Thu Mar 13 13:57:30 2008 @@ -2,64 +2,54 @@ Mario GameBoy (TM) Emulator Serial Link Controller """ -class Serial(object): - # Gameboy Clock Speed (1048576 Hz) - GAMEBOY_CLOCK = 1 << 20; - - # Serial Clock Speed (8 x 1024 bits/sec) - SERIAL_CLOCK = GAMEBOY_CLOCK >> 16; - - # Serial Idle Speed (128 Hz) - SERIAL_IDLE_CLOCK = GAMEBOY_CLOCK >> 7; +from pypy.lang.gameboy import constants - # Serial Register Addresses - - SB = 0xFF01; #Serial Transfer Data */ - SC = 0xFF02; # Serial Transfer Control */ +class Serial(object): # Registers - sb = 0; - sc = 0; - cycles = 0; + sb = 0 + sc = 0 + cycles = 0 # Interrupt Controller #Interrupt - interrupt = None; + interrupt = None def __init__(self, interrupt): - self.interrupt = interrupt; - self.reset(); + self.interrupt = interrupt + self.reset() def reset(self): - self.cycles = SERIAL_CLOCK; - self.sb = 0x00; - self.sc = 0x00; + self.cycles = constants.SERIAL_CLOCK + self.sb = 0x00 + self.sc = 0x00 def cycles(self): - return self.cycles; + return self.cycles def emulate(self, ticks): if ((self.sc & 0x81) == 0x81): - self.cycles -= ticks; + self.cycles -= ticks if (self.cycles <= 0): - self.sb = 0xFF; - self.sc &= 0x7F; - self.cycles = SERIAL_IDLE_CLOCK; + self.sb = 0xFF + self.sc &= 0x7F + self.cycles = constants.SERIAL_IDLE_CLOCK - self.interrupt.raiseInterrupt(Interrupt.SERIAL); + self.interrupt.raiseInterrupt(constants.SERIAL) def setSerialData(self, data): - self.sb = data; + self.sb = data def setSerialControl(self, data): - self.sc = data; + self.sc = data # HACK: delay the serial interrupt (Shin Nihon Pro Wrestling) - self.cycles = SERIAL_IDLE_CLOCK + SERIAL_CLOCK; + self.cycles = constants.SERIAL_IDLE_CLOCK + constants.SERIAL_CLOCK def getSerialData(self): - return self.sb; + return self.sb def getSerialControl(self): - return self.sc; + return self.sc + Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py Thu Mar 13 13:57:30 2008 @@ -4,50 +4,10 @@ Audio Processor Unit (Sharp LR35902 APU) """ +from pypy.lang.gameboy import constants class Sound(object): - # Gameboy Clock Speed (1048576 Hz) - - GAMEBOY_CLOCK = 1 << 20; - - - # Sound Clock (256 Hz) - - SOUND_CLOCK = 256; - - - # Sound Register Addresses - - NR10 = 0xFF10 # AUD1SWEEP */ - NR11 = 0xFF11 # AUD1LEN */ - NR12 = 0xFF12 # AUD1ENV */ - NR13 = 0xFF13 # AUD1LOW */ - NR14 = 0xFF14 # AUD1HIGH */ - - NR21 = 0xFF16 # AUD2LEN */ - NR22 = 0xFF17 # AUD2ENV */ - NR23 = 0xFF18 # AUD2LOW */ - NR24 = 0xFF19 # AUD2HIGH */ - - NR30 = 0xFF1A # AUD3ENA */ - NR31 = 0xFF1B # AUD3LEN */ - NR32 = 0xFF1C # AUD3LEVEL */ - NR33 = 0xFF1D # AUD3LOW */ - NR34 = 0xFF1E # AUD3HIGH */ - - NR41 = 0xFF20 # AUD4LEN */ - NR42 = 0xFF21 # AUD4ENV */ - NR43 = 0xFF22 # AUD4POLY */ - NR44 = 0xFF23 # AUD4GO */ - - NR50 = 0xFF24 # AUDVOL */ - NR51 = 0xFF25 # AUDTERM */ - NR52 = 0xFF26 # AUDENA */ - - AUD3WAVERAM = 0xFF30; - - # Audio Channel 1 int nr10=0; nr11=0; @@ -141,44 +101,44 @@ self.updateAudio(); if (self.driver.isEnabled()): self.frames += self.driver.getSampleRate(); - length = (self.frames / SOUND_CLOCK) << 1; + length = (self.frames / constants.SOUND_CLOCK) << 1; self.mixAudio(self.buffer, length); self.driver.write(self.buffer, length); - self.frames %= SOUND_CLOCK; + self.frames %= constants.SOUND_CLOCK; - self.cycles += GAMEBOY_CLOCK / SOUND_CLOCK; + self.cycles += constants.GAMEBOY_CLOCK / constants.SOUND_CLOCK; def reset(self): - self.cycles = GAMEBOY_CLOCK / SOUND_CLOCK; + self.cycles = constants.GAMEBOY_CLOCK / constants.SOUND_CLOCK; self.frames = 0; self.audio1Index = self.audio2Index = self.audio3Index = self.audio4Index = 0; - self.write(NR10, 0x80); - self.write(NR11, 0x3F); # 0xBF - self.write(NR12, 0x00); # 0xF3 - self.write(NR13, 0xFF); - self.write(NR14, 0xBF); - - self.write(NR21, 0x3F); - self.write(NR22, 0x00); - self.write(NR23, 0xFF); - self.write(NR24, 0xBF); - - self.write(NR30, 0x7F); - self.write(NR31, 0xFF); - self.write(NR32, 0x9F); - self.write(NR33, 0xFF); - self.write(NR34, 0xBF); - - self.write(NR41, 0xFF); - self.write(NR42, 0x00); - self.write(NR43, 0x00); - self.write(NR44, 0xBF); - - self.write(NR50, 0x00); # 0x77 - self.write(NR51, 0xF0); - self.write(NR52, 0xFF); # 0xF0 + self.write(constants.NR10, 0x80); + self.write(constants.NR11, 0x3F); # 0xBF + self.write(constants.NR12, 0x00); # 0xF3 + self.write(constants.NR13, 0xFF); + self.write(constants.NR14, 0xBF); + + self.write(constants.NR21, 0x3F); + self.write(constants.NR22, 0x00); + self.write(constants.NR23, 0xFF); + self.write(constants.NR24, 0xBF); + + self.write(constants.NR30, 0x7F); + self.write(constants.NR31, 0xFF); + self.write(constants.NR32, 0x9F); + self.write(constants.NR33, 0xFF); + self.write(constants.NR34, 0xBF); + + self.write(constants.NR41, 0xFF); + self.write(constants.NR42, 0x00); + self.write(constants.NR43, 0x00); + self.write(constants.NR44, 0xBF); + + self.write(constants.NR50, 0x00); # 0x77 + self.write(constants.NR51, 0xF0); + self.write(constants.NR52, 0xFF); # 0xF0 for address in range(0xFF30, 0xFF3F): write = 0xFF @@ -188,108 +148,108 @@ def read(self, address): - if address==NR10: + if address==constants.NR10: return self.getAudio1Sweep(); - elif address == NR11: + elif address == constants.NR11: return self.getAudio1Length(); - elif address == NR12: + elif address == constants.NR12: return self.getAudio1Envelope(); - elif address == NR13: + elif address == constants.NR13: return self.getAudio1Frequency(); - elif address == NR14: + elif address == constants.NR14: return self.getAudio1Playback(); - elif address == NR21: + elif address == constants.NR21: return self.getAudio2Length(); - elif address == NR22: + elif address == constants.NR22: return self.getAudio2Envelope(); - elif address==NR23: + elif address==constants.NR23: return self.getAudio2Frequency(); - elif address==NR24: + elif address==constants.NR24: return self.getAudio2Playback(); - elif address==NR30: + elif address==constants.NR30: return self.getAudio3Enable(); - elif address==NR31: + elif address==constants.NR31: return self.getAudio3Length(); - elif address==NR32: + elif address==constants.NR32: return self.getAudio3Level(); - elif address==NR33: + elif address==constants.NR33: return self.getAudio4Frequency(); - elif address==NR34: + elif address==constants.NR34: return self.getAudio3Playback(); - elif address==NR41: + elif address==constants.NR41: return self.getAudio4Length(); - elif address==NR42: + elif address==constants.NR42: return self.getAudio4Envelope(); - elif address==NR43: + elif address==constants.NR43: return self.getAudio4Polynomial(); - elif address==NR44: + elif address==constants.NR44: return self.getAudio4Playback(); - elif address==NR50: + elif address==constants.NR50: return self.getOutputLevel(); - elif address==NR51: + elif address==constants.NR51: return self.getOutputTerminal(); - elif address==NR52: + elif address==constants.NR52: return self.getOutputEnable(); - elif (address >= AUD3WAVERAM and address <= AUD3WAVERAM + 0x3F): + elif (address >= constants.AUD3WAVERAM and address <= constants.AUD3WAVERAM + 0x3F): return self.getAudio3WavePattern(address); return 0xFF; def write(self, address, data): - if address==NR10: + if address==constants.NR10: self.setAudio1Sweep(data); - elif address == NR11: + elif address == constants.NR11: self.setAudio1Length(data); - elif address == NR12: + elif address == constants.NR12: self.setAudio1Envelope(data); - elif address == NR13: + elif address == constants.NR13: self.setAudio1Frequency(data); - elif address == NR14: + elif address == constants.NR14: self.setAudio1Playback(data); - elif address == NR21: + elif address == constants.NR21: self.setAudio2Length(data); - elif address == NR22: + elif address == constants.NR22: self.setAudio2Envelope(data); - elif address == NR23: + elif address == constants.NR23: self.setAudio2Frequency(data); - elif address == NR24: + elif address == constants.NR24: self.setAudio2Playback(data); - elif address == NR30: + elif address == constants.NR30: self.setAudio3Enable(data); - elif address == NR31: + elif address == constants.NR31: self.setAudio3Length(data); - elif address == NR32: + elif address == constants.NR32: self.setAudio3Level(data); - elif address == NR33: + elif address == constants.NR33: self.setAudio3Frequency(data); - elif address == NR34: + elif address == constants.NR34: self.setAudio3Playback(data); - elif address == NR41: + elif address == constants.NR41: self.setAudio4Length(data); - elif address == NR42: + elif address == constants.NR42: self.setAudio4Envelope(data); - elif address == NR43: + elif address == constants.NR43: self.setAudio4Polynomial(data); - elif address == NR44: + elif address == constants.NR44: self.setAudio4Playback(data); - elif address == NR50: + elif address == constants.NR50: self.setOutputLevel(data); - elif address == NR51: + elif address == constants.NR51: self.setOutputTerminal(data); - elif address == NR52: + elif address == constants.NR52: self.setOutputEnable(data); - elif (address >= AUD3WAVERAM and address <= AUD3WAVERAM + 0x3F): + elif (address >= constants.AUD3WAVERAM and address <= constants.AUD3WAVERAM + 0x3F): self.setAudio3WavePattern(address, data); @@ -353,12 +313,12 @@ def setAudio1Sweep(self, data): self.nr10 = data; - self.audio1SweepLength = (SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); + self.audio1SweepLength = (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); def setAudio1Length(self, data): self.nr11 = data; - self.audio1Length = (SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)); + self.audio1Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)); def setAudio1Envelope(self, data): @@ -388,12 +348,12 @@ self.nr52 |= 0x01; if ((self.nr14 & 0x40) != 0 and self.audio1Length == 0): - self.audio1Length = (SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)); + self.audio1Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)); - self.audio1SweepLength = (SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); + self.audio1SweepLength = (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); self.audio1Volume = self.nr12 >> 4; - self.audio1EnvelopeLength = (SOUND_CLOCK / 64) * (self.nr12 & 0x07); + self.audio1EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr12 & 0x07); def updateAudio1(self): @@ -409,7 +369,7 @@ self.audio1Volume+=1; elif (self.audio1Volume > 0): self.audio1Volume-=1; - self.audio1EnvelopeLength += (SOUND_CLOCK / 64) * (self.nr12 & 0x07); + self.audio1EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr12 & 0x07); if (self.audio1SweepLength > 0): self.audio1SweepLength-=1; if (self.audio1SweepLength <= 0): @@ -428,7 +388,7 @@ self.audio1Frequency = 0; self.nr52 &= ~0x01; - self.audio1SweepLength += (SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); + self.audio1SweepLength += (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); def mixAudio1(self, buffer, length): @@ -474,7 +434,7 @@ def setAudio2Length(self, data): self.nr21 = data; - self.audio2Length = (SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); + self.audio2Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); def setAudio2Envelope(self, data): @@ -504,10 +464,10 @@ self.nr52 |= 0x02; if ((self.nr24 & 0x40) != 0 and self.audio2Length == 0): - self.audio2Length = (SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); + self.audio2Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); self.audio2Volume = self.nr22 >> 4; - self.audio2EnvelopeLength = (SOUND_CLOCK / 64) * (self.nr22 & 0x07); + self.audio2EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr22 & 0x07); @@ -526,7 +486,7 @@ self.audio2Volume+=1; elif (self.audio2Volume > 0): self.audio2Volume-=1; - self.audio2EnvelopeLength += (SOUND_CLOCK / 64) * (self.nr22 & 0x07); + self.audio2EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr22 & 0x07); def mixAudio2(self, buffer, length): @@ -583,7 +543,7 @@ def setAudio3Length(self, data): self.nr31 = data; - self.audio3Length = (SOUND_CLOCK / 256) * (256 - self.nr31); + self.audio3Length = (constants.SOUND_CLOCK / 256) * (256 - self.nr31); def setAudio3Level(self, data): @@ -603,7 +563,7 @@ if ((self.nr34 & 0x80) != 0 and (self.nr30 & 0x80) != 0): self.nr52 |= 0x04; if ((self.nr34 & 0x40) != 0 and self.audio3Length == 0): - self.audio3Length = (SOUND_CLOCK / 256) * (256 - self.nr31); + self.audio3Length = (constants.SOUND_CLOCK / 256) * (256 - self.nr31); @@ -667,7 +627,7 @@ def setAudio4Length(self, data): self.nr41 = data; - self.audio4Length = (SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); + self.audio4Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); def setAudio4Envelope(self, data): @@ -695,10 +655,10 @@ self.nr52 |= 0x08; if ((self.nr44 & 0x40) != 0 and self.audio4Length == 0): - self.audio4Length = (SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); + self.audio4Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); self.audio4Volume = self.nr42 >> 4; - self.audio4EnvelopeLength = (SOUND_CLOCK / 64) * (self.nr42 & 0x07); + self.audio4EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr42 & 0x07); self.audio4Index = 0; @@ -720,7 +680,7 @@ elif (self.audio4Volume > 0): self.audio4Volume-=1; - self.audio4EnvelopeLength += (SOUND_CLOCK / 64) * (self.nr42 & 0x07); + self.audio4EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr42 & 0x07); def mixAudio4(self, buffer, length): @@ -782,7 +742,7 @@ # frequency = (4194304 / 32) / (2048 - period) Hz for period in range(0, 2048): - skip = (((GAMEBOY_CLOCK << 10) / sampleRate) << (22 - 8)) / (2048 - period); + skip = (((constants.GAMEBOY_CLOCK << 10) / sampleRate) << (22 - 8)) / (2048 - period); if (skip >= (32 << 22)): self.frequencyTable[period] = 0; else: @@ -796,7 +756,7 @@ divider = 1 if ratio != 0: divider = 2 * ratio - self.noiseFreqRatioTable[ratio] = (GAMEBOY_CLOCK / divider) * ((1 << 16) / sampleRate); + self.noiseFreqRatioTable[ratio] = (constants.GAMEBOY_CLOCK / divider) * ((1 << 16) / sampleRate); Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py Thu Mar 13 13:57:30 2008 @@ -6,32 +6,6 @@ class Timer(object): - # Gameboy Clock Speed (1048576 Hz) - - GAMEBOY_CLOCK = 1 << 20; - - - # DIV Timer Speed (16384 Hz) - - DIV_CLOCK = GAMEBOY_CLOCK >> 14; - - - # Timer Clock Speeds (4096, 262144, 65536 and 16384 Hz) - - TIMER_CLOCK = [ GAMEBOY_CLOCK >> 12, - GAMEBOY_CLOCK >> 18, - GAMEBOY_CLOCK >> 16, - GAMEBOY_CLOCK >> 14 ]; - - - # Timer Register Addresses - - DIV = 0xFF04 # Divider Register */ - TIMA = 0xFF05 # Timer Counter */ - TMA = 0xFF06 # Timer Modulo */ - TAC = 0xFF07 # Timer Control */ - - # Registers #int div = 0; @@ -54,31 +28,31 @@ def reset(self): self.div = 0; - self.dividerCycles = DIV_CLOCK; + self.dividerCycles = constants.DIV_CLOCK; self.tima = self.tma = self.tac = 0x00; - self.timerCycles = self.timerClock = TIMER_CLOCK[self.tac & 0x03]; + self.timerCycles = self.timerClock = constants.TIMER_CLOCK[self.tac & 0x03]; def write(self, address, data): - if address==DIV: + if address==constants.DIV: self.setDivider(data); - elif address==TIMA: + elif address==constants.TIMA: self.setTimerCounter(data); - elif address==TMA: + elif address==constants.TMA: self.setTimerModulo(data); - elif address==TAC: + elif address==constants.TAC: self.setTimerControl(data); def read(self, address): - if address==DIV: + if address==constants.DIV: return self.getDivider(); - elif address==TIMA: + elif address==constants.TIMA: return self.getTimerCounter(); - elif address==TMA: + elif address==constants.TMA: return self.getTimerModulo(); - elif address==TAC: + elif address==constants.TAC: return self.getTimerControl(); return 0xFF; @@ -98,7 +72,7 @@ def setTimerControl(self, data): if ((self.tac & 0x03) != (data & 0x03)): - self.timerCycles = self.timerClock = TIMER_CLOCK[data & 0x03]; + self.timerCycles = self.timerClock = constants.TIMER_CLOCK[data & 0x03]; self.tac = data; @@ -133,7 +107,7 @@ self.dividerCycles -= ticks; while (self.dividerCycles <= 0): self.div = (self.div + 1) & 0xFF; - self.dividerCycles += DIV_CLOCK; + self.dividerCycles += constants.DIV_CLOCK; @@ -147,5 +121,5 @@ if (self.tima == 0x00): self.tima = self.tma; - self.interrupt.raiseInterrupt(Interrupt.TIMER); + self.interrupt.raiseInterrupt(constants.TIMER); Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Thu Mar 13 13:57:30 2008 @@ -1,82 +1,20 @@ """ Mario GameBoy (TM) Emulator - LCD Video Display Processor + constants.LCD Video Display Processor """ +from pypy.lang.gameboy import constants class Video(object): - # LCD Register Addresses - LCDC = 0xFF40 #LCD Control */ - STAT = 0xFF41 #LCD Status */ - SCY = 0xFF42 #BG Scroll Y (0-255) */ - SCX = 0xFF43 #BG Scroll X (0-255) */ - LY = 0xFF44 #LCDC Y-Coordinate (0-153) */ - LYC = 0xFF45 #LY Compare */ - DMA = 0xFF46 #OAM DMA Transfer */ - BGP = 0xFF47 #BG Palette Data */ - OBP0 = 0xFF48 #Object Palette 0 Data */ - OBP1 = 0xFF49 #Object Palette 1 Data */ - WY = 0xFF4A #Window Y Position (0-143) */ - WX = 0xFF4B #Window X Position (0-166) */ - - # OAM Register Addresses - OAM_ADDR = 0xFE00; - # OAM Object Attribute Map - # (FE00..FE9F) - OAM_SIZE = 0xA0 - - # Video RAM Addresses - VRAM_ADDR = 0x8000 #8KB Video RAM (8000..9FFF) */ - VRAM_SIZE = 0x2000 - - # VRAM Tile Data/Maps Addresses - VRAM_DATA_A = 0x0000 - # 4KB Tile Data - # (8000..8FFF) - - VRAM_DATA_B = 0x0800 - # 4KB Tile Data - # (8800..97FF) - - - VRAM_MAP_A = 0x1800 - # 1KB BG Tile Map 0 - # (9800..9BFF) - - VRAM_MAP_B = 0x1C00 - # 1KB BG Tile Map 1 - # (9C00..9FFF) - - - # Gameboy Clock Speed (1048576 Hz) - GAMEBOY_CLOCK = 1 << 20 - - # LCD Mode Durations - MODE_0_TICKS = 50 #H-Blank */ - MODE_1_TICKS = 114 #V-Blank */ - MODE_2_TICKS = 20 #OAM */ - MODE_3_BEGIN_TICKS = 12 #Display */ - MODE_3_END_TICKS = 32 #Display */ - MODE_1_BEGIN_TICKS = 8 #V-Blank Line 144 */ - MODE_1_END_TICKS = 1 #V-Blank Line 153 */ - - # Objects per Line - OBJECTS_PER_LINE = 10 - - # LCD Color Palette - COLOR_MAP = [ 0x9CB916, 0x8CAA14, 0x306430, 0x103F10 - # 0xE0F8D0, 0x88C070, 0x386850, 0x081820 - # 0xFFFFFF, 0xAAAAAA, 0x555555, 0x000000 - ] - # OAM Registers + # constants.OAM Registers oam = [] #= new byte[OAM_SIZE] - # Video RAM + # Video constants.RAM vram = []#= new byte[VRAM_SIZE] - # LCD Registers int + # constants.LCD Registers int lcdc = 0 stat = 0 scy = 0 @@ -102,7 +40,7 @@ vblank = False dirty = False - # Line Buffer, OAM Cache and Color Palette + # Line Buffer, constants.OAM Cache and Color Palette line = []#= new int[8 + 160 + 8] objects = []#= new int[OBJECTS_PER_LINE] palette = []#= new int[1024] @@ -133,7 +71,7 @@ def reset(self): - self.cycles = MODE_2_TICKS + self.cycles = constants.MODE_2_TICKS self.lcdc = 0x91 self.stat = 2 @@ -152,79 +90,79 @@ self.vblank = True self.dirty = True - for index in range(0, VRAM_SIZE): + for index in range(0, constants.VRAM_SIZE): self.vram[index] = 0x00 - for index in range(0, OAM_SIZE): + for index in range(0, constants.OAM_SIZE): self.oam[index] = 0x00 def write(self, address, data): # assert data >= 0x00 and data <= 0xFF - if address == LCDC : + if address == constants.LCDC : self.setControl(data) - elif address == STAT: + elif address == constants.STAT: self.setStatus(data) - elif address == SCY: + elif address == constants.SCY: self.setScrollY(data) - elif address == SCX: + elif address == constants.SCX: self.setScrollX(data) - elif address == LY: + elif address == constants.LY: # Read Only pass - elif address == LYC: + elif address == constants.LYC: self.setLYCompare(data) - elif address == DMA: + elif address == constants.DMA: self.setDMA(data) - elif address == BGP: + elif address == constants.BGP: self.setBackgroundPalette(data) - elif address == OBP0: + elif address == constants.OBP0: self.setObjectPalette0(data) - elif address == OBP1: + elif address == constants.OBP1: self.setObjectPalette1(data) - elif address == WY: + elif address == constants.WY: self.setWindowY(data) - elif address == WX: + elif address == constants.WX: self.setWindowX(data) else: - if (address >= OAM_ADDR and address < OAM_ADDR + OAM_SIZE): + if (address >= constants.OAM_ADDR and address < constants.OAM_ADDR + constants.OAM_SIZE): #TODO convert to byte - self.oam[address - OAM_ADDR] = data - elif (address >= VRAM_ADDR and address < VRAM_ADDR + VRAM_SIZE): + self.oam[address - constants.OAM_ADDR] = data + elif (address >= constants.VRAM_ADDR and address < constants.VRAM_ADDR + constants.VRAM_SIZE): #TODO convert to byte - self.vram[address - VRAM_ADDR] =data + self.vram[address - constants.VRAM_ADDR] =data def read(self, address): - if address == LCDC: + if address == constants.LCDC: return self.getControl() - elif address == STAT: + elif address == constants.STAT: return self.getStatus() - elif address == SCY: + elif address == constants.SCY: return self.getScrollY() - elif address == SCX: + elif address == constants.SCX: return self.getScrollX() - elif address == LY: + elif address == constants.LY: return self.getLineY() - elif address == LYC: + elif address == constants.LYC: return self.getLineYCompare() - elif address == DMA: + elif address == constants.DMA: return self.getDMA() - elif address == BGP: + elif address == constants.BGP: return self.getBackgroundPalette() - elif address == OBP0: + elif address == constants.OBP0: return self.getObjectPalette0() - elif address == OBP1: + elif address == constants.OBP1: return self.getObjectPalette1() - elif address == WY: + elif address == constants.WY: return self.getWindowY() - elif address == WX: + elif address == constants.WX: return self.getWindowX() else: - if (address >= OAM_ADDR and address < OAM_ADDR + OAM_SIZE): - return self.oam[address - OAM_ADDR] & 0xFF - elif (address >= VRAM_ADDR and address < VRAM_ADDR + VRAM_SIZE): - return self.vram[address - VRAM_ADDR] & 0xFF + if (address >= constants.OAM_ADDR and address < constants.OAM_ADDR + constants.OAM_SIZE): + return self.oam[address - constants.OAM_ADDR] & 0xFF + elif (address >= constants.VRAM_ADDR and address < constants.VRAM_ADDR + constants.VRAM_SIZE): + return self.vram[address - constants.VRAM_ADDR] & 0xFF return 0xFF @@ -297,16 +235,16 @@ def setControl(self, data): if ((self.lcdc & 0x80) != (data & 0x80)): - # NOTE: do not reset LY=LYC flag (bit 2) of the STAT register (Mr. + # constants.NOTE: do not reset constants.LY=LYC flag (bit 2) of the constants.STAT register (Mr. # Do!) if ((data & 0x80) != 0): self.stat = (self.stat & 0xFC) | 0x02 - self.cycles = MODE_2_TICKS + self.cycles = constants.MODE_2_TICKS self.ly = 0 self.display = False else: self.stat = (self.stat & 0xFC) | 0x00 - self.cycles = MODE_1_TICKS + self.cycles = constants.MODE_1_TICKS self.ly = 0 self.clearFrame() @@ -323,7 +261,7 @@ self.stat = (self.stat & 0x87) | (data & 0x78) # Gameboy Bug if ((self.lcdc & 0x80) != 0 and (self.stat & 0x03) == 0x01 and (self.stat & 0x44) != 0x44): - self.interrupt.raiseInterrupt(Interrupt.LCD) + self.interrupt.raiseInterrupt(constants.LCD) def setScrollY(self, data): @@ -338,20 +276,20 @@ self.lyc = data if ((self.lcdc & 0x80) != 0): if (self.ly == self.lyc): - # NOTE: raise interrupt once per line (Prehistorik Man, The + # constants.NOTE: raise interrupt once per line (Prehistorik Man, The # Jetsons, Muhammad Ali) if ((self.stat & 0x04) == 0): - # LYC=LY interrupt + # constants.LYC=LY interrupt self.stat |= 0x04 if ((self.stat & 0x40) != 0): - self.interrupt.raiseInterrupt(Interrupt.LCD) + self.interrupt.raiseInterrupt(constants.LCD) else: self.stat &= 0xFB def setDMA(self, data): self.dma = data - for index in range(0, OAM_SIZE): + for index in range(0, constants.OAM_SIZE): #TODO convert to byte self.oam[index] = self.memory.read((self.dma << 8) + index) @@ -384,7 +322,7 @@ def emulateOAM(self): self.stat = (self.stat & 0xFC) | 0x03 - self.cycles += MODE_3_BEGIN_TICKS + self.cycles += constants.MODE_3_BEGIN_TICKS self.transfer = True @@ -393,32 +331,32 @@ if (self.display): self.drawLine() self.stat = (self.stat & 0xFC) | 0x03 - self.cycles += MODE_3_END_TICKS + self.cycles += constants.MODE_3_END_TICKS self.transfer = False else: self.stat = (self.stat & 0xFC) | 0x00 - self.cycles += MODE_0_TICKS + self.cycles += constants.MODE_0_TICKS # H-Blank interrupt if ((self.stat & 0x08) != 0 and (self.stat & 0x44) != 0x44): - self.interrupt.raiseInterrupt(Interrupt.LCD) + self.interrupt.raiseInterrupt(constants.LCD) def emulateHBlank(self): self.ly+=1 if (self.ly == self.lyc): - # LYC=LY interrupt + # constants.LYC=LY interrupt self.stat |= 0x04 if ((self.stat & 0x40) != 0): - self.interrupt.raiseInterrupt(Interrupt.LCD) + self.interrupt.raiseInterrupt(constants.LCD) else: self.stat &= 0xFB if (self.ly < 144): self.stat = (self.stat & 0xFC) | 0x02 - self.cycles += MODE_2_TICKS - # OAM interrupt + self.cycles += constants.MODE_2_TICKS + # constants.OAM interrupt if ((self.stat & 0x20) != 0 and (self.stat & 0x44) != 0x44): - self.interrupt.raiseInterrupt(Interrupt.LCD) + self.interrupt.raiseInterrupt(constants.LCD) else: if (self.display): self.drawFrame() @@ -430,7 +368,7 @@ self.display = False self.stat = (self.stat & 0xFC) | 0x01 - self.cycles += MODE_1_BEGIN_TICKS + self.cycles += constants.MODE_1_BEGIN_TICKS self.vblank = True @@ -439,35 +377,35 @@ self.vblank = False self.stat = (self.stat & 0xFC) | 0x01 - self.cycles += MODE_1_TICKS - MODE_1_BEGIN_TICKS + self.cycles += constants.MODE_1_TICKS - constants.MODE_1_BEGIN_TICKS # V-Blank interrupt if ((self.stat & 0x10) != 0): - self.interrupt.raiseInterrupt(Interrupt.LCD) + self.interrupt.raiseInterrupt(constants.LCD) # V-Blank interrupt - self.interrupt.raiseInterrupt(Interrupt.VBLANK) + self.interrupt.raiseInterrupt(constants.VBLANK) elif (self.ly == 0): self.stat = (self.stat & 0xFC) | 0x02 - self.cycles += MODE_2_TICKS - # OAM interrupt + self.cycles += constants.MODE_2_TICKS + # constants.OAM interrupt if ((self.stat & 0x20) != 0 and (self.stat & 0x44) != 0x44): - self.interrupt.raiseInterrupt(Interrupt.LCD) + self.interrupt.raiseInterrupt(constants.LCD) else: if (self.ly < 153): self.ly+=1 self.stat = (self.stat & 0xFC) | 0x01 if (self.ly == 153): - self.cycles += MODE_1_END_TICKS + self.cycles += constants.MODE_1_END_TICKS else: - self.cycles += MODE_1_TICKS + self.cycles += constants.MODE_1_TICKS else: self.ly = self.wly = 0 self.stat = (self.stat & 0xFC) | 0x01 - self.cycles += MODE_1_TICKS - MODE_1_END_TICKS + self.cycles += constants.MODE_1_TICKS - constants.MODE_1_END_TICKS if (self.ly == self.lyc): - # LYC=LY interrupt + # constants.LYC=LY interrupt self.stat |= 0x04 if ((self.stat & 0x40) != 0): - self.interrupt.raiseInterrupt(Interrupt.LCD) + self.interrupt.raiseInterrupt(constants.LCD) else: self.stat &= 0xFB @@ -502,12 +440,12 @@ y = (self.scy + self.ly) & 0xFF x = self.scx & 0xFF - tileMap = VRAM_MAP_A + tileMap = constants.VRAM_MAP_A if (self.lcdc & 0x08) != 0: - tileMap = VRAM_MAP_B - tileData = VRAM_DATA_B + tileMap = constants.VRAM_MAP_B + tileData = constants.VRAM_DATA_B if (self.lcdc & 0x10) != 0: - tileData = VRAM_DATA_A + tileData = constants.VRAM_DATA_A tileMap += ((y >> 3) << 5) + (x >> 3) tileData += (y & 7) << 1 @@ -516,12 +454,12 @@ def drawWindow(self): if (self.ly >= self.wy and self.wx < 167 and self.wly < 144): - tileMap = VRAM_MAP_A + tileMap = constants.VRAM_MAP_A if (self.lcdc & 0x40) != 0: - tileMap = VRAM_MAP_B - tileData = VRAM_DATA_B + tileMap = constants.VRAM_MAP_B + tileData = constants.VRAM_DATA_B if (self.lcdc & 0x10) != 0: - tileData = VRAM_DATA_A + tileData = constants.VRAM_DATA_A tileMap += (self.wly >> 3) << 5 tileData += (self.wly & 7) << 1 @@ -574,7 +512,7 @@ if ((flags & 0x40) != 0): y = 7 - y self.objects[count] = (x << 24) + (count << 20) + (flags << 12) + ((tile << 4) + (y << 1)) - if (++count >= OBJECTS_PER_LINE): + if (++count >= constants.OBJECTS_PER_LINE): break self.sortScanObject(count) return count @@ -765,24 +703,24 @@ pixels = self.driver.getPixels() length = self.driver.getWidth() * self.driver.getHeight() for offset in range(0, length): - pixels[offset] = COLOR_MAP[0] + pixels[offset] = constants.COLOR_MAP[0] def updatePalette(self): if (not self.dirty): return - # bit 4/0 = BG color, bit 5/1 = OBJ color, bit 2 = OBJ palette, bit - # 3 = OBJ priority + # bit 4/0 = constants.BG color, bit 5/1 = constants.OBJ color, bit 2 = constants.OBJ palette, bit + # 3 = constants.OBJ priority for pattern in range(0, 64): #color if ((pattern & 0x22) == 0 or ((pattern & 0x08) != 0 and (pattern & 0x11) != 0)): - # OBJ behind BG color 1-3 + # constants.OBJ behind constants.BG color 1-3 color = (self.bgp >> ((((pattern >> 3) & 0x02) + (pattern & 0x01)) << 1)) & 0x03 - # OBJ above BG + # constants.OBJ above constants.BG elif ((pattern & 0x04) == 0): color = (self.obp0 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03 else: color = (self.obp1 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03 - self.palette[((pattern & 0x30) << 4) + (pattern & 0x0F)] = COLOR_MAP[color] + self.palette[((pattern & 0x30) << 4) + (pattern & 0x0F)] = constants.COLOR_MAP[color] self.dirty = False From tverwaes at codespeak.net Thu Mar 13 14:03:07 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Thu, 13 Mar 2008 14:03:07 +0100 (CET) Subject: [pypy-svn] r52446 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080313130307.789C3169F76@codespeak.net> Author: tverwaes Date: Thu Mar 13 14:03:06 2008 New Revision: 52446 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py Log: more constants Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Thu Mar 13 14:03:06 2008 @@ -1,4 +1,4 @@ -# CATRIGE TYPES +# constants.CATRIGE constants.TYPES # ___________________________________________________________________________ from pypy.lang.gameboy import constants @@ -15,12 +15,12 @@ def hasCartridgeType(self, catridgeType): - return CATRIDGE_TYPE_MAPPING.has_key(cartridgeType); + return constants.CATRIDGE_TYPE_MAPPING.has_key(cartridgeType); def createBankController(self, cartridgeType, rom, ram, clock): if hasCartridgeType(cartridgeType): - return CATRIDGE_TYPE_MAPPING[cartridgeType](rom, ram, clock); + return constants.CATRIDGE_TYPE_MAPPING[cartridgeType](rom, ram, clock); else: raise InvalidMemoryBankTypeError("Unsupported memory bank controller (0x"+hex(cartridgeType)+")") @@ -35,17 +35,6 @@ class Cartridge(object): - CARTRIDGE_TYPE_ADDRESS = 0x0147 - ROM_SIZE_ADDRESS = 0x0148 - RAM_SIZE_ADDRESS = 0x0149 - RAM_SIZE_MAPPING = {0x00:0, 0x01:8192, 0x02:8192, 0x03:32768} - DESTINATION_CODE_ADDRESS = 0x014A - LICENSEE_ADDRESS = 0x014B - ROM_VERSION_ADDRESS = 0x014C - HEADER_CHECKSUM_ADDRESS = 0x014D - CHECKSUM_A_ADDRESS = 0x014E - CHECKSUM_B_ADDRESS = 0x014F - def __init__(self, storeDriver, clockDriver): self.store = storeDriver self.clock = clockDriver @@ -60,7 +49,7 @@ def getCartridgeType(self): - return self.rom[CARTRIDGE_TYPE_ADDRESS] & 0xFF + return self.rom[constants.CARTRIDGE_TYPE_ADDRESS] & 0xFF def getRom(self): @@ -68,34 +57,34 @@ def getROMSize(self): - romSize = self.rom[CARTRIDGE_SIZE_ADDRESS] & 0xFF + romSize = self.rom[constants.CARTRIDGE_SIZE_ADDRESS] & 0xFF if romSize>=0x00 and romSize<=0x07: return 32768 << romSize return -1 def getRAMSize(self): - return RAM_SIZE_MAPPING[self.rom[RAM_SIZE_ADDRESS]] + return constants.RAM_SIZE_MAPPING[self.rom[constants.RAM_SIZE_ADDRESS]] def getDestinationCode(self): - return self.rom[DESTINATION_CODE_ADDRESS] & 0xFF; + return self.rom[constants.DESTINATION_CODE_ADDRESS] & 0xFF; def getLicenseeCode(): - return self.rom[LICENSEE_ADDRESS] & 0xFF; + return self.rom[constants.LICENSEE_ADDRESS] & 0xFF; def getROMVersion(self): - return self.rom[ROM_VERSION_ADDRESS] & 0xFF; + return self.rom[constants.ROM_VERSION_ADDRESS] & 0xFF; def getHeaderChecksum(self): - return self.rom[HEADER_CHECKSUM_ADDRESS] & 0xFF; + return self.rom[constants.HEADER_CHECKSUM_ADDRESS] & 0xFF; def getChecksum(self): - return ((rom[CHECKSUM_A_ADDRESS] & 0xFF) << 8) + (rom[CHECKSUM_B_ADDRESS] & 0xFF); + return ((rom[constants.CHECKSUM_A_ADDRESS] & 0xFF) << 8) + (rom[constants.CHECKSUM_B_ADDRESS] & 0xFF); def hasBattery(self): @@ -173,12 +162,7 @@ # CARTRIDGE TYPES class MBC(object): - #ROM Bank Size (16KB) - ROM_BANK_SIZE = 0x4000 - - # RAM Bank Size (8KB) - RAM_BANK_SIZE = 0x2000 - + ramEnable = False rom = [] @@ -193,35 +177,35 @@ minRamBankSize = 0 maxRamBankSize = 0 - romBank = ROM_BANK_SIZE + romBank = constants.ROM_BANK_SIZE ramBank = 0 def reset(self): - self.romBank = ROM_BANK_SIZE; + self.romBank = constants.ROM_BANK_SIZE; self.ramBank = 0; self.ramEnable = False; def setROM(self, buffer): - banks = len(buffer) / ROM_BANK_SIZE; + banks = len(buffer) / constants.ROM_BANK_SIZE; if (banks < minRomBankSize or banks > maxRomBankSize): - raise Exception("Invalid ROM size"); + raise Exception("Invalid constants.ROM size"); self.rom = buffer; - self.romSize = ROM_BANK_SIZE*banks - 1; + self.romSize = constants.ROM_BANK_SIZE*banks - 1; def setRAM(buffer): - banks = len(buffer) / RAM_BANK_SIZE; + banks = len(buffer) / constants.RAM_BANK_SIZE; if (banks < minRamBankSize or banks > maxRamBankSize): - raise Exception("Invalid RAM size"); + raise Exception("Invalid constants.RAM size"); self.ram = buffer; - self.ramSize = RAM_BANK_SIZE*banks - 1; + self.ramSize = constants.RAM_BANK_SIZE*banks - 1; """ Mario GameBoy (TM) Emulator -Memory Bank Controller 1 (2MB ROM, 32KB RAM) +Memory Bank Controller 1 (2MB constants.ROM, 32KB constants.RAM) 0000-3FFF ROM Bank 0 (16KB) 4000-7FFF ROM Bank 1-127 (16KB) @@ -292,7 +276,7 @@ """ Mario GameBoy (TM) Emulator -Memory Bank Controller 2 (256KB ROM, 512x4bit RAM) +Memory Bank Controller 2 (256KB constants.ROM, 512x4bit constants.RAM) 0000-3FFF ROM Bank 0 (16KB) 4000-7FFF ROM Bank 1-15 (16KB) @@ -303,8 +287,8 @@ RAM_BANK_SIZE = 512; def __init__(self, rom, ram): - self.minRamBankSize = RAM_BANK_SIZE - self.maxRamBankSize = RAM_BANK_SIZE + self.minRamBankSize = constants.RAM_BANK_SIZE + self.maxRamBankSize = constants.RAM_BANK_SIZE self.minRomBankSize = 2 self.maxRomBankSize = 16 @@ -349,7 +333,7 @@ """ Mario GameBoy (TM) Emulator -Memory Bank Controller 3 (2MB ROM, 32KB RAM, Real Time Clock) +Memory Bank Controller 3 (2MB constants.ROM, 32KB constants.RAM, Real Time Clock) 0000-3FFF ROM Bank 0 (16KB) 4000-7FFF ROM Bank 1-127 (16KB) @@ -452,7 +436,7 @@ # A000-BFFF if (self.ramEnable): if (self.ramBank >= 0): - # TODO conversion to byte + # constants.TODO conversion to byte self.ram[self.ramBank + (address & 0x1FFF)] = data; else: self.updateClock(); @@ -522,7 +506,7 @@ """ Mario GameBoy (TM) Emulator -Memory Bank Controller 5 (8MB ROM, 128KB RAM) +Memory Bank Controller 5 (8MB constants.ROM, 128KB constants.RAM) * 0000-3FFF ROM Bank 0 (16KB) 4000-7FFF ROM Bank 1-511 (16KB) @@ -596,7 +580,7 @@ """ Mario GameBoy (TM) Emulator -Hudson Memory Bank Controller 3 (2MB ROM, 128KB RAM, RTC) +Hudson Memory Bank Controller 3 (2MB constants.ROM, 128KB constants.RAM, constants.RTC) 0000-3FFF ROM Bank 0 (16KB) 4000-7FFF ROM Bank 1-127 (16KB) Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py Thu Mar 13 14:03:06 2008 @@ -38,6 +38,23 @@ TYPE_HUC3_RTC_RAM = 0xFE TYPE_HUC1_RAM_BATTERY = 0xFF +CARTRIDGE_TYPE_ADDRESS = 0x0147 +ROM_SIZE_ADDRESS = 0x0148 +RAM_SIZE_ADDRESS = 0x0149 +RAM_SIZE_MAPPING = {0x00:0, 0x01:8192, 0x02:8192, 0x03:32768} +DESTINATION_CODE_ADDRESS = 0x014A +LICENSEE_ADDRESS = 0x014B +ROM_VERSION_ADDRESS = 0x014C +HEADER_CHECKSUM_ADDRESS = 0x014D +CHECKSUM_A_ADDRESS = 0x014E +CHECKSUM_B_ADDRESS = 0x014F + + #ROM Bank Size (16KB) +ROM_BANK_SIZE = 0x4000 + +# constants.RAM Bank Size (8KB) +RAM_BANK_SIZE = 0x2000 + # ___________________________________________________________________________ # CPU FLAGS # ___________________________________________________________________________ @@ -207,4 +224,4 @@ DIV = 0xFF04 # Divider Register */ TIMA = 0xFF05 # Timer Counter */ TMA = 0xFF06 # Timer Modulo */ -TAC = 0xFF07 # Timer Control */ \ No newline at end of file +TAC = 0xFF07 # Timer Control */ From tverwaes at codespeak.net Thu Mar 13 14:21:02 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Thu, 13 Mar 2008 14:21:02 +0100 (CET) Subject: [pypy-svn] r52447 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080313132102.5B193169F6E@codespeak.net> Author: tverwaes Date: Thu Mar 13 14:21:02 2008 New Revision: 52447 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py Log: use if anyway... too much space wasted otherwise Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py Thu Mar 13 14:21:02 2008 @@ -8,192 +8,147 @@ class GameBoy(object): - # RAM - ram = None; - cartridge = None; - interrupt = None; - cpu = None; - serial = None; - timer = None; - joypad = None; - video = None; - sound = None; - - def __init__(self, videoDriver, soundDriver, joypadDriver, storeDriver, clockDriver): - self.ram = RAM(); - self.cartridge = Cartridge(storeDriver, clockDriver); - self.interrupt = Interrupt(); - self.cpu = CPU(self.interrupt, this); - self.serial = Serial(self.interrupt); - self.timer = Timer(self.interrupt); - self.joypad = Joypad(joypadDriver, self.interrupt); - self.video = Video(videoDriver, self.interrupt, this); - self.sound = Sound(soundDriver); - - - def getCartridge(self): - return self.cartridge; - - - def getFrameSkip(self): - return self.video.getFrameSkip(); - - - def setFrameSkip(self, frameSkip): - self.video.setFrameSkip(frameSkip); - - - def load(self, cartridgeName): - self.cartridge.load(cartridgeName); - - - def save(self, cartridgeName): - self.cartridge.save(cartridgeName); - - - def start(self): - self.sound.start(); - - - def stop(self): - self.sound.stop(); - - - def reset(self): - self.ram.reset(); - self.cartridge.reset(); - self.interrupt.reset(); - self.cpu.reset(); - self.serial.reset(); - self.timer.reset(); - self.joypad.reset(); - self.video.reset(); - self.sound.reset(); - self.cpu.setROM(self.cartridge.getROM()); - self.drawLogo(); - - - def cycles(self): - return min(self.video.cycles(), self.serial.cycles(), - self.timer.cycles(), self.sound.cycles(), - self.joypad.cycles()); - - - def emulate(self, ticks): - while (ticks > 0): - count = self.cycles(); - - self.cpu.emulate(count); - self.serial.emulate(count); - self.timer.emulate(count); - self.video.emulate(count); - self.sound.emulate(count); - self.joypad.emulate(count); - - ticks -= count; - - - - def write(self, address, data): - (0x0000, 0x7FFF,Gameboy.cartridge), - (0x8000, 0x9FFF, Gameboy.video), - (0xA000, 0xBFFF, Gameboy.cartridge), - (0xC000, 0xFDFF, Gameboy.ram), - (0xFE00, 0xFEFF, Gameboy.video), - (0xFF00, 0xFF00, Gameboy.joypad), - (0xFF01, 0xFF02, Gameboy.serial), - (0xFF04, 0xFF07, Gameboy.timer), - (0xFF0F, 0xFF0F, Gameboy.interrupt), - (0xFF10, 0xFF3F, Gameboy.sound), - (0xFF40, 0xFF4B, Gameboy.video), - (0xFF80, 0xFFFE, Gameboy.ram), - (0xFFFF, 0xFFFF, Gameboy.interrupt) -] - - - - def read(self, address): - if (address <= 0x7FFF): - # 0000-7FFF ROM Bank - return self.cartridge.read(address); - elif (address <= 0x9FFF): - # 8000-9FFF Video RAM - return self.video.read(address); - elif (address <= 0xBFFF): - # A000-BFFF External RAM - return self.cartridge.read(address); - elif (address <= 0xFDFF): - # C000-FDFF Work RAM - return self.ram.read(address); - elif (address <= 0xFEFF): - # FE00-FEFF OAM - return self.video.read(address); - elif (address == 0xFF00): - # FF00-FF00 Joypad - return self.joypad.read(address); - elif (address >= 0xFF01 and address <= 0xFF02): - # FF01-FF02 Serial - return self.serial.read(address); - elif (address >= 0xFF04 and address <= 0xFF07): - # FF04-FF07 Timer - return self.timer.read(address); - elif (address == 0xFF0F): - # FF0F-FF0F Interrupt - return self.interrupt.read(address); - elif (address >= 0xFF10 and address <= 0xFF3F): - # FF10-FF3F Sound - return self.sound.read(address); - elif (address >= 0xFF40 and address <= 0xFF4B): - # FF40-FF4B Video - return self.video.read(address); - elif (address >= 0xFF80 and address <= 0xFFFE): - # FF80-FFFE High RAM - return self.ram.read(address); - elif (address == 0xFFFF): - # FFFF-FFFF Interrupt - return self.interrupt.read(address); - else: - return 0xFF; - - - def drawLogo(self): - for index in range(0, 48): - bits = self.cartridge.read(0x0104 + index); - pattern0 = ((bits >> 0) & 0x80) + ((bits >> 1) & 0x60)\ - + ((bits >> 2) & 0x18) + ((bits >> 3) & 0x06)\ - + ((bits >> 4) & 0x01); - - pattern1 = ((bits << 4) & 0x80) + ((bits << 3) & 0x60)\ - + ((bits << 2) & 0x18) + ((bits << 1) & 0x06)\ - + ((bits << 0) & 0x01); - - self.video.write(0x8010 + (index << 3), pattern0); - self.video.write(0x8012 + (index << 3), pattern0); - - self.video.write(0x8014 + (index << 3), pattern1); - self.video.write(0x8016 + (index << 3), pattern1); - - for index in range(0, 8): - self.video.write(0x8190 + (index << 1), constants.REGISTERED_BITMAP[index]); - - for tile in range(0, 12): - self.video.write(0x9904 + tile, tile + 1); - self.video.write(0x9924 + tile, tile + 13); - - self.video.write(0x9905 + 12, 25); - - - (0x0000, 0x7FFF, Gameboy.cartridge), - (0x8000, 0x9FFF, Gameboy.video), - (0xA000, 0xBFFF, Gameboy.cartridge), - (0xC000, 0xFDFF, Gameboy.ram), - (0xFE00, 0xFEFF, Gameboy.video), - (0xFF00, 0xFF00, Gameboy.joypad), - (0xFF01, 0xFF02, Gameboy.serial), - (0xFF04, 0xFF07, Gameboy.timer), - (0xFF0F, 0xFF0F, Gameboy.interrupt), - (0xFF10, 0xFF3F, Gameboy.sound), - (0xFF40, 0xFF4B, Gameboy.video), - (0xFF80, 0xFFFE, Gameboy.ram), - (0xFFFF, 0xFFFF, Gameboy.interrupt) -] + # RAM + ram = None; + cartridge = None; + interrupt = None; + cpu = None; + serial = None; + timer = None; + joypad = None; + video = None; + sound = None; + + def __init__(self, videoDriver, soundDriver, joypadDriver, storeDriver, clockDriver): + self.ram = RAM(); + self.cartridge = Cartridge(storeDriver, clockDriver); + self.interrupt = Interrupt(); + self.cpu = CPU(self.interrupt, this); + self.serial = Serial(self.interrupt); + self.timer = Timer(self.interrupt); + self.joypad = Joypad(joypadDriver, self.interrupt); + self.video = Video(videoDriver, self.interrupt, this); + self.sound = Sound(soundDriver); + + + def getCartridge(self): + return self.cartridge; + + + def getFrameSkip(self): + return self.video.getFrameSkip(); + + + def setFrameSkip(self, frameSkip): + self.video.setFrameSkip(frameSkip); + + + def load(self, cartridgeName): + self.cartridge.load(cartridgeName); + + + def save(self, cartridgeName): + self.cartridge.save(cartridgeName); + + + def start(self): + self.sound.start(); + + + def stop(self): + self.sound.stop(); + + + def reset(self): + self.ram.reset(); + self.cartridge.reset(); + self.interrupt.reset(); + self.cpu.reset(); + self.serial.reset(); + self.timer.reset(); + self.joypad.reset(); + self.video.reset(); + self.sound.reset(); + self.cpu.setROM(self.cartridge.getROM()); + self.drawLogo(); + + + def cycles(self): + return min(self.video.cycles(), self.serial.cycles(), + self.timer.cycles(), self.sound.cycles(), + self.joypad.cycles()); + + + def emulate(self, ticks): + while (ticks > 0): + count = self.cycles(); + + self.cpu.emulate(count); + self.serial.emulate(count); + self.timer.emulate(count); + self.video.emulate(count); + self.sound.emulate(count); + self.joypad.emulate(count); + + ticks -= count; + + + def write(self, address, data): + self.getreceiver(address).write(address, data) + + def read(self, address): + self.getreceiver().read(address) + + def getreceiver(self, address): + if 0x0000 <= address <= 0x7FFF: + return Gameboy.cartridge + elif 0x8000 <= address <= 0x9FFF: + return Gameboy.video + elif 0xA000 <= address <= 0xBFFF: + return Gameboy.cartridge + elif 0xC000 <= address <= 0xFDFF: + return Gameboy.ram + elif 0xFE00 <= address <= 0xFEFF: + return Gameboy.video + elif 0xFF00 <= address <= 0xFF00: + return Gameboy.joypad + elif 0xFF01 <= address <= 0xFF02: + return Gameboy.serial + elif 0xFF04 <= address <= 0xFF07: + return Gameboy.timer + elif 0xFF0F <= address <= 0xFF0F: + return Gameboy.interrupt + elif 0xFF10 <= address <= 0xFF3F: + return Gameboy.sound + elif 0xFF40 <= address <= 0xFF4B: + return Gameboy.video + elif 0xFF80 <= address <= 0xFFFE: + return Gameboy.ram + elif 0xFFFF <= address <= 0xFFFF: + return Gameboy.interrupt + + def drawLogo(self): + for index in range(0, 48): + bits = self.cartridge.read(0x0104 + index); + pattern0 = ((bits >> 0) & 0x80) + ((bits >> 1) & 0x60)\ + + ((bits >> 2) & 0x18) + ((bits >> 3) & 0x06)\ + + ((bits >> 4) & 0x01); + + pattern1 = ((bits << 4) & 0x80) + ((bits << 3) & 0x60)\ + + ((bits << 2) & 0x18) + ((bits << 1) & 0x06)\ + + ((bits << 0) & 0x01); + + self.video.write(0x8010 + (index << 3), pattern0); + self.video.write(0x8012 + (index << 3), pattern0); + + self.video.write(0x8014 + (index << 3), pattern1); + self.video.write(0x8016 + (index << 3), pattern1); + + for index in range(0, 8): + self.video.write(0x8190 + (index << 1), constants.REGISTERED_BITMAP[index]); + + for tile in range(0, 12): + self.video.write(0x9904 + tile, tile + 1); + self.video.write(0x9924 + tile, tile + 13); + + self.video.write(0x9905 + 12, 25); From tverwaes at codespeak.net Thu Mar 13 15:15:28 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Thu, 13 Mar 2008 15:15:28 +0100 (CET) Subject: [pypy-svn] r52448 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080313141528.000B6169F82@codespeak.net> Author: tverwaes Date: Thu Mar 13 15:15:26 2008 New Revision: 52448 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/utility.py Log: fixed typo + removed old comment Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Thu Mar 13 15:15:26 2008 @@ -238,7 +238,7 @@ def lookup(self, selector): look_in_shadow = self - while lookin_shadow is not None: + while look_in_shadow is not None: try: w_method = look_in_shadow.methoddict[selector] # We locally cache the method we found. Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/utility.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/utility.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/utility.py Thu Mar 13 15:15:26 2008 @@ -10,8 +10,6 @@ return w_value.value raise UnwrappingError("expected a W_SmallInteger, got %s" % (w_value,)) -# XXX maybe chars are stored in char-table for uniqueness? This would solve -# the equal problem... def unwrap_char(w_char): from pypy.lang.smalltalk import classtable, objtable, constants w_class = w_char.getclass() From arigo at codespeak.net Thu Mar 13 15:43:04 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 13 Mar 2008 15:43:04 +0100 (CET) Subject: [pypy-svn] r52449 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080313144304.86C7A169F0C@codespeak.net> Author: arigo Date: Thu Mar 13 15:43:04 2008 New Revision: 52449 Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hot_promotion.py - copied, changed from r52444, pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_promotion.py Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: Starting to port the promotion tests. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Thu Mar 13 15:43:04 2008 @@ -843,6 +843,8 @@ self.register_greenvar(result) def handle_global_merge_point_hint(self, op, arg, result): + if self.hannotator.policy.hotpath: + raise JitHintError("'global_merge_point' not supported by hotpath") return # the compute_merge_points function already cared def handle_reverse_split_queue_hint(self, op, arg, result): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Thu Mar 13 15:43:04 2008 @@ -15,12 +15,16 @@ def __init__(self, result): self.result = result -class TestHotPath(test_interpreter.InterpretationTest): +class HotPathTest(test_interpreter.InterpretationTest): type_system = 'lltype' def run(self, main, main_args, threshold, policy=P_HOTPATH, small=False): # xxx caching of tests doesn't work - do we care? self._serialize(main, main_args, policy=policy, backendoptimize=True) + self._rewrite(threshold) + self._run(main, main_args) + + def _rewrite(self, threshold): rewriter = EntryPointsRewriter(self.hintannotator, self.rtyper, self.jitcode, self.RGenOp, self.writer, threshold, self.translate_support_code) @@ -29,6 +33,7 @@ if small and conftest.option.view: self.rtyper.annotator.translator.view() + def _run(self, main, main_args): graph = self.rtyper.annotator.translator.graphs[0] assert graph.func is main llinterp = LLInterpreter( @@ -50,6 +55,8 @@ i += 1 +class TestHotPath(HotPathTest): + def test_simple_loop(self): # there are no greens in this test class MyJitDriver(JitDriver): From arigo at codespeak.net Thu Mar 13 16:39:23 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 13 Mar 2008 16:39:23 +0100 (CET) Subject: [pypy-svn] r52450 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080313153923.8A3A0169F82@codespeak.net> Author: arigo Date: Thu Mar 13 16:39:22 2008 New Revision: 52450 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: Oups. Didn't run the tests after refactoring the test runner :-( Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Thu Mar 13 16:39:22 2008 @@ -21,10 +21,10 @@ def run(self, main, main_args, threshold, policy=P_HOTPATH, small=False): # xxx caching of tests doesn't work - do we care? self._serialize(main, main_args, policy=policy, backendoptimize=True) - self._rewrite(threshold) - self._run(main, main_args) + self._rewrite(threshold, small=small) + return self._run(main, main_args) - def _rewrite(self, threshold): + def _rewrite(self, threshold, small): rewriter = EntryPointsRewriter(self.hintannotator, self.rtyper, self.jitcode, self.RGenOp, self.writer, threshold, self.translate_support_code) From arigo at codespeak.net Thu Mar 13 16:42:42 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 13 Mar 2008 16:42:42 +0100 (CET) Subject: [pypy-svn] r52451 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080313154242.6DFE4169F82@codespeak.net> Author: arigo Date: Thu Mar 13 16:42:42 2008 New Revision: 52451 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: Reduce confusion by only showing the green args in the "jit_compile" trace, as the red args are not used at this point. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Thu Mar 13 16:42:42 2008 @@ -75,7 +75,7 @@ interpreter.debug_trace("jit_not_entered", *args) state.counters[key] = counter return - interpreter.debug_trace("jit_compile", *args) + interpreter.debug_trace("jit_compile", *args[:num_green_args]) if not state.compile(key): return interpreter.debug_trace("run_machine_code", *args) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Thu Mar 13 16:42:42 2008 @@ -94,7 +94,7 @@ "jit_not_entered 14 105", "jit_not_entered 13 119", # on the start of the next iteration, compile the 'total += n1' - "jit_compile 12 132", + "jit_compile", "pause at hotsplit in ll_function", # execute the compiled machine code until the 'n1 <= 1'. # It finishes in the fallback interpreter 7 times @@ -190,7 +190,7 @@ # start compiling the 3rd time we loop back "jit_not_entered * struct rpy_string {...} 5 9 10 10", "jit_not_entered * struct rpy_string {...} 5 8 90 10", - "jit_compile * struct rpy_string {...} 5 7 720 10", + "jit_compile * struct rpy_string {...} 5", # stop compiling at the red split ending an extra iteration "pause at hotsplit in ll_function", # run it, finishing twice through the fallback interp @@ -279,7 +279,7 @@ "jit_not_entered * stru...} 10 70 * array [ 70, 71, 71 ]", "jit_not_entered * stru...} 10 69 * array [ 69, 71, 142 ]", "jit_not_entered * stru...} 10 68 * array [ 68, 71, 213 ]", - "jit_compile * stru...} 10 67 * array [ 67, 71, 284 ]", + "jit_compile * stru...} 10", "pause at hotsplit in hp_interpret", "run_machine_code * stru...} 10 67 * array [ 67, 71, 284 ]", "fallback_interp", From tverwaes at codespeak.net Thu Mar 13 19:21:48 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Thu, 13 Mar 2008 19:21:48 +0100 (CET) Subject: [pypy-svn] r52452 - in pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk: . test Message-ID: <20080313182148.00F22169F37@codespeak.net> Author: tverwaes Date: Thu Mar 13 19:21:47 2008 New Revision: 52452 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_miniimage.py Log: (akuhn, tverwaes) adding comments to the model file Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Thu Mar 13 19:21:47 2008 @@ -1,3 +1,19 @@ +""" +Squeak model. + + W_Object + W_SmallInteger + W_Float + W_AbstractObjectWithIdentityHash + W_AbstractObjectWithClassReference + W_PointersObject + W_BytesObject + W_WordsObject + W_CompiledMethod + +W_BlockContext and W_MethodContext classes have been replaced by functions +that create W_PointersObjects of correct size with attached shadows. +""" import sys from pypy.rlib import rrandom, objectmodel from pypy.rlib.rarithmetic import intmask @@ -7,48 +23,77 @@ from pypy.lang.smalltalk.tool.bitmanipulation import splitter class W_Object(object): + """Root of Squeak model, abstract.""" __slots__ = () # no RPython-level instance variables allowed in W_Object def size(self): + """Return bytesize that conforms to Blue Book. + + The reported size may differ from the actual size in Spy's object +space, as memory representation varies depending on PyPy translation.""" return 0 def varsize(self): + """Return bytesize of variable-sized part. + + Variable sized objects are those created with #new:.""" return self.size() def primsize(self): + # TODO remove this method return self.size() def getclass(self): + """Return Squeak class.""" raise NotImplementedError() def gethash(self): + """Return 31-bit hash value.""" raise NotImplementedError() def at0(self, index0): + """Access variable-sized part, as by Object>>at:. + + Return value depends on layout of instance. Byte objects return bytes, + word objects return words, pointer objects return pointers. Compiled method are + treated special, if index0 within the literalsize returns pointer to literal, + otherwise returns byte (ie byte code indexing starts at literalsize).""" raise NotImplementedError() def atput0(self, index0, w_value): + """Access variable-sized part, as by Object>>at:put:. + + Semantics depend on layout of instance. Byte objects set bytes, + word objects set words, pointer objects set pointers. Compiled method are + treated special, if index0 within the literalsize sets pointer to literal, + otherwise patches bytecode (ie byte code indexing starts at literalsize).""" raise NotImplementedError() def fetch(self, n0): + """Access fixed-size part, maybe also variable-sized part (we have to + consult the Blue Book).""" + # TODO check the Blue Book raise NotImplementedError() def store(self, n0, w_value): + """Access fixed-size part, maybe also variable-sized part (we have to + consult the Blue Book).""" raise NotImplementedError() def invariant(self): return True def shadow_of_my_class(self): + """Return internal representation of Squeak class.""" return self.getclass().as_class_get_shadow() - def pointer_equals(self,other): - return self == other - def equals(self, other): - return self.pointer_equals(other) + """Compare object identity""" + return self == other def become(self, w_old, w_new): + """Exchange object identity.""" + # TODO use PyPy's become pass class W_SmallInteger(W_Object): @@ -138,9 +183,6 @@ return (W_AbstractObjectWithIdentityHash.invariant(self) and isinstance(self.w_class, W_PointersObject)) - def equals(self, w_other): - return self.pointer_equals(w_other) - def become(self, w_old, w_new): if self.w_class == w_old: self.w_class = w_new Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_miniimage.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_miniimage.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_miniimage.py Thu Mar 13 19:21:47 2008 @@ -239,6 +239,7 @@ interp.interpret() def test_compile_method(): + py.test.skip("fails again because of the removed become. should work with new pypy become") sourcecode = """fib ^self < 2 ifTrue: [ 1 ] From tverwaes at codespeak.net Thu Mar 13 20:01:48 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Thu, 13 Mar 2008 20:01:48 +0100 (CET) Subject: [pypy-svn] r52453 - in pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk: . test Message-ID: <20080313190148.565D8169F42@codespeak.net> Author: tverwaes Date: Thu Mar 13 20:01:45 2008 New Revision: 52453 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_shadow.py Log: (akuhn, tverwaes) comments and renamings Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Thu Mar 13 20:01:45 2008 @@ -97,12 +97,15 @@ pass class W_SmallInteger(W_Object): + """Boxed integer value""" + # TODO can we tell pypy that its never larger then 31-bit? __slots__ = ('value',) # the only allowed slot here def __init__(self, value): self.value = value def getclass(self): + """Return SmallInteger from special objects array.""" from pypy.lang.smalltalk.classtable import w_SmallInteger return w_SmallInteger @@ -110,21 +113,24 @@ return self.value def invariant(self): - return isinstance(self.value, int) + return isinstance(self.value, int) and self.value < 0x8000 def __repr__(self): return "W_SmallInteger(%d)" % self.value def equals(self, other): + # TODO what is correct terminology to say that identity is by value? if not isinstance(other, W_SmallInteger): return False return self.value == other.value class W_Float(W_Object): + """Boxed float value.""" def __init__(self, value): self.value = value def getclass(self): + """Return Float from special objects array.""" from pypy.lang.smalltalk.classtable import w_Float return w_Float @@ -140,9 +146,12 @@ def equals(self, other): if not isinstance(other, W_Float): return False + # TODO is that correct in Squeak? return self.value == other.value class W_AbstractObjectWithIdentityHash(W_Object): + """Object with explicit hash (ie all except small + ints and floats).""" #XXX maybe this is too extreme, but it's very random hash_generator = rrandom.Random() UNASSIGNED_HASH = sys.maxint @@ -159,7 +168,8 @@ return isinstance(self.hash, int) class W_AbstractObjectWithClassReference(W_AbstractObjectWithIdentityHash): - """ The base class of objects that store 'w_class' explicitly. """ + """Objects with arbitrary class (ie not CompiledMethod, SmallInteger or + Float).""" def __init__(self, w_class): if w_class is not None: # it's None only for testing @@ -184,17 +194,19 @@ isinstance(self.w_class, W_PointersObject)) def become(self, w_old, w_new): + # TODO to be eventually replaced by PyPy's become if self.w_class == w_old: self.w_class = w_new elif self.w_class == w_new: self.w_class = w_old class W_PointersObject(W_AbstractObjectWithClassReference): - """ The normal object """ + """Common object.""" _shadow = None # Default value def __init__(self, w_class, size): + """Create new object with size = fixed + variable size.""" W_AbstractObjectWithClassReference.__init__(self, w_class) self._vars = [w_nil] * size @@ -208,20 +220,20 @@ def fetch(self, n0): if self._shadow is not None: - self._shadow.check_for_w_updates() + self._shadow.sync_w_self() return self._vars[n0] def store(self, n0, w_value): if self._shadow is not None: - self._shadow.check_for_w_updates() - self._shadow.invalidate() + self._shadow.sync_w_self() + self._shadow.invalidate_shadow() self._vars[n0] = w_value - def fetchvarpointer(self, idx): - return self._vars[idx+self.instsize()] + # def fetchvarpointer(self, idx): + # return self._vars[idx+self.instsize()] - def storevarpointer(self, idx, value): - self._vars[idx+self.instsize()] = value + # def storevarpointer(self, idx, value): + # self._vars[idx+self.instsize()] = value def varsize(self): return self.size() - self.instsize() @@ -251,11 +263,11 @@ shadow = TheClass(self, invalid) self._shadow = shadow elif not isinstance(shadow, TheClass): - shadow.check_for_w_updates() - shadow.invalidate() + shadow.sync_w_self() + shadow.invalidate_shadow() shadow = TheClass(self, invalid) self._shadow = shadow - shadow.check_for_updates() + shadow.sync_shadow() return shadow def get_shadow(self): Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/primitives.py Thu Mar 13 20:01:45 2008 @@ -700,7 +700,7 @@ assert isinstance(w_args, model.W_PointersObject) # Push all the items from the array for i in range(exp_arg_cnt): - s_block_ctx.push(w_args.fetchvarpointer(i)) + s_block_ctx.push(w_args.at0(i)) # XXX Check original logic. Image does not test this anyway # because falls back to value + internal implementation Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/shadow.py Thu Mar 13 20:01:45 2008 @@ -3,7 +3,7 @@ from pypy.tool.pairtype import extendabletype class Invalidateable(object): - def invalidate(self): + def invalidate_shadow(self): pass class AbstractShadow(Invalidateable): @@ -17,7 +17,7 @@ self.invalid = invalid self.w_invalid = False if invalid: - self.invalidate() + self.invalidate_shadow() def notifyinvalid(self, other): self._notifyinvalid += [other] @@ -29,13 +29,13 @@ def getname(self): return repr(self) - def invalidate(self): + def invalidate_shadow(self): """XXX This should get called whenever the base Smalltalk object changes.""" if not self.invalid: self.invalid = True for listener in self._notifyinvalid: - listener.invalidate() + listener.invalidate_shadow() self._notifyinvalid = [] def invalidate_w_self(self): @@ -47,11 +47,11 @@ def w_self(self): return self._w_self - def check_for_w_updates(self): + def sync_w_self(self): if self.w_invalid: self.update_w_self() - def check_for_updates(self): + def sync_shadow(self): if self.invalid: self.update_shadow() @@ -84,8 +84,8 @@ def __init__(self, w_self, invalid): AbstractShadow.__init__(self, w_self, invalid) - def invalidate(self): - AbstractShadow.invalidate(self) + def invalidate_shadow(self): + AbstractShadow.invalidate_shadow(self) self.methoddict = {} self.s_superclass = None # the ClassShadow of the super class self.name = None @@ -259,7 +259,7 @@ def __init__(self, w_self, invalid): AbstractShadow.__init__(self, w_self, invalid) - def invalidate(self): + def invalidate_shadow(self): self.methoddict = {} def update_shadow(self): @@ -581,11 +581,11 @@ self._s_home = None ContextPartShadow.__init__(self, w_self, invalid) - def invalidate(self): + def invalidate_shadow(self): if self._s_home is not None: self._s_home.unnotify(self) self._s_home = None - AbstractShadow.invalidate(self) + AbstractShadow.invalidate_shadow(self) def update_shadow(self): self.store_w_home(self.w_self()._vars[constants.BLKCTX_HOME_INDEX]) Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/squeakimage.py Thu Mar 13 20:01:45 2008 @@ -332,7 +332,7 @@ w_pointersobject.w_class = self.g_class.w_object w_pointersobject.hash = self.chunk.hash12 if w_pointersobject._shadow is not None: - w_pointersobject._shadow.invalidate() + w_pointersobject._shadow.invalidate_shadow() def fillin_wordsobject(self, w_wordsobject): w_wordsobject.words = self.chunk.data Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py Thu Mar 13 20:01:45 2008 @@ -61,7 +61,7 @@ lstlen = len(lit) res = classtable.w_Array.as_class_get_shadow().new(lstlen) for i in range(lstlen): - res.storevarpointer(i, fakeliteral(lit[i])) + res.atput0(i, fakeliteral(lit[i])) return res return lit return [fakeliteral(lit) for lit in literals] Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_shadow.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_shadow.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_shadow.py Thu Mar 13 20:01:45 2008 @@ -229,7 +229,7 @@ assert s_object2.key() == w_o1 assert s_object2.value() == w_o2 assert w_object._shadow == s_object2 - s_object.check_for_updates() + s_object.sync_shadow() assert s_object.w_firstlink() == w_o1 assert s_object.w_lastlink() == w_o2 assert w_object._shadow == s_object From tverwaes at codespeak.net Thu Mar 13 21:05:52 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Thu, 13 Mar 2008 21:05:52 +0100 (CET) Subject: [pypy-svn] r52469 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk Message-ID: <20080313200552.B4F47169EEE@codespeak.net> Author: tverwaes Date: Thu Mar 13 21:05:50 2008 New Revision: 52469 Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Log: moving around comments Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py ============================================================================== --- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py (original) +++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/model.py Thu Mar 13 21:05:50 2008 @@ -30,7 +30,7 @@ """Return bytesize that conforms to Blue Book. The reported size may differ from the actual size in Spy's object -space, as memory representation varies depending on PyPy translation.""" + space, as memory representation varies depending on PyPy translation.""" return 0 def varsize(self): @@ -408,28 +408,27 @@ header (4 bytes) literals (4 bytes each) bytecodes (variable) - trailer (variable) - - The header is a 30-bit integer with the following format: - - (index 0) 9 bits: main part of primitive number (#primitive) - (index 9) 8 bits: number of literals (#numLiterals) - (index 17) 1 bit: whether a large frame size is needed (#frameSize) - (index 18) 6 bits: number of temporary variables (#numTemps) - (index 24) 4 bits: number of arguments to the method (#numArgs) - (index 28) 1 bit: high-bit of primitive number (#primitive) - (index 29) 1 bit: flag bit, ignored by the VM (#flag) - - The trailer has two variant formats. In the first variant, the last byte is at least 252 and the last four bytes represent a source pointer into one of the sources files (see #sourcePointer). In the second variant, the last byte is less than 252, and the last several bytes are a compressed version of the names of the method's temporary variables. The number of bytes used for this purpose is the value of the last byte in the method. """ +### Extension from Squeak 3.9 doc, which we do not implement: +### trailer (variable) +### The trailer has two variant formats. In the first variant, the last +### byte is at least 252 and the last four bytes represent a source pointer +### into one of the sources files (see #sourcePointer). In the second +### variant, the last byte is less than 252, and the last several bytes +### are a compressed version of the names of the method's temporary +### variables. The number of bytes used for this purpose is the value of +### the last byte in the method. + def __init__(self, bytecount=0, header=0): self.setheader(header) self.bytes = "\x00"*bytecount def compiledin(self): if self.w_compiledin is None: - # (Blue book, p 607) All CompiledMethods that contain extended-super bytecodes have the clain which they are found as their last literal variable. + # (Blue book, p 607) All CompiledMethods that contain + # extended-super bytecodes have the clain which they are found as + # their last literal variable. # Last of the literals is an association with compiledin # as a class w_association = self.literals[-1] @@ -489,13 +488,16 @@ return self.header def setheader(self, header): - #(index 0) 9 bits: main part of primitive number (#primitive) - #(index 9) 8 bits: number of literals (#numLiterals) - #(index 17) 1 bit: whether a large frame size is needed (#frameSize) - #(index 18) 6 bits: number of temporary variables (#numTemps) - #(index 24) 4 bits: number of arguments to the method (#numArgs) - #(index 28) 1 bit: high-bit of primitive number (#primitive) - #(index 29) 1 bit: flag bit, ignored by the VM (#flag) + """Decode 30-bit method header and apply new format. + + (index 0) 9 bits: main part of primitive number (#primitive) + (index 9) 8 bits: number of literals (#numLiterals) + (index 17) 1 bit: whether a large frame size is needed (#frameSize) + (index 18) 6 bits: number of temporary variables (#numTemps) + (index 24) 4 bits: number of arguments to the method (#numArgs) + (index 28) 1 bit: high-bit of primitive number (#primitive) + (index 29) 1 bit: flag bit, ignored by the VM (#flag) + """ primitive, literalsize, islarge, tempsize, numargs, highbit = ( splitter[9,8,1,6,4,1](header)) primitive = primitive + (highbit << 10) ##XXX todo, check this From fijal at codespeak.net Fri Mar 14 01:34:58 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 14 Mar 2008 01:34:58 +0100 (CET) Subject: [pypy-svn] r52471 - in pypy/branch/jit-refactoring/pypy/lang/js: . test Message-ID: <20080314003458.6ECA9169EED@codespeak.net> Author: fijal Date: Fri Mar 14 01:34:57 2008 New Revision: 52471 Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Log: Basic while working. Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jscode.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jscode.py Fri Mar 14 01:34:57 2008 @@ -1,19 +1,55 @@ from pypy.lang.js.jsobj import W_IntNumber, W_FloatNumber, W_String +class AlreadyRun(Exception): + pass + class JsCode(object): """ That object stands for code of a single javascript function """ def __init__(self): self.opcodes = [] + self.label_count = 0 + self.has_labels = True + + def emit_label(self): + num = self.prealocate_label() + self.emit('LABEL', num) + return num + + def prealocate_label(self): + num = self.label_count + self.label_count += 1 + return num def emit(self, operation, *args): try: - self.opcodes.append(OpcodeMap[operation](*args)) + opcode = OpcodeMap[operation](*args) + self.opcodes.append(opcode) + return opcode except KeyError: raise ValueError("Unknown opcode %s" % (operation,)) emit._annspecialcase_ = 'specialize:arg(1)' + def remove_labels(self): + """ Basic optimization to remove all labels and change + jumps to addresses. Necessary to run code at all + """ + if not self.has_labels: + raise AlreadyRun("Already has labels") + labels = {} + counter = 0 + for i, op in enumerate(self.opcodes): + if isinstance(op, LABEL): + labels[op.num] = counter + else: + counter += 1 + self.opcodes = [op for op in self.opcodes if not isinstance(op, LABEL)] + for op in self.opcodes: + if isinstance(op, BaseJump): + op.where = labels[op.where] + self.has_labels = False + def __repr__(self): return "\n".join([repr(i) for i in self.opcodes]) @@ -176,6 +212,38 @@ class POSTDECR(BaseUnaryOperation): pass +class GT(BaseBinaryComparison): + pass + +class GE(BaseBinaryComparison): + pass + +class LT(BaseBinaryComparison): + pass + +class LE(BaseBinaryComparison): + pass + +class LABEL(Opcode): + def __init__(self, num): + self.num = num + + def __repr__(self): + return 'LABEL %d' % (self.num,) + +class BaseJump(Opcode): + def __init__(self, where): + self.where = where + + def __repr__(self): + return '%s %d' % (self.__class__.__name__, self.where) + +class JUMP(BaseJump): + pass + +class JUMP_IF_FALSE(BaseJump): + pass + OpcodeMap = {} for name, value in locals().items(): Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Fri Mar 14 01:34:57 2008 @@ -204,6 +204,10 @@ def __init__(self, pos, nodes): self.pos = pos self.nodes = nodes + + def emit(self, bytecode): + for node in self.nodes: + node.emit(bytecode) def execute(self, ctx): try: @@ -419,6 +423,7 @@ class Ge(BinaryOp): + operation_name = 'GE' def decision(self, ctx, op1, op2): s5 = ARC(ctx, op1, op2) if s5 in (-1, 1): @@ -428,6 +433,7 @@ class Gt(BinaryOp): + operation_name = 'GT' def decision(self, ctx, op1, op2): s5 = ARC(ctx, op2, op1) if s5 == -1: @@ -437,6 +443,7 @@ class Le(BinaryOp): + operation_name = 'LE' def decision(self, ctx, op1, op2): s5 = ARC(ctx, op2, op1) if s5 in (-1, 1): @@ -446,6 +453,7 @@ class Lt(BinaryOp): + operation_name = 'LT' def decision(self, ctx, op1, op2): s5 = ARC(ctx, op1, op2) if s5 == -1: @@ -1062,6 +1070,15 @@ continue class While(WhileBase): + def emit(self, bytecode): + startlabel = bytecode.emit_label() + self.condition.emit(bytecode) + endlabel = bytecode.prealocate_label() + bytecode.emit('JUMP_IF_FALSE', endlabel) + self.body.emit(bytecode) + bytecode.emit('JUMP', startlabel) + bytecode.emit('LABEL', endlabel) + def execute(self, ctx): while self.condition.eval(ctx).ToBoolean(): try: Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Fri Mar 14 01:34:57 2008 @@ -276,10 +276,7 @@ self.parse('function z (a,b,c,d,e) {;}') -class TestToASTExpr(BaseGrammarTest): - def setup_class(cls): - cls.parse = parse_func('expression') - +class BaseTestToAST(BaseGrammarTest): def to_ast(self, s): return ASTBuilder().dispatch(self.parse(s)) @@ -288,14 +285,15 @@ bytecode = JsCode() ast.emit(bytecode) return bytecode -# w_Global = W_Object() -# w_Object = W_Object(Prototype=W_Object()) -# w_Global.Put('Object', w_Object) -# return ast.eval(global_context(w_Global)) def check(self, source, expected): bytecode = self.compile(source) assert bytecode == expected + return bytecode + +class TestToASTExpr(BaseTestToAST): + def setup_class(cls): + cls.parse = parse_func('expression') def test_get_pos(self): from pypy.lang.js import operations @@ -369,6 +367,37 @@ 'LOAD_STRINGCONSTANT "world"', 'ADD']) +class TestToAstStatement(BaseTestToAST): + def setup_class(cls): + cls.parse = parse_func('statement') + + def check_remove_label(self, s, expected, expected_after_rl): + bytecode = self.check(s, expected) + bytecode.remove_labels() + assert bytecode == expected_after_rl + + def test_control_flow(self): + self.check_remove_label('while (i>1) {x}', + ['LABEL 0', + 'LOAD_VARIABLE "i"', + 'LOAD_INTCONSTANT 1', + 'GT', + 'JUMP_IF_FALSE 1', + 'LOAD_VARIABLE "x"', + 'JUMP 0', + 'LABEL 1'], + ['LOAD_VARIABLE "i"', + 'LOAD_INTCONSTANT 1', + 'GT', + 'JUMP_IF_FALSE 6', + 'LOAD_VARIABLE "x"', + 'JUMP 0']) + #self.check_remove_label('if (x>3) {x} else {y}', + + + def test_function_decl(self): + pass + from pypy.lang.js.jsparser import parse def test_simplesemicolon(): From fijal at codespeak.net Fri Mar 14 01:35:46 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 14 Mar 2008 01:35:46 +0100 (CET) Subject: [pypy-svn] r52472 - pypy/extradoc/talk/pycon2008 Message-ID: <20080314003546.92045169EED@codespeak.net> Author: fijal Date: Fri Mar 14 01:35:46 2008 New Revision: 52472 Modified: pypy/extradoc/talk/pycon2008/pytest.txt pypy/extradoc/talk/pycon2008/status.txt Log: Minor changes. Modified: pypy/extradoc/talk/pycon2008/pytest.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/pytest.txt (original) +++ pypy/extradoc/talk/pycon2008/pytest.txt Fri Mar 14 01:35:46 2008 @@ -6,7 +6,8 @@ =========================================== :authors: Maciej Fijalkowski, Holger Krekel (merlinux GmbH), Brian Dorsey -:date: XXX +:date: 16 March 2008 +:event: Pycon 2008, Chicago IL XXX fill details Intro Modified: pypy/extradoc/talk/pycon2008/status.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/status.txt (original) +++ pypy/extradoc/talk/pycon2008/status.txt Fri Mar 14 01:35:46 2008 @@ -49,7 +49,7 @@ Status of PyPy ============== -* Very compliant language (to Python 2.4/2.5) +* Very compliant language (to Python version 2.4/2.5) * Some modules from the stdlib are missing, no 3rd party modules at all @@ -87,50 +87,11 @@ * If your problem is similiar enough to counting Fibonacci numbers, we're as fast as psyco -* PyPy's JIT is way easier to extend (think PPC, think 64 bit, +* PyPy's JIT is way easier to extend than psyco (think PPC, think 64 bit, think floats) -RPython -======= - -* The static subset of Python which we used for implementing the - interpreter - -* Our compiler toolchain analyzes RPython (i.e. interpreter source code, - like C), not the user program - -* Our interpreter is a "normal Python" interpreter - -* Only PyPy implementers should know anything about RPython - -RPython (2) -=========== - -* It's not a general purpose language - -* One has to have a very good reason to use it - -* Clunky error messages (XXX demo) - -* It's fast, it is pleasant not to code in C - -* Ideally, our JIT will achieve the same level of speed - -RPython - language -================== - -* It's high level but only convenient if you want to write interpreters :-) - -* Usually tons of metaprogramming - -* Like C++ - you can write books about tricks - -* Hard to extend - -XXX this slides needs to fit somewhere - -Example of useful feature - sandboxing -====================================== +Sandboxing +========== * we analyze interpreter source (not user code) for all external function calls @@ -146,11 +107,9 @@ * special switches for buffer overflows and common errors in interpreters (disregard to user code!) -* can work as well with smalltalk or prolog vm (XXX kill this?) +* cannot segfault (unlike CPython) -XXX demo - -Example of useful feature - tproxy +Transparent proxy =================================== * app-level code for controlling behavior of @@ -159,9 +118,7 @@ * very similiar concept to the .NET VM transparent proxy -XXX demo - -Example of useful feature - distribution +Distribution prototype ========================================= * a very simple distribution protocol built @@ -172,9 +129,44 @@ * can work on any type, so you can raise a remote traceback and everything will be fine -* nice experiment, few lines of code (XXX how many exactly?) +* nice experiment, ~700 lines of code + +RPython +======= + +* The static subset of Python which we used for implementing the + interpreter -XXX demo +* Our compiler toolchain analyzes RPython (i.e. interpreter source code, + like C), not the user program + +* Our interpreter is a "normal Python" interpreter + +* Only PyPy implementers should know anything about RPython + +RPython (2) +=========== + +* It's not a general purpose language + +* One has to have a very good reason to use it + +* Clunky error messages + +* It's fast, it is pleasant not to code in C + +* Ideally, our JIT will achieve the same level of speed + +RPython - language +================== + +* It's high level but only convenient if you want to write interpreters :-) + +* Usually tons of metaprogramming + +* Like C++ - you can write books about tricks + +* Hard to extend PyPy - future ============= From arigo at codespeak.net Fri Mar 14 09:23:05 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 09:23:05 +0100 (CET) Subject: [pypy-svn] r52474 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080314082305.A9CFD169EDC@codespeak.net> Author: arigo Date: Fri Mar 14 09:23:04 2008 New Revision: 52474 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hot_promotion.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: * Support for promotion. * Rename the rewriter to HotRunnerDesc and try to make it the central place that holds references to all other objects (interpreter, fallbackinterp, etc.) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Fri Mar 14 09:23:04 2008 @@ -686,7 +686,11 @@ ERASED = self.RGenOp.erasedType(TYPE) if ERASED in self.promotiondesc_positions: return self.promotiondesc_positions[ERASED] - promotiondesc = rtimeshift.PromotionDesc(ERASED, self.interpreter) + if self.hannotator.policy.hotpath: + from pypy.jit.rainbow.rhotpath import HotPromotionDesc + promotiondesc = HotPromotionDesc(ERASED, self.RGenOp) + else: + promotiondesc = rtimeshift.PromotionDesc(ERASED, self.interpreter) result = len(self.promotiondescs) self.promotiondescs.append(promotiondesc) self.promotiondesc_positions[ERASED] = result @@ -837,7 +841,10 @@ if self.varcolor(arg) == "green": self.register_greenvar(result, self.green_position(arg)) return - self.emit("promote") + if self.hannotator.policy.hotpath: + self.emit("hp_promote") + else: + self.emit("promote") self.emit(self.serialize_oparg("red", arg)) self.emit(self.promotiondesc_position(arg.concretetype)) self.register_greenvar(result) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Fri Mar 14 09:23:04 2008 @@ -12,31 +12,24 @@ actual values for the live red vars, and interprets the jitcode normally until it reaches the 'jit_merge_point' or raises. """ - def __init__(self, interpreter, exceptiondesc, - DoneWithThisFrame, ContinueRunningNormally): - self.interpreter = interpreter - self.rgenop = interpreter.rgenop - self.exceptiondesc = exceptiondesc - self.DoneWithThisFrame = DoneWithThisFrame - self.ContinueRunningNormally = ContinueRunningNormally - self.register_opcode_impls(interpreter) + def __init__(self, hotrunnerdesc): + self.hotrunnerdesc = hotrunnerdesc + self.interpreter = hotrunnerdesc.interpreter + self.rgenop = self.interpreter.rgenop + self.exceptiondesc = hotrunnerdesc.exceptiondesc + self.register_opcode_impls(self.interpreter) - def run(self, fallback_point, framebase, pc): + def initialize_state(self, fallback_point, framebase): self.interpreter.debug_trace("fallback_interp") - self.fbp = fallback_point - self.framebase = framebase - self.initialize_state(pc) - self.bytecode_loop() - - def initialize_state(self, pc): - jitstate = self.fbp.saved_jitstate + jitstate = fallback_point.saved_jitstate incoming_gv = jitstate.get_locals_gv() + self.framebase = framebase + self.frameinfo = fallback_point.frameinfo self.gv_to_index = {} for i in range(len(incoming_gv)): self.gv_to_index[incoming_gv[i]] = i self.initialize_from_frame(jitstate.frame) - self.pc = pc self.gv_exc_type = self.getinitialboxgv(jitstate.exc_type_box) self.gv_exc_value = self.getinitialboxgv(jitstate.exc_value_box) self.seen_can_enter_jit = False @@ -47,7 +40,7 @@ if not gv.is_const: # fetch the value from the machine code stack gv = self.rgenop.genconst_from_frame_var(box.kind, self.framebase, - self.fbp.frameinfo, + self.frameinfo, self.gv_to_index[gv]) return gv @@ -85,7 +78,9 @@ self.interpreter.debug_trace("fb_raise", type_name(lltype)) raise LLException(lltype, llvalue) else: - raise self.DoneWithThisFrame(gv_result) + self.interpreter.debug_trace("fb_return", gv_result) + DoneWithThisFrame = self.hotrunnerdesc.DoneWithThisFrame + raise DoneWithThisFrame(gv_result) # ____________________________________________________________ # XXX Lots of copy and paste from interp.py! @@ -254,8 +249,9 @@ opimpl_make_new_greenvars.argspec = arguments("green_varargs") @arguments("green", "calldesc", "green_varargs") - def opimpl_green_call(self, fnptr_gv, calldesc, greenargs): - xxx + def opimpl_green_call(self, gv_fnptr, calldesc, greenargs): + gv_res = calldesc.perform_call(self.rgenop, gv_fnptr, greenargs) + self.green_result(gv_res) @arguments("green_varargs", "red_varargs", "red", "indirectcalldesc") def opimpl_indirect_call_const(self, greenargs, redargs, @@ -410,8 +406,9 @@ @arguments("greenkey") def opimpl_jit_merge_point(self, key): - raise self.ContinueRunningNormally(self.local_green + self.local_red, - self.seen_can_enter_jit) + ContinueRunningNormally = self.hotrunnerdesc.ContinueRunningNormally + raise ContinueRunningNormally(self.local_green + self.local_red, + self.seen_can_enter_jit) @arguments() def opimpl_can_enter_jit(self): @@ -422,6 +419,10 @@ if gv_switch.revealconst(lltype.Bool): self.pc = target + @arguments("red", "promotiondesc") + def opimpl_hp_promote(self, gv_promote, promotiondesc): + xxx + @arguments("green_varargs", "red_varargs", "bytecode") def opimpl_hp_yellow_direct_call(self, greenargs, redargs, targetbytecode): gv_res = self.run_directly(greenargs, redargs, targetbytecode) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Fri Mar 14 09:23:04 2008 @@ -14,7 +14,7 @@ from pypy.jit.rainbow.codewriter import maybe_on_top_of_llinterp -class EntryPointsRewriter: +class HotRunnerDesc: def __init__(self, hintannotator, rtyper, entryjitcode, RGenOp, codewriter, threshold, translate_support_code = True): @@ -22,6 +22,7 @@ self.entryjitcode = entryjitcode self.rtyper = rtyper self.RGenOp = RGenOp + self.exceptiondesc = codewriter.exceptiondesc self.interpreter = codewriter.interpreter self.codewriter = codewriter self.threshold = threshold @@ -34,7 +35,9 @@ self.make_args_specification() self.make_enter_function() self.rewrite_graphs() - self.update_interp() + self.make_descs() + self.fallbackinterp = FallbackInterpreter(self) + self.interpreter.hotrunnerdesc = self def make_args_specification(self): origportalgraph = self.hintannotator.portalgraph @@ -62,7 +65,7 @@ def make_enter_function(self): HotEnterState = make_state_class(self) state = HotEnterState() - exceptiondesc = self.codewriter.exceptiondesc + exceptiondesc = self.exceptiondesc interpreter = self.interpreter num_green_args = len(self.green_args_spec) @@ -87,15 +90,10 @@ maybe_enter_jit._always_inline_ = True self.maybe_enter_jit_fn = maybe_enter_jit - def update_interp(self): - self.fallbackinterp = FallbackInterpreter( - self.interpreter, - self.codewriter.exceptiondesc, - self.DoneWithThisFrame, - self.ContinueRunningNormally) + def make_descs(self): ERASED = self.RGenOp.erasedType(lltype.Bool) - self.interpreter.bool_hotpromotiondesc = rhotpath.HotPromotionDesc( - ERASED, self.interpreter, self.threshold, self.fallbackinterp) + self.bool_hotpromotiondesc = rhotpath.HotPromotionDesc(ERASED, + self.RGenOp) def rewrite_graphs(self): for graph in self.hintannotator.base_translator.graphs: @@ -209,6 +207,7 @@ ', '.join(map(str, self.args)),) self.DoneWithThisFrame = DoneWithThisFrame + self.DoneWithThisFrameARG = RES self.ContinueRunningNormally = ContinueRunningNormally def portal_runner(*args): @@ -252,12 +251,12 @@ return True -def make_state_class(rewriter): +def make_state_class(hotrunnerdesc): # very minimal, just to make the first test pass - green_args_spec = unrolling_iterable(rewriter.green_args_spec) - red_args_spec = unrolling_iterable(rewriter.red_args_spec) - if rewriter.green_args_spec: - keydesc = KeyDesc(rewriter.RGenOp, *rewriter.green_args_spec) + green_args_spec = unrolling_iterable(hotrunnerdesc.green_args_spec) + red_args_spec = unrolling_iterable(hotrunnerdesc.red_args_spec) + if hotrunnerdesc.green_args_spec: + keydesc = KeyDesc(hotrunnerdesc.RGenOp, *hotrunnerdesc.green_args_spec) else: keydesc = None @@ -279,7 +278,7 @@ def getkey(self, *greenvalues): if keydesc is None: return empty_key - rgenop = rewriter.interpreter.rgenop + rgenop = hotrunnerdesc.interpreter.rgenop lst_gv = [None] * len(greenvalues) i = 0 for _ in green_args_spec: @@ -292,14 +291,15 @@ self._compile(greenkey) return True except Exception, e: - rhotpath.report_compile_time_exception(rewriter.interpreter, e) + rhotpath.report_compile_time_exception( + hotrunnerdesc.interpreter, e) return False def _compile(self, greenkey): - interp = rewriter.interpreter + interp = hotrunnerdesc.interpreter rgenop = interp.rgenop builder, gv_generated, inputargs_gv = rgenop.newgraph( - rewriter.sigtoken, "residual") + hotrunnerdesc.sigtoken, "residual") greenargs = list(greenkey.values) redargs = () @@ -313,14 +313,19 @@ jitstate = interp.fresh_jitstate(builder) rhotpath.setup_jitstate(interp, jitstate, greenargs, redargs, - rewriter.entryjitcode, rewriter.sigtoken) + hotrunnerdesc.entryjitcode, + hotrunnerdesc.sigtoken) builder = jitstate.curbuilder builder.start_writing() rhotpath.compile(interp) builder.end() - FUNCPTR = lltype.Ptr(rewriter.RESIDUAL_FUNCTYPE) - self.machine_codes[greenkey] = gv_generated.revealconst(FUNCPTR) + FUNCPTR = lltype.Ptr(hotrunnerdesc.RESIDUAL_FUNCTYPE) + generated = gv_generated.revealconst(FUNCPTR) + self.machine_codes[greenkey] = generated self.counters[greenkey] = -1 # compiled + if not we_are_translated(): + hotrunnerdesc.residual_graph = generated._obj.graph #for tests + return HotEnterState Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Fri Mar 14 09:23:04 2008 @@ -857,7 +857,7 @@ if done: self.debug_trace("done at jit_merge_point") self.newjitstate(None) - return STOP + raise rhotpath.FinishedCompiling @arguments() def opimpl_can_enter_jit(self): @@ -865,10 +865,24 @@ @arguments("red", "jumptarget") def opimpl_hp_red_goto_iftrue(self, switchbox, target): - self.debug_trace("pause at hotsplit in", self.frame.bytecode.name) - rhotpath.hotsplit(self.jitstate, self.bool_hotpromotiondesc, - switchbox, self.frame.pc, target) - assert False, "unreachable" + if switchbox.is_constant(): + if switchbox.getgenvar(self.jitstate).revealconst(lltype.Bool): + self.frame.pc = target + else: + self.debug_trace("pause at hotsplit in", self.frame.bytecode.name) + rhotpath.hotsplit(self.jitstate, self.hotrunnerdesc, + switchbox, self.frame.pc, target) + assert False, "unreachable" + + @arguments("red", "promotiondesc") + def opimpl_hp_promote(self, promotebox, promotiondesc): + if promotebox.is_constant(): + self.green_result_from_red(promotebox) + else: + self.debug_trace("pause at promote in", self.frame.bytecode.name) + rhotpath.hp_promote(self.jitstate, self.hotrunnerdesc, + promotebox, promotiondesc) + assert False, "unreachable" @arguments("green_varargs", "red_varargs", "bytecode") def opimpl_hp_yellow_direct_call(self, greenargs, redargs, targetbytecode): @@ -885,7 +899,20 @@ @arguments() def opimpl_hp_red_return(self): - xxx + gv_result = self.frame.local_boxes[0].getgenvar(self.jitstate) + # XXX not translatable (and slow if translated literally) + # XXX well, and hackish, clearly + def exit(llvalue): + DoneWithThisFrame = self.hotrunnerdesc.DoneWithThisFrame + raise DoneWithThisFrame(self.rgenop.genconst(llvalue)) + FUNCTYPE = lltype.FuncType([self.hotrunnerdesc.DoneWithThisFrameARG], + lltype.Void) + exitfnptr = lltype.functionptr(FUNCTYPE, 'exit', _callable=exit) + gv_exitfnptr = self.rgenop.genconst(exitfnptr) + self.jitstate.curbuilder.genop_call(self.rgenop.sigToken(FUNCTYPE), + gv_exitfnptr, + [gv_result]) + rhotpath.leave_graph(self) @arguments() def opimpl_hp_yellow_return(self): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Fri Mar 14 09:23:04 2008 @@ -3,7 +3,8 @@ """ from pypy.jit.timeshifter import rtimeshift, rvalue -from pypy.rlib.objectmodel import we_are_translated +from pypy.jit.timeshifter.greenkey import KeyDesc, GreenKey, newgreendict +from pypy.rlib.objectmodel import we_are_translated, specialize from pypy.rpython.annlowlevel import cachedtype, base_ptr_lltype from pypy.rpython.annlowlevel import llhelper from pypy.rpython.lltypesystem import lltype, llmemory @@ -22,8 +23,6 @@ def leave_graph(interp): jitstate = interp.jitstate - if jitstate is None: - return exceptiondesc = interp.exceptiondesc builder = jitstate.curbuilder #for virtualizable_box in jitstate.virtualizables: @@ -34,18 +33,16 @@ exceptiondesc.store_global_excdata(jitstate) jitstate.curbuilder.finish_and_return(interp.graphsigtoken, None) jitstate.curbuilder = None + raise FinishedCompiling def compile(interp): jitstate = interp.jitstate builder = jitstate.curbuilder try: interp.bytecode_loop() + assert False, "unreachable" except FinishedCompiling: pass - except GenerateReturn: - leave_graph(interp) - else: - leave_graph(interp) builder.show_incremental_progress() def report_compile_time_exception(interp, e): @@ -70,58 +67,43 @@ class FinishedCompiling(Exception): pass -class GenerateReturn(Exception): - pass - class HotPromotionDesc: __metaclass__ = cachedtype - def __init__(self, ERASED, interpreter, threshold, fallbackinterp): - self.exceptiondesc = interpreter.exceptiondesc - self.gv_constant_one = interpreter.rgenop.constPrebuiltGlobal(1) + def __init__(self, ERASED, RGenOp): + self.RGenOp = RGenOp + self.greenkeydesc = KeyDesc(RGenOp, ERASED) + pathkind = "%s path" % (ERASED,) def ll_reach_fallback_point(fallback_point_ptr, value, framebase): try: fbp = fallback_point_ptr # XXX cast - assert lltype.typeOf(value) is lltype.Bool # XXX for now - if value: - counter = fbp.truepath_counter - pc = fbp.truepath_pc - else: - counter = fbp.falsepath_counter - pc = fbp.falsepath_pc - assert counter >= 0, ( - "reaching a fallback point for an already-compiled path") - counter += 1 + # check if we should compile for this value. + path_is_hot = fbp.check_should_compile(value) - if counter >= threshold: + if path_is_hot: # this is a hot path, compile it - interpreter.debug_trace("jit_resume", "bool_path", value, + interpreter = fbp.hotrunnerdesc.interpreter + interpreter.debug_trace("jit_resume", pathkind, value, "in", fbp.saved_jitstate.frame.bytecode.name) - gv_value = interpreter.rgenop.genconst(value) - fbp.compile_hot_path(interpreter, gv_value, pc) - if value: - fbp.truepath_counter = -1 # means "compiled" - else: - fbp.falsepath_counter = -1 # means "compiled" + fbp.compile_hot_path(value) # Done. We return without an exception set, which causes # our caller (the machine code produced by hotsplit()) to # loop back to the flexswitch and execute the # newly-generated code. interpreter.debug_trace("resume_machine_code") return - else: - # path is still cold - if value: - fbp.truepath_counter = counter - else: - fbp.falsepath_counter = counter + # else: path is still cold except Exception, e: + interpreter = fbp.hotrunnerdesc.interpreter report_compile_time_exception(interpreter, e) # exceptions below at run-time exceptions, we let them propagate - fallbackinterp.run(fbp, framebase, pc) + fallbackinterp = fbp.hotrunnerdesc.fallbackinterp + fallbackinterp.initialize_state(fbp, framebase) + fbp.prepare_fallbackinterp(fallbackinterp, value) + fallbackinterp.bytecode_loop() # If the fallback interpreter reached the next jit_merge_point(), # it raised ContinueRunningNormally(). This exception is # caught by portal_runner() from hotpath.py in order to loop @@ -135,7 +117,7 @@ llmemory.Address], lltype.Void) FUNCPTRTYPE = lltype.Ptr(FUNCTYPE) self.FUNCPTRTYPE = FUNCPTRTYPE - self.sigtoken = interpreter.rgenop.sigToken(FUNCTYPE) + self.sigtoken = RGenOp.sigToken(FUNCTYPE) def get_gv_reach_fallback_point(builder): fnptr = llhelper(FUNCPTRTYPE, ll_reach_fallback_point) @@ -149,43 +131,159 @@ class FallbackPoint(object): - falsepath_counter = 0 # -1 after this path was compiled - truepath_counter = 0 # -1 after this path was compiled - def __init__(self, jitstate, flexswitch, frameinfo, - falsepath_pc, truepath_pc): + def __init__(self, jitstate, hotrunnerdesc, promotebox): # XXX we should probably trim down the jitstate once our caller # is done with it, to avoid keeping too much stuff in memory self.saved_jitstate = jitstate + self.hotrunnerdesc = hotrunnerdesc + self.promotebox = promotebox + + def set_machine_code_info(self, flexswitch, frameinfo): self.flexswitch = flexswitch self.frameinfo = frameinfo # ^^^ 'frameinfo' describes where the machine code stored all # its GenVars, so that we can fish these values to pass them # to the fallback interpreter + + # hack for testing: make the llinterpreter believe this is a Ptr to base + # instance + _TYPE = base_ptr_lltype() + + +class HotSplitFallbackPoint(FallbackPoint): + falsepath_counter = 0 # -1 after this path was compiled + truepath_counter = 0 # -1 after this path was compiled + + def __init__(self, jitstate, hotrunnerdesc, promotebox, + falsepath_pc, truepath_pc): + FallbackPoint. __init__(self, jitstate, hotrunnerdesc, promotebox) self.falsepath_pc = falsepath_pc self.truepath_pc = truepath_pc - def compile_hot_path(self, interpreter, gv_case, pc): + @specialize.arg(1) + def check_should_compile(self, value): + assert lltype.typeOf(value) is lltype.Bool + threshold = self.hotrunnerdesc.threshold + if value: + counter = self.truepath_counter + 1 + assert counter > 0, ( + "reaching a fallback point for an already-compiled path") + if counter >= threshold: + return True + self.truepath_counter = counter + return False + else: + counter = self.falsepath_counter + 1 + assert counter > 0, ( + "reaching a fallback point for an already-compiled path") + if counter >= threshold: + return True + self.falsepath_counter = counter + return False # path is still cold + + @specialize.arg(2) + def prepare_fallbackinterp(self, fallbackinterp, value): + if value: + fallbackinterp.pc = self.truepath_pc + else: + fallbackinterp.pc = self.falsepath_pc + + @specialize.arg(1) + def compile_hot_path(self, value): + if value: + pc = self.truepath_pc + else: + pc = self.falsepath_pc + gv_value = self.hotrunnerdesc.interpreter.rgenop.genconst(value) + self._compile_hot_path(gv_value, pc) + if value: + self.truepath_counter = -1 # means "compiled" + else: + self.falsepath_counter = -1 # means "compiled" + + def _compile_hot_path(self, gv_case, pc): if self.falsepath_counter == -1 or self.truepath_counter == -1: # the other path was already compiled, we can reuse the jitstate jitstate = self.saved_jitstate self.saved_jitstate = None + promotebox = self.promotebox else: # clone the jitstate memo = rvalue.copy_memo() jitstate = self.saved_jitstate.clone(memo) + promotebox = memo.boxes[self.promotebox] + promotebox.setgenvar(gv_case) + interpreter = self.hotrunnerdesc.interpreter interpreter.newjitstate(jitstate) interpreter.frame.pc = pc jitstate.curbuilder = self.flexswitch.add_case(gv_case) compile(interpreter) - # hack for testing: make the llinterpreter believe this is a Ptr to base - # instance - _TYPE = base_ptr_lltype() +class PromoteFallbackPoint(FallbackPoint): -def hotsplit(jitstate, hotpromotiondesc, switchbox, falsepath_pc, truepath_pc): + def __init__(self, jitstate, hotrunnerdesc, promotebox, hotpromotiondesc): + FallbackPoint. __init__(self, jitstate, hotrunnerdesc, promotebox) + self.hotpromotiondesc = hotpromotiondesc + self.counters = newgreendict() + + @specialize.arg(1) + def check_should_compile(self, value): + # XXX incredibly heavy for a supposely lightweight profiling + gv_value = self.hotrunnerdesc.interpreter.rgenop.genconst(value) + greenkey = GreenKey([gv_value], self.hotpromotiondesc.greenkeydesc) + counter = self.counters.get(greenkey, 0) + 1 + threshold = self.hotrunnerdesc.threshold + assert counter > 0, ( + "reaching a fallback point for an already-compiled path") + if counter >= threshold: + return True + self.counters[greenkey] = counter + return False + + @specialize.arg(2) + def prepare_fallbackinterp(self, fallbackinterp, value): + gv_value = self.hotrunnerdesc.interpreter.rgenop.genconst(value) + fallbackinterp.local_green.append(gv_value) + + @specialize.arg(1) + def compile_hot_path(self, value): + gv_value = self.hotrunnerdesc.interpreter.rgenop.genconst(value) + self._compile_hot_path(gv_value) + + def _compile_hot_path(self, gv_value): + # clone the jitstate + memo = rvalue.copy_memo() + jitstate = self.saved_jitstate.clone(memo) + promotebox = memo.boxes[self.promotebox] + promotebox.setgenvar(gv_value) + # compile from that state + interpreter = self.hotrunnerdesc.interpreter + interpreter.newjitstate(jitstate) + interpreter.green_result(gv_value) + jitstate.curbuilder = self.flexswitch.add_case(gv_value) + compile(interpreter) + # done + greenkey = GreenKey([gv_value], self.hotpromotiondesc.greenkeydesc) + self.counters[greenkey] = -1 # means "compiled" + + +def hotsplit(jitstate, hotrunnerdesc, switchbox, + falsepath_pc, truepath_pc): # produce a Bool flexswitch for now + fbp = HotSplitFallbackPoint(jitstate, hotrunnerdesc, switchbox, + falsepath_pc, truepath_pc) + desc = hotrunnerdesc.bool_hotpromotiondesc + generate_fallback_code(fbp, desc, switchbox) + +def hp_promote(jitstate, hotrunnerdesc, promotebox, hotpromotiondesc): + fbp = PromoteFallbackPoint(jitstate, hotrunnerdesc, promotebox, + hotpromotiondesc) + generate_fallback_code(fbp, hotpromotiondesc, promotebox) + +def generate_fallback_code(fbp, hotpromotiondesc, switchbox): + jitstate = fbp.saved_jitstate incoming = jitstate.enter_block_sweep_virtualizables() switchblock = rtimeshift.enter_next_block(jitstate, incoming) gv_switchvar = switchbox.genvar @@ -195,8 +293,7 @@ jitstate.curbuilder = default_builder # default case of the switch: frameinfo = default_builder.get_frame_info(incoming_gv) - fbp = FallbackPoint(jitstate, flexswitch, frameinfo, - falsepath_pc, truepath_pc) + fbp.set_machine_code_info(flexswitch, frameinfo) ll_fbp = fbp # XXX doesn't translate gv_fbp = default_builder.rgenop.genconst(ll_fbp) gv_switchvar = switchbox.genvar @@ -208,7 +305,7 @@ # The call above may either return normally, meaning that more machine # code was compiled and we should loop back to 'switchblock' to enter it, # or it may have set an exception. - exceptiondesc = hotpromotiondesc.exceptiondesc + exceptiondesc = fbp.hotrunnerdesc.exceptiondesc gv_exc_type = exceptiondesc.genop_get_exc_type(default_builder) gv_noexc = default_builder.genop_ptr_iszero( exceptiondesc.exc_type_kind, gv_exc_type) @@ -217,4 +314,4 @@ jitstate.curbuilder = excpath_builder excpath_builder.start_writing() - raise GenerateReturn + leave_graph(fbp.hotrunnerdesc.interpreter) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hot_promotion.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hot_promotion.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hot_promotion.py Fri Mar 14 09:23:04 2008 @@ -3,34 +3,44 @@ from pypy.rlib.jit import JitDriver, hint, JitHintError from pypy.jit.rainbow.test import test_hotpath -py.test.skip("in-progress") - class TestHotPromotion(test_hotpath.HotPathTest): def interpret(self, main, ll_values, opt_consts=[]): - if opt_consts: - # opt_consts lists the indices of arguments that should be - # passed in as constant red boxes. To emulate this effect - # we make them green vars in a wrapper main() but pass - # them as red boxes to the original main(). - miniglobals = {'original_main': main, - 'hint': hint, - } - args = ', '.join(['a%d' % i for i in range(len(ll_values))]) - lines = '\n'.join([' a%d = hint(hint(a%d, concrete=True), ' - 'variable=True)' % (i, i) - for i in opt_consts]) - # cannot use unrolling_iterable because the main() cannot - # take *args... - src = py.code.Source("""\ - def main(%(args)s): - %(lines)s - return original_main(%(args)s)""" % locals()) - exec src.compile() in miniglobals - main = miniglobals['main'] + py.test.skip("fix this test") + def interpret_raises(self, Exception, main, ll_values, opt_consts=[]): + py.test.skip("fix this test") + + def get_residual_graph(self): + return self.hotrunnerdesc.residual_graph + + def check_insns_excluding_return(self, expected=None, **counts): + # the return is currently implemented by a direct_call(exitfnptr) + if expected is not None: + expected.setdefault('direct_call', 0) + expected['direct_call'] += 1 + if 'direct_call' in counts: + counts['direct_call'] += 1 + self.check_insns(expected, **counts) - return self.run(main, ll_values, threshold=1) + def test_easy_case(self): + class MyJitDriver(JitDriver): + greens = ['n'] + reds = [] + def ll_two(k): + return (k+1)*2 + def ll_function(n): + MyJitDriver.jit_merge_point(n=n) + MyJitDriver.can_enter_jit(n=n) + hint(n, concrete=True) + n = hint(n, variable=True) # n => constant red box + k = hint(n, promote=True) # no-op + k = ll_two(k) + return hint(k, variable=True) + + res = self.run(ll_function, [20], threshold=1) + assert res == 42 + self.check_insns_excluding_return({}) def test_simple_promotion(self): class MyJitDriver(JitDriver): @@ -40,36 +50,54 @@ return (k+1)*2 def ll_function(n): MyJitDriver.jit_merge_point(n=n) + MyJitDriver.can_enter_jit(n=n) k = hint(n, promote=True) k = ll_two(k) return hint(k, variable=True) - # easy case: no promotion needed - res = self.interpret(ll_function, [20], [0]) - assert res == 42 - self.check_insns({}) - - # the real test: with promotion - res = self.interpret(ll_function, [20], []) + res = self.run(ll_function, [20], threshold=1) assert res == 42 self.check_insns(int_add=0, int_mul=0) def test_many_promotions(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'total'] def ll_two(k): return k*k def ll_function(n, total): while n > 0: - hint(None, global_merge_point=True) + MyJitDriver.jit_merge_point(n=n, total=total) + MyJitDriver.can_enter_jit(n=n, total=total) k = hint(n, promote=True) k = ll_two(k) total += hint(k, variable=True) n -= 1 return total - res = self.interpret(ll_function, [10, 0], []) + res = self.run(ll_function, [10, 0], threshold=1) assert res == ll_function(10, 0) self.check_insns(int_add=10, int_mul=0) + # the same using the fallback interp instead of compiling each case + res = self.run(ll_function, [10, 0], threshold=3) + assert res == ll_function(10, 0) + self.check_insns(int_add=0, int_mul=0) + self.check_traces([ + "jit_not_entered 10 0", + "jit_not_entered 9 100", + "jit_compile", + "pause at promote in ll_function", + "run_machine_code 8 181", "fallback_interp", "fb_leave 7 245", + "run_machine_code 7 245", "fallback_interp", "fb_leave 6 294", + "run_machine_code 6 294", "fallback_interp", "fb_leave 5 330", + "run_machine_code 5 330", "fallback_interp", "fb_leave 4 355", + "run_machine_code 4 355", "fallback_interp", "fb_leave 3 371", + "run_machine_code 3 371", "fallback_interp", "fb_leave 2 380", + "run_machine_code 2 380", "fallback_interp", "fb_leave 1 384", + "run_machine_code 1 384", "fallback_interp", "fb_return (385)" + ]) + def test_promote_after_call(self): S = lltype.GcStruct('S', ('x', lltype.Signed)) def ll_two(k, s): @@ -85,7 +113,7 @@ k *= 17 return hint(k, variable=True) + s.x - res = self.interpret(ll_function, [4], []) + res = self.interpret(ll_function, [4]) assert res == 4*17 + 10 self.check_insns(int_mul=0, int_add=1) @@ -107,7 +135,7 @@ k += c return hint(k, variable=True) - res = self.interpret(ll_function, [4], []) + res = self.interpret(ll_function, [4]) assert res == 49 self.check_insns(int_add=0) @@ -120,7 +148,7 @@ hint(None, global_merge_point=True) return ll_two(n + 1) - 1 - res = self.interpret(ll_function, [10], []) + res = self.interpret(ll_function, [10]) assert res == 186 self.check_insns(int_add=1, int_mul=0, int_sub=0) @@ -137,15 +165,15 @@ return 42 return ll_two(n + 1) - 1 - res = self.interpret(ll_function, [10, 0], []) + res = self.interpret(ll_function, [10, 0]) assert res == 186 self.check_insns(int_add=1, int_mul=0, int_sub=0) - res = self.interpret(ll_function, [0, 0], []) + res = self.interpret(ll_function, [0, 0]) assert res == -41 self.check_insns(int_add=1, int_mul=0, int_sub=0) - res = self.interpret(ll_function, [1, 1], []) + res = self.interpret(ll_function, [1, 1]) assert res == 42 self.check_insns(int_add=1, int_mul=0, int_sub=0) @@ -158,7 +186,7 @@ s1 = n1 + m1 return hint(s1, variable=True) - res = self.interpret(ll_function, [40, 2], []) + res = self.interpret(ll_function, [40, 2]) assert res == 42 self.check_insns(int_add=0) @@ -177,7 +205,7 @@ hint(None, global_merge_point=True) return ll_two(n) - res = self.interpret(ll_function, [3], []) + res = self.interpret(ll_function, [3]) assert res == 340 self.check_insns(int_lt=1, int_mul=0) @@ -199,7 +227,7 @@ self.check_insns({}) # the real test: with promotion - res = self.interpret(ll_function, [20], []) + res = self.interpret(ll_function, [20]) assert res == 62 self.check_insns(int_add=0, int_mul=0) @@ -236,7 +264,7 @@ i += j return s.x + s.y * 17 - res = self.interpret(ll_function, [100, 2], []) + res = self.interpret(ll_function, [100, 2]) assert res == ll_function(100, 2) def test_mixed_merges(self): @@ -307,7 +335,7 @@ return s ll_function.convert_arguments = [struct_S, int] - res = self.interpret(ll_function, ["20", 0], []) + res = self.interpret(ll_function, ["20", 0]) assert res == 42 self.check_flexswitches(1) @@ -324,7 +352,7 @@ vl[i] = l[i] i = i + 1 return len(vl) - res = self.interpret(ll_function, [6, 5], []) + res = self.interpret(ll_function, [6, 5]) assert res == 6 self.check_oops(**{'newlist': 1, 'list.len': 1}) @@ -349,7 +377,7 @@ a += z assert ll_function(1, 5, 8) == 22 - res = self.interpret(ll_function, [1, 5, 8], []) + res = self.interpret(ll_function, [1, 5, 8]) assert res == 22 def test_raise_result_mixup(self): @@ -431,7 +459,7 @@ if m == 0: raise ValueError return n - self.interpret_raises(ValueError, ll_function, [1, 0], []) + self.interpret_raises(ValueError, ll_function, [1, 0]) def test_promote_in_yellow_call(self): def ll_two(n): @@ -443,7 +471,7 @@ c = ll_two(n) return hint(c, variable=True) - res = self.interpret(ll_function, [4], []) + res = self.interpret(ll_function, [4]) assert res == 6 self.check_insns(int_add=0) @@ -460,7 +488,7 @@ c = ll_two(n) return hint(c, variable=True) - res = self.interpret(ll_function, [4], []) + res = self.interpret(ll_function, [4]) assert res == 6 self.check_insns(int_add=0) @@ -482,6 +510,6 @@ c = ll_one(n, m) return c - res = self.interpret(ll_function, [4, 7], []) + res = self.interpret(ll_function, [4, 7]) assert res == 11 self.check_insns(int_add=0) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Fri Mar 14 09:23:04 2008 @@ -2,7 +2,7 @@ import re from pypy.rlib.jit import JitDriver, hint, JitHintError from pypy.jit.rainbow.test import test_interpreter -from pypy.jit.rainbow.hotpath import EntryPointsRewriter +from pypy.jit.rainbow.hotpath import HotRunnerDesc from pypy.jit.hintannotator.policy import HintAnnotatorPolicy from pypy.rpython.llinterp import LLInterpreter from pypy import conftest @@ -25,11 +25,10 @@ return self._run(main, main_args) def _rewrite(self, threshold, small): - rewriter = EntryPointsRewriter(self.hintannotator, self.rtyper, + self.hotrunnerdesc = HotRunnerDesc(self.hintannotator, self.rtyper, self.jitcode, self.RGenOp, self.writer, threshold, self.translate_support_code) - self.rewriter = rewriter - rewriter.rewrite_all() + self.hotrunnerdesc.rewrite_all() if small and conftest.option.view: self.rtyper.annotator.translator.view() @@ -40,8 +39,11 @@ self.rtyper, exc_data_ptr=self.writer.exceptiondesc.exc_data_ptr) return llinterp.eval_graph(graph, main_args) + def get_traces(self): + return self.hotrunnerdesc.interpreter.debug_traces + def check_traces(self, expected): - traces = self.rewriter.interpreter.debug_traces + traces = self.get_traces() i = 0 for trace, expect in zip(traces + ['--end of traces--'], expected + ['--end of traces--']): @@ -108,7 +110,7 @@ "run_machine_code 5 195", # now that we know which path is hot (i.e. "staying in the loop"), # it gets compiled - "jit_resume bool_path False in ll_function", + "jit_resume Bool path False in ll_function", "done at jit_merge_point", # execution continues purely in machine code, from the "n1 <= 1" # test which triggered the "jit_resume" @@ -203,7 +205,7 @@ "run_machine_code * struct rpy_string {...} 5 5 30240 10", # the third time, compile the hot path, which closes the loop # in the generated machine code - "jit_resume bool_path True in ll_function", + "jit_resume Bool path True in ll_function", "done at jit_merge_point", # continue running 100% in the machine code as long as necessary "resume_machine_code", @@ -216,7 +218,7 @@ res = self.run(main, [2, 1291], threshold=3, small=True) assert res == 1 - assert len(self.rewriter.interpreter.debug_traces) < 20 + assert len(self.get_traces()) < 20 def test_simple_return(self): class MyJitDriver(JitDriver): @@ -246,7 +248,7 @@ res = self.run(ll_function, [50], threshold=3, small=True) assert res == (50*51)/2 - assert len(self.rewriter.interpreter.debug_traces) < 20 + assert len(self.get_traces()) < 20 def test_hint_errors(self): class MyJitDriver(JitDriver): @@ -291,7 +293,7 @@ "fallback_interp", "fb_leave * stru...} 10 64 * array [ 64, 71, 497 ]", "run_machine_code * stru...} 10 64 * array [ 64, 71, 497 ]", - "jit_resume bool_path True in hp_interpret", + "jit_resume Bool path True in hp_interpret", "done at jit_merge_point", "resume_machine_code", "fallback_interp", From arigo at codespeak.net Fri Mar 14 09:23:56 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 09:23:56 +0100 (CET) Subject: [pypy-svn] r52475 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080314082356.16F7C169EDC@codespeak.net> Author: arigo Date: Fri Mar 14 09:23:55 2008 New Revision: 52475 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: Reduce the time taken by this test. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Fri Mar 14 09:23:55 2008 @@ -216,7 +216,7 @@ # which gives us the final answer ]) - res = self.run(main, [2, 1291], threshold=3, small=True) + res = self.run(main, [2, 127], threshold=3, small=True) assert res == 1 assert len(self.get_traces()) < 20 From arigo at codespeak.net Fri Mar 14 09:44:49 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 09:44:49 +0100 (CET) Subject: [pypy-svn] r52476 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080314084449.CA5AA169EF9@codespeak.net> Author: arigo Date: Fri Mar 14 09:44:49 2008 New Revision: 52476 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hot_promotion.py Log: Fix returns. Pass one more test. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Fri Mar 14 09:44:49 2008 @@ -1043,7 +1043,10 @@ if bytecode.is_portal: self.emit("portal_call", *emitted_args) else: - self.emit("red_direct_call") + if self.hannotator.policy.hotpath: + self.emit("hp_%s_direct_call" % (kind,)) + else: + self.emit("red_direct_call") self.emit(*emitted_args) self.emit(graphindex) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Fri Mar 14 09:44:49 2008 @@ -300,12 +300,6 @@ def opimpl_metacall(self, metafunc, redargs): xxx - @arguments("green_varargs", "red_varargs", "bytecode") - def opimpl_red_direct_call(self, greenargs, redargs, targetbytecode): - gv_res = self.run_directly(greenargs, redargs, targetbytecode) - if gv_res is not None: - self.red_result(gv_res) - # exceptions @arguments(returns="red") @@ -424,6 +418,16 @@ xxx @arguments("green_varargs", "red_varargs", "bytecode") + def opimpl_hp_red_direct_call(self, greenargs, redargs, targetbytecode): + gv_res = self.run_directly(greenargs, redargs, targetbytecode) + self.red_result(gv_res) + + @arguments("green_varargs", "red_varargs", "bytecode") + def opimpl_hp_gray_direct_call(self, greenargs, redargs, targetbytecode): + gv_res = self.run_directly(greenargs, redargs, targetbytecode) + assert gv_res is None + + @arguments("green_varargs", "red_varargs", "bytecode") def opimpl_hp_yellow_direct_call(self, greenargs, redargs, targetbytecode): gv_res = self.run_directly(greenargs, redargs, targetbytecode) self.green_result(gv_res) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Fri Mar 14 09:44:49 2008 @@ -885,7 +885,7 @@ assert False, "unreachable" @arguments("green_varargs", "red_varargs", "bytecode") - def opimpl_hp_yellow_direct_call(self, greenargs, redargs, targetbytecode): + def opimpl_hp_red_direct_call(self, greenargs, redargs, targetbytecode): frame = rtimeshift.VirtualFrame(self.frame, None) self.frame = self.jitstate.frame = frame frame.pc = 0 @@ -893,33 +893,36 @@ frame.local_boxes = redargs frame.local_green = greenargs + opimpl_hp_gray_direct_call = opimpl_hp_red_direct_call + opimpl_hp_yellow_direct_call = opimpl_hp_red_direct_call + @arguments() def opimpl_hp_gray_return(self): - xxx + frame = self.frame.backframe + if frame is None: + rhotpath.hp_return(self, None) + else: + self.frame = self.jitstate.frame = frame @arguments() def opimpl_hp_red_return(self): gv_result = self.frame.local_boxes[0].getgenvar(self.jitstate) - # XXX not translatable (and slow if translated literally) - # XXX well, and hackish, clearly - def exit(llvalue): - DoneWithThisFrame = self.hotrunnerdesc.DoneWithThisFrame - raise DoneWithThisFrame(self.rgenop.genconst(llvalue)) - FUNCTYPE = lltype.FuncType([self.hotrunnerdesc.DoneWithThisFrameARG], - lltype.Void) - exitfnptr = lltype.functionptr(FUNCTYPE, 'exit', _callable=exit) - gv_exitfnptr = self.rgenop.genconst(exitfnptr) - self.jitstate.curbuilder.genop_call(self.rgenop.sigToken(FUNCTYPE), - gv_exitfnptr, - [gv_result]) - rhotpath.leave_graph(self) + frame = self.frame.backframe + if frame is None: + rhotpath.hp_return(self, gv_result) + else: + self.frame = self.jitstate.frame = frame + self.red_result(gv_result) @arguments() def opimpl_hp_yellow_return(self): gv_result = self.frame.local_green[0] frame = self.frame.backframe - self.frame = self.jitstate.frame = frame - self.green_result(gv_result) + if frame is None: + xxx + else: + self.frame = self.jitstate.frame = frame + self.green_result(gv_result) # ____________________________________________________________ # construction-time interface Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Fri Mar 14 09:44:49 2008 @@ -62,6 +62,24 @@ lloperation.llop.debug_print(lltype.Void, msg) interp.debug_trace("ERROR:", "compile-time exception:", e) +def hp_return(interp, gv_result): + # XXX not translatable (and slow if translated literally) + # XXX well, and hackish, clearly + def exit(llvalue=None): + DoneWithThisFrame = interp.hotrunnerdesc.DoneWithThisFrame + raise DoneWithThisFrame(interp.rgenop.genconst(llvalue)) + FUNCTYPE = lltype.FuncType([interp.hotrunnerdesc.DoneWithThisFrameARG], + lltype.Void) + exitfnptr = lltype.functionptr(FUNCTYPE, 'exit', _callable=exit) + gv_exitfnptr = interp.rgenop.genconst(exitfnptr) + if gv_result is None: + args_gv = [] + else: + args_gv = [gv_result] + interp.jitstate.curbuilder.genop_call(interp.rgenop.sigToken(FUNCTYPE), + gv_exitfnptr, args_gv) + leave_graph(interp) + # ____________________________________________________________ class FinishedCompiling(Exception): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hot_promotion.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hot_promotion.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hot_promotion.py Fri Mar 14 09:44:49 2008 @@ -99,23 +99,27 @@ ]) def test_promote_after_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n'] S = lltype.GcStruct('S', ('x', lltype.Signed)) def ll_two(k, s): if k > 5: s.x = 20 else: - s.x = 10 + s.x = k def ll_function(n): - hint(None, global_merge_point=True) + MyJitDriver.jit_merge_point(n=n) + MyJitDriver.can_enter_jit(n=n) s = lltype.malloc(S) ll_two(n, s) k = hint(n, promote=True) k *= 17 return hint(k, variable=True) + s.x - res = self.interpret(ll_function, [4]) - assert res == 4*17 + 10 - self.check_insns(int_mul=0, int_add=1) + res = self.run(ll_function, [4], threshold=1) + assert res == 4*17 + 4 + self.check_insns(int_mul=0, int_add=0) def test_promote_after_yellow_call(self): S = lltype.GcStruct('S', ('x', lltype.Signed)) From arigo at codespeak.net Fri Mar 14 09:46:20 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 09:46:20 +0100 (CET) Subject: [pypy-svn] r52477 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080314084620.6F3F3169EF9@codespeak.net> Author: arigo Date: Fri Mar 14 09:46:20 2008 New Revision: 52477 Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py - copied unchanged from r52476, pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hot_promotion.py Removed: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hot_promotion.py Log: Rename this test to match the names I tend to use now for hot-path-policy-specific things. From arigo at codespeak.net Fri Mar 14 09:56:12 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 09:56:12 +0100 (CET) Subject: [pypy-svn] r52478 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080314085612.951C6169EF9@codespeak.net> Author: arigo Date: Fri Mar 14 09:56:09 2008 New Revision: 52478 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py Log: A skipped test for on_enter_jit(). Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Fri Mar 14 09:56:09 2008 @@ -63,6 +63,7 @@ interp.debug_trace("ERROR:", "compile-time exception:", e) def hp_return(interp, gv_result): + interp.debug_trace("done at hp_return") # XXX not translatable (and slow if translated literally) # XXX well, and hackish, clearly def exit(llvalue=None): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Fri Mar 14 09:56:09 2008 @@ -56,6 +56,18 @@ " expected: %s" % (i, trace, expect)) i += 1 + def get_residual_graph(self): + return self.hotrunnerdesc.residual_graph + + def check_insns_excluding_return(self, expected=None, **counts): + # the return is currently implemented by a direct_call(exitfnptr) + if expected is not None: + expected.setdefault('direct_call', 0) + expected['direct_call'] += 1 + if 'direct_call' in counts: + counts['direct_call'] += 1 + self.check_insns(expected, **counts) + class TestHotPath(HotPathTest): @@ -265,6 +277,27 @@ hint(n, concrete=True) py.test.raises(JitHintError, self.run, ll_function, [5], 3) + def test_on_enter_jit(self): + py.test.skip("in-progress") + class MyJitDriver(JitDriver): + greens = [] + reds = ['n'] + def on_enter_jit(self): + self.n += 100 # doesn't make sense, just for testing + + def ll_function(n): + MyJitDriver.jit_merge_point(n=n) + MyJitDriver.can_enter_jit(n=n) + return n + 5 + + res = self.run(ll_function, [2], threshold=1, small=True) + assert res == 107 + self.check_traces([ + "jit_compile", + "done at hp_return", + "run_machine_code 2", + ]) + def test_hp_tlr(self): from pypy.jit.tl import tlr @@ -299,5 +332,8 @@ "fallback_interp", "fb_leave * stru...} 27 0 * array [ 0, 71, 5041 ]", ]) - py.test.skip("XXX currently the 'regs' list is not virtual." - "The test should check this and fail.") + py.test.skip("XXX currently the 'regs' list is not virtual.") + # We expect only the direct_call from the red split fallback point. + # If we get e.g. 7 of them instead it probably means that we see + # direct_calls to the ll helpers for the 'regs' list. + self.check_insns(direct_call = 1) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py Fri Mar 14 09:56:09 2008 @@ -11,18 +11,6 @@ def interpret_raises(self, Exception, main, ll_values, opt_consts=[]): py.test.skip("fix this test") - def get_residual_graph(self): - return self.hotrunnerdesc.residual_graph - - def check_insns_excluding_return(self, expected=None, **counts): - # the return is currently implemented by a direct_call(exitfnptr) - if expected is not None: - expected.setdefault('direct_call', 0) - expected['direct_call'] += 1 - if 'direct_call' in counts: - counts['direct_call'] += 1 - self.check_insns(expected, **counts) - def test_easy_case(self): class MyJitDriver(JitDriver): greens = ['n'] From arigo at codespeak.net Fri Mar 14 11:22:29 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 11:22:29 +0100 (CET) Subject: [pypy-svn] r52479 - in pypy/branch/jit-hotpath/pypy: jit/hintannotator jit/rainbow jit/rainbow/test jit/tl rlib Message-ID: <20080314102229.DB0C6169F5F@codespeak.net> Author: arigo Date: Fri Mar 14 11:22:28 2008 New Revision: 52479 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py pypy/branch/jit-hotpath/pypy/rlib/jit.py Log: Support for on_enter_jit(). Not really nice, full of graph transformations and at least three slightly different copies of the portal graph :-/ Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Fri Mar 14 11:22:28 2008 @@ -1,63 +1,47 @@ from pypy.objspace.flow.model import checkgraph, copygraph -from pypy.translator.unsimplify import split_block +from pypy.objspace.flow.model import Block, Link, SpaceOperation, Variable +from pypy.translator.unsimplify import split_block, varoftype from pypy.translator.simplify import join_blocks from pypy.jit.hintannotator.annotator import HintAnnotator from pypy.jit.hintannotator.model import SomeLLAbstractConstant, OriginFlags +from pypy.annotation import model as annmodel +from pypy.rpython.rtyper import LowLevelOpList from pypy.rlib.jit import JitHintError class HotPathHintAnnotator(HintAnnotator): - def find_jit_merge_point(self, graph): - found_at = [] - for block in graph.iterblocks(): - for op in block.operations: - if op.opname == 'jit_merge_point': - found_at.append((graph, block, op)) - if len(found_at) > 1: - raise JitHintError("multiple jit_merge_point() not supported") - if found_at: - return found_at[0] - else: - return None - def build_hotpath_types(self): self.prepare_portal_graphs() + graph = self.portalgraph_with_on_enter_jit input_args_hs = [SomeLLAbstractConstant(v.concretetype, {OriginFlags(): True}) - for v in self.portalgraph.getargs()] - return self.build_types(self.portalgraph, input_args_hs) + for v in graph.getargs()] + return self.build_types(graph, input_args_hs) def prepare_portal_graphs(self): # find the graph with the jit_merge_point() found_at = [] for graph in self.base_translator.graphs: - place = self.find_jit_merge_point(graph) + place = find_jit_merge_point(graph) if place is not None: found_at.append(place) if len(found_at) != 1: raise JitHintError("found %d graphs with a jit_merge_point()," " expected 1 (for now)" % len(found_at)) - origportalgraph, _, _ = found_at[0] + origportalgraph, _, origportalop = found_at[0] + drivercls = origportalop.args[0].value # # We make a copy of origportalgraph and mutate it to make it # the portal. The portal really starts at the jit_merge_point() # without any block or operation before it. # portalgraph = copygraph(origportalgraph) - _, portalblock, portalop = self.find_jit_merge_point(portalgraph) - portalopindex = portalblock.operations.index(portalop) - # split the block just before the jit_merge_point() - link = split_block(None, portalblock, portalopindex) - # split again, this time enforcing the order of the live vars - # specified by the user in the jit_merge_point() call - _, portalblock, portalop = self.find_jit_merge_point(portalgraph) - assert portalop is portalblock.operations[0] - livevars = portalop.args[1:] - link = split_block(None, portalblock, 0, livevars) + block = split_before_jit_merge_point(None, portalgraph) + assert block is not None # rewire the graph to start at the global_merge_point portalgraph.startblock.isstartblock = False - portalgraph.startblock = link.target + portalgraph.startblock = block portalgraph.startblock.isstartblock = True self.portalgraph = portalgraph self.origportalgraph = origportalgraph @@ -65,7 +49,93 @@ # been listed in the jit_merge_point() # (XXX should give an explicit JitHintError explaining the problem) checkgraph(portalgraph) - join_blocks(portalgraph) + # insert the on_enter_jit() logic before the jit_merge_point() + # in a copy of the graph which will be the one that gets hint-annotated + # and turned into rainbow bytecode. On the other hand, the + # 'self.portalgraph' is the copy that will run directly, in + # non-JITting mode, so it should not contain the on_enter_jit() call. + if hasattr(drivercls, 'on_enter_jit'): + anothercopy = copygraph(portalgraph) + anothercopy.tag = 'portal' + insert_on_enter_jit_handling(self.base_translator.rtyper, + anothercopy, + drivercls) + self.portalgraph_with_on_enter_jit = anothercopy + else: + self.portalgraph_with_on_enter_jit = portalgraph # same is ok # put the new graph back in the base_translator portalgraph.tag = 'portal' self.base_translator.graphs.append(portalgraph) + +# ____________________________________________________________ + +def find_jit_merge_point(graph): + found_at = [] + for block in graph.iterblocks(): + for op in block.operations: + if op.opname == 'jit_merge_point': + found_at.append((graph, block, op)) + if len(found_at) > 1: + raise JitHintError("multiple jit_merge_point() not supported") + if found_at: + return found_at[0] + else: + return None + +def split_before_jit_merge_point(hannotator, graph): + """Find the block with 'jit_merge_point' and split just before, + making sure the input args are in the canonical order. If + hannotator is not None, preserve the hint-annotations while doing so + (used by codewriter.py). + """ + found_at = find_jit_merge_point(graph) + if found_at is not None: + _, portalblock, portalop = found_at + portalopindex = portalblock.operations.index(portalop) + # split the block just before the jit_merge_point() + if portalopindex > 0: + split_block(hannotator, portalblock, portalopindex) + # split again, this time enforcing the order of the live vars + # specified by the user in the jit_merge_point() call + _, portalblock, portalop = find_jit_merge_point(graph) + assert portalop is portalblock.operations[0] + livevars = portalop.args[1:] + link = split_block(hannotator, portalblock, 0, livevars) + return link.target + else: + return None + +def insert_on_enter_jit_handling(rtyper, graph, drivercls): + vars = [varoftype(v.concretetype, name=v) for v in graph.getargs()] + newblock = Block(vars) + + llops = LowLevelOpList(rtyper) + # generate ops to make an instance of DriverCls + classdef = rtyper.annotator.bookkeeper.getuniqueclassdef(drivercls) + s_instance = annmodel.SomeInstance(classdef) + r_instance = rtyper.getrepr(s_instance) + v_self = r_instance.new_instance(llops) + # generate ops to store the 'reds' variables on 'self' + num_greens = len(drivercls.greens) + num_reds = len(drivercls.reds) + assert len(vars) == num_greens + num_reds + for name, v_value in zip(drivercls.reds, vars[num_greens:]): + r_instance.setfield(v_self, name, v_value, llops) + # generate a call to on_enter_jit(self) + on_enter_jit_func = drivercls.on_enter_jit.im_func + s_func = rtyper.annotator.bookkeeper.immutablevalue(on_enter_jit_func) + r_func = rtyper.getrepr(s_func) + c_func = r_func.get_unique_llfn() + llops.genop('direct_call', [c_func, v_self]) + # generate ops to reload the 'reds' variables from 'self' + newvars = vars[:num_greens] + for name, v_value in zip(drivercls.reds, vars[num_greens:]): + v_value = r_instance.getfield(v_self, name, llops) + newvars.append(v_value) + # done, fill the block and link it to make it the startblock + newblock.operations[:] = llops + newblock.closeblock(Link(newvars, graph.startblock)) + graph.startblock.isstartblock = False + graph.startblock = newblock + graph.startblock.isstartblock = True + checkgraph(graph) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Fri Mar 14 11:22:28 2008 @@ -1437,8 +1437,10 @@ return greens_v, reds_v def serialize_op_jit_merge_point(self, op): - # by construction, the graph should have exactly the vars listed - # in the op as live vars. Check this. + # If jit_merge_point is the first operation of its block, and if + # the block's input variables are in the right order, the graph + # should have exactly the vars listed in the op as live vars. + # Check this. It should be ensured by the GraphTransformer. greens_v, reds_v = self.check_hp_hint_args(op) key = () for i, v in enumerate(greens_v): @@ -1466,6 +1468,11 @@ # we want native red switch support in the hotpath policy if not self.hannotator.policy.hotpath: self.insert_splits() + # we need jit_merge_point to be at the start of its block + if self.hannotator.policy.hotpath: + from pypy.jit.hintannotator.hotpath import \ + split_before_jit_merge_point + split_before_jit_merge_point(self.hannotator, graph) def insert_splits(self): hannotator = self.hannotator Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Fri Mar 14 11:22:28 2008 @@ -167,7 +167,7 @@ # portalgraph = self.hintannotator.portalgraph # ^^^ as computed by HotPathHintAnnotator.prepare_portal_graphs() - if origportalgraph is portalgraph: + if origportalgraph is not self.hintannotator.origportalgraph: return False # only mutate the original portal graph, # not its copy Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Fri Mar 14 11:22:28 2008 @@ -278,7 +278,6 @@ py.test.raises(JitHintError, self.run, ll_function, [5], 3) def test_on_enter_jit(self): - py.test.skip("in-progress") class MyJitDriver(JitDriver): greens = [] reds = ['n'] @@ -299,6 +298,7 @@ ]) def test_hp_tlr(self): + py.test.skip("in-progress") from pypy.jit.tl import tlr def main(code, n): @@ -332,7 +332,6 @@ "fallback_interp", "fb_leave * stru...} 27 0 * array [ 0, 71, 5041 ]", ]) - py.test.skip("XXX currently the 'regs' list is not virtual.") # We expect only the direct_call from the red split fallback point. # If we get e.g. 7 of them instead it probably means that we see # direct_calls to the ll helpers for the 'regs' list. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Fri Mar 14 11:22:28 2008 @@ -13,6 +13,7 @@ from pypy.rpython.llinterp import LLInterpreter, LLException from pypy.rpython.module.support import LLSupport from pypy.annotation import model as annmodel +from pypy.annotation.policy import AnnotatorPolicy from pypy.objspace.flow.model import summary, Variable from pypy.rlib.debug import ll_assert from pypy.rlib.jit import hint @@ -48,7 +49,9 @@ portal=None, type_system="lltype"): # build the normal ll graphs for ll_function t = TranslationContext() - a = t.buildannotator() + annpolicy = AnnotatorPolicy() + annpolicy.allow_someobjects = False + a = t.buildannotator(policy=annpolicy) argtypes = getargtypes(a, values) a.build_types(func, argtypes) rtyper = t.buildrtyper(type_system = type_system) Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py Fri Mar 14 11:22:28 2008 @@ -54,12 +54,11 @@ reds = ['a', 'regs'] def on_enter_jit(self): - xxx - "not called yet" # make a copy of the 'regs' list to make it a VirtualList for the JIT length = hint(len(self.regs), promote=True) - newregs = [None] * length - for i in range(length): - newregs[i] = self.regs[i] + newregs = [] + for x in self.regs: + newregs.append(x) self.regs = newregs def hp_interpret(bytecode, a): Modified: pypy/branch/jit-hotpath/pypy/rlib/jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/jit.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/jit.py Fri Mar 14 11:22:28 2008 @@ -121,6 +121,7 @@ raise JitHintError("%s.%s(): must give exactly the same keywords" " as the 'greens' and 'reds'" % ( drivercls.__name__, self.instance.name)) + drivercls._emulate_method_calls(self.bookkeeper, kwds_s) return annmodel.s_None def specialize_call(self, hop, **kwds_i): @@ -174,3 +175,19 @@ raise JitHintError("%s: the 'greens' and 'reds' names should" " not start with an underscore" % (cls,)) _check_class = classmethod(_check_class) + + def _emulate_method_calls(cls, bookkeeper, livevars_s): + # annotate "cls.on_enter_jit()" if it is defined + from pypy.annotation import model as annmodel + if hasattr(cls, 'on_enter_jit'): + classdef = bookkeeper.getuniqueclassdef(cls) + s_arg = annmodel.SomeInstance(classdef) + for name, s_value in livevars_s.items(): + assert name.startswith('s_') + name = name[2:] + s_arg.setattr(bookkeeper.immutablevalue(name), s_value) + key = "rlib.jit.JitDriver.on_enter_jit" + s_func = bookkeeper.immutablevalue(cls.on_enter_jit.im_func) + s_result = bookkeeper.emulate_pbc_call(key, s_func, [s_arg]) + assert annmodel.s_None.contains(s_result) + _emulate_method_calls = classmethod(_emulate_method_calls) From arigo at codespeak.net Fri Mar 14 12:19:17 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 12:19:17 +0100 (CET) Subject: [pypy-svn] r52482 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080314111917.455DE169F5F@codespeak.net> Author: arigo Date: Fri Mar 14 12:19:16 2008 New Revision: 52482 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: One more test, checking fallback interp support for virtual structures. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Fri Mar 14 12:19:16 2008 @@ -2,6 +2,7 @@ from pypy.rlib.unroll import unrolling_iterable from pypy.rlib.objectmodel import we_are_translated, CDefinedIntSymbolic from pypy.rpython.lltypesystem import lltype, llmemory +from pypy.jit.timeshifter import rvalue from pypy.jit.timeshifter.greenkey import empty_key, GreenKey from pypy.jit.rainbow.interpreter import SIGN_EXTEND2, arguments @@ -25,6 +26,7 @@ incoming_gv = jitstate.get_locals_gv() self.framebase = framebase self.frameinfo = fallback_point.frameinfo + self.containers_gv = {} self.gv_to_index = {} for i in range(len(incoming_gv)): self.gv_to_index[incoming_gv[i]] = i @@ -35,8 +37,9 @@ self.seen_can_enter_jit = False def getinitialboxgv(self, box): - assert box.genvar is not None, "XXX Virtuals support missing" gv = box.genvar + if gv is None: + return self.build_gv_container(box) if not gv.is_const: # fetch the value from the machine code stack gv = self.rgenop.genconst_from_frame_var(box.kind, self.framebase, @@ -44,6 +47,20 @@ self.gv_to_index[gv]) return gv + def build_gv_container(self, box): + # allocate a real structure on the heap mirroring the virtual + # container of the box + assert isinstance(box, rvalue.PtrRedBox) + content = box.content + assert content is not None + try: + return self.containers_gv[content] + except KeyError: + gv_result = content.allocate_gv_container(self.rgenop) + self.containers_gv[content] = gv_result + content.populate_gv_container(gv_result, self.getinitialboxgv) + return gv_result + def initialize_from_frame(self, frame): # note that both local_green and local_red contain GenConsts self.current_source_jitframe = frame @@ -415,7 +432,7 @@ @arguments("red", "promotiondesc") def opimpl_hp_promote(self, gv_promote, promotiondesc): - xxx + self.green_result(gv_promote) @arguments("green_varargs", "red_varargs", "bytecode") def opimpl_hp_red_direct_call(self, greenargs, redargs, targetbytecode): @@ -432,19 +449,34 @@ gv_res = self.run_directly(greenargs, redargs, targetbytecode) self.green_result(gv_res) + def hp_return(self): + frame = self.current_source_jitframe.backframe + if frame is None: + return True + else: + self.initialize_from_frame(frame) + return False + @arguments() def opimpl_hp_gray_return(self): - assert self.current_source_jitframe.backframe is None # XXX for now - self.leave_fallback_interp(None) + if self.hp_return(): + self.leave_fallback_interp(None) @arguments() def opimpl_hp_red_return(self): - assert self.current_source_jitframe.backframe is None # XXX for now - self.leave_fallback_interp(self.local_red[0]) + gv_result = self.local_red[0] + if self.hp_return(): + self.leave_fallback_interp(gv_result) + else: + self.red_result(gv_result) @arguments() def opimpl_hp_yellow_return(self): - xxx + gv_result = self.local_green[0] + if self.hp_return(): + self.leave_fallback_interp(gv_result) + else: + self.green_result(gv_result) # ____________________________________________________________ # construction-time helpers Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Fri Mar 14 12:19:16 2008 @@ -896,32 +896,37 @@ opimpl_hp_gray_direct_call = opimpl_hp_red_direct_call opimpl_hp_yellow_direct_call = opimpl_hp_red_direct_call - @arguments() - def opimpl_hp_gray_return(self): + def hp_return(self): frame = self.frame.backframe if frame is None: - rhotpath.hp_return(self, None) + return True else: self.frame = self.jitstate.frame = frame + return False + + @arguments() + def opimpl_hp_gray_return(self): + if self.hp_return(): + rhotpath.hp_return(self, gv_result) + assert False, "unreachable" @arguments() def opimpl_hp_red_return(self): - gv_result = self.frame.local_boxes[0].getgenvar(self.jitstate) - frame = self.frame.backframe - if frame is None: + box = self.frame.local_boxes[0] + if self.hp_return(): + gv_result = box.getgenvar(self.jitstate) rhotpath.hp_return(self, gv_result) + assert False, "unreachable" else: - self.frame = self.jitstate.frame = frame - self.red_result(gv_result) + self.red_result(box) @arguments() def opimpl_hp_yellow_return(self): gv_result = self.frame.local_green[0] - frame = self.frame.backframe - if frame is None: - xxx + if self.hp_return(): + rhotpath.hp_return(self, gv_result) + assert False, "unreachable" else: - self.frame = self.jitstate.frame = frame self.green_result(gv_result) # ____________________________________________________________ Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py Fri Mar 14 12:19:16 2008 @@ -110,6 +110,9 @@ self.check_insns(int_mul=0, int_add=0) def test_promote_after_yellow_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'i'] S = lltype.GcStruct('S', ('x', lltype.Signed)) def ll_two(k, s): if k > 5: @@ -120,14 +123,19 @@ return 9 def ll_function(n): - hint(None, global_merge_point=True) - s = lltype.malloc(S) - c = ll_two(n, s) - k = hint(s.x, promote=True) - k += c - return hint(k, variable=True) + i = 10 + while i > 0: + i -= 1 + MyJitDriver.jit_merge_point(n=n, i=i) + MyJitDriver.can_enter_jit(n=n, i=i) + s = lltype.malloc(S) + c = ll_two(n, s) + k = hint(s.x, promote=True) + k += c + res = hint(k, variable=True) + return res - res = self.interpret(ll_function, [4]) + res = self.run(ll_function, [4], threshold=2) assert res == 49 self.check_insns(int_add=0) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Fri Mar 14 12:19:16 2008 @@ -136,12 +136,27 @@ def _define_allocate(self): TYPE = self.TYPE + descs = unrolling_iterable(self.fielddescs) def allocate(rgenop): s = lltype.malloc(TYPE) return rgenop.genconst(s) + def populate(content_boxes, gv_s, box_gv_reader): + s = gv_s.revealconst(lltype.Ptr(TYPE)) + i = 0 + for desc in descs: + box = content_boxes[i] + if box is not None: + gv_value = box_gv_reader(box) + FIELDTYPE = getattr(desc.PTRTYPE.TO, desc.fieldname) + v = gv_value.revealconst(FIELDTYPE) + tgt = lltype.cast_pointer(desc.PTRTYPE, s) + setattr(tgt, desc.fieldname, v) + i += 1 + self.allocate = allocate + self.populate = populate def _define_devirtualize(self): TYPE = self.TYPE @@ -814,6 +829,13 @@ assert content.allowed_in_virtualizable content.reshape(jitstate, shapemask, memo) + def allocate_gv_container(self, rgenop): + return self.typedesc.allocate(rgenop) + + def populate_gv_container(self, gv_structptr, box_gv_reader): + return self.typedesc.populate(self.content_boxes, + gv_structptr, box_gv_reader) + class VirtualizableStruct(VirtualStruct): def force_runtime_container(self, jitstate): From fijal at codespeak.net Fri Mar 14 12:32:09 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 14 Mar 2008 12:32:09 +0100 (CET) Subject: [pypy-svn] r52485 - pypy/extradoc/talk/pycon2008/demo Message-ID: <20080314113209.A65CD168447@codespeak.net> Author: fijal Date: Fri Mar 14 12:32:09 2008 New Revision: 52485 Added: pypy/extradoc/talk/pycon2008/demo/listserver.py (contents, props changed) pypy/extradoc/talk/pycon2008/demo/local.py (contents, props changed) pypy/extradoc/talk/pycon2008/demo/myproxy.py (contents, props changed) pypy/extradoc/talk/pycon2008/demo/remote.py (contents, props changed) Log: some demos. Added: pypy/extradoc/talk/pycon2008/demo/listserver.py ============================================================================== --- (empty file) +++ pypy/extradoc/talk/pycon2008/demo/listserver.py Fri Mar 14 12:32:09 2008 @@ -0,0 +1,31 @@ +from pypy.translator.js.lib import server +from py.__.green.server.httpserver import GreenHTTPServer +import random + +class Root(server.Collection): + def __init__(self): + self.l = range(10) + random.shuffle(self.l) + + def index(self): + return repr(self.l) + index.exposed = True + + def getitem(self, item): + return str(self.l[int(item)]) + getitem.exposed = True + + def setitem(self, item, value): + self.l[int(item)] = int(value) + return "" + setitem.exposed = True + +class Handler(server.NewHandler): + application = Root() + +if __name__ == '__main__': + addr = ('', 8010) + httpd = server.create_server(server_address=addr, handler=Handler, + server=GreenHTTPServer) + httpd.serve_forever() + Added: pypy/extradoc/talk/pycon2008/demo/local.py ============================================================================== --- (empty file) +++ pypy/extradoc/talk/pycon2008/demo/local.py Fri Mar 14 12:32:09 2008 @@ -0,0 +1,18 @@ + +from distributed import RemoteProtocol, remote_loop +from distributed.socklayer import Finished, socket_listener, socket_connecter +import sys +import pdb + +PORT = 12122 + +def f(): + print "Calling f" + return 8 + + +if __name__ == '__main__': + send, receive = socket_connecter(('localhost', PORT)) + r = RemoteProtocol(send, receive) + import code + code.interact(local=locals()) Added: pypy/extradoc/talk/pycon2008/demo/myproxy.py ============================================================================== --- (empty file) +++ pypy/extradoc/talk/pycon2008/demo/myproxy.py Fri Mar 14 12:32:09 2008 @@ -0,0 +1,25 @@ +import tputil +import urllib + +class ProxyController(object): + def __getitem__(self, item): + data = urllib.urlencode({'item':item}) + return int(urllib.urlopen("http://localhost:8010/getitem?%s" % data, + ).read()) + + def __setitem__(self, item, value): + data = urllib.urlencode({'item':item, 'value':value}) + urllib.urlopen("http://localhost:8010/setitem?%s" % data, + data=data).read() + + def __repr__(self): + return urllib.urlopen("http://localhost:8010/").read() + +def proxy_controller(oper): + return oper.delegate() + +l = tputil.make_proxy(proxy_controller, list, ProxyController()) + +import code +code.interact(local=locals()) + Added: pypy/extradoc/talk/pycon2008/demo/remote.py ============================================================================== --- (empty file) +++ pypy/extradoc/talk/pycon2008/demo/remote.py Fri Mar 14 12:32:09 2008 @@ -0,0 +1,27 @@ + +from distributed import RemoteProtocol, remote_loop +from distributed.socklayer import Finished, socket_listener, socket_connecter +import sys + +PORT = 12122 + +class X: + def __init__(self): + self.xxx = 3 + + def meth(self, f): + print "Calling meth" + return f() + self.xxx + +x = X() + +def f(name): + return open(name) + +if __name__ == '__main__': + send, receive = socket_listener(address=('', PORT)) + try: + remote_loop(RemoteProtocol(send, receive, globals())) + except Finished: + pass + From fijal at codespeak.net Fri Mar 14 12:36:05 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 14 Mar 2008 12:36:05 +0100 (CET) Subject: [pypy-svn] r52488 - pypy/extradoc/talk/pycon2008 Message-ID: <20080314113605.41EA3169F6E@codespeak.net> Author: fijal Date: Fri Mar 14 12:36:04 2008 New Revision: 52488 Modified: pypy/extradoc/talk/pycon2008/status.txt Log: bunch of xxxs Modified: pypy/extradoc/talk/pycon2008/status.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/status.txt (original) +++ pypy/extradoc/talk/pycon2008/status.txt Fri Mar 14 12:36:04 2008 @@ -77,6 +77,16 @@ * Real world apps usually 1.5-2., sometimes as slow as 3x. +Pystone speed over time +======================== + +XXX insert from the web page + +Richards speed over time +========================== + +XXX insert from the web page + Status of JIT in PyPy ===================== @@ -109,6 +119,11 @@ * cannot segfault (unlike CPython) +Sandboxing diagram +================== + +XXX + Transparent proxy =================================== @@ -118,6 +133,11 @@ * very similiar concept to the .NET VM transparent proxy +Tproxy diagram +================ + +XXX + Distribution prototype ========================================= @@ -131,9 +151,17 @@ * nice experiment, ~700 lines of code +Distribution diagram +===================== + +XXX + RPython ======= +* In short - syntax of Python, restrictions of Java, error + messages as readable as MUMPS + * The static subset of Python which we used for implementing the interpreter From fijal at codespeak.net Fri Mar 14 12:47:03 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 14 Mar 2008 12:47:03 +0100 (CET) Subject: [pypy-svn] r52489 - pypy/extradoc/talk/pycon2008 Message-ID: <20080314114703.A81E2169F76@codespeak.net> Author: fijal Date: Fri Mar 14 12:47:03 2008 New Revision: 52489 Added: pypy/extradoc/talk/pycon2008/plot_pystone.png (contents, props changed) pypy/extradoc/talk/pycon2008/plot_richards.png (contents, props changed) Log: add plots here Added: pypy/extradoc/talk/pycon2008/plot_pystone.png ============================================================================== Binary file. No diff available. Added: pypy/extradoc/talk/pycon2008/plot_richards.png ============================================================================== Binary file. No diff available. From arigo at codespeak.net Fri Mar 14 13:39:02 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 13:39:02 +0100 (CET) Subject: [pypy-svn] r52491 - in pypy/dist/pypy: doc/config module/_file/test module/fcntl/test Message-ID: <20080314123902.C6A781684C6@codespeak.net> Author: arigo Date: Fri Mar 14 13:39:02 2008 New Revision: 52491 Removed: pypy/dist/pypy/doc/config/objspace.usemodules.array.txt Modified: pypy/dist/pypy/module/_file/test/test_file_extra.py pypy/dist/pypy/module/fcntl/test/test_fcntl.py Log: The --usemodules=array option was removed (always app-level now). Modified: pypy/dist/pypy/module/_file/test/test_file_extra.py ============================================================================== --- pypy/dist/pypy/module/_file/test/test_file_extra.py (original) +++ pypy/dist/pypy/module/_file/test/test_file_extra.py Fri Mar 14 13:39:02 2008 @@ -350,9 +350,6 @@ class AppTestAFewExtra: - def setup_class(cls): - cls.space = gettestobjspace(usemodules=['array']) - def setup_method(self, method): fn = str(udir.join('temptestfile')) self.w_temptestfile = self.space.wrap(fn) Modified: pypy/dist/pypy/module/fcntl/test/test_fcntl.py ============================================================================== --- pypy/dist/pypy/module/fcntl/test/test_fcntl.py (original) +++ pypy/dist/pypy/module/fcntl/test/test_fcntl.py Fri Mar 14 13:39:02 2008 @@ -13,7 +13,7 @@ class AppTestFcntl: def setup_class(cls): - space = gettestobjspace(usemodules=('fcntl', 'array')) + space = gettestobjspace(usemodules=('fcntl',)) cls.space = space tmpprefix = str(udir.ensure('test_fcntl', dir=1).join('tmp_')) cls.w_tmp = space.wrap(tmpprefix) From arigo at codespeak.net Fri Mar 14 13:45:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 13:45:09 +0100 (CET) Subject: [pypy-svn] r52492 - pypy/dist/pypy/rlib/test Message-ID: <20080314124509.634E8169F7F@codespeak.net> Author: arigo Date: Fri Mar 14 13:45:09 2008 New Revision: 52492 Removed: pypy/dist/pypy/rlib/test/test_rbuffer.py Log: Forgot to remove this file when rlib/rbuffer.py was removed. From arigo at codespeak.net Fri Mar 14 13:46:02 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 13:46:02 +0100 (CET) Subject: [pypy-svn] r52493 - pypy/dist/pypy/module/posix/test Message-ID: <20080314124602.33C6C169F7F@codespeak.net> Author: arigo Date: Fri Mar 14 13:46:01 2008 New Revision: 52493 Modified: pypy/dist/pypy/module/posix/test/test_posix2.py Log: Fix tests stamping on each other's temporary file. Modified: pypy/dist/pypy/module/posix/test/test_posix2.py ============================================================================== --- pypy/dist/pypy/module/posix/test/test_posix2.py (original) +++ pypy/dist/pypy/module/posix/test/test_posix2.py Fri Mar 14 13:46:01 2008 @@ -11,8 +11,7 @@ mod.space = gettestobjspace(usemodules=['posix']) mod.path = udir.join('posixtestfile.txt') mod.path.write("this is a test") - mod.path2 = udir.join('posixtestlargefile') - mod.path3 = udir.join('posixtestwritebuffer') + mod.path2 = udir.join('test_posix2-') pdir = udir.ensure('posixtestdir', dir=True) pdir.join('file1').write("test1") os.chmod(str(pdir.join('file1')), 0600) @@ -32,7 +31,6 @@ cls.w_posix = space.appexec([], "(): import %s as m ; return m" % os.name) cls.w_path = space.wrap(str(path)) cls.w_path2 = space.wrap(str(path2)) - cls.w_path3 = space.wrap(str(path3)) cls.w_pdir = space.wrap(str(pdir)) if hasattr(os, 'getuid'): cls.w_getuid = space.wrap(os.getuid()) @@ -319,7 +317,7 @@ def test_largefile(self): os = self.posix - fd = os.open(self.path2, os.O_RDWR | os.O_CREAT, 0666) + fd = os.open(self.path2 + 'test_largefile', os.O_RDWR | os.O_CREAT, 0666) os.ftruncate(fd, 10000000000L) res = os.lseek(fd, 9900000000L, 0) assert res == 9900000000L @@ -329,13 +327,13 @@ assert res == 4800000000L os.close(fd) - st = os.stat(self.path2) + st = os.stat(self.path2 + 'test_largefile') assert st.st_size == 10000000000L test_largefile.need_sparse_files = True def test_write_buffer(self): os = self.posix - fd = os.open(self.path3, os.O_RDWR | os.O_CREAT, 0666) + fd = os.open(self.path2 + 'test_write_buffer', os.O_RDWR | os.O_CREAT, 0666) def writeall(s): while s: count = os.write(fd, s) @@ -356,7 +354,7 @@ def test_write_unicode(self): os = self.posix - fd = os.open(self.path3, os.O_RDWR | os.O_CREAT, 0666) + fd = os.open(self.path2 + 'test_write_unicode', os.O_RDWR | os.O_CREAT, 0666) os.write(fd, u'X') raises(UnicodeEncodeError, os.write, fd, u'\xe9') os.lseek(fd, 0, 0) From arigo at codespeak.net Fri Mar 14 13:49:15 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 13:49:15 +0100 (CET) Subject: [pypy-svn] r52494 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080314124915.4C598169F7F@codespeak.net> Author: arigo Date: Fri Mar 14 13:49:14 2008 New Revision: 52494 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Log: Yay! We can kill the obscure voidargs hacks now, because the function pointer is not directly executed but runs through the llinterp. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Fri Mar 14 13:49:14 2008 @@ -52,7 +52,7 @@ class CallDesc: __metaclass__ = cachedtype - def __init__(self, RGenOp, exceptiondesc, FUNCTYPE, voidargs=()): + def __init__(self, RGenOp, exceptiondesc, FUNCTYPE): self.exceptiondesc = exceptiondesc self.sigtoken = RGenOp.sigToken(FUNCTYPE.TO) self.result_kind = RGenOp.kindToken(FUNCTYPE.TO.RESULT) @@ -64,8 +64,6 @@ for ARG in FUNCTYPE.TO.ARGS: if ARG == lltype.Void: voidargcount += 1 - if len(voidargs) != voidargcount: - voidargs = (None, ) * voidargcount argiter = unrolling_iterable(FUNCTYPE.TO.ARGS) RETURN = FUNCTYPE.TO.RESULT if RETURN is lltype.Void: @@ -76,20 +74,12 @@ def perform_call(rgenop, gv_fnptr, greenargs): fnptr = gv_fnptr.revealconst(FUNCTYPE) - assert len(greenargs) + len(voidargs) == numargs + assert len(greenargs) + voidargcount == numargs args = () j = 0 - k = 0 for ARG in argiter: if ARG == lltype.Void: - # XXX terrible hack - if not we_are_translated(): - arg = voidargs[k] - arg._TYPE = lltype.Void - else: - arg = None - args += (arg, ) - k += 1 + args += (None, ) else: genconst = greenargs[j] arg = genconst.revealconst(ARG) @@ -705,13 +695,13 @@ self.graph_positions[graph] = index return index - def calldesc_position(self, FUNCTYPE, *voidargs): - key = FUNCTYPE, voidargs + def calldesc_position(self, FUNCTYPE): + key = FUNCTYPE if key in self.calldesc_positions: return self.calldesc_positions[key] result = len(self.calldescs) self.calldescs.append( - CallDesc(self.RGenOp, self.exceptiondesc, FUNCTYPE, voidargs)) + CallDesc(self.RGenOp, self.exceptiondesc, FUNCTYPE)) self.calldesc_positions[key] = result return result @@ -992,10 +982,8 @@ args = op.args[1:-1] else: args = op.args[1:] - voidargs = [const.value for const in args - if const.concretetype == lltype.Void] fnptr = op.args[0] - pos = self.calldesc_position(fnptr.concretetype, *voidargs) + pos = self.calldesc_position(fnptr.concretetype) func = self.serialize_oparg("green", fnptr) emitted_args = [] for v in op.args[1:]: From arigo at codespeak.net Fri Mar 14 13:58:00 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 13:58:00 +0100 (CET) Subject: [pypy-svn] r52495 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080314125800.D9437169F67@codespeak.net> Author: arigo Date: Fri Mar 14 13:57:58 2008 New Revision: 52495 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py Log: Fallback interp support for oopspec calls. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Fri Mar 14 13:57:58 2008 @@ -5,12 +5,11 @@ from pypy.objspace.flow import model as flowmodel from pypy.rpython.annlowlevel import cachedtype from pypy.rpython.lltypesystem import lltype, llmemory -from pypy.rpython.llinterp import LLInterpreter -from pypy.rpython.extregistry import ExtRegistryEntry from pypy.jit.hintannotator.model import originalconcretetype from pypy.jit.hintannotator import model as hintmodel from pypy.jit.timeshifter import rtimeshift, rvalue, rcontainer, exception from pypy.jit.timeshifter import oop +from pypy.jit.timeshifter.oop import maybe_on_top_of_llinterp from pypy.jit.timeshifter.greenkey import KeyDesc from pypy.jit.rainbow.interpreter import JitCode, JitInterpreter from pypy.jit.rainbow.interpreter import DEBUG_JITCODES @@ -29,25 +28,6 @@ rtyper, exc_classdef) jitstate.residual_ll_exception(ll_exc) -def maybe_on_top_of_llinterp(exceptiondesc, fnptr): - # Run a generated graph on top of the llinterp for testing. - # When translated, this just returns the fnptr. - exc_data_ptr = exceptiondesc.exc_data_ptr - assert exceptiondesc.rtyper is not None - llinterp = LLInterpreter(exceptiondesc.rtyper, exc_data_ptr=exc_data_ptr) - def on_top_of_llinterp(*args): - return llinterp.eval_graph(fnptr._obj.graph, list(args)) - return on_top_of_llinterp - -class Entry(ExtRegistryEntry): - _about_ = maybe_on_top_of_llinterp - - def compute_result_annotation(self, s_exceptiondesc, s_fnptr): - return s_fnptr - - def specialize_call(self, hop): - return hop.inputarg(hop.args_r[1], arg=1) - class CallDesc: __metaclass__ = cachedtype @@ -666,6 +646,7 @@ if key in self.oopspecdesc_positions: return self.oopspecdesc_positions[key] oopspecdesc = oop.OopSpecDesc(self.RGenOp, self.rtyper, + self.exceptiondesc, fnobj, canraise) result = len(self.oopspecdescs) self.oopspecdescs.append(oopspecdesc) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Fri Mar 14 13:57:58 2008 @@ -277,35 +277,35 @@ @arguments("oopspec", "bool", returns="red") def opimpl_red_oopspec_call_0(self, oopspec, deepfrozen): - xxx + return oopspec.do_call(self.rgenop, []) @arguments("oopspec", "bool", "red", returns="red") def opimpl_red_oopspec_call_1(self, oopspec, deepfrozen, arg1): - xxx + return oopspec.do_call(self.rgenop, [arg1]) @arguments("oopspec", "bool", "red", "red", returns="red") def opimpl_red_oopspec_call_2(self, oopspec, deepfrozen, arg1, arg2): - xxx + return oopspec.do_call(self.rgenop, [arg1, arg2]) @arguments("oopspec", "bool", "red", "red", "red", returns="red") def opimpl_red_oopspec_call_3(self, oopspec, deepfrozen, arg1, arg2, arg3): - xxx + return oopspec.do_call(self.rgenop, [arg1, arg2, arg3]) @arguments("oopspec", "bool") def opimpl_red_oopspec_call_noresult_0(self, oopspec, deepfrozen): - xxx + oopspec.do_call(self.rgenop, []) @arguments("oopspec", "bool", "red") def opimpl_red_oopspec_call_noresult_1(self, oopspec, deepfrozen, arg1): - xxx + oopspec.do_call(self.rgenop, [arg1]) @arguments("oopspec", "bool", "red", "red") def opimpl_red_oopspec_call_noresult_2(self, oopspec, deepfrozen, arg1, arg2): - xxx + oopspec.do_call(self.rgenop, [arg1, arg2]) @arguments("oopspec", "bool", "red", "red", "red") def opimpl_red_oopspec_call_noresult_3(self, oopspec, deepfrozen, arg1, arg2, arg3): - xxx + oopspec.do_call(self.rgenop, [arg1, arg2, arg3]) @arguments("red", "calldesc", "bool", "bool", "red_varargs", "promotiondesc") Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Fri Mar 14 13:57:58 2008 @@ -7,11 +7,11 @@ from pypy.rlib.objectmodel import we_are_translated from pypy.jit.hintannotator.model import originalconcretetype from pypy.jit.timeshifter import rvalue +from pypy.jit.timeshifter.oop import maybe_on_top_of_llinterp from pypy.jit.timeshifter.greenkey import KeyDesc, empty_key from pypy.jit.timeshifter.greenkey import GreenKey, newgreendict from pypy.jit.rainbow import rhotpath from pypy.jit.rainbow.fallback import FallbackInterpreter -from pypy.jit.rainbow.codewriter import maybe_on_top_of_llinterp class HotRunnerDesc: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py Fri Mar 14 13:57:58 2008 @@ -340,19 +340,28 @@ self.check_flexswitches(1) def test_virtual_list_copy(self): + py.test.skip("in-progress") + class MyJitDriver(JitDriver): + greens = [] + reds = ['x', 'y', 'repeat'] def ll_function(x, y): - hint(None, global_merge_point=True) - l = [y] * x - size = len(l) - size = hint(size, promote=True) - vl = [0] * size - i = 0 - while i < size: - hint(i, concrete=True) - vl[i] = l[i] - i = i + 1 - return len(vl) - res = self.interpret(ll_function, [6, 5]) + repeat = 10 + while repeat > 0: + repeat -= 1 + MyJitDriver.jit_merge_point(x=x, y=y, repeat=repeat) + MyJitDriver.can_enter_jit(x=x, y=y, repeat=repeat) + l = [y] * x + size = len(l) + size = hint(size, promote=True) + vl = [0] * size + i = 0 + while i < size: + hint(i, concrete=True) + vl[i] = l[i] + i = i + 1 + res = len(vl) + return res + res = self.run(ll_function, [6, 11], threshold=2) assert res == 6 self.check_oops(**{'newlist': 1, 'list.len': 1}) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py Fri Mar 14 13:57:58 2008 @@ -2,6 +2,7 @@ from pypy.jit.timeshifter.rcontainer import cachedtype from pypy.rlib.objectmodel import we_are_translated from pypy.rlib.unroll import unrolling_iterable +from pypy.rpython.llinterp import LLInterpreter from pypy.rpython.extregistry import ExtRegistryEntry from pypy.rpython.lltypesystem import lltype from pypy.tool.sourcetools import func_with_new_name @@ -19,9 +20,7 @@ class OopSpecDesc: __metaclass__ = cachedtype - do_call = None - - def __init__(self, RGenOp, rtyper, fnobj, can_raise): + def __init__(self, RGenOp, rtyper, exceptiondesc, fnobj, can_raise): self.rtyper = rtyper ll_func = fnobj._callable FUNCTYPE = lltype.typeOf(fnobj) @@ -129,18 +128,25 @@ # make a copy of the function, for specialization purposes oopargcheck = func_with_new_name(oopargcheck, 'argcheck_%s' % (method,)) + else: + oopargcheck = None + + if True: # preserve indentation for svn history. + # This used to be only if couldfold, but it is now + # always required, for the fallback interp ARGS = FUNCTYPE.ARGS residualargsources = self.residualargsources unrolling_ARGS = unrolling_iterable(ARGS) unrolling_OOPARGS = unrolling_iterable(enumerate(OOPARGTYPES)) - def do_call(jitstate, argboxes): + def do_call(rgenop, args_gv): oopargs = () for i, ARG in unrolling_OOPARGS: - v = rvalue.ll_getvalue(argboxes[i], ARG) + v = args_gv[i].revealconst(ARG) oopargs += (v,) - if not oopargcheck(*oopargs): - raise SegfaultException + if oopargcheck is not None: + if not oopargcheck(*oopargs): + raise SegfaultException args = () j = 0 for ARG in unrolling_ARGS: @@ -151,10 +157,10 @@ j = j + 1 v = oopargs[argsrc] args += (v,) - result = fnptr(*args) + result = maybe_on_top_of_llinterp(exceptiondesc, fnptr)(*args) if FUNCTYPE.RESULT == lltype.Void: return None - return rvalue.ll_fromvalue(jitstate, result) + return rgenop.genconst(result) self.do_call = do_call @@ -168,13 +174,15 @@ fold &= gv_arg.is_const if fold: try: - return self.do_call(jitstate, argboxes) + gv_result = self.do_call(builder.rgenop, args_gv) except Exception, e: jitstate.residual_exception(e) return self.errorbox - gv_result = builder.genop_call(self.sigtoken, self.gv_fnptr, args_gv) - if self.can_raise: - jitstate.generated_oop_residual_can_raise = True + else: + gv_result = builder.genop_call(self.sigtoken, + self.gv_fnptr, args_gv) + if self.can_raise: + jitstate.generated_oop_residual_can_raise = True return self.redboxbuilder(self.result_kind, gv_result) def residual_exception(self, jitstate, ExcCls): @@ -216,3 +224,22 @@ excdata = rtyper.exceptiondata ll_evalue = excdata.get_standard_ll_exc_instance(rtyper, clsdef) return hop.inputconst(hop.r_result, ll_evalue) + +def maybe_on_top_of_llinterp(exceptiondesc, fnptr): + # Run a generated graph on top of the llinterp for testing. + # When translated, this just returns the fnptr. + exc_data_ptr = exceptiondesc.exc_data_ptr + assert exceptiondesc.rtyper is not None + llinterp = LLInterpreter(exceptiondesc.rtyper, exc_data_ptr=exc_data_ptr) + def on_top_of_llinterp(*args): + return llinterp.eval_graph(fnptr._obj.graph, list(args)) + return on_top_of_llinterp + +class Entry(ExtRegistryEntry): + _about_ = maybe_on_top_of_llinterp + + def compute_result_annotation(self, s_exceptiondesc, s_fnptr): + return s_fnptr + + def specialize_call(self, hop): + return hop.inputarg(hop.args_r[1], arg=1) From arigo at codespeak.net Fri Mar 14 14:07:20 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 14:07:20 +0100 (CET) Subject: [pypy-svn] r52496 - in pypy/branch/jit-hotpath/pypy/jit: rainbow/test timeshifter Message-ID: <20080314130720.40F8D169F67@codespeak.net> Author: arigo Date: Fri Mar 14 14:07:19 2008 New Revision: 52496 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py Log: Fallback interp support for virtual lists. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py Fri Mar 14 14:07:19 2008 @@ -340,7 +340,6 @@ self.check_flexswitches(1) def test_virtual_list_copy(self): - py.test.skip("in-progress") class MyJitDriver(JitDriver): greens = [] reds = ['x', 'y', 'repeat'] Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py Fri Mar 14 14:07:19 2008 @@ -92,7 +92,8 @@ vmodule = __import__('pypy.jit.timeshifter.v%s' % (typename,), None, None, [method]) - self.typedesc = vmodule.TypeDesc(RGenOp, rtyper, SELFTYPE) + self.typedesc = vmodule.TypeDesc(RGenOp, rtyper, exceptiondesc, + SELFTYPE) handler = getattr(vmodule, method) boxargcount_max = handler.func_code.co_argcount - 3 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py Fri Mar 14 14:07:19 2008 @@ -95,7 +95,7 @@ class DictTypeDesc(object): __metaclass__ = cachedtype - def __init__(self, RGenOp, rtyper, DICT): + def __init__(self, RGenOp, rtyper, exceptiondesc, DICT): bk = rtyper.annotator.bookkeeper self.DICT = DICT self.DICTPTR = lltype.Ptr(DICT) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py Fri Mar 14 14:07:19 2008 @@ -27,12 +27,13 @@ class ListTypeDesc(object): __metaclass__ = cachedtype - def __init__(self, RGenOp, rtyper, LIST): + def __init__(self, RGenOp, rtyper, exceptiondesc, LIST): self.LIST = LIST self.LISTPTR = lltype.Ptr(LIST) self.ptrkind = RGenOp.kindToken(self.LISTPTR) self.null = self.LISTPTR._defl() self.gv_null = RGenOp.constPrebuiltGlobal(self.null) + self.exceptiondesc = exceptiondesc argtypes = [lltype.Signed] ll_newlist_ptr = rtyper.annotate_helper_fn(LIST.ll_newlist, @@ -48,6 +49,7 @@ lltype.typeOf(ll_setitem_fast).TO) self._define_devirtualize() + self._define_allocate() def _define_devirtualize(self): LIST = self.LIST @@ -68,6 +70,26 @@ self.devirtualize = make, fill_into + def _define_allocate(self): + LIST = self.LIST + LISTPTR = self.LISTPTR + + def allocate(rgenop, n): + l = LIST.ll_newlist(n) + return rgenop.genconst(l) + + def populate(item_boxes, gv_lst, box_gv_reader): + l = gv_lst.revealconst(LISTPTR) + for i in range(len(item_boxes)): + box = item_boxes[i] + if box is not None: + gv_value = box_gv_reader(box) + v = gv_value.revealconst(LIST.ITEM) + l.ll_setitem_fast(i, v) + + self.allocate = allocate + self.populate = populate + def _freeze_(self): return True @@ -266,6 +288,13 @@ assert content.allowed_in_virtualizable content.reshape(jitstate, shapemask, memo) + def allocate_gv_container(self, rgenop): + return self.typedesc.allocate(rgenop, len(self.item_boxes)) + + def populate_gv_container(self, gv_listptr, box_gv_reader): + return self.typedesc.populate(self.item_boxes, + gv_listptr, box_gv_reader) + def oop_newlist(jitstate, oopspecdesc, deepfrozen, lengthbox, itembox=None): if lengthbox.is_constant(): From fijal at codespeak.net Fri Mar 14 14:10:29 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 14 Mar 2008 14:10:29 +0100 (CET) Subject: [pypy-svn] r52497 - in pypy/extradoc/talk/pycon2008: . demo Message-ID: <20080314131029.4271B169F67@codespeak.net> Author: fijal Date: Fri Mar 14 14:10:28 2008 New Revision: 52497 Modified: pypy/extradoc/talk/pycon2008/demo/local.py pypy/extradoc/talk/pycon2008/demo/remote.py pypy/extradoc/talk/pycon2008/status.txt Log: Some info, update demos. Modified: pypy/extradoc/talk/pycon2008/demo/local.py ============================================================================== --- pypy/extradoc/talk/pycon2008/demo/local.py (original) +++ pypy/extradoc/talk/pycon2008/demo/local.py Fri Mar 14 14:10:28 2008 @@ -10,6 +10,12 @@ print "Calling f" return 8 +def catch(): + try: + r.get_remote('x').raising() + except: + import pdb + pdb.post_mortem(sys.exc_info()[2]) if __name__ == '__main__': send, receive = socket_connecter(('localhost', PORT)) Modified: pypy/extradoc/talk/pycon2008/demo/remote.py ============================================================================== --- pypy/extradoc/talk/pycon2008/demo/remote.py (original) +++ pypy/extradoc/talk/pycon2008/demo/remote.py Fri Mar 14 14:10:28 2008 @@ -13,6 +13,11 @@ print "Calling meth" return f() + self.xxx + def raising(self): + def f(): + 1/0 + f() + x = X() def f(name): Modified: pypy/extradoc/talk/pycon2008/status.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/status.txt (original) +++ pypy/extradoc/talk/pycon2008/status.txt Fri Mar 14 14:10:28 2008 @@ -80,12 +80,16 @@ Pystone speed over time ======================== -XXX insert from the web page +.. raw:: html + + Richards speed over time ========================== -XXX insert from the web page +.. raw:: html + + Status of JIT in PyPy ===================== @@ -104,25 +108,26 @@ ========== * we analyze interpreter source (not user code) for - all external function calls - -* we replace them all with stubs interacting only with - stdin/stdout + all external function calls and replace them with stubs * small piece of code to trust (no worry about 3rd party modules or whatever) -* very flexible policy +.. raw:: html + + -* special switches for buffer overflows and common - errors in interpreters (disregard to user code!) +More about sandboxing +====================== * cannot segfault (unlike CPython) -Sandboxing diagram -================== +* very flexible policy -XXX +* there are special switches for all possible buffer overflows + in interpreter source (still, not analyzing any user code) + +* demo Transparent proxy =================================== @@ -133,10 +138,7 @@ * very similiar concept to the .NET VM transparent proxy -Tproxy diagram -================ - -XXX +* demo Distribution prototype ========================================= @@ -219,3 +221,15 @@ * A lot of benchmarking and tweaking * Yes, you can help as well + +PyPy - more info +================== + +* http://codespeak.net/pypy - web page + +* http://morepypy.blogspot.com - blog + +* IRC channel #pypy on irc.freenode.net + +* newcomer-friendly + From briandorsey at codespeak.net Fri Mar 14 14:46:05 2008 From: briandorsey at codespeak.net (briandorsey at codespeak.net) Date: Fri, 14 Mar 2008 14:46:05 +0100 (CET) Subject: [pypy-svn] r52498 - pypy/extradoc/talk/pycon2008 Message-ID: <20080314134605.0BB5D169EBC@codespeak.net> Author: briandorsey Date: Fri Mar 14 14:46:05 2008 New Revision: 52498 Modified: pypy/extradoc/talk/pycon2008/pytest.txt Log: Some phrasing edits. Modified: pypy/extradoc/talk/pycon2008/pytest.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/pytest.txt (original) +++ pypy/extradoc/talk/pycon2008/pytest.txt Fri Mar 14 14:46:05 2008 @@ -15,7 +15,7 @@ * if you think 5 lines are more than 2 -* minimal boilerplate approach +* minimal boilerplate code * cross-project testing tool @@ -26,20 +26,20 @@ * almost identical to nose -* def test_one(): defines test function +* def test_something(): defines test function -* class TestClass: defines test class +* class TestSomething: defines test class -* setup/teardown on many layers (module, class, function) +* setup/teardown on many levels (module, class, function) Automatic test collection ========================== -* no need of specific test runners +* no need for specific test runners * simply running py.test is enough -* py.test --collectonly to show all tests to run +* py.test --collectonly to show tests which would run XXX demo of --collectonly @@ -48,7 +48,7 @@ * no self.assertEqual, self.failUnlessEqual and friends -* assert x == 3 is fine enough +* assert x == 3 is enough * assert reinterpretation (XXX demo) @@ -57,6 +57,8 @@ * no point in showing output of working tests +* leave your debug prints in your tests + * options to control test selection @@ -68,7 +70,7 @@ * -k -name selects all but name -* multiple -k are such as "and" operator +* multiple -k are treated as "and" operator installation ============= @@ -87,7 +89,7 @@ * can connect over Popen, Ssh, socket... -* rsyncs local dir, no need of doing it manually +* rsyncs local dir, no need to copy files XXX demo @@ -96,7 +98,7 @@ * useful for running distributed tests -* still needs some work (any volunteer?) +* still needs some work (any volunteers?) extending ============== From arigo at codespeak.net Fri Mar 14 14:57:31 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 14:57:31 +0100 (CET) Subject: [pypy-svn] r52499 - in pypy/branch/jit-hotpath/pypy: jit/rainbow jit/rainbow/test jit/timeshifter jit/tl rpython rpython/lltypesystem Message-ID: <20080314135731.90F95169F82@codespeak.net> Author: arigo Date: Fri Mar 14 14:57:29 2008 New Revision: 52499 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py pypy/branch/jit-hotpath/pypy/rpython/llinterp.py pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/llmemory.py Log: test_hp_tlr passes :-) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Fri Mar 14 14:57:29 2008 @@ -71,6 +71,18 @@ for box in frame.local_boxes: self.local_red.append(self.getinitialboxgv(box)) + def capture_exception(self, e): + if not we_are_translated(): + from pypy.rpython.llinterp import LLException + if not isinstance(e, LLException): + raise # don't know how to capture it, and it + # probably shows a bug anyway + lltype, llvalue = e.args + self.gv_exc_type = self.rgenop.genconst(lltype) + self.gv_exc_value = self.rgenop.genconst(llvalue) + else: + xxx + def run_directly(self, greenargs, redargs, targetbytecode): assert not (greenargs and redargs) # XXX for now calldesc = targetbytecode.owncalldesc @@ -79,9 +91,17 @@ targetbytecode.gv_ownfnptr, greenargs or redargs) except Exception, e: - XXX + self.capture_exception(e) + gv_res = calldesc.gv_whatever_return_value return gv_res + def oopspec_call(self, oopspec, arglist): + try: + return oopspec.do_call(self.rgenop, arglist) + except Exception, e: + self.capture_exception(e) + return oopspec.gv_whatever_return_value + def leave_fallback_interp(self, gv_result): # at this point we might have an exception set in self.gv_exc_xxx # and we have to really raise it. @@ -277,35 +297,35 @@ @arguments("oopspec", "bool", returns="red") def opimpl_red_oopspec_call_0(self, oopspec, deepfrozen): - return oopspec.do_call(self.rgenop, []) + return self.oopspec_call(oopspec, []) @arguments("oopspec", "bool", "red", returns="red") def opimpl_red_oopspec_call_1(self, oopspec, deepfrozen, arg1): - return oopspec.do_call(self.rgenop, [arg1]) + return self.oopspec_call(oopspec, [arg1]) @arguments("oopspec", "bool", "red", "red", returns="red") def opimpl_red_oopspec_call_2(self, oopspec, deepfrozen, arg1, arg2): - return oopspec.do_call(self.rgenop, [arg1, arg2]) + return self.oopspec_call(oopspec, [arg1, arg2]) @arguments("oopspec", "bool", "red", "red", "red", returns="red") def opimpl_red_oopspec_call_3(self, oopspec, deepfrozen, arg1, arg2, arg3): - return oopspec.do_call(self.rgenop, [arg1, arg2, arg3]) + return self.oopspec_call(oopspec, [arg1, arg2, arg3]) @arguments("oopspec", "bool") def opimpl_red_oopspec_call_noresult_0(self, oopspec, deepfrozen): - oopspec.do_call(self.rgenop, []) + self.oopspec_call(oopspec, []) @arguments("oopspec", "bool", "red") def opimpl_red_oopspec_call_noresult_1(self, oopspec, deepfrozen, arg1): - oopspec.do_call(self.rgenop, [arg1]) + self.oopspec_call(oopspec, [arg1]) @arguments("oopspec", "bool", "red", "red") def opimpl_red_oopspec_call_noresult_2(self, oopspec, deepfrozen, arg1, arg2): - oopspec.do_call(self.rgenop, [arg1, arg2]) + self.oopspec_call(oopspec, [arg1, arg2]) @arguments("oopspec", "bool", "red", "red", "red") def opimpl_red_oopspec_call_noresult_3(self, oopspec, deepfrozen, arg1, arg2, arg3): - oopspec.do_call(self.rgenop, [arg1, arg2, arg3]) + self.oopspec_call(oopspec, [arg1, arg2, arg3]) @arguments("red", "calldesc", "bool", "bool", "red_varargs", "promotiondesc") Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Fri Mar 14 14:57:29 2008 @@ -15,6 +15,38 @@ def __init__(self, result): self.result = result +def summary_loops(graph): + # Find all operations that are inside a loop. + # Ignore the 'default' path of exitswitches, because they are + # part of the pseudo-loop that jumps back to the exitswitch + # after compiling more code. + def visit(block): + if block not in stackpos: + stackpos[block] = len(blockstack) + blockstack.append(block) + for link in block.exits: + if getattr(link, 'exitcase', None) != 'default': + visit(link.target) + blockstack.pop() + stackpos[block] = None + else: + if stackpos[block] is not None: # back-edge + for b in blockstack[stackpos[block]:]: + blocks_in_loop[b] = True + blockstack = [] + stackpos = {} + blocks_in_loop = {} + visit(graph.startblock) + # count operations + insns = {} + for block in blocks_in_loop: + for op in block.operations: + if op.opname != 'same_as': + insns[op.opname] = insns.get(op.opname, 0) + 1 + return insns + +# ____________________________________________________________ + class HotPathTest(test_interpreter.InterpretationTest): type_system = 'lltype' @@ -68,6 +100,13 @@ counts['direct_call'] += 1 self.check_insns(expected, **counts) + def check_insns_in_loops(self, expected=None, **counts): + self.insns_in_loops = summary_loops(self.get_residual_graph()) + if expected is not None: + assert self.insns_in_loops == expected + for opname, count in counts.items(): + assert self.insns_in_loops.get(opname, 0) == count + class TestHotPath(HotPathTest): @@ -298,7 +337,6 @@ ]) def test_hp_tlr(self): - py.test.skip("in-progress") from pypy.jit.tl import tlr def main(code, n): @@ -308,31 +346,44 @@ bytecode = chr(tlr.RETURN_A) return tlr.hp_interpret(bytecode, n) - res = self.run(main, [1, 71], threshold=4) + res = self.run(main, [1, 71], threshold=3) assert res == 5041 self.check_traces([ "jit_not_entered * stru...} 10 70 * array [ 70, 71, 71 ]", "jit_not_entered * stru...} 10 69 * array [ 69, 71, 142 ]", - "jit_not_entered * stru...} 10 68 * array [ 68, 71, 213 ]", "jit_compile * stru...} 10", - "pause at hotsplit in hp_interpret", + # we first see the promotion of len(regs) in on_enter_jit() + "pause at promote in TLRJitDriver.on_enter_jit_Hv", + # followed by two fallback runs + "run_machine_code * stru...} 10 68 * array [ 68, 71, 213 ]", + "fallback_interp", + "fb_leave * stru...} 10 68 * array [ 68, 71, 213 ]", "run_machine_code * stru...} 10 67 * array [ 67, 71, 284 ]", "fallback_interp", - "fb_leave * stru...} 10 66 * array [ 66, 71, 355 ]", + "fb_leave * stru...} 10 67 * array [ 67, 71, 284 ]", + # the third time, we resume compiling for len(regs) == 3 "run_machine_code * stru...} 10 66 * array [ 66, 71, 355 ]", + "jit_resume Signed path 3 in TLRJitDriver.on_enter_jit_Hv", + # pause at the "int_is_true" from the JUMP_IF_A opcode + "pause at hotsplit in hp_interpret", + # two fallback runs off this hotsplit + "resume_machine_code", "fallback_interp", "fb_leave * stru...} 10 65 * array [ 65, 71, 426 ]", "run_machine_code * stru...} 10 65 * array [ 65, 71, 426 ]", "fallback_interp", "fb_leave * stru...} 10 64 * array [ 64, 71, 497 ]", + # the third time, compile the path "stay in the loop" "run_machine_code * stru...} 10 64 * array [ 64, 71, 497 ]", "jit_resume Bool path True in hp_interpret", "done at jit_merge_point", + # the rest is running 100% in machine code "resume_machine_code", + # fallback interp for the exit path "fallback_interp", "fb_leave * stru...} 27 0 * array [ 0, 71, 5041 ]", ]) - # We expect only the direct_call from the red split fallback point. - # If we get e.g. 7 of them instead it probably means that we see - # direct_calls to the ll helpers for the 'regs' list. - self.check_insns(direct_call = 1) + # check that the residual graph's inner loop has no direct_call (as + # would be the case if the 'regs' list was not properly virtualized) + self.check_insns_in_loops({'int_add': 2, + 'int_is_true': 1}) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py Fri Mar 14 14:57:29 2008 @@ -62,10 +62,12 @@ self.result_kind = result_kind if FUNCTYPE.RESULT is lltype.Void: self.errorbox = None + self.gv_whatever_return_value = None else: error_value = exceptiontransform.error_value(FUNCTYPE.RESULT) self.errorbox = rvalue.redbox_from_prebuilt_value(RGenOp, error_value) + self.gv_whatever_return_value = self.errorbox.genvar redboxbuilder = rvalue.ll_redboxbuilder(FUNCTYPE.RESULT) self.redboxbuilder = redboxbuilder self.sigtoken = RGenOp.sigToken(FUNCTYPE) Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py Fri Mar 14 14:57:29 2008 @@ -56,9 +56,12 @@ def on_enter_jit(self): # make a copy of the 'regs' list to make it a VirtualList for the JIT length = hint(len(self.regs), promote=True) - newregs = [] - for x in self.regs: - newregs.append(x) + newregs = [0] * length + i = 0 + while i < length: + i = hint(i, concrete=True) + newregs[i] = self.regs[i] + i += 1 self.regs = newregs def hp_interpret(bytecode, a): Modified: pypy/branch/jit-hotpath/pypy/rpython/llinterp.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/llinterp.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/llinterp.py Fri Mar 14 14:57:29 2008 @@ -727,7 +727,7 @@ self.heap.free(obj, flavor=flavor) def op_zero_gc_pointers_inside(self, obj): - raise NotImplementedError("zero_gc_pointers_inside") + llmemory.zero_gc_pointers_inside(obj) def op_getfield(self, obj, field): checkptr(obj) Modified: pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/llmemory.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/llmemory.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/llmemory.py Fri Mar 14 14:57:29 2008 @@ -687,3 +687,24 @@ setattr(dest._obj, name, llvalue) else: raise TypeError(T) + + +def zero_gc_pointers_inside(obj): + T = lltype.typeOf(obj).TO + if isinstance(T, lltype.Struct): + for name in T._names: + FIELDTYPE = getattr(T, name) + if isinstance(FIELDTYPE, lltype.Ptr): + if FIELDTYPE.TO._gckind == 'gc': + setattr(obj, name, lltype.nullptr(FIELDTYPE.TO)) + elif isinstance(FIELDTYPE, lltype.ContainerType): + zero_gc_pointers_inside(getattr(obj, name)) + elif isinstance(T, lltype.Array): + ITEMTYPE = T.OF + if isinstance(ITEMTYPE, lltype.Ptr): + if ITEMTYPE.TO._gckind == 'gc': + for i in range(len(obj)): + obj[i] = lltype.nullptr(ITEMTYPE.TO) + elif isinstance(ITEMTYPE, lltype.ContainerType): + for i in range(len(obj)): + zero_gc_pointers_inside(obj[i]) From arigo at codespeak.net Fri Mar 14 15:00:44 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 15:00:44 +0100 (CET) Subject: [pypy-svn] r52500 - pypy/dist/pypy/interpreter/test Message-ID: <20080314140044.1A8FE169F84@codespeak.net> Author: arigo Date: Fri Mar 14 15:00:43 2008 New Revision: 52500 Modified: pypy/dist/pypy/interpreter/test/test_pickle.py Log: Can't pickle buffer objects on top of CPython either. Do we really need it? If so, which kinds of buffer do we need? Modified: pypy/dist/pypy/interpreter/test/test_pickle.py ============================================================================== --- pypy/dist/pypy/interpreter/test/test_pickle.py (original) +++ pypy/dist/pypy/interpreter/test/test_pickle.py Fri Mar 14 15:00:43 2008 @@ -241,6 +241,8 @@ assert mod is result def test_pickle_buffer(self): + skip("Can't pickle buffer objects on top of CPython either. " + "Do we really need it?") import pickle a = buffer('ABCDEF') pckl = pickle.dumps(a) From arigo at codespeak.net Fri Mar 14 15:38:06 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 15:38:06 +0100 (CET) Subject: [pypy-svn] r52501 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080314143806.A6C82169F49@codespeak.net> Author: arigo Date: Fri Mar 14 15:38:06 2008 New Revision: 52501 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py Log: More passing tests. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Fri Mar 14 15:38:06 2008 @@ -91,6 +91,9 @@ def get_residual_graph(self): return self.hotrunnerdesc.residual_graph + def check_nothing_compiled_at_all(self): + assert not hasattr(self.hotrunnerdesc, 'residual_graph') + def check_insns_excluding_return(self, expected=None, **counts): # the return is currently implemented by a direct_call(exitfnptr) if expected is not None: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py Fri Mar 14 15:38:06 2008 @@ -140,53 +140,79 @@ self.check_insns(int_add=0) def test_promote_inside_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'i'] def ll_two(n): k = hint(n, promote=True) k *= 17 return hint(k, variable=True) def ll_function(n): - hint(None, global_merge_point=True) - return ll_two(n + 1) - 1 + i = 1024 + while i > 0: + i >>= 1 + MyJitDriver.jit_merge_point(n=n, i=i) + MyJitDriver.can_enter_jit(n=n, i=i) + res = ll_two(n + 1) - 1 + return res - res = self.interpret(ll_function, [10]) + res = self.run(ll_function, [10], threshold=2) assert res == 186 self.check_insns(int_add=1, int_mul=0, int_sub=0) def test_promote_inside_call2(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'm', 'i'] def ll_two(n): k = hint(n, promote=True) k *= 17 return k def ll_function(n, m): - hint(None, global_merge_point=True) - if not n: - return -41 - if m: - return 42 - return ll_two(n + 1) - 1 + i = 1024 + while i > 0: + i >>= 1 + MyJitDriver.jit_merge_point(n=n, m=m, i=i) + MyJitDriver.can_enter_jit(n=n, m=m, i=i) + if not n: + return -41 + if m: + res = 42 + else: + res = ll_two(n + 1) - 1 + return res - res = self.interpret(ll_function, [10, 0]) + res = self.run(ll_function, [10, 0], threshold=2) assert res == 186 self.check_insns(int_add=1, int_mul=0, int_sub=0) - res = self.interpret(ll_function, [0, 0]) + res = self.run(ll_function, [0, 0], threshold=2) assert res == -41 - self.check_insns(int_add=1, int_mul=0, int_sub=0) + self.check_nothing_compiled_at_all() - res = self.interpret(ll_function, [1, 1]) + res = self.run(ll_function, [1, 1], threshold=2) assert res == 42 - self.check_insns(int_add=1, int_mul=0, int_sub=0) - + self.check_insns_in_loops({'int_is_true': 2, + 'int_gt': 1, + 'int_rshift': 1}) def test_two_promotions(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'm', 'i'] def ll_function(n, m): - hint(None, global_merge_point=True) - n1 = hint(n, promote=True) - m1 = hint(m, promote=True) - s1 = n1 + m1 - return hint(s1, variable=True) + i = 1024 + while i > 0: + i >>= 1 + MyJitDriver.jit_merge_point(n=n, m=m, i=i) + MyJitDriver.can_enter_jit(n=n, m=m, i=i) + n1 = hint(n, promote=True) + m1 = hint(m, promote=True) + s1 = n1 + m1 + res = hint(s1, variable=True) + return res - res = self.interpret(ll_function, [40, 2]) + res = self.run(ll_function, [40, 2], threshold=2) assert res == 42 self.check_insns(int_add=0) From arigo at codespeak.net Fri Mar 14 15:52:07 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 15:52:07 +0100 (CET) Subject: [pypy-svn] r52502 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080314145207.0A850168449@codespeak.net> Author: arigo Date: Fri Mar 14 15:52:06 2008 New Revision: 52502 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Log: This comment is outdated. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Fri Mar 14 15:52:06 2008 @@ -223,9 +223,6 @@ args = e.args self.interpreter.debug_trace("fb_leave", *args) check_for_immediate_reentry = e.seen_can_enter_jit - # ^^^ but should depend on whether the fallback - # interpreter reached a can_enter_jit() or just - # the jit_merge_point() portal_runner_ptr = lltype.functionptr(PORTALFUNC, 'portal_runner', _callable = portal_runner) From arigo at codespeak.net Fri Mar 14 16:09:53 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 16:09:53 +0100 (CET) Subject: [pypy-svn] r52503 - in pypy/dist/pypy: interpreter module/__builtin__/test Message-ID: <20080314150953.379FB169EC1@codespeak.net> Author: arigo Date: Fri Mar 14 16:09:52 2008 New Revision: 52503 Modified: pypy/dist/pypy/interpreter/buffer.py pypy/dist/pypy/module/__builtin__/test/test_buffer.py Log: Support for buffer(x, offset, size). Modified: pypy/dist/pypy/interpreter/buffer.py ============================================================================== --- pypy/dist/pypy/interpreter/buffer.py (original) +++ pypy/dist/pypy/interpreter/buffer.py Fri Mar 14 16:09:52 2008 @@ -151,15 +151,28 @@ self.setitem(start + i, string[i]) -def descr_buffer__new__(space, w_subtype, w_object): #, offset, size +def descr_buffer__new__(space, w_subtype, w_object, offset=0, size=-1): # w_subtype can only be exactly 'buffer' for now if not space.is_w(w_subtype, space.gettypefor(Buffer)): raise OperationError(space.w_TypeError, space.wrap("argument 1 must be 'buffer'")) w_buffer = space.buffer(w_object) - space.interp_w(Buffer, w_buffer) # type-check - return w_buffer -descr_buffer__new__.unwrap_spec = [ObjSpace, W_Root, W_Root] + buffer = space.interp_w(Buffer, w_buffer) # type-check + if offset == 0 and size == -1: + return w_buffer + # handle buffer slices + if offset < 0: + raise OperationError(space.w_ValueError, + space.wrap("offset must be zero or positive")) + if size < -1: + raise OperationError(space.w_ValueError, + space.wrap("size must be zero or positive")) + if isinstance(buffer, RWBuffer): + buffer = RWSubBuffer(buffer, offset, size) + else: + buffer = SubBuffer(buffer, offset, size) + return space.wrap(buffer) +descr_buffer__new__.unwrap_spec = [ObjSpace, W_Root, W_Root, int, int] Buffer.typedef = TypeDef( @@ -241,3 +254,45 @@ s = space.str_w(space.getslice(self.w_obj, space.wrap(start), space.wrap(stop))) return s + +# ____________________________________________________________ + +class SubBufferMixin(object): + _mixin_ = True + + def __init__(self, buffer, offset, size): + self.buffer = buffer + self.offset = offset + self.size = size + + def getlength(self): + at_most = self.buffer.getlength() - self.offset + if 0 <= self.size <= at_most: + return self.size + elif at_most >= 0: + return at_most + else: + return 0 + + def getitem(self, index): + return self.buffer.getitem(self.offset + index) + + def getslice(self, start, stop): + if start == stop: + return '' # otherwise, adding self.offset might make them + # out of bounds + return self.buffer.getslice(self.offset + start, self.offset + stop) + +class SubBuffer(SubBufferMixin, Buffer): + pass + +class RWSubBuffer(SubBufferMixin, RWBuffer): + + def setitem(self, index, char): + self.buffer.setitem(self.offset + index, char) + + def setslice(self, start, string): + if len(string) == 0: + return # otherwise, adding self.offset might make 'start' + # out of bounds + self.buffer.setslice(self.offset + start, string) Modified: pypy/dist/pypy/module/__builtin__/test/test_buffer.py ============================================================================== --- pypy/dist/pypy/module/__builtin__/test/test_buffer.py (original) +++ pypy/dist/pypy/module/__builtin__/test/test_buffer.py Fri Mar 14 16:09:52 2008 @@ -64,3 +64,91 @@ assert buffer('ab') * (-2) == '' assert 5 * buffer('ab') == 'ababababab' assert (-2) * buffer('ab') == '' + + def test_offset_size(self): + b = buffer('hello world', 6) + assert len(b) == 5 + assert b[0] == 'w' + assert b[:] == 'world' + raises(IndexError, 'b[5]') + b = buffer(b, 2) + assert len(b) == 3 + assert b[0] == 'r' + assert b[:] == 'rld' + raises(IndexError, 'b[3]') + b = buffer('hello world', 1, 8) + assert len(b) == 8 + assert b[0] == 'e' + assert b[:] == 'ello wor' + raises(IndexError, 'b[8]') + b = buffer(b, 2, 3) + assert len(b) == 3 + assert b[2] == ' ' + assert b[:] == 'lo ' + raises(IndexError, 'b[3]') + b = buffer('hello world', 55) + assert len(b) == 0 + assert b[:] == '' + b = buffer('hello world', 6, 999) + assert len(b) == 5 + assert b[:] == 'world' + + raises(ValueError, buffer, "abc", -1) + raises(ValueError, buffer, "abc", 0, -2) + + def test_rw_offset_size(self): + import array + + a = array.array("c", 'hello world') + b = buffer(a, 6) + assert len(b) == 5 + assert b[0] == 'w' + assert b[:] == 'world' + raises(IndexError, 'b[5]') + b[0] = 'W' + assert str(b) == 'World' + assert a.tostring() == 'hello World' + b[:] = '12345' + assert a.tostring() == 'hello 12345' + raises(IndexError, 'b[5] = "."') + + b = buffer(b, 2) + assert len(b) == 3 + assert b[0] == '3' + assert b[:] == '345' + raises(IndexError, 'b[3]') + b[1] = 'X' + assert a.tostring() == 'hello 123X5' + raises(IndexError, 'b[3] = "."') + + a = array.array("c", 'hello world') + b = buffer(a, 1, 8) + assert len(b) == 8 + assert b[0] == 'e' + assert b[:] == 'ello wor' + raises(IndexError, 'b[8]') + b[0] = 'E' + assert str(b) == 'Ello wor' + assert a.tostring() == 'hEllo world' + b[:] = '12345678' + assert a.tostring() == 'h12345678ld' + raises(IndexError, 'b[8] = "."') + + b = buffer(b, 2, 3) + assert len(b) == 3 + assert b[2] == '5' + assert b[:] == '345' + raises(IndexError, 'b[3]') + b[1] = 'X' + assert a.tostring() == 'h123X5678ld' + raises(IndexError, 'b[3] = "."') + + b = buffer(a, 55) + assert len(b) == 0 + assert b[:] == '' + b = buffer(a, 6, 999) + assert len(b) == 5 + assert b[:] == '678ld' + + raises(ValueError, buffer, a, -1) + raises(ValueError, buffer, a, 0, -2) From fijal at codespeak.net Fri Mar 14 16:19:20 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 14 Mar 2008 16:19:20 +0100 (CET) Subject: [pypy-svn] r52505 - pypy/extradoc/talk/pycon2008 Message-ID: <20080314151920.3A90C169F7F@codespeak.net> Author: fijal Date: Fri Mar 14 16:19:20 2008 New Revision: 52505 Added: pypy/extradoc/talk/pycon2008/distribution.fig pypy/extradoc/talk/pycon2008/distribution.png (contents, props changed) pypy/extradoc/talk/pycon2008/sandboxed.png (contents, props changed) Modified: pypy/extradoc/talk/pycon2008/status.txt Log: Update and some more diagrams. Added: pypy/extradoc/talk/pycon2008/distribution.fig ============================================================================== --- (empty file) +++ pypy/extradoc/talk/pycon2008/distribution.fig Fri Mar 14 16:19:20 2008 @@ -0,0 +1,53 @@ +#FIG 3.2 Produced by xfig version 3.2.5 +Landscape +Center +Metric +A4 +100.00 +Single +-2 +1200 2 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + -675 -1350 0 1800 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 225 1800 900 -1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 1125 -1350 2025 1800 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 2295 1800 2925 -1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 3600 -1350 4275 1800 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 4500 1800 5175 -1350 +2 1 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 2 + -1125 1800 7200 1800 +2 1 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 2 + -1125 -1350 7200 -1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + -1125 -1350 -675 -1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 900 -1350 1125 -1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 0 1800 225 1800 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 2025 1800 2250 1800 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 2925 -1350 3600 -1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 4275 1800 4500 1800 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 5175 -1350 7200 -1350 +4 0 0 50 -1 0 20 0.0000 4 225 1665 -675 2475 Remote Side\001 +4 0 0 50 -1 0 20 0.0000 4 225 1395 -675 -1800 Local Side\001 +4 0 0 50 -1 0 14 0.0000 4 210 3165 -3105 585 x.meth()\001 +4 0 0 50 -1 0 14 0.0000 4 210 240 495 -945 f()\001 +4 0 0 50 -1 0 14 0.0000 4 165 120 1485 1170 8\001 +4 0 0 50 -1 0 14 0.0000 4 165 240 2385 -630 11\001 +4 0 0 50 -1 0 14 0.0000 4 225 1005 3105 1260 x.raising()\001 +4 0 0 50 -1 0 14 0.0000 4 165 1950 4950 270 \001 Added: pypy/extradoc/talk/pycon2008/distribution.png ============================================================================== Binary file. No diff available. Added: pypy/extradoc/talk/pycon2008/sandboxed.png ============================================================================== Binary file. No diff available. Modified: pypy/extradoc/talk/pycon2008/status.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/status.txt (original) +++ pypy/extradoc/talk/pycon2008/status.txt Fri Mar 14 16:19:20 2008 @@ -153,10 +153,14 @@ * nice experiment, ~700 lines of code +* demo + Distribution diagram ===================== -XXX +.. raw:: html + + RPython ======= @@ -231,5 +235,4 @@ * IRC channel #pypy on irc.freenode.net -* newcomer-friendly From arigo at codespeak.net Fri Mar 14 16:39:43 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 16:39:43 +0100 (CET) Subject: [pypy-svn] r52506 - pypy/extradoc/talk/pycon2008 Message-ID: <20080314153943.86F94169F5A@codespeak.net> Author: arigo Date: Fri Mar 14 16:39:43 2008 New Revision: 52506 Modified: pypy/extradoc/talk/pycon2008/status.txt Log: Last-minute comments (I can help with image resizing if you want me to) Modified: pypy/extradoc/talk/pycon2008/status.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/status.txt (original) +++ pypy/extradoc/talk/pycon2008/status.txt Fri Mar 14 16:39:43 2008 @@ -54,7 +54,7 @@ * Some modules from the stdlib are missing, no 3rd party modules at all -* Recent developement - ctypes +* Recent development - ctypes Status of PyPy backends ======================= @@ -84,6 +84,10 @@ +.. XXX make sure you explain this while keeping in mind + that all texts in this image are probably too small + to be read by people + Richards speed over time ========================== @@ -113,6 +117,9 @@ * small piece of code to trust (no worry about 3rd party modules or whatever) +.. XXX maybe put sandboxed.png on its own page and make it + twice bigger for readability + .. raw:: html @@ -124,7 +131,7 @@ * very flexible policy -* there are special switches for all possible buffer overflows +* extra run-time checks for all possible buffer overflows in interpreter source (still, not analyzing any user code) * demo @@ -158,6 +165,8 @@ Distribution diagram ===================== +.. XXX all texts far too small to read + .. raw:: html @@ -208,7 +217,8 @@ * Making 3rd party modules run on PyPy - you can help, notably by porting some to ctypes -* Making different programs run on PyPy - you can help +* Making different programs run on PyPy - you can help, + even just by trying and telling us * We're thinking about providing different ways of getting 3rd party modules @@ -220,7 +230,7 @@ * Short term goal - more general Python programs seeing speedups -* Machine code backend: need support for floats, better assembler +* Machine code backend: needs support for floats, better assembler * A lot of benchmarking and tweaking From arigo at codespeak.net Fri Mar 14 16:55:38 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 16:55:38 +0100 (CET) Subject: [pypy-svn] r52507 - in pypy/branch/jit-hotpath/pypy: annotation jit/rainbow jit/rainbow/test jit/timeshifter rlib Message-ID: <20080314155538.EE012169F54@codespeak.net> Author: arigo Date: Fri Mar 14 16:55:37 2008 New Revision: 52507 Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py (contents, props changed) Modified: pypy/branch/jit-hotpath/pypy/annotation/model.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py pypy/branch/jit-hotpath/pypy/rlib/objectmodel.py Log: A translation test for the hotpath support code. Some initial RPython fixes, in-progress. Modified: pypy/branch/jit-hotpath/pypy/annotation/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/annotation/model.py (original) +++ pypy/branch/jit-hotpath/pypy/annotation/model.py Fri Mar 14 16:55:37 2008 @@ -611,8 +611,8 @@ info = '' else: info = '%s: ' % info - raise ValueError("%sshould return a low-level type,\ngot instead %r" % ( - info, s_val)) + raise ValueError("%sshould take/return a low-level type,\ngot instead %r" + % (info, s_val)) ll_to_annotation_map = dict([(ll, ann) for ann, ll in annotation_to_ll_map if ll is not NUMBER]) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Fri Mar 14 16:55:37 2008 @@ -1,7 +1,7 @@ from pypy.rlib.rarithmetic import intmask from pypy.rlib.unroll import unrolling_iterable from pypy.rlib.objectmodel import we_are_translated, CDefinedIntSymbolic -from pypy.rpython.lltypesystem import lltype, llmemory +from pypy.rpython.lltypesystem import lltype, llmemory, lloperation from pypy.jit.timeshifter import rvalue from pypy.jit.timeshifter.greenkey import empty_key, GreenKey from pypy.jit.rainbow.interpreter import SIGN_EXTEND2, arguments @@ -108,6 +108,10 @@ exceptiondesc = self.exceptiondesc lltype = self.gv_exc_type.revealconst(exceptiondesc.LL_EXC_TYPE) if lltype: + if we_are_translated(): + lloperation.llop.debug_fatalerror(lltype.Void, + "fb_raise not implemented") + assert 0 # XXX non-translatable hack follows... from pypy.rpython.llinterp import LLException, type_name llvalue = self.gv_exc_value.revealconst(exceptiondesc.LL_EXC_VALUE) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Fri Mar 14 16:55:37 2008 @@ -1,5 +1,7 @@ from pypy.objspace.flow.model import Constant, Variable, SpaceOperation from pypy.objspace.flow.model import Link, checkgraph +from pypy.annotation import model as annmodel +from pypy.rpython import annlowlevel from pypy.rpython.annlowlevel import llhelper from pypy.rpython.lltypesystem import lltype, lloperation from pypy.rpython.llinterp import LLInterpreter @@ -32,12 +34,16 @@ return True def rewrite_all(self): + if self.translate_support_code: + self.annhelper = annlowlevel.MixLevelHelperAnnotator(self.rtyper) + self.interpreter.set_hotrunnerdesc(self) self.make_args_specification() self.make_enter_function() self.rewrite_graphs() self.make_descs() self.fallbackinterp = FallbackInterpreter(self) - self.interpreter.hotrunnerdesc = self + if self.translate_support_code: + self.annhelper.finish() def make_args_specification(self): origportalgraph = self.hintannotator.portalgraph @@ -121,23 +127,29 @@ assert graph is not self.hintannotator.origportalgraph, ( "XXX can_enter_jit() cannot appear before jit_merge_point() " "in the graph of the main loop") + FUNC = self.JIT_ENTER_FUNCTYPE + FUNCPTR = lltype.Ptr(FUNC) + if not self.translate_support_code: # this case is used for most tests: the jit stuff should be run # directly to make these tests faster - op = block.operations[index] - greens_v, reds_v = self.codewriter.decode_hp_hint_args(op) - args_v = greens_v + reds_v - - FUNCPTR = lltype.Ptr(self.JIT_ENTER_FUNCTYPE) - jit_enter_graph_ptr = llhelper(FUNCPTR, self.maybe_enter_jit_fn) - vlist = [Constant(jit_enter_graph_ptr, FUNCPTR)] + args_v - - v_result = Variable() - v_result.concretetype = lltype.Void - newop = SpaceOperation('direct_call', vlist, v_result) - block.operations[index] = newop + jit_enter_fnptr = llhelper(FUNCPTR, self.maybe_enter_jit_fn) else: - xxx + args_s = [annmodel.lltype_to_annotation(ARG) for ARG in FUNC.ARGS] + s_result = annmodel.lltype_to_annotation(FUNC.RESULT) + jit_enter_fnptr = self.annhelper.delayedfunction( + self.maybe_enter_jit_fn, args_s, s_result) + + op = block.operations[index] + greens_v, reds_v = self.codewriter.decode_hp_hint_args(op) + args_v = greens_v + reds_v + + vlist = [Constant(jit_enter_fnptr, FUNCPTR)] + args_v + + v_result = Variable() + v_result.concretetype = lltype.Void + newop = SpaceOperation('direct_call', vlist, v_result) + block.operations[index] = newop return True def rewrite_jit_merge_point(self, origportalgraph, origblock, origindex): @@ -175,59 +187,64 @@ RES = portalgraph.getreturnvar().concretetype PORTALFUNC = lltype.FuncType(ARGS, RES) - if not self.translate_support_code: - # ____________________________________________________________ - # Prepare the portal_runner() helper, in a version that - # doesn't need to be translated - # - exc_data_ptr = self.codewriter.exceptiondesc.exc_data_ptr - llinterp = LLInterpreter(self.rtyper, exc_data_ptr=exc_data_ptr) - maybe_enter_jit = self.maybe_enter_jit_fn - - class DoneWithThisFrame(Exception): - _go_through_llinterp_uncaught_ = True # ugh - def __init__(self, gv_result): - if RES is lltype.Void: - assert gv_result is None - self.result = None - else: - self.result = gv_result.revealconst(RES) - def __str__(self): - return 'DoneWithThisFrame(%s)' % (self.result,) - - class ContinueRunningNormally(Exception): - _go_through_llinterp_uncaught_ = True # ugh - def __init__(self, args_gv, seen_can_enter_jit): - assert len(args_gv) == len(ARGS) - self.args = [gv_arg.revealconst(ARG) - for gv_arg, ARG in zip(args_gv, ARGS)] - self.seen_can_enter_jit = seen_can_enter_jit - def __str__(self): - return 'ContinueRunningNormally(%s)' % ( - ', '.join(map(str, self.args)),) - - self.DoneWithThisFrame = DoneWithThisFrame - self.DoneWithThisFrameARG = RES - self.ContinueRunningNormally = ContinueRunningNormally - - def portal_runner(*args): - check_for_immediate_reentry = False - while 1: - try: - if check_for_immediate_reentry: - maybe_enter_jit(*args) - return llinterp.eval_graph(portalgraph, list(args)) - except DoneWithThisFrame, e: - return e.result - except ContinueRunningNormally, e: - args = e.args - self.interpreter.debug_trace("fb_leave", *args) - check_for_immediate_reentry = e.seen_can_enter_jit + # ____________________________________________________________ + # Prepare the portal_runner() helper + # + exceptiondesc = self.exceptiondesc + portal_ptr = lltype.functionptr(PORTALFUNC, 'portal', + graph = portalgraph) + maybe_enter_jit = self.maybe_enter_jit_fn + + class DoneWithThisFrame(Exception): + _go_through_llinterp_uncaught_ = True # ugh + def __init__(self, gv_result): + if RES is lltype.Void: + assert gv_result is None + self.result = None + else: + self.result = gv_result.revealconst(RES) + def __str__(self): + return 'DoneWithThisFrame(%s)' % (self.result,) + + class ContinueRunningNormally(Exception): + _go_through_llinterp_uncaught_ = True # ugh + def __init__(self, args_gv, seen_can_enter_jit): + assert len(args_gv) == len(ARGS) + self.args = [gv_arg.revealconst(ARG) + for gv_arg, ARG in zip(args_gv, ARGS)] + self.seen_can_enter_jit = seen_can_enter_jit + def __str__(self): + return 'ContinueRunningNormally(%s)' % ( + ', '.join(map(str, self.args)),) + + self.DoneWithThisFrame = DoneWithThisFrame + self.DoneWithThisFrameARG = RES + self.ContinueRunningNormally = ContinueRunningNormally + + def ll_portal_runner(*args): + check_for_immediate_reentry = False + while 1: + try: + if check_for_immediate_reentry: + maybe_enter_jit(*args) + return maybe_on_top_of_llinterp(exceptiondesc, + portal_ptr)(*args) + except DoneWithThisFrame, e: + return e.result + except ContinueRunningNormally, e: + args = e.args + self.interpreter.debug_trace("fb_leave", *args) + check_for_immediate_reentry = e.seen_can_enter_jit - portal_runner_ptr = lltype.functionptr(PORTALFUNC, 'portal_runner', - _callable = portal_runner) + if not self.translate_support_code: + portal_runner_ptr = llhelper(lltype.Ptr(PORTALFUNC), + ll_portal_runner) else: - xxx + args_s = [annmodel.lltype_to_annotation(ARG) for ARG in ARGS] + s_result = annmodel.lltype_to_annotation(RES) + portal_runner_ptr = self.annhelper.delayedfunction( + ll_portal_runner, args_s, s_result) + # ____________________________________________________________ # Now mutate origportalgraph to end with a call to portal_runner_ptr # Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Fri Mar 14 16:55:37 2008 @@ -1,6 +1,6 @@ from pypy.rlib.rarithmetic import intmask from pypy.rlib.unroll import unrolling_iterable -from pypy.rlib.objectmodel import we_are_translated, CDefinedIntSymbolic +from pypy.rlib.objectmodel import we_are_translated, CDefinedIntSymbolic, noop from pypy.jit.timeshifter import rtimeshift, rcontainer, rvalue from pypy.jit.timeshifter.greenkey import empty_key, GreenKey, newgreendict from pypy.jit.rainbow import rhotpath @@ -219,11 +219,19 @@ if DEBUG_JITCODES: self.find_opcode("trace") # force it to be compiled in - def debug_trace(self, *args): - if not we_are_translated(): - trace = DebugTrace(*args) - log.trace(trace) - self.debug_traces.append(trace) + def _debug_trace(self, *args): + "NOT_RPYTHON" + trace = DebugTrace(*args) + log.trace(trace) + self.debug_traces.append(trace) + + debug_trace = noop # RPython-friendly, + # patched for tests in set_hotrunnerdesc() + + def set_hotrunnerdesc(self, hotrunnerdesc): + self.hotrunnerdesc = hotrunnerdesc + if not hotrunnerdesc.translate_support_code: + self.debug_trace = self._debug_trace def set_portalstate(self, portalstate): assert self.portalstate is None @@ -907,7 +915,7 @@ @arguments() def opimpl_hp_gray_return(self): if self.hp_return(): - rhotpath.hp_return(self, gv_result) + rhotpath.hp_return(self, None) assert False, "unreachable" @arguments() Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Fri Mar 14 16:55:37 2008 @@ -7,7 +7,9 @@ from pypy.rlib.objectmodel import we_are_translated, specialize from pypy.rpython.annlowlevel import cachedtype, base_ptr_lltype from pypy.rpython.annlowlevel import llhelper -from pypy.rpython.lltypesystem import lltype, llmemory +from pypy.rpython.annlowlevel import cast_instance_to_base_ptr +from pypy.rpython.annlowlevel import cast_base_ptr_to_instance +from pypy.rpython.lltypesystem import lltype, llmemory, lloperation def setup_jitstate(interp, jitstate, greenargs, redargs, @@ -64,6 +66,11 @@ def hp_return(interp, gv_result): interp.debug_trace("done at hp_return") + if we_are_translated(): + lloperation.llop.debug_fatalerror(lltype.Void, + "hp_return not implemented") + leave_graph(interp) + # XXX not translatable (and slow if translated literally) # XXX well, and hackish, clearly def exit(llvalue=None): @@ -95,8 +102,8 @@ pathkind = "%s path" % (ERASED,) def ll_reach_fallback_point(fallback_point_ptr, value, framebase): + fbp = _cast_base_ptr_to_fallback_point(fallback_point_ptr) try: - fbp = fallback_point_ptr # XXX cast # check if we should compile for this value. path_is_hot = fbp.check_should_compile(value) @@ -180,7 +187,7 @@ self.falsepath_pc = falsepath_pc self.truepath_pc = truepath_pc - @specialize.arg(1) + @specialize.arglltype(1) def check_should_compile(self, value): assert lltype.typeOf(value) is lltype.Bool threshold = self.hotrunnerdesc.threshold @@ -201,14 +208,14 @@ self.falsepath_counter = counter return False # path is still cold - @specialize.arg(2) + @specialize.arglltype(2) def prepare_fallbackinterp(self, fallbackinterp, value): if value: fallbackinterp.pc = self.truepath_pc else: fallbackinterp.pc = self.falsepath_pc - @specialize.arg(1) + @specialize.arglltype(1) def compile_hot_path(self, value): if value: pc = self.truepath_pc @@ -247,7 +254,7 @@ self.hotpromotiondesc = hotpromotiondesc self.counters = newgreendict() - @specialize.arg(1) + @specialize.arglltype(1) def check_should_compile(self, value): # XXX incredibly heavy for a supposely lightweight profiling gv_value = self.hotrunnerdesc.interpreter.rgenop.genconst(value) @@ -261,12 +268,12 @@ self.counters[greenkey] = counter return False - @specialize.arg(2) + @specialize.arglltype(2) def prepare_fallbackinterp(self, fallbackinterp, value): gv_value = self.hotrunnerdesc.interpreter.rgenop.genconst(value) fallbackinterp.local_green.append(gv_value) - @specialize.arg(1) + @specialize.arglltype(1) def compile_hot_path(self, value): gv_value = self.hotrunnerdesc.interpreter.rgenop.genconst(value) self._compile_hot_path(gv_value) @@ -313,7 +320,7 @@ # default case of the switch: frameinfo = default_builder.get_frame_info(incoming_gv) fbp.set_machine_code_info(flexswitch, frameinfo) - ll_fbp = fbp # XXX doesn't translate + ll_fbp = _cast_fallback_point_to_base_ptr(fbp) gv_fbp = default_builder.rgenop.genconst(ll_fbp) gv_switchvar = switchbox.genvar gv_fnptr = hotpromotiondesc.get_gv_reach_fallback_point(default_builder) @@ -334,3 +341,17 @@ jitstate.curbuilder = excpath_builder excpath_builder.start_writing() leave_graph(fbp.hotrunnerdesc.interpreter) + +# for testing purposes +def _cast_base_ptr_to_fallback_point(ptr): + if we_are_translated(): + return cast_base_ptr_to_instance(FallbackPoint, ptr) + else: + return ptr + +def _cast_fallback_point_to_base_ptr(instance): + assert isinstance(instance, FallbackPoint) + if we_are_translated(): + return cast_instance_to_base_ptr(instance) + else: + return instance Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py Fri Mar 14 16:55:37 2008 @@ -0,0 +1,17 @@ + + +import py +from pypy.jit.conftest import option +from pypy.jit.rainbow.test import test_hotpath + +if option.quicktest: + py.test.skip("slow") + + +py.test.skip("in-progress") + +class TestLLInterpreted(test_hotpath.TestHotPath): + translate_support_code = True + + # for the individual tests see + # ====> test_hotpath.py Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Fri Mar 14 16:55:37 2008 @@ -65,6 +65,7 @@ immutable noidentity materialize devirtualize + allocate populate """.split() Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Fri Mar 14 16:55:37 2008 @@ -1066,6 +1066,7 @@ self.frame.copy(memo), self.exc_type_box .copy(memo), self.exc_value_box.copy(memo), + self.resumepoint, self.greens[:], virtualizables) Modified: pypy/branch/jit-hotpath/pypy/rlib/objectmodel.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/objectmodel.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/objectmodel.py Fri Mar 14 16:55:37 2008 @@ -219,6 +219,20 @@ llhelper(rffi.AroundFnPtr, before) llhelper(rffi.AroundFnPtr, after) +def noop(*args, **kwds): + pass # an RPython-friendly noop function + +class Entry(ExtRegistryEntry): + _about_ = noop + + def compute_result_annotation(self, *args_s, **kwds_s): + from pypy.annotation import model as annmodel + return annmodel.s_None + + def specialize_call(self, hop): + from pypy.rpython.lltypesystem import lltype + return hop.inputconst(lltype.Void, None) + class UnboxedValue(object): """A mixin class to use for classes that have exactly one field which From fijal at codespeak.net Fri Mar 14 17:09:28 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 14 Mar 2008 17:09:28 +0100 (CET) Subject: [pypy-svn] r52509 - pypy/extradoc/talk/pycon2008 Message-ID: <20080314160928.920DE169F39@codespeak.net> Author: fijal Date: Fri Mar 14 17:09:28 2008 New Revision: 52509 Modified: pypy/extradoc/talk/pycon2008/distribution.fig pypy/extradoc/talk/pycon2008/distribution.png pypy/extradoc/talk/pycon2008/status.txt Log: use image instead of raw html. Try to adapt text size (still sucks with regard to AA) Modified: pypy/extradoc/talk/pycon2008/distribution.fig ============================================================================== --- pypy/extradoc/talk/pycon2008/distribution.fig (original) +++ pypy/extradoc/talk/pycon2008/distribution.fig Fri Mar 14 17:09:28 2008 @@ -7,47 +7,47 @@ Single -2 1200 2 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 60.00 120.00 - -675 -1350 0 1800 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 60.00 120.00 +2 1 2 3 0 7 50 -1 -1 3.000 0 0 7 0 0 2 + -1125 1800 7200 1800 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 0 0 2 + 4275 1800 4500 1800 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 0 0 2 + 0 1800 225 1800 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 0 0 2 + 2025 1800 2250 1800 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 1 0 2 + 0 0 3.00 90.00 150.00 225 1800 900 -1350 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 60.00 120.00 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 1 0 2 + 0 0 3.00 90.00 150.00 1125 -1350 2025 1800 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 60.00 120.00 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 1 0 2 + 0 0 3.00 90.00 150.00 2295 1800 2925 -1350 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 60.00 120.00 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 1 0 2 + 0 0 3.00 90.00 150.00 3600 -1350 4275 1800 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 60.00 120.00 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 1 0 2 + 0 0 3.00 90.00 150.00 4500 1800 5175 -1350 -2 1 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 2 - -1125 1800 7200 1800 -2 1 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 2 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 1 0 2 + 0 0 3.00 90.00 150.00 + -675 -1350 0 1800 +2 1 2 3 0 7 50 -1 -1 3.000 0 0 7 0 0 2 -1125 -1350 7200 -1350 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 0 0 2 -1125 -1350 -675 -1350 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 900 -1350 1125 -1350 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 0 1800 225 1800 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 2025 1800 2250 1800 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 2925 -1350 3600 -1350 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 4275 1800 4500 1800 -2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 0 0 2 5175 -1350 7200 -1350 -4 0 0 50 -1 0 20 0.0000 4 225 1665 -675 2475 Remote Side\001 -4 0 0 50 -1 0 20 0.0000 4 225 1395 -675 -1800 Local Side\001 -4 0 0 50 -1 0 14 0.0000 4 210 3165 -3105 585 x.meth()\001 -4 0 0 50 -1 0 14 0.0000 4 210 240 495 -945 f()\001 -4 0 0 50 -1 0 14 0.0000 4 165 120 1485 1170 8\001 -4 0 0 50 -1 0 14 0.0000 4 165 240 2385 -630 11\001 -4 0 0 50 -1 0 14 0.0000 4 225 1005 3105 1260 x.raising()\001 -4 0 0 50 -1 0 14 0.0000 4 165 1950 4950 270 \001 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 0 0 2 + 2925 -1350 3600 -1350 +2 1 0 3 0 7 50 -1 -1 0.000 0 0 7 0 0 2 + 900 -1350 1125 -1350 +4 0 0 50 -1 0 30 0.0000 4 345 2535 -675 2475 Remote Side\001 +4 0 0 50 -1 0 30 0.0000 4 345 2115 -675 -1800 Local Side\001 +4 0 0 50 -1 0 20 0.0000 4 300 345 315 -900 f()\001 +4 0 0 50 -1 0 20 0.0000 4 225 300 2340 -810 11\001 +4 0 0 50 -1 0 20 0.0000 4 300 4200 -4455 1395 x.meth()\001 +4 0 0 50 -1 0 20 0.0000 4 225 150 1530 1395 8\001 +4 0 0 50 -1 0 20 0.0000 4 300 1350 2700 1440 x.raising()\001 +4 0 0 50 -1 0 20 0.0000 4 225 2610 5265 -810 \001 Modified: pypy/extradoc/talk/pycon2008/distribution.png ============================================================================== Binary files. No diff available. Modified: pypy/extradoc/talk/pycon2008/status.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/status.txt (original) +++ pypy/extradoc/talk/pycon2008/status.txt Fri Mar 14 17:09:28 2008 @@ -117,24 +117,21 @@ * small piece of code to trust (no worry about 3rd party modules or whatever) -.. XXX maybe put sandboxed.png on its own page and make it - twice bigger for readability - -.. raw:: html - - +* very flexible policy -More about sandboxing -====================== +* extra run-time checks for all possible buffer overflows + in interpreter source (still, not analyzing any user code) * cannot segfault (unlike CPython) -* very flexible policy +.. XXX maybe put sandboxed.png on its own page and make it + twice bigger for readability -* extra run-time checks for all possible buffer overflows - in interpreter source (still, not analyzing any user code) +More about sandboxing +====================== -* demo +.. image:: sandboxed.png + :align: center Transparent proxy =================================== @@ -165,11 +162,7 @@ Distribution diagram ===================== -.. XXX all texts far too small to read - -.. raw:: html - - +.. image:: distribution.png RPython ======= From fijal at codespeak.net Fri Mar 14 17:11:46 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 14 Mar 2008 17:11:46 +0100 (CET) Subject: [pypy-svn] r52510 - pypy/extradoc/talk/pycon2008 Message-ID: <20080314161146.4026E169F5F@codespeak.net> Author: fijal Date: Fri Mar 14 17:11:44 2008 New Revision: 52510 Modified: pypy/extradoc/talk/pycon2008/sandboxed.png Log: scale this twice Modified: pypy/extradoc/talk/pycon2008/sandboxed.png ============================================================================== Binary files. No diff available. From fijal at codespeak.net Fri Mar 14 17:16:45 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 14 Mar 2008 17:16:45 +0100 (CET) Subject: [pypy-svn] r52512 - pypy/extradoc/talk/pycon2008 Message-ID: <20080314161645.5FD88169F39@codespeak.net> Author: fijal Date: Fri Mar 14 17:16:45 2008 New Revision: 52512 Modified: pypy/extradoc/talk/pycon2008/distribution.png Log: a bit of antialiasing fight. Modified: pypy/extradoc/talk/pycon2008/distribution.png ============================================================================== Binary files. No diff available. From fijal at codespeak.net Fri Mar 14 17:17:01 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 14 Mar 2008 17:17:01 +0100 (CET) Subject: [pypy-svn] r52513 - pypy/extradoc/talk/pycon2008 Message-ID: <20080314161701.A1A19169F50@codespeak.net> Author: fijal Date: Fri Mar 14 17:17:00 2008 New Revision: 52513 Added: pypy/extradoc/talk/pycon2008/sandboxed.dia (contents, props changed) Log: this belongs to repo as well Added: pypy/extradoc/talk/pycon2008/sandboxed.dia ============================================================================== Binary file. No diff available. From arigo at codespeak.net Fri Mar 14 17:23:34 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 17:23:34 +0100 (CET) Subject: [pypy-svn] r52514 - pypy/branch/jit-hotpath/pypy/rpython Message-ID: <20080314162334.F115F169F39@codespeak.net> Author: arigo Date: Fri Mar 14 17:23:34 2008 New Revision: 52514 Modified: pypy/branch/jit-hotpath/pypy/rpython/error.py pypy/branch/jit-hotpath/pypy/rpython/rtyper.py Log: A much-needed enhancement to TyperError: give the name of the graph where the error occurred. Modified: pypy/branch/jit-hotpath/pypy/rpython/error.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/error.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/error.py Fri Mar 14 17:23:34 2008 @@ -3,7 +3,7 @@ def __str__(self): result = Exception.__str__(self) if hasattr(self, 'where'): - result += '\n.. %r\n.. %r' % self.where + result += '\n.. %s\n.. %r\n.. %r' % self.where return result class MissingRTypeOperation(TyperError): Modified: pypy/branch/jit-hotpath/pypy/rpython/rtyper.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/rtyper.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/rtyper.py Fri Mar 14 17:23:34 2008 @@ -259,8 +259,7 @@ if minimize and isinstance(err, BrokenReprTyperError): bc += 1 continue - block, position = err.where - graph = self.annotator.annotated.get(block, None) + graph, block, position = err.where errmsg = ("TyperError-%d: %s\n" % (c, graph) + str(err) + "\n") @@ -525,7 +524,8 @@ """Record a TyperError without crashing immediately. Put a 'TyperError' operation in the graph instead. """ - e.where = (block, position) + graph = self.annotator.annotated.get(block) + e.where = (graph, block, position) self.typererror_count += 1 if self.crash_on_first_typeerror: raise From pedronis at codespeak.net Fri Mar 14 17:24:10 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 14 Mar 2008 17:24:10 +0100 (CET) Subject: [pypy-svn] r52515 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080314162410.0B877169F39@codespeak.net> Author: pedronis Date: Fri Mar 14 17:24:09 2008 New Revision: 52515 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Log: some more keepalive tests, found a not so relevant but annoying discrepancy in our keepalive impl. we don't have any union keepalive support right, not that the ctypes one makes complete sense, they behave just like Structures there. Modified: pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Fri Mar 14 17:24:09 2008 @@ -21,7 +21,8 @@ def test_structure_with_pointers(self): class X(Structure): - _fields_ = [('x', POINTER(c_int))] + _fields_ = [('x', POINTER(c_int)), + ('y', POINTER(c_int))] x = X() u = c_int(3) @@ -31,6 +32,46 @@ assert p._objects == {'1': u} assert x._objects == {'0': p._objects} + w = c_int(4) + q = pointer(w) + x.y = q + assert p._objects == {'1': u} + assert q._objects == {'1': w} + py.test.skip("impl discrepancy") + assert x._objects == {'0': p._objects, '1': q._objects} + + n = POINTER(c_int)() + x.x = n + x.y = n + assert x._objects == {'0': n._objects, '1': n._objects} + + def test_union_with_pointers(self): + py.test.skip("WIP") + class X(Union): + _fields_ = [('x', POINTER(c_int)), + ('y', POINTER(c_int))] + + x = X() + u = c_int(3) + p = pointer(u) + x.x = p + assert x.x._objects is None + assert p._objects == {'1': u} + assert x._objects == {'0': p._objects} + + # unions works just like structures it seems + w = c_int(4) + q = pointer(w) + x.y = q + assert p._objects == {'1': u} + assert q._objects == {'1': w} + assert x._objects == {'0': p._objects, '1': q._objects} + + n = POINTER(c_int)() + x.x = n + x.y = n + assert x._objects == {'0': n._objects, '1': n._objects} + def test_pointer_setitem(self): x = c_int(2) y = c_int(3) @@ -78,6 +119,23 @@ assert a._objects['0:3']['1'] is s + def test_array_of_union_with_pointer(self): + py.test.skip("WIP") + class S(Structure): + _fields_ = [('x', c_int)] + PS = POINTER(S) + + class Q(Union): + _fields_ = [('p', PS), ('x', c_int)] + + A = Q*10 + a=A() + s=S() + s.x=3 + a[3].p = pointer(s) + + assert a._objects['0:3']['1'] is s + def test_struct_with_inlined_array(self): class S(Structure): _fields_ = [('b', c_int), @@ -87,3 +145,14 @@ stuff = c_int(2) s.a[1] = pointer(stuff) assert s._objects == {'1:1': {'1': stuff}} + + def test_union_with_inlined_array(self): + py.test.skip("WIP") + class S(Union): + _fields_ = [('b', c_int), + ('a', POINTER(c_int) * 2)] + + s = S() + stuff = c_int(2) + s.a[1] = pointer(stuff) + assert s._objects == {'1:1': {'1': stuff}} From arigo at codespeak.net Fri Mar 14 17:24:58 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 17:24:58 +0100 (CET) Subject: [pypy-svn] r52516 - pypy/branch/jit-hotpath/pypy/rlib Message-ID: <20080314162458.A8C2E169F5A@codespeak.net> Author: arigo Date: Fri Mar 14 17:24:58 2008 New Revision: 52516 Modified: pypy/branch/jit-hotpath/pypy/rlib/objectmodel.py Log: Duh, a bug in the implementation of noop(). Modified: pypy/branch/jit-hotpath/pypy/rlib/objectmodel.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/objectmodel.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/objectmodel.py Fri Mar 14 17:24:58 2008 @@ -231,6 +231,7 @@ def specialize_call(self, hop): from pypy.rpython.lltypesystem import lltype + hop.exception_cannot_occur() return hop.inputconst(lltype.Void, None) From pedronis at codespeak.net Fri Mar 14 17:30:44 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 14 Mar 2008 17:30:44 +0100 (CET) Subject: [pypy-svn] r52517 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080314163044.1602B169F42@codespeak.net> Author: pedronis Date: Fri Mar 14 17:30:43 2008 New Revision: 52517 Modified: pypy/dist/pypy/lib/_ctypes/structure.py pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Log: fix discrepency what comes next is a real bug though Modified: pypy/dist/pypy/lib/_ctypes/structure.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/structure.py (original) +++ pypy/dist/pypy/lib/_ctypes/structure.py Fri Mar 14 17:30:43 2008 @@ -182,7 +182,7 @@ except KeyError: raise AttributeError(name) if getattr(value, '_objects', None): - key = keepalive_key(getattr(self.__class__, name).offset) + key = keepalive_key(getattr(self.__class__, name).num) store_reference(self, key, value._objects) arg = fieldtype._CData_value(value) if fieldtype._fficompositesize is not None: Modified: pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Fri Mar 14 17:30:43 2008 @@ -37,9 +37,9 @@ x.y = q assert p._objects == {'1': u} assert q._objects == {'1': w} - py.test.skip("impl discrepancy") assert x._objects == {'0': p._objects, '1': q._objects} + py.test.skip("and now we go for a real bug") n = POINTER(c_int)() x.x = n x.y = n From arigo at codespeak.net Fri Mar 14 17:37:52 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 17:37:52 +0100 (CET) Subject: [pypy-svn] r52518 - pypy/branch/jit-hotpath/pypy/annotation Message-ID: <20080314163752.3FF7D169F5A@codespeak.net> Author: arigo Date: Fri Mar 14 17:37:51 2008 New Revision: 52518 Modified: pypy/branch/jit-hotpath/pypy/annotation/description.py Log: Obscure annotator bug: don't attach _annenforceargs_ back to the real function object! It explodes confusingly if the function object has many specialized version because _annenforceargs_ then shows up on the other versions as well... Modified: pypy/branch/jit-hotpath/pypy/annotation/description.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/annotation/description.py (original) +++ pypy/branch/jit-hotpath/pypy/annotation/description.py Fri Mar 14 17:37:51 2008 @@ -166,6 +166,7 @@ class FunctionDesc(Desc): knowntype = types.FunctionType overridden = False + enforceargs = None def __init__(self, bookkeeper, pyobj=None, name=None, signature=None, defaults=None, @@ -252,12 +253,13 @@ tag = getattr(self.pyobj, '_annspecialcase_', None) policy = self.bookkeeper.annotator.policy self.specializer = policy.get_specializer(tag) - enforceargs = getattr(self.pyobj, '_annenforceargs_', None) + enforceargs = (self.enforceargs or + getattr(self.pyobj, '_annenforceargs_', None)) if enforceargs: if not callable(enforceargs): from pypy.annotation.policy import Sig enforceargs = Sig(*enforceargs) - self.pyobj._annenforceargs_ = enforceargs + self.enforceargs = enforceargs enforceargs(self, inputcells) # can modify inputcells in-place return self.specializer(self, inputcells) From pedronis at codespeak.net Fri Mar 14 17:57:19 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 14 Mar 2008 17:57:19 +0100 (CET) Subject: [pypy-svn] r52519 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080314165719.6C28F169ED8@codespeak.net> Author: pedronis Date: Fri Mar 14 17:57:16 2008 New Revision: 52519 Modified: pypy/dist/pypy/lib/_ctypes/array.py pypy/dist/pypy/lib/_ctypes/pointer.py pypy/dist/pypy/lib/_ctypes/structure.py pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Log: fix the bug this way Modified: pypy/dist/pypy/lib/_ctypes/array.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/array.py (original) +++ pypy/dist/pypy/lib/_ctypes/array.py Fri Mar 14 17:57:16 2008 @@ -160,7 +160,7 @@ self._slice_setitem(index, value) return index = self._fix_index(index) - if getattr(value, '_objects', None): + if getattr(value, '_objects', None) is not None: store_reference(self, index, value._objects) arg = self._type_._CData_value(value) if self._type_._fficompositesize is None: Modified: pypy/dist/pypy/lib/_ctypes/pointer.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/pointer.py (original) +++ pypy/dist/pypy/lib/_ctypes/pointer.py Fri Mar 14 17:57:16 2008 @@ -58,6 +58,8 @@ self._buffer = ffiarray(1, autofree=True) if value is not None: self.contents = value + else: + self._objects = {} self._ffiarray = ffiarray self.__init__ = __init__ self._type_ = TP @@ -78,7 +80,7 @@ raise TypeError("expected %s instead of %s" % ( self._type_.__name__, type(value).__name__)) self._objects = {keepalive_key(1):value} - if getattr(value, '_objects', None): + if getattr(value, '_objects', None) is not None: self._objects[keepalive_key(0)] = value._objects value = value._buffer self._buffer[0] = value Modified: pypy/dist/pypy/lib/_ctypes/structure.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/structure.py (original) +++ pypy/dist/pypy/lib/_ctypes/structure.py Fri Mar 14 17:57:16 2008 @@ -181,7 +181,7 @@ fieldtype = self._fieldtypes[name].ctype except KeyError: raise AttributeError(name) - if getattr(value, '_objects', None): + if getattr(value, '_objects', None) is not None: key = keepalive_key(getattr(self.__class__, name).num) store_reference(self, key, value._objects) arg = fieldtype._CData_value(value) Modified: pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Fri Mar 14 17:57:16 2008 @@ -39,11 +39,12 @@ assert q._objects == {'1': w} assert x._objects == {'0': p._objects, '1': q._objects} - py.test.skip("and now we go for a real bug") n = POINTER(c_int)() x.x = n x.y = n assert x._objects == {'0': n._objects, '1': n._objects} + assert x._objects['0'] is n._objects + assert n._objects is not None def test_union_with_pointers(self): py.test.skip("WIP") @@ -71,7 +72,9 @@ x.x = n x.y = n assert x._objects == {'0': n._objects, '1': n._objects} - + assert x._objects['0'] is n._objects + assert n._objects is not None + def test_pointer_setitem(self): x = c_int(2) y = c_int(3) From arigo at codespeak.net Fri Mar 14 18:00:45 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 18:00:45 +0100 (CET) Subject: [pypy-svn] r52520 - in pypy/branch/jit-hotpath/pypy: annotation rpython/test Message-ID: <20080314170045.E6D2B169ED8@codespeak.net> Author: arigo Date: Fri Mar 14 18:00:44 2008 New Revision: 52520 Modified: pypy/branch/jit-hotpath/pypy/annotation/builtin.py pypy/branch/jit-hotpath/pypy/rpython/test/test_rlist.py Log: Test and a simple fix for calling list() on a list and then mutating the result to make the items more general (used to cause a badly-typed called to ll_copy()). Modified: pypy/branch/jit-hotpath/pypy/annotation/builtin.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/annotation/builtin.py (original) +++ pypy/branch/jit-hotpath/pypy/annotation/builtin.py Fri Mar 14 18:00:44 2008 @@ -7,7 +7,7 @@ from pypy.annotation.model import SomeString, SomeTuple, SomeSlice, s_Bool from pypy.annotation.model import SomeUnicodeCodePoint, SomeAddress from pypy.annotation.model import SomeFloat, unionof, SomeUnicodeString -from pypy.annotation.model import SomePBC, SomeInstance, SomeDict +from pypy.annotation.model import SomePBC, SomeInstance, SomeDict, SomeList from pypy.annotation.model import SomeExternalObject from pypy.annotation.model import SomeWeakRef from pypy.annotation.model import annotation_to_lltype, lltype_to_annotation, ll_to_annotation @@ -216,6 +216,8 @@ return SomeObject() def builtin_list(s_iterable): + if isinstance(s_iterable, SomeList): + return s_iterable.listdef.offspring() # unify the two lists' items s_iter = s_iterable.iter() return getbookkeeper().newlist(s_iter.next()) Modified: pypy/branch/jit-hotpath/pypy/rpython/test/test_rlist.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/test/test_rlist.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/test/test_rlist.py Fri Mar 14 18:00:44 2008 @@ -1303,6 +1303,26 @@ return ''.join(l) py.test.raises(TyperError, self.interpret, f, [5]) + def test_copy(self): + def f(): + l1 = [] + l2 = list(l1) + l2.append(54) + return l2.pop() + res = self.interpret(f, []) + assert res == 54 + + def test_copy_2(self): + f1 = Freezing(); f1.x = 50 + f2 = Freezing(); f2.x = 8 + def f(): + l1 = [f1] + l2 = list(l1) + l2.append(f2) + return l2[0].x - l2[1].x + res = self.interpret(f, []) + assert res == 42 + class TestLLtype(BaseTestRlist, LLRtypeMixin): rlist = ll_rlist From arigo at codespeak.net Fri Mar 14 18:03:48 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 18:03:48 +0100 (CET) Subject: [pypy-svn] r52521 - in pypy/branch/jit-hotpath/pypy/jit: rainbow timeshifter Message-ID: <20080314170348.F1F7F169F0A@codespeak.net> Author: arigo Date: Fri Mar 14 18:03:47 2008 New Revision: 52521 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: Translation fixes. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Fri Mar 14 18:03:47 2008 @@ -77,11 +77,13 @@ if not isinstance(e, LLException): raise # don't know how to capture it, and it # probably shows a bug anyway - lltype, llvalue = e.args - self.gv_exc_type = self.rgenop.genconst(lltype) + llexctype, llvalue = e.args + self.gv_exc_type = self.rgenop.genconst(llexctype) self.gv_exc_value = self.rgenop.genconst(llvalue) else: - xxx + lloperation.llop.debug_fatalerror(lltype.Void, "capture_exception" + " not implemented") + assert 0 def run_directly(self, greenargs, redargs, targetbytecode): assert not (greenargs and redargs) # XXX for now @@ -106,8 +108,8 @@ # at this point we might have an exception set in self.gv_exc_xxx # and we have to really raise it. exceptiondesc = self.exceptiondesc - lltype = self.gv_exc_type.revealconst(exceptiondesc.LL_EXC_TYPE) - if lltype: + llexctype = self.gv_exc_type.revealconst(exceptiondesc.LL_EXC_TYPE) + if llexctype: if we_are_translated(): lloperation.llop.debug_fatalerror(lltype.Void, "fb_raise not implemented") @@ -115,9 +117,9 @@ # XXX non-translatable hack follows... from pypy.rpython.llinterp import LLException, type_name llvalue = self.gv_exc_value.revealconst(exceptiondesc.LL_EXC_VALUE) - assert lltype and llvalue - self.interpreter.debug_trace("fb_raise", type_name(lltype)) - raise LLException(lltype, llvalue) + assert llexctype and llvalue + self.interpreter.debug_trace("fb_raise", type_name(llexctype)) + raise LLException(llexctype, llvalue) else: self.interpreter.debug_trace("fb_return", gv_result) DoneWithThisFrame = self.hotrunnerdesc.DoneWithThisFrame Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Fri Mar 14 18:03:47 2008 @@ -194,6 +194,7 @@ portal_ptr = lltype.functionptr(PORTALFUNC, 'portal', graph = portalgraph) maybe_enter_jit = self.maybe_enter_jit_fn + unroll_ARGS = unrolling_iterable(ARGS) class DoneWithThisFrame(Exception): _go_through_llinterp_uncaught_ = True # ugh @@ -210,8 +211,13 @@ _go_through_llinterp_uncaught_ = True # ugh def __init__(self, args_gv, seen_can_enter_jit): assert len(args_gv) == len(ARGS) - self.args = [gv_arg.revealconst(ARG) - for gv_arg, ARG in zip(args_gv, ARGS)] + args = () + i = 0 + for ARG in unroll_ARGS: + gv_arg = args_gv[i] + args += (gv_arg.revealconst(ARG), ) + i += 1 + self.args = args self.seen_can_enter_jit = seen_can_enter_jit def __str__(self): return 'ContinueRunningNormally(%s)' % ( Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py Fri Mar 14 18:03:47 2008 @@ -245,4 +245,5 @@ return s_fnptr def specialize_call(self, hop): + hop.exception_cannot_occur() return hop.inputarg(hop.args_r[1], arg=1) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Fri Mar 14 18:03:47 2008 @@ -362,6 +362,8 @@ resuming = jitstate.get_resuming() if resuming is None: node = jitstate.promotion_path + if node is None: + return # not recording paths at all while not node.cut_limit: node = node.next dispatchqueue = jitstate.frame.dispatchqueue @@ -1236,6 +1238,8 @@ self.residual_ll_exception(cast_instance_to_base_ptr(e)) def get_resuming(self): + if self.frame.dispatchqueue is None: + return None return self.frame.dispatchqueue.resuming def clear_resuming(self): From pedronis at codespeak.net Fri Mar 14 18:26:34 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 14 Mar 2008 18:26:34 +0100 (CET) Subject: [pypy-svn] r52522 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080314172634.93252169ED0@codespeak.net> Author: pedronis Date: Fri Mar 14 18:26:33 2008 New Revision: 52522 Modified: pypy/dist/pypy/lib/_ctypes/union.py pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Log: make the union keepalive tests pass. there are many more corner cases of union usage which are untested on unsupported. Modified: pypy/dist/pypy/lib/_ctypes/union.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/union.py (original) +++ pypy/dist/pypy/lib/_ctypes/union.py Fri Mar 14 18:26:33 2008 @@ -1,7 +1,7 @@ import _rawffi -from _ctypes.basics import _CData, _CDataMeta +from _ctypes.basics import _CData, _CDataMeta, store_reference, keepalive_key from _ctypes.structure import round_up, names_and_fields, struct_getattr,\ struct_setattr import inspect @@ -33,6 +33,7 @@ raise TypeError("Cannot instantiate union, has no type") # malloc size size = self.__class__._sizeofinstances() + self.__dict__['_objects'] = {} self.__dict__['_buffer'] = self._ffiopaque(autofree=True) res.__init__ = __init__ return res @@ -65,6 +66,22 @@ _set_shape(self) _CDataMeta.__setattr__(self, name, value) + #def _CData_output(self, resarray, base=None, index=-1): + # res = self.__new__(self) + # ffistruct = self._ffiopaque.fromaddress(resarray.buffer) + # res.__dict__['_buffer'] = ffistruct + # res.__dict__['_base'] = base + # res.__dict__['_index'] = index + # return res.__ctypes_from_outparam__() + + #def _CData_retval(self, resbuffer): + # res = self.__new__(self) + # res.__dict__['_buffer'] = resbuffer + # res.__dict__['_base'] = None + # res.__dict__['_index'] = -1 + # return res.__ctypes_from_outparam__() + + class Union(_CData): __metaclass__ = UnionMeta @@ -74,12 +91,16 @@ except KeyError: raise AttributeError(name) val = self._ffiarrays[name].fromaddress(self._buffer.buffer, 1) - return fieldtype._CData_output(val) + offset = self.__class__._fieldtypes[name].num + return fieldtype._CData_output(val, self, offset) def __setattr__(self, name, value): try: fieldtype = self._fieldtypes[name].ctype except KeyError: raise AttributeError(name) + if getattr(value, '_objects', None) is not None: + key = keepalive_key(getattr(self.__class__, name).num) + store_reference(self, key, value._objects) buf = self._ffiarrays[name].fromaddress(self._buffer.buffer, 1) buf[0] = fieldtype._CData_value(value) Modified: pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Fri Mar 14 18:26:33 2008 @@ -47,7 +47,6 @@ assert n._objects is not None def test_union_with_pointers(self): - py.test.skip("WIP") class X(Union): _fields_ = [('x', POINTER(c_int)), ('y', POINTER(c_int))] @@ -123,7 +122,6 @@ assert a._objects['0:3']['1'] is s def test_array_of_union_with_pointer(self): - py.test.skip("WIP") class S(Structure): _fields_ = [('x', c_int)] PS = POINTER(S) @@ -150,7 +148,6 @@ assert s._objects == {'1:1': {'1': stuff}} def test_union_with_inlined_array(self): - py.test.skip("WIP") class S(Union): _fields_ = [('b', c_int), ('a', POINTER(c_int) * 2)] From arigo at codespeak.net Fri Mar 14 18:39:21 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 18:39:21 +0100 (CET) Subject: [pypy-svn] r52523 - in pypy/branch/jit-hotpath/pypy: jit/rainbow jit/rainbow/test rlib Message-ID: <20080314173921.7B26D169ED1@codespeak.net> Author: arigo Date: Fri Mar 14 18:39:21 2008 New Revision: 52523 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/rlib/debug.py Log: Implement fb_raise. Redirect debug_trace() to the debug_print llop when translating the support code. The first test passes! Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Fri Mar 14 18:39:21 2008 @@ -2,6 +2,7 @@ from pypy.rlib.unroll import unrolling_iterable from pypy.rlib.objectmodel import we_are_translated, CDefinedIntSymbolic from pypy.rpython.lltypesystem import lltype, llmemory, lloperation +from pypy.rpython.annlowlevel import cast_base_ptr_to_instance from pypy.jit.timeshifter import rvalue from pypy.jit.timeshifter.greenkey import empty_key, GreenKey from pypy.jit.rainbow.interpreter import SIGN_EXTEND2, arguments @@ -108,15 +109,15 @@ # at this point we might have an exception set in self.gv_exc_xxx # and we have to really raise it. exceptiondesc = self.exceptiondesc - llexctype = self.gv_exc_type.revealconst(exceptiondesc.LL_EXC_TYPE) - if llexctype: + llvalue = self.gv_exc_value.revealconst(exceptiondesc.LL_EXC_VALUE) + if llvalue: if we_are_translated(): - lloperation.llop.debug_fatalerror(lltype.Void, - "fb_raise not implemented") - assert 0 - # XXX non-translatable hack follows... + exception = cast_base_ptr_to_instance(Exception, llvalue) + self.interpreter.debug_trace("fb_raise", str(exception)) + raise Exception, exception + # non-translatable hack follows... from pypy.rpython.llinterp import LLException, type_name - llvalue = self.gv_exc_value.revealconst(exceptiondesc.LL_EXC_VALUE) + llexctype = self.gv_exc_type.revealconst(exceptiondesc.LL_EXC_TYPE) assert llexctype and llvalue self.interpreter.debug_trace("fb_raise", type_name(llexctype)) raise LLException(llexctype, llvalue) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Fri Mar 14 18:39:21 2008 @@ -1,6 +1,7 @@ from pypy.rlib.rarithmetic import intmask from pypy.rlib.unroll import unrolling_iterable from pypy.rlib.objectmodel import we_are_translated, CDefinedIntSymbolic, noop +from pypy.rlib.debug import debug_print from pypy.jit.timeshifter import rtimeshift, rcontainer, rvalue from pypy.jit.timeshifter.greenkey import empty_key, GreenKey, newgreendict from pypy.jit.rainbow import rhotpath @@ -225,8 +226,11 @@ log.trace(trace) self.debug_traces.append(trace) - debug_trace = noop # RPython-friendly, - # patched for tests in set_hotrunnerdesc() + # a choice of two RPython-friendly implementation, + # patched for tests in set_hotrunnerdesc(): + + #debug_trace = staticmethod(noop) + debug_trace = staticmethod(debug_print) def set_hotrunnerdesc(self, hotrunnerdesc): self.hotrunnerdesc = hotrunnerdesc Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Fri Mar 14 18:39:21 2008 @@ -75,6 +75,8 @@ return self.hotrunnerdesc.interpreter.debug_traces def check_traces(self, expected): + if self.translate_support_code: + return # XXX it would be nice to check traces in this case too traces = self.get_traces() i = 0 for trace, expect in zip(traces + ['--end of traces--'], Modified: pypy/branch/jit-hotpath/pypy/rlib/debug.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/debug.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/debug.py Fri Mar 14 18:39:21 2008 @@ -1,4 +1,4 @@ - +import sys from pypy.rpython.extregistry import ExtRegistryEntry def ll_assert(x, msg): @@ -16,9 +16,27 @@ def specialize_call(self, hop): from pypy.rpython.lltypesystem import lltype vlist = hop.inputargs(lltype.Bool, lltype.Void) + hop.exception_cannot_occur() hop.genop('debug_assert', vlist) +def debug_print(*args): + for arg in args: + print >> sys.stderr, arg, + print >> sys.stderr + +class Entry(ExtRegistryEntry): + _about_ = debug_print + + def compute_result_annotation(self, *args_s): + return None + + def specialize_call(self, hop): + vlist = hop.inputargs(*hop.args_r) + hop.exception_cannot_occur() + hop.genop('debug_print', vlist) + + def llinterpcall(RESTYPE, pythonfunction, *args): """When running on the llinterp, this causes the llinterp to call to the provided Python function with the run-time value of the given args. From arigo at codespeak.net Fri Mar 14 18:56:32 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 18:56:32 +0100 (CET) Subject: [pypy-svn] r52524 - in pypy/branch/jit-hotpath/pypy/objspace/flow: . test Message-ID: <20080314175632.AA900169EBF@codespeak.net> Author: arigo Date: Fri Mar 14 18:56:27 2008 New Revision: 52524 Modified: pypy/branch/jit-hotpath/pypy/objspace/flow/objspace.py pypy/branch/jit-hotpath/pypy/objspace/flow/test/test_objspace.py Log: Experimental: this removes the unexpected difference the flow object space makes for constant-folding between 'i += 1' and 'i = i + 1'. Modified: pypy/branch/jit-hotpath/pypy/objspace/flow/objspace.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/objspace/flow/objspace.py (original) +++ pypy/branch/jit-hotpath/pypy/objspace/flow/objspace.py Fri Mar 14 18:56:27 2008 @@ -592,8 +592,9 @@ op = None skip = False arithmetic = False + check_immutable_args = False - if name.startswith('del') or name.startswith('set') or name.startswith('inplace_'): + if name.startswith('del') or name.startswith('set'): # skip potential mutators if debug: print "Skip", name skip = True @@ -611,6 +612,7 @@ else: op = FunctionByName[name] arithmetic = (name + '_ovf') in FunctionByName + check_immutable_args = name.startswith('inplace_') if not op: if not skip: @@ -618,8 +620,7 @@ else: if debug: print "Can constant-fold operation: %s" % name - def generic_operator(self, *args_w): - assert len(args_w) == arity, name+" got the wrong number of arguments" + def try_to_constant_fold(self, *args_w): if op: args = [] for w_arg in args_w: @@ -631,6 +632,12 @@ args.append(arg) else: # All arguments are constants: call the operator now + if check_immutable_args: + try: + map(hash, args) + except TypeError: + raise TypeError("operation %r should not be applied on" + " constant objects %r" % (name, args)) #print >> sys.stderr, 'Constant operation', op try: result = op(*args) @@ -655,6 +662,12 @@ # store operation with variable result instead pass + def generic_operator(self, *args_w): + assert len(args_w) == arity, name+" got the wrong number of arguments" + result = try_to_constant_fold(self, *args_w) + if result is not None: + return result + #print >> sys.stderr, 'Variable operation', name, args_w w_result = self.do_operation_with_implicit_exceptions(name, *args_w) return w_result Modified: pypy/branch/jit-hotpath/pypy/objspace/flow/test/test_objspace.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/objspace/flow/test/test_objspace.py (original) +++ pypy/branch/jit-hotpath/pypy/objspace/flow/test/test_objspace.py Fri Mar 14 18:56:27 2008 @@ -856,6 +856,24 @@ return foolist[0] py.test.raises(RuntimeError, "self.codetest(f)") + def test_constant_fold_immutable_inplace_add(self): + def f(): + i = 5 + i += 1 + return i + graph = self.codetest(f) + simplify_graph(graph) + assert self.all_operations(graph) == {} + + l1 = [] + l2 = [] + def g(): + i = l1 + i += l2 # mutates global lists - forbidden + return i + py.test.raises(TypeError, self.codetest, g) + + class TestFlowObjSpaceDelay(Base): def setup_class(cls): cls.space = FlowObjSpace() From arigo at codespeak.net Fri Mar 14 19:06:14 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 19:06:14 +0100 (CET) Subject: [pypy-svn] r52525 - pypy/branch/jit-hotpath/pypy/objspace/flow/test Message-ID: <20080314180614.366A2169F54@codespeak.net> Author: arigo Date: Fri Mar 14 19:06:12 2008 New Revision: 52525 Modified: pypy/branch/jit-hotpath/pypy/objspace/flow/test/test_objspace.py Log: Report this minor problem as a skipped test. Modified: pypy/branch/jit-hotpath/pypy/objspace/flow/test/test_objspace.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/objspace/flow/test/test_objspace.py (original) +++ pypy/branch/jit-hotpath/pypy/objspace/flow/test/test_objspace.py Fri Mar 14 19:06:12 2008 @@ -873,6 +873,21 @@ return i py.test.raises(TypeError, self.codetest, g) + def test_ordering_bug(self): + # eager constant propagation could make the flow space believe that + # there is an always-raising '1.0 / 0' operation. Unsure how to + # fix this. + py.test.skip("minor bug") + def f(n, m): + x = 0 + total = 0.0 + while x < n: + if x > m: + total += 1.0 / x + x = x + 1 + return total + self.codetest(f) + class TestFlowObjSpaceDelay(Base): def setup_class(cls): From arigo at codespeak.net Fri Mar 14 19:07:11 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 19:07:11 +0100 (CET) Subject: [pypy-svn] r52526 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080314180711.7D20D169F54@codespeak.net> Author: arigo Date: Fri Mar 14 19:07:09 2008 New Revision: 52526 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: Flow space workaround. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Fri Mar 14 19:07:09 2008 @@ -205,6 +205,7 @@ elif c == '*': accum *= data elif c == '%': + assert data != 0 accum %= data elif c == '?': accum = int(bool(accum)) From pedronis at codespeak.net Fri Mar 14 19:12:00 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 14 Mar 2008 19:12:00 +0100 (CET) Subject: [pypy-svn] r52527 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080314181200.A99DC168432@codespeak.net> Author: pedronis Date: Fri Mar 14 19:11:58 2008 New Revision: 52527 Modified: pypy/dist/pypy/lib/app_test/ctypes/_ctypes_test.c pypy/dist/pypy/lib/app_test/ctypes/test_functions.py Log: WIP passing and returning union from functions Modified: pypy/dist/pypy/lib/app_test/ctypes/_ctypes_test.c ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/_ctypes_test.c (original) +++ pypy/dist/pypy/lib/app_test/ctypes/_ctypes_test.c Fri Mar 14 19:11:58 2008 @@ -508,3 +508,14 @@ } #endif + +typedef union { + short x; + long y; +} UN; + +EXPORT(UN) ret_un_func(UN inp) +{ + inp.y = inp.x * 10000; + return inp; +} Modified: pypy/dist/pypy/lib/app_test/ctypes/test_functions.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_functions.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_functions.py Fri Mar 14 19:11:58 2008 @@ -403,3 +403,15 @@ callback = proto(callback) raises(ArgumentError, lambda: callback((1, 2, 3, 4), POINT())) + def test_union_as_passed_value(self): + py.test.skip("WIP") + class UN(Union): + _fields_ = [("x", c_short), + ("y", c_long)] + dll.ret_un_func.restype = UN + dll.ret_un_func.argtypes = [UN] + A = UN * 2 + a = A() + a[1].x = 33 + u = dll.ret_un_func(a[1]) + assert u.y == 33*10000 From arigo at codespeak.net Fri Mar 14 19:16:58 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 19:16:58 +0100 (CET) Subject: [pypy-svn] r52528 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080314181658.12037169F5F@codespeak.net> Author: arigo Date: Fri Mar 14 19:16:58 2008 New Revision: 52528 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Log: Translation "fixes". Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Fri Mar 14 19:16:58 2008 @@ -82,9 +82,7 @@ self.gv_exc_type = self.rgenop.genconst(llexctype) self.gv_exc_value = self.rgenop.genconst(llvalue) else: - lloperation.llop.debug_fatalerror(lltype.Void, "capture_exception" - " not implemented") - assert 0 + Xxx("capture_exception") def run_directly(self, greenargs, redargs, targetbytecode): assert not (greenargs and redargs) # XXX for now @@ -245,15 +243,15 @@ @arguments("green", "green_varargs", "jumptargets") def opimpl_green_switch(self, exitcase, cases, targets): - xxx + Xxx("green_switch") @arguments("bool", "red", "red", "jumptarget") def opimpl_red_goto_ifptrnonzero(self, reverse, gv_ptr, gv_switch, target): - xxx + Xxx("red_goto_ifptrnonzero") @arguments("red", "jumptarget") def opimpl_goto_if_constant(self, gv_value, target): - xxx + Xxx("goto_if_constant") @arguments("red", returns="red") @@ -268,11 +266,11 @@ @arguments("red", "red", returns="red") def opimpl_red_ptr_eq(self, gv_ptr1, gv_ptr2): - xxx + Xxx("red_ptr_eq") @arguments("red", "red", returns="red") def opimpl_red_ptr_ne(self, gv_ptr1, gv_ptr2): - xxx + Xxx("red_ptr_ne") @arguments("red_varargs") @@ -300,7 +298,7 @@ @arguments("green_varargs", "red_varargs", "red", "indirectcalldesc") def opimpl_indirect_call_const(self, greenargs, redargs, gv_funcptr, callset): - xxx + Xxx("indirect_call_const") @arguments("oopspec", "bool", returns="red") def opimpl_red_oopspec_call_0(self, oopspec, deepfrozen): @@ -338,11 +336,11 @@ "promotiondesc") def opimpl_red_residual_call(self, gv_func, calldesc, withexc, has_result, redargs, promotiondesc): - xxx + Xxx("red_residual_call") @arguments("metacalldesc", "red_varargs", returns="red") def opimpl_metacall(self, metafunc, redargs): - xxx + Xxx("metacall") # exceptions @@ -375,11 +373,11 @@ @arguments("structtypedesc", "red", returns="red") def opimpl_red_malloc_varsize_struct(self, structtypedesc, gv_size): - xxx + Xxx("red_malloc_varsize_struct") @arguments("arraydesc", "red", returns="red") def opimpl_red_malloc_varsize_array(self, arraytypedesc, gv_size): - xxx + Xxx("red_malloc_varsize_array") @arguments("red", "fielddesc", "bool", returns="red") def opimpl_red_getfield(self, gv_struct, fielddesc, deepfrozen): @@ -389,7 +387,7 @@ @arguments("red", "fielddesc", "bool", returns="green_from_red") def opimpl_green_getfield(self, gv_struct, fielddesc, deepfrozen): - xxx + Xxx("green_getfield") @arguments("red", "fielddesc", "red") def opimpl_red_setfield(self, gv_dest, fielddesc, gv_value): @@ -397,48 +395,48 @@ @arguments("red", "arraydesc", "red", "bool", returns="red") def opimpl_red_getarrayitem(self, gv_array, fielddesc, gv_index, deepfrozen): - xxx + Xxx("red_getarrayitem") @arguments("red", "arraydesc", "red", "red") def opimpl_red_setarrayitem(self, gv_dest, fielddesc, gv_index, gv_value): - xxx + Xxx("red_setarrayitem") @arguments("red", "arraydesc", returns="red") def opimpl_red_getarraysize(self, gv_array, fielddesc): - xxx + Xxx("red_getarraysize") @arguments("red", "arraydesc", returns="green_from_red") def opimpl_green_getarraysize(self, gv_array, fielddesc): - xxx + Xxx("green_getarraysize") @arguments("red", "interiordesc", "bool", "red_varargs", returns="red") def opimpl_red_getinteriorfield(self, gv_struct, interiordesc, deepfrozen, indexes_gv): - xxx + Xxx("red_getinteriorfield") @arguments("red", "interiordesc", "bool", "red_varargs", returns="green_from_red") def opimpl_green_getinteriorfield(self, gv_struct, interiordesc, deepfrozen, indexes_gv): - xxx + Xxx("green_getinteriorfield") @arguments("red", "interiordesc", "red_varargs", "red") def opimpl_red_setinteriorfield(self, gv_dest, interiordesc, indexes_gv, gv_value): - xxx + Xxx("red_setinteriorfield") @arguments("red", "interiordesc", "red_varargs", returns="red") def opimpl_red_getinteriorarraysize(self, gv_array, interiordesc, indexes_gv): - xxx + Xxx("red_getinteriorarraysize") @arguments("red", "interiordesc", "red_varargs", returns="green_from_red") def opimpl_green_getinteriorarraysize(self, gv_array, interiordesc, indexes_gv): - xxx + Xxx("green_getinteriorarraysize") @arguments("red", "green", "green", returns="green") def opimpl_is_constant(self, arg, true, false): - xxx + Xxx("is_constant") # hotpath-specific operations @@ -543,3 +541,8 @@ # the argspec may unwrap *args_gv from local_red or local_green # and put the result back into local_red or local_green return argspec(implementation) + + +def Xxx(msg): + lloperation.llop.debug_fatalerror(lltype.Void, "not implemented: " + msg) + assert 0 From pedronis at codespeak.net Fri Mar 14 19:17:51 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 14 Mar 2008 19:17:51 +0100 (CET) Subject: [pypy-svn] r52529 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080314181751.324E6169F6C@codespeak.net> Author: pedronis Date: Fri Mar 14 19:17:50 2008 New Revision: 52529 Modified: pypy/dist/pypy/lib/_ctypes/union.py pypy/dist/pypy/lib/app_test/ctypes/test_functions.py Log: make the test pass Modified: pypy/dist/pypy/lib/_ctypes/union.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/union.py (original) +++ pypy/dist/pypy/lib/_ctypes/union.py Fri Mar 14 19:17:50 2008 @@ -66,20 +66,20 @@ _set_shape(self) _CDataMeta.__setattr__(self, name, value) - #def _CData_output(self, resarray, base=None, index=-1): - # res = self.__new__(self) - # ffistruct = self._ffiopaque.fromaddress(resarray.buffer) - # res.__dict__['_buffer'] = ffistruct - # res.__dict__['_base'] = base - # res.__dict__['_index'] = index - # return res.__ctypes_from_outparam__() + def _CData_output(self, resarray, base=None, index=-1): + res = self.__new__(self) + ffiopaque = self._ffiopaque.fromaddress(resarray.buffer) + res.__dict__['_buffer'] = ffiopaque + res.__dict__['_base'] = base + res.__dict__['_index'] = index + return res.__ctypes_from_outparam__() - #def _CData_retval(self, resbuffer): - # res = self.__new__(self) - # res.__dict__['_buffer'] = resbuffer - # res.__dict__['_base'] = None - # res.__dict__['_index'] = -1 - # return res.__ctypes_from_outparam__() + def _CData_retval(self, resbuffer): + res = self.__new__(self) + res.__dict__['_buffer'] = resbuffer + res.__dict__['_base'] = None + res.__dict__['_index'] = -1 + return res.__ctypes_from_outparam__() class Union(_CData): Modified: pypy/dist/pypy/lib/app_test/ctypes/test_functions.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_functions.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_functions.py Fri Mar 14 19:17:50 2008 @@ -404,7 +404,6 @@ raises(ArgumentError, lambda: callback((1, 2, 3, 4), POINT())) def test_union_as_passed_value(self): - py.test.skip("WIP") class UN(Union): _fields_ = [("x", c_short), ("y", c_long)] From pedronis at codespeak.net Fri Mar 14 19:30:26 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 14 Mar 2008 19:30:26 +0100 (CET) Subject: [pypy-svn] r52530 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080314183026.5BD46169EC0@codespeak.net> Author: pedronis Date: Fri Mar 14 19:30:25 2008 New Revision: 52530 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Log: a bit more of keepalive obscurity tests Modified: pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Fri Mar 14 19:30:25 2008 @@ -156,3 +156,41 @@ stuff = c_int(2) s.a[1] = pointer(stuff) assert s._objects == {'1:1': {'1': stuff}} + + def test_struct_within_struct(self): + py.test.skip("WIP") + class R(Structure): + _fields_ = [('p', POINTER(c_int))] + + class S(Structure): + _fields_ = [('b', c_int), + ('r', R)] + + s = S() + stuff = c_int(2) + s.r.p = pointer(stuff) + assert s._objects == {'0:1': {'1': stuff}} + + r = R() + s.r = r + # obscure + assert s._objects == {'1': {}, '0:1': {'1': stuff}} + + def test_union_within_union(self): + py.test.skip("WIP") + class R(Union): + _fields_ = [('p', POINTER(c_int))] + + class S(Union): + _fields_ = [('b', c_int), + ('r', R)] + + s = S() + stuff = c_int(2) + s.r.p = pointer(stuff) + assert s._objects == {'0:1': {'1': stuff}} + + r = R() + s.r = r + # obscure + assert s._objects == {'1': {}, '0:1': {'1': stuff}} From arigo at codespeak.net Fri Mar 14 19:42:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 19:42:09 +0100 (CET) Subject: [pypy-svn] r52531 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080314184209.45A67169EC5@codespeak.net> Author: arigo Date: Fri Mar 14 19:42:08 2008 New Revision: 52531 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py Log: More translation fixes. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Fri Mar 14 19:42:08 2008 @@ -120,9 +120,14 @@ self.interpreter.debug_trace("fb_raise", type_name(llexctype)) raise LLException(llexctype, llvalue) else: - self.interpreter.debug_trace("fb_return", gv_result) + ARGS = self.hotrunnerdesc.RAISE_DONE_FUNCPTR.TO.ARGS + if ARGS: + result = gv_result.revealconst(ARGS[0]) + else: + result = None + self.interpreter.debug_trace("fb_return", result) DoneWithThisFrame = self.hotrunnerdesc.DoneWithThisFrame - raise DoneWithThisFrame(gv_result) + raise DoneWithThisFrame(result) # ____________________________________________________________ # XXX Lots of copy and paste from interp.py! Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Fri Mar 14 19:42:08 2008 @@ -198,15 +198,14 @@ class DoneWithThisFrame(Exception): _go_through_llinterp_uncaught_ = True # ugh - def __init__(self, gv_result): - if RES is lltype.Void: - assert gv_result is None - self.result = None - else: - self.result = gv_result.revealconst(RES) + def __init__(self, result): + self.result = result def __str__(self): return 'DoneWithThisFrame(%s)' % (self.result,) + def raise_done(llvalue=None): + raise DoneWithThisFrame(llvalue) + class ContinueRunningNormally(Exception): _go_through_llinterp_uncaught_ = True # ugh def __init__(self, args_gv, seen_can_enter_jit): @@ -223,8 +222,14 @@ return 'ContinueRunningNormally(%s)' % ( ', '.join(map(str, self.args)),) + self.raise_done = raise_done + if RES is lltype.Void: + RAISE_DONE_FUNC = lltype.FuncType([], lltype.Void) + else: + RAISE_DONE_FUNC = lltype.FuncType([RES], lltype.Void) + self.tok_raise_done = self.RGenOp.sigToken(RAISE_DONE_FUNC) + self.RAISE_DONE_FUNCPTR = lltype.Ptr(RAISE_DONE_FUNC) self.DoneWithThisFrame = DoneWithThisFrame - self.DoneWithThisFrameARG = RES self.ContinueRunningNormally = ContinueRunningNormally def ll_portal_runner(*args): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Fri Mar 14 19:42:08 2008 @@ -66,25 +66,15 @@ def hp_return(interp, gv_result): interp.debug_trace("done at hp_return") - if we_are_translated(): - lloperation.llop.debug_fatalerror(lltype.Void, - "hp_return not implemented") - leave_graph(interp) - - # XXX not translatable (and slow if translated literally) - # XXX well, and hackish, clearly - def exit(llvalue=None): - DoneWithThisFrame = interp.hotrunnerdesc.DoneWithThisFrame - raise DoneWithThisFrame(interp.rgenop.genconst(llvalue)) - FUNCTYPE = lltype.FuncType([interp.hotrunnerdesc.DoneWithThisFrameARG], - lltype.Void) - exitfnptr = lltype.functionptr(FUNCTYPE, 'exit', _callable=exit) + # XXX slowish + desc = interp.hotrunnerdesc + exitfnptr = llhelper(desc.RAISE_DONE_FUNCPTR, desc.raise_done) gv_exitfnptr = interp.rgenop.genconst(exitfnptr) if gv_result is None: args_gv = [] else: args_gv = [gv_result] - interp.jitstate.curbuilder.genop_call(interp.rgenop.sigToken(FUNCTYPE), + interp.jitstate.curbuilder.genop_call(desc.tok_raise_done, gv_exitfnptr, args_gv) leave_graph(interp) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Fri Mar 14 19:42:08 2008 @@ -106,6 +106,8 @@ self.check_insns(expected, **counts) def check_insns_in_loops(self, expected=None, **counts): + if self.translate_support_code: + return # XXX it would be nice to check insns in this case too self.insns_in_loops = summary_loops(self.get_residual_graph()) if expected is not None: assert self.insns_in_loops == expected Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py Fri Mar 14 19:42:08 2008 @@ -83,7 +83,7 @@ "run_machine_code 4 355", "fallback_interp", "fb_leave 3 371", "run_machine_code 3 371", "fallback_interp", "fb_leave 2 380", "run_machine_code 2 380", "fallback_interp", "fb_leave 1 384", - "run_machine_code 1 384", "fallback_interp", "fb_return (385)" + "run_machine_code 1 384", "fallback_interp", "fb_return 385" ]) def test_promote_after_call(self): From pedronis at codespeak.net Fri Mar 14 19:51:24 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 14 Mar 2008 19:51:24 +0100 (CET) Subject: [pypy-svn] r52532 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080314185124.99CDB169E9A@codespeak.net> Author: pedronis Date: Fri Mar 14 19:51:20 2008 New Revision: 52532 Modified: pypy/dist/pypy/lib/_ctypes/array.py pypy/dist/pypy/lib/_ctypes/structure.py pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Log: make test pass, had to fight with consistency problems in how _CData_value was defined, used Modified: pypy/dist/pypy/lib/_ctypes/array.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/array.py (original) +++ pypy/dist/pypy/lib/_ctypes/array.py Fri Mar 14 19:51:20 2008 @@ -97,12 +97,12 @@ if isinstance(value, basestring): if len(value) > self._length_: raise ValueError("Invalid length") - return self(*value) + value = self(*value) else: if isinstance(value, tuple): if len(value) > self._length_: raise RuntimeError("Invalid length") - return self(*value) + value = self(*value) return _CDataMeta._CData_value(self, value) def array_get_slice_params(self, index): Modified: pypy/dist/pypy/lib/_ctypes/structure.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/structure.py (original) +++ pypy/dist/pypy/lib/_ctypes/structure.py Fri Mar 14 19:51:20 2008 @@ -148,7 +148,7 @@ def _CData_value(self, value): if isinstance(value, tuple): - return self(*value) + value = self(*value) return _CDataMeta._CData_value(self, value) def _CData_output(self, resarray, base=None, index=-1): @@ -188,7 +188,7 @@ if fieldtype._fficompositesize is not None: from ctypes import memmove dest = self._buffer.fieldaddress(name) - memmove(dest, arg._buffer.buffer, fieldtype._fficompositesize) + memmove(dest, arg, fieldtype._fficompositesize) else: self._buffer.__setattr__(name, arg) Modified: pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Fri Mar 14 19:51:20 2008 @@ -158,7 +158,6 @@ assert s._objects == {'1:1': {'1': stuff}} def test_struct_within_struct(self): - py.test.skip("WIP") class R(Structure): _fields_ = [('p', POINTER(c_int))] From arigo at codespeak.net Fri Mar 14 19:55:08 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 19:55:08 +0100 (CET) Subject: [pypy-svn] r52533 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080314185508.52E13169E93@codespeak.net> Author: arigo Date: Fri Mar 14 19:55:07 2008 New Revision: 52533 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Log: Translation fixes. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Fri Mar 14 19:55:07 2008 @@ -120,9 +120,9 @@ self.interpreter.debug_trace("fb_raise", type_name(llexctype)) raise LLException(llexctype, llvalue) else: - ARGS = self.hotrunnerdesc.RAISE_DONE_FUNCPTR.TO.ARGS - if ARGS: - result = gv_result.revealconst(ARGS[0]) + ARG = self.hotrunnerdesc.RAISE_DONE_FUNCPTR.TO.ARGS[0] + if ARG is not lltype.Void: + result = gv_result.revealconst(ARG) else: result = None self.interpreter.debug_trace("fb_return", result) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Fri Mar 14 19:55:07 2008 @@ -223,10 +223,7 @@ ', '.join(map(str, self.args)),) self.raise_done = raise_done - if RES is lltype.Void: - RAISE_DONE_FUNC = lltype.FuncType([], lltype.Void) - else: - RAISE_DONE_FUNC = lltype.FuncType([RES], lltype.Void) + RAISE_DONE_FUNC = lltype.FuncType([RES], lltype.Void) self.tok_raise_done = self.RGenOp.sigToken(RAISE_DONE_FUNC) self.RAISE_DONE_FUNCPTR = lltype.Ptr(RAISE_DONE_FUNC) self.DoneWithThisFrame = DoneWithThisFrame From pedronis at codespeak.net Fri Mar 14 19:59:46 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Fri, 14 Mar 2008 19:59:46 +0100 (CET) Subject: [pypy-svn] r52534 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080314185946.09126169E93@codespeak.net> Author: pedronis Date: Fri Mar 14 19:59:44 2008 New Revision: 52534 Modified: pypy/dist/pypy/lib/_ctypes/union.py pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Log: make this keepalive union manipulationt test pass too Modified: pypy/dist/pypy/lib/_ctypes/union.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/union.py (original) +++ pypy/dist/pypy/lib/_ctypes/union.py Fri Mar 14 19:59:44 2008 @@ -101,6 +101,15 @@ raise AttributeError(name) if getattr(value, '_objects', None) is not None: key = keepalive_key(getattr(self.__class__, name).num) - store_reference(self, key, value._objects) - buf = self._ffiarrays[name].fromaddress(self._buffer.buffer, 1) - buf[0] = fieldtype._CData_value(value) + store_reference(self, key, value._objects) + arg = fieldtype._CData_value(value) + if fieldtype._fficompositesize is not None: + from ctypes import memmove + dest = self._buffer.buffer + memmove(dest, arg, fieldtype._fficompositesize) + else: + buf = self._ffiarrays[name].fromaddress(self._buffer.buffer, 1) + buf[0] = arg + + def _get_buffer_value(self): + return self._buffer.buffer Modified: pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Fri Mar 14 19:59:44 2008 @@ -176,7 +176,6 @@ assert s._objects == {'1': {}, '0:1': {'1': stuff}} def test_union_within_union(self): - py.test.skip("WIP") class R(Union): _fields_ = [('p', POINTER(c_int))] From arigo at codespeak.net Fri Mar 14 20:08:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 20:08:09 +0100 (CET) Subject: [pypy-svn] r52535 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080314190809.8579D169E9A@codespeak.net> Author: arigo Date: Fri Mar 14 20:08:08 2008 New Revision: 52535 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py Log: Fix the tests. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Fri Mar 14 20:08:08 2008 @@ -96,6 +96,11 @@ def check_nothing_compiled_at_all(self): assert not hasattr(self.hotrunnerdesc, 'residual_graph') + def check_insns(self, *args, **kwds): + if self.translate_support_code: + return # XXX it would be nice to check insns in this case too + test_interpreter.InterpretationTest.check_insns(self, *args, **kwds) + def check_insns_excluding_return(self, expected=None, **counts): # the return is currently implemented by a direct_call(exitfnptr) if expected is not None: @@ -182,8 +187,7 @@ greens = ['code', 'pc'] reds = ['accum', 'data', 'buffer'] - def ll_function(code, buffer): - data = 0 + def ll_function(code, buffer, data): accum = 0 pc = 0 while True: @@ -207,7 +211,6 @@ elif c == '*': accum *= data elif c == '%': - assert data != 0 accum %= data elif c == '?': accum = int(bool(accum)) @@ -236,7 +239,7 @@ else: raise ValueError try: - ll_function(code, arg) + ll_function(code, arg, 0) except Exit, e: return e.result Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py Fri Mar 14 20:08:08 2008 @@ -2,7 +2,7 @@ import py from pypy.jit.conftest import option -from pypy.jit.rainbow.test import test_hotpath +from pypy.jit.rainbow.test import test_hotpath, test_hp_promotion if option.quicktest: py.test.skip("slow") @@ -15,3 +15,10 @@ # for the individual tests see # ====> test_hotpath.py + + +class TestLLInterpreted(test_hp_promotion.TestHotPromotion): + translate_support_code = True + + # for the individual tests see + # ====> test_hp_promotion.py From arigo at codespeak.net Fri Mar 14 21:06:52 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 14 Mar 2008 21:06:52 +0100 (CET) Subject: [pypy-svn] r52536 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080314200652.967E7169EAD@codespeak.net> Author: arigo Date: Fri Mar 14 21:06:50 2008 New Revision: 52536 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py Log: test_hp_llinterp passes. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Fri Mar 14 21:06:50 2008 @@ -101,6 +101,11 @@ return # XXX it would be nice to check insns in this case too test_interpreter.InterpretationTest.check_insns(self, *args, **kwds) + def check_oops(self, *args, **kwds): + if self.translate_support_code: + return # XXX it would be nice to check insns in this case too + test_interpreter.InterpretationTest.check_oops(self, *args, **kwds) + def check_insns_excluding_return(self, expected=None, **counts): # the return is currently implemented by a direct_call(exitfnptr) if expected is not None: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py Fri Mar 14 21:06:50 2008 @@ -8,8 +8,6 @@ py.test.skip("slow") -py.test.skip("in-progress") - class TestLLInterpreted(test_hotpath.TestHotPath): translate_support_code = True From fijal at codespeak.net Fri Mar 14 21:07:22 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 14 Mar 2008 21:07:22 +0100 (CET) Subject: [pypy-svn] r52537 - in pypy/branch/jit-refactoring/pypy/lang/js: . test Message-ID: <20080314200722.42F87169EB6@codespeak.net> Author: fijal Date: Fri Mar 14 21:07:21 2008 New Revision: 52537 Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py pypy/branch/jit-refactoring/pypy/lang/js/jscode.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Log: Implement DO and fix WHILE Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py Fri Mar 14 21:07:21 2008 @@ -310,7 +310,7 @@ if len(node.children) > 2: elseblock = self.dispatch(node.children[2]) else: - elseblock = operations.astundef + elseblock = None return operations.If(pos, condition, ifblock, elseblock) def visit_iterationstatement(self, node): @@ -324,7 +324,11 @@ block = self.dispatch(node.children[2]) return operations.While(pos, condition, block) elif itertype == "do": - pass + condition = self.dispatch(node.children[2]) + block = self.dispatch(node.children[1]) + return operations.Do(pos, condition, block) + else: + raise NotImplementedError("Unknown while version %s" % (itertype,)) def visit_regularfor(self, node): pos = self.get_pos(node) Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jscode.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jscode.py Fri Mar 14 21:07:21 2008 @@ -244,6 +244,9 @@ class JUMP_IF_FALSE(BaseJump): pass +class JUMP_IF_TRUE(BaseJump): + pass + OpcodeMap = {} for name, value in locals().items(): Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Fri Mar 14 21:07:21 2008 @@ -361,6 +361,20 @@ self.thenPart = thenpart self.elsePart = elsepart + def emit(self, bytecode): + self.condition.emit(bytecode) + one = bytecode.prealocate_label() + bytecode.emit('JUMP_IF_FALSE', one) + self.thenPart.emit(bytecode) + if self.elsePart is not None: + two = bytecode.prealocate_label() + bytecode.emit('JUMP', two) + bytecode.emit('LABEL', one) + self.elsePart.emit(bytecode) + bytecode.emit('LABEL', two) + else: + bytecode.emit('LABEL', one) + def execute(self, ctx): temp = self.condition.eval(ctx).GetValue() if temp.ToBoolean(): @@ -1068,6 +1082,12 @@ break elif e.type == 'continue': continue + + def emit(self, bytecode): + startlabel = bytecode.emit_label() + self.body.emit(bytecode) + self.condition.emit(bytecode) + bytecode.emit('JUMP_IF_TRUE', startlabel) class While(WhileBase): def emit(self, bytecode): Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Fri Mar 14 21:07:21 2008 @@ -392,8 +392,39 @@ 'JUMP_IF_FALSE 6', 'LOAD_VARIABLE "x"', 'JUMP 0']) - #self.check_remove_label('if (x>3) {x} else {y}', - + self.check_remove_label('if (x<3) {x} else {y}',[ + 'LOAD_VARIABLE "x"', + 'LOAD_INTCONSTANT 3', + 'LT', + 'JUMP_IF_FALSE 0', + 'LOAD_VARIABLE "x"', + 'JUMP 1', + 'LABEL 0', + 'LOAD_VARIABLE "y"', + 'LABEL 1'],[ + 'LOAD_VARIABLE "x"', + 'LOAD_INTCONSTANT 3', + 'LT', + 'JUMP_IF_FALSE 6', + 'LOAD_VARIABLE "x"', + 'JUMP 7', + 'LOAD_VARIABLE "y"']) + self.check_remove_label('if (x) {y}',[ + 'LOAD_VARIABLE "x"', + 'JUMP_IF_FALSE 0', + 'LOAD_VARIABLE "y"', + 'LABEL 0'],[ + 'LOAD_VARIABLE "x"', + 'JUMP_IF_FALSE 3', + 'LOAD_VARIABLE "y"']) + self.check_remove_label('do { stuff } while (x)',[ + 'LABEL 0', + 'LOAD_VARIABLE "stuff"', + 'LOAD_VARIABLE "x"', + 'JUMP_IF_TRUE 0'],[ + 'LOAD_VARIABLE "stuff"', + 'LOAD_VARIABLE "x"', + 'JUMP_IF_TRUE 0']) def test_function_decl(self): pass From fijal at codespeak.net Fri Mar 14 23:29:13 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 14 Mar 2008 23:29:13 +0100 (CET) Subject: [pypy-svn] r52538 - in pypy/branch/jit-refactoring/pypy/lang/js: . doc test Message-ID: <20080314222913.05D00169E9E@codespeak.net> Author: fijal Date: Fri Mar 14 23:29:12 2008 New Revision: 52538 Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt pypy/branch/jit-refactoring/pypy/lang/js/jscode.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Log: Function declaraction and function expression. Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py Fri Mar 14 23:29:12 2008 @@ -47,6 +47,8 @@ } def __init__(self): + self.varlists = [] + self.funclists = [] self.sourcename = "" RPythonVisitor.__init__(self) @@ -200,8 +202,6 @@ return operations.Identifier(pos, name) def visit_program(self, node): - self.varlists = [] - self.funclists = [] pos = self.get_pos(node) body = self.dispatch(node.children[0]) return operations.Program(pos, body) @@ -235,7 +235,7 @@ identifier, i = self.get_next_expr(node, i) parameters, i = self.get_next_expr(node, i) functionbody, i = self.get_next_expr(node, i) - if parameters == operations.astundef: + if parameters is None: p = [] else: p = [pident.get_literal() for pident in parameters.nodes] @@ -359,7 +359,7 @@ def get_next_expr(self, node, i): if isinstance(node.children[i], Symbol) and \ node.children[i].additional_info in [';', ')', '(', '}']: - return operations.astundef, i+1 + return None, i+1 else: return self.dispatch(node.children[i]), i+2 @@ -368,7 +368,7 @@ if len(node.children) > 0: target = self.dispatch(node.children[0]) else: - target = operations.astundef + target = None return operations.Break(pos, target) def visit_returnstatement(self, node): Modified: pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt Fri Mar 14 23:29:12 2008 @@ -28,6 +28,22 @@ create array out of num elements on the stack +object creation: + +LOAD_OBJECT + +Takes one element per one parameter from the stack and initializes +object this way. + +POP + +pops one element from the stack. + +LOAD_FUNCTION + +loads function object (declared earlier) to a stack. used for +function expressions. + Arithmetic binary operations: (all pops two values and pushes on stack the result) @@ -45,17 +61,14 @@ PREDECR, POSTDECR, PREINCR, POSTINCR decrement and increment (++, --) prefix and postfix -object creation: - -LOAD_OBJECT - -Takes one element per one parameter from the stack and initializes -object this way. - control flow: -XXX +JUMP, LABEL, JUMP_IF_TRUE, JUMP_IF_FALSE function control flow: -DECLARE_FUNCTION +DECLARE_FUNCTION + +scope control opcodes: + +DECLARE_VAR Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jscode.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jscode.py Fri Mar 14 23:29:12 2008 @@ -58,6 +58,12 @@ return False return all([i == j for i, j in zip(self.opcodes, list_of_opcodes)]) +class JsFunction(object): + def __init__(self, name, params, code): + self.name = name + self.params = params + self.code = code + class Opcode(object): def eval(self, ctx, stack): """ Execute in context ctx @@ -158,6 +164,13 @@ def __repr__(self): return 'LOAD_ARRAY %d' % (self.counter,) +class LOAD_FUNCTION(Opcode): + def __init__(self, funcobj): + self.funcobj = funcobj + + def __repr__(self): + return 'LOAD_FUNCTION' # XXX + class STORE_MEMBER(Opcode): def eval(self, ctx): XXX @@ -247,6 +260,29 @@ class JUMP_IF_TRUE(BaseJump): pass +class DECLARE_FUNCTION(Opcode): + def __init__(self, funcobj): + self.funcobj = funcobj + + def __repr__(self): + funcobj = self.funcobj + if funcobj.name is None: + name = "" + else: + name = funcobj.name + " " + codestr = '\n'.join([' %r' % (op,) for op in funcobj.code.opcodes]) + return 'DECLARE_FUNCTION %s%r [\n%s\n]' % (name, funcobj.params, codestr) + +class DECLARE_VAR(Opcode): + def __init__(self, name): + self.name = name + + def __repr__(self): + return 'DECLARE_VAR "%s"' % (self.name,) + +class RETURN(Opcode): + pass + OpcodeMap = {} for name, value in locals().items(): Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Fri Mar 14 23:29:12 2008 @@ -13,6 +13,7 @@ isnan, isinf from pypy.lang.js.execution import ExecutionReturned, JsTypeError,\ ThrowException +from pypy.lang.js.jscode import JsCode, JsFunction from constants import unescapedict, SLASH import sys @@ -321,10 +322,23 @@ class FunctionStatement(Statement): def __init__(self, pos, name, params, body): self.pos = pos - self.name = name + if name is None: + self.name = None + else: + assert isinstance(name, Identifier) + self.name = name.name self.body = body self.params = params + def emit(self, bytecode): + code = JsCode() + self.body.emit(code) + funcobj = JsFunction(self.name, self.params, code) + bytecode.emit('DECLARE_FUNCTION', funcobj) + if self.name is None: + # XXX looks awful + bytecode.emit('LOAD_FUNCTION', funcobj) + def eval(self, ctx): proto = ctx.get_global().Get('Function').Get('prototype') w_func = W_Object(ctx=ctx, Prototype=proto, Class='Function', callfunc=self) @@ -346,8 +360,8 @@ def emit(self, bytecode): bytecode.emit('LOAD_VARIABLE', self.name) -# def get_literal(self): -# return self.name + def get_literal(self): + return self.name class This(Identifier): @@ -912,6 +926,15 @@ self.nodes = nodes self.sourcename = sourcename + def emit(self, bytecode): + for varname in self.var_decl: + bytecode.emit('DECLARE_VAR', varname) + for funcname, funccode in self.func_decl.items(): + funccode.emit(bytecode) + + for node in self.nodes: + node.emit(bytecode) + def execute(self, ctx): for varname in self.var_decl: ctx.variable.Put(varname, w_Undefined, dd=True) @@ -946,6 +969,10 @@ def __init__(self, pos, expr): self.pos = pos self.expr = expr + + def emit(self, bytecode): + self.expr.emit(bytecode) + bytecode.emit('RETURN') def execute(self, ctx): if isinstance(self.expr, Undefined): @@ -1004,8 +1031,13 @@ class VariableDeclaration(Expression): def __init__(self, pos, identifier, expr=None): self.pos = pos - self.identifier = identifier + assert isinstance(identifier, Identifier) + self.identifier = identifier.name self.expr = expr + + def emit(self, bytecode): + self.expr.emit(bytecode) + bytecode.emit('STORE', self.identifier) def eval(self, ctx): name = self.identifier.get_literal() @@ -1020,6 +1052,10 @@ def __init__(self, pos, nodes): self.pos = pos self.nodes = nodes + + def emit(self, bytecode): + for node in self.nodes: + node.emit(bytecode) def eval(self, ctx): for var in self.nodes: @@ -1030,6 +1066,9 @@ def __init__(self, pos, body): self.pos = pos self.body = body + + def emit(self, bytecode): + self.body.emit(bytecode) def execute(self, ctx): return self.body.eval(ctx) Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Fri Mar 14 23:29:12 2008 @@ -426,8 +426,20 @@ 'LOAD_VARIABLE "x"', 'JUMP_IF_TRUE 0']) +class TestToAstFunction(BaseTestToAST): + def setup_class(cls): + cls.parse = parse_func('sourceelements') + def test_function_decl(self): - pass + self.check('function f(x, y, z) {x;}', + ['DECLARE_FUNCTION f [\'x\', \'y\', \'z\'] [\n LOAD_VARIABLE "x"\n]']) + + def test_function_expression(self): + self.check('var x = function() {return x}',[ + 'DECLARE_VAR "x"', + 'DECLARE_FUNCTION [] [\n LOAD_VARIABLE "x"\n RETURN\n]', + 'LOAD_FUNCTION', + 'STORE "x"']) from pypy.lang.js.jsparser import parse From fijal at codespeak.net Sat Mar 15 00:27:06 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sat, 15 Mar 2008 00:27:06 +0100 (CET) Subject: [pypy-svn] r52540 - pypy/extradoc/talk/pycon2008/pytestdemo Message-ID: <20080314232706.B81B3169FA5@codespeak.net> Author: fijal Date: Sat Mar 15 00:27:06 2008 New Revision: 52540 Added: pypy/extradoc/talk/pycon2008/pytestdemo/ Log: add a directory for pytest related demos. From fijal at codespeak.net Sat Mar 15 00:31:47 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sat, 15 Mar 2008 00:31:47 +0100 (CET) Subject: [pypy-svn] r52541 - in pypy/extradoc/talk/pycon2008: . pytestdemo Message-ID: <20080314233147.56176169F86@codespeak.net> Author: fijal Date: Sat Mar 15 00:31:46 2008 New Revision: 52541 Added: pypy/extradoc/talk/pycon2008/pytestdemo/test_one.py (contents, props changed) Modified: pypy/extradoc/talk/pycon2008/pytest.txt Log: Progress on pytest talk. Modified: pypy/extradoc/talk/pycon2008/pytest.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/pytest.txt (original) +++ pypy/extradoc/talk/pycon2008/pytest.txt Sat Mar 15 00:31:46 2008 @@ -1,14 +1,12 @@ -XXX order of slides is a bit random, I will reorder them - =========================================== -py.test - rapid testing with minimal effort +py.test =========================================== -:authors: Maciej Fijalkowski, Holger Krekel (merlinux GmbH), Brian Dorsey +:authors: Maciej Fijalkowski (merlinux GmbH), Brian Dorsey (noonhat) +:Title: py.test - rapid testing with minimal effort :date: 16 March 2008 -:event: Pycon 2008, Chicago IL -XXX fill details +:Event: Pycon 2008, Chicago IL Intro ========== @@ -26,12 +24,17 @@ * almost identical to nose -* def test_something(): defines test function +* def ``test_foo():`` defines test function -* class TestSomething: defines test class +* ``class TestFoo:`` defines test class * setup/teardown on many levels (module, class, function) +* generative tests: + + def test_one(): + yield function, arg + Automatic test collection ========================== @@ -41,16 +44,18 @@ * py.test --collectonly to show tests which would run -XXX demo of --collectonly +* demo assert by assert ================= -* no self.assertEqual, self.failUnlessEqual and friends +* no self.assertEqual, self.failNotUnlessEqual and friends + +* ``assert x == 3`` is enough -* assert x == 3 is enough +* assert reinterpretation -* assert reinterpretation (XXX demo) +* demo stdout/err capturing ===================== Added: pypy/extradoc/talk/pycon2008/pytestdemo/test_one.py ============================================================================== --- (empty file) +++ pypy/extradoc/talk/pycon2008/pytestdemo/test_one.py Sat Mar 15 00:31:46 2008 @@ -0,0 +1,14 @@ + +def test_working(): + assert 1 + +def test_failing(): + x = [1,2,3] + assert len(x) == 4 + +def test_printing(): + print "Blah blah blah blah" + +class TestFoo: + def test_one(self): + assert 1 From fijal at codespeak.net Sat Mar 15 00:33:02 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sat, 15 Mar 2008 00:33:02 +0100 (CET) Subject: [pypy-svn] r52542 - in pypy/branch/jit-refactoring/pypy/lang/js: . test Message-ID: <20080314233302.34366169F83@codespeak.net> Author: fijal Date: Sat Mar 15 00:33:00 2008 New Revision: 52542 Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Log: a POP bytecode. Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jscode.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jscode.py Sat Mar 15 00:33:00 2008 @@ -283,6 +283,9 @@ class RETURN(Opcode): pass +class POP(Opcode): + pass + OpcodeMap = {} for name, value in locals().items(): Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Sat Mar 15 00:33:00 2008 @@ -209,6 +209,7 @@ def emit(self, bytecode): for node in self.nodes: node.emit(bytecode) + bytecode.emit('POP') def execute(self, ctx): try: Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Sat Mar 15 00:33:00 2008 @@ -384,13 +384,15 @@ 'GT', 'JUMP_IF_FALSE 1', 'LOAD_VARIABLE "x"', + 'POP', 'JUMP 0', 'LABEL 1'], ['LOAD_VARIABLE "i"', 'LOAD_INTCONSTANT 1', 'GT', - 'JUMP_IF_FALSE 6', + 'JUMP_IF_FALSE 7', 'LOAD_VARIABLE "x"', + 'POP', 'JUMP 0']) self.check_remove_label('if (x<3) {x} else {y}',[ 'LOAD_VARIABLE "x"', @@ -398,31 +400,39 @@ 'LT', 'JUMP_IF_FALSE 0', 'LOAD_VARIABLE "x"', + 'POP', 'JUMP 1', 'LABEL 0', 'LOAD_VARIABLE "y"', + 'POP', 'LABEL 1'],[ 'LOAD_VARIABLE "x"', 'LOAD_INTCONSTANT 3', 'LT', - 'JUMP_IF_FALSE 6', + 'JUMP_IF_FALSE 7', 'LOAD_VARIABLE "x"', - 'JUMP 7', - 'LOAD_VARIABLE "y"']) + 'POP', + 'JUMP 9', + 'LOAD_VARIABLE "y"', + 'POP']) self.check_remove_label('if (x) {y}',[ 'LOAD_VARIABLE "x"', 'JUMP_IF_FALSE 0', 'LOAD_VARIABLE "y"', + 'POP', 'LABEL 0'],[ 'LOAD_VARIABLE "x"', - 'JUMP_IF_FALSE 3', - 'LOAD_VARIABLE "y"']) + 'JUMP_IF_FALSE 4', + 'LOAD_VARIABLE "y"', + 'POP']) self.check_remove_label('do { stuff } while (x)',[ 'LABEL 0', 'LOAD_VARIABLE "stuff"', + 'POP', 'LOAD_VARIABLE "x"', 'JUMP_IF_TRUE 0'],[ 'LOAD_VARIABLE "stuff"', + 'POP', 'LOAD_VARIABLE "x"', 'JUMP_IF_TRUE 0']) From fijal at codespeak.net Sat Mar 15 00:46:58 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sat, 15 Mar 2008 00:46:58 +0100 (CET) Subject: [pypy-svn] r52543 - in pypy/branch/jit-refactoring/pypy/lang/js: . test Message-ID: <20080314234658.4BCCF169FA5@codespeak.net> Author: fijal Date: Sat Mar 15 00:46:57 2008 New Revision: 52543 Added: pypy/branch/jit-refactoring/pypy/lang/js/baseop.py (contents, props changed) Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py Log: First interpreter test passes! Added: pypy/branch/jit-refactoring/pypy/lang/js/baseop.py ============================================================================== --- (empty file) +++ pypy/branch/jit-refactoring/pypy/lang/js/baseop.py Sat Mar 15 00:46:57 2008 @@ -0,0 +1,23 @@ + +""" Base operations implementations +""" + +from pypy.lang.js.jsobj import W_String, W_IntNumber, W_FloatNumber + +def plus(ctx, nleft, nright): + if isinstance(nleft, W_String) or isinstance(nright, W_String): + sleft = nleft.ToString(ctx) + sright = nright.ToString(ctx) + return W_String(sleft + sright) + # hot path + if isinstance(nleft, W_IntNumber) and isinstance(nright, W_IntNumber): + ileft = nleft.ToInt32() + iright = nright.ToInt32() + try: + return W_IntNumber(ovfcheck(ileft + iright)) + except OverflowError: + return W_FloatNumber(float(ileft) + float(iright)) + else: + fleft = nleft.ToNumber() + fright = nright.ToNumber() + return W_FloatNumber(fleft + fright) Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jscode.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jscode.py Sat Mar 15 00:46:57 2008 @@ -1,5 +1,7 @@ from pypy.lang.js.jsobj import W_IntNumber, W_FloatNumber, W_String +from pypy.rlib.unroll import unrolling_iterable +from pypy.lang.js.baseop import plus class AlreadyRun(Exception): pass @@ -11,6 +13,7 @@ self.opcodes = [] self.label_count = 0 self.has_labels = True + self.stack = [] def emit_label(self): num = self.prealocate_label() @@ -31,6 +34,17 @@ raise ValueError("Unknown opcode %s" % (operation,)) emit._annspecialcase_ = 'specialize:arg(1)' + def run(self, ctx, check_stack=True): + i = 0 + while i < len(self.opcodes): + for name, op in opcode_unrolling: + opcode = self.opcodes[i] + if isinstance(opcode, op): + opcode.eval(ctx, self.stack) + i += 1 + if check_stack: + assert not self.stack + def remove_labels(self): """ Basic optimization to remove all labels and change jumps to addresses. Necessary to run code at all @@ -95,7 +109,10 @@ raise NotImplementedError class BaseBinaryOperation(Opcode): - pass + def eval(self, ctx, stack): + right = stack.pop() + left = stack.pop() + stack.append(self.operation(ctx, left, right)) class BaseUnaryOperation(Opcode): pass @@ -121,8 +138,8 @@ def __init__(self, value): self.w_floatvalue = W_FloatNumber(float(value)) - def eval(self, ctx): - return self.w_floatvalue + def eval(self, ctx, stack): + stack.append(self.w_floatvalue) def __repr__(self): return 'LOAD_FLOATCONSTANT %s' % (self.w_floatvalue.floatval,) @@ -196,7 +213,8 @@ pass class ADD(BaseBinaryOperation): - pass + def operation(self, ctx, left, right): + return plus(ctx, left, right) class MUL(BaseBinaryOperation): pass @@ -292,3 +310,4 @@ if name.upper() == name and issubclass(value, Opcode): OpcodeMap[name] = value +opcode_unrolling = unrolling_iterable(OpcodeMap.items()) Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Sat Mar 15 00:46:57 2008 @@ -724,24 +724,6 @@ def mathop(self, ctx, n1, n2): raise NotImplementedError -def plus(ctx, nleft, nright): - if isinstance(nleft, W_String) or isinstance(nright, W_String): - sleft = nleft.ToString(ctx) - sright = nright.ToString(ctx) - return W_String(sleft + sright) - # hot path - if isinstance(nleft, W_IntNumber) and isinstance(nright, W_IntNumber): - ileft = nleft.ToInt32() - iright = nright.ToInt32() - try: - return W_IntNumber(ovfcheck(ileft + iright)) - except OverflowError: - return W_FloatNumber(float(ileft) + float(iright)) - else: - fleft = nleft.ToNumber() - fright = nright.ToNumber() - return W_FloatNumber(fleft + fright) - def mult(ctx, nleft, nright): if isinstance(nleft, W_IntNumber) and isinstance(nright, W_IntNumber): ileft = nleft.ToInt32() @@ -787,9 +769,6 @@ class Plus(BinaryNumberOp): operation_name = 'ADD' - def mathop(self, ctx, n1, n2): - return plus(ctx, n1, n2) - class Mult(BinaryNumberOp): operation_name = 'MUL' Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py Sat Mar 15 00:46:57 2008 @@ -4,14 +4,15 @@ from pypy.lang.js.operations import AEC, IntNumber, FloatNumber, Position, Plus from pypy.lang.js.jsobj import W_Object, ExecutionContext, W_Root, w_Null from pypy.lang.js.execution import ThrowException +from pypy.lang.js.jscode import JsCode def test_simple(): - n1 = FloatNumber(Position(), 2.0) - n2 = FloatNumber(Position(), 4.0) - p = Plus(Position(), n1, n2) - assert p.eval(ExecutionContext([W_Object(),])).GetValue().ToNumber() == 6.0 - l = [] - interpreter.writer = l.append + bytecode = JsCode() + bytecode.emit('LOAD_FLOATCONSTANT', 2) + bytecode.emit('LOAD_FLOATCONSTANT', 4) + bytecode.emit('ADD') + bytecode.run(ExecutionContext([W_Object()]), check_stack=False) + assert bytecode.stack[0].GetValue().ToNumber() == 6.0 def assertp(code, prints): l = [] From fijal at codespeak.net Sat Mar 15 02:28:52 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sat, 15 Mar 2008 02:28:52 +0100 (CET) Subject: [pypy-svn] r52544 - in pypy/branch/jit-refactoring/pypy/lang/js: . test Message-ID: <20080315012852.DFD4A16A02B@codespeak.net> Author: fijal Date: Sat Mar 15 02:28:50 2008 New Revision: 52544 Modified: pypy/branch/jit-refactoring/pypy/lang/js/baseop.py pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py pypy/branch/jit-refactoring/pypy/lang/js/jscode.py pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Log: More tests passing. Modified: pypy/branch/jit-refactoring/pypy/lang/js/baseop.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/baseop.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/baseop.py Sat Mar 15 02:28:50 2008 @@ -3,6 +3,8 @@ """ from pypy.lang.js.jsobj import W_String, W_IntNumber, W_FloatNumber +from pypy.rlib.rarithmetic import r_uint, intmask, INFINITY, NAN, ovfcheck,\ + isnan, isinf def plus(ctx, nleft, nright): if isinstance(nleft, W_String) or isinstance(nright, W_String): @@ -21,3 +23,15 @@ fleft = nleft.ToNumber() fright = nright.ToNumber() return W_FloatNumber(fleft + fright) + +def sub(ctx, nleft, nright): + if isinstance(nleft, W_IntNumber) and isinstance(nright, W_IntNumber): + ileft = nleft.ToInt32() + iright = nright.ToInt32() + try: + return W_IntNumber(ovfcheck(ileft - iright)) + except OverflowError: + return W_FloatNumber(float(ileft) - float(iright)) + fleft = nleft.ToNumber() + fright = nright.ToNumber() + return W_FloatNumber(fleft - fright) Modified: pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py Sat Mar 15 02:28:50 2008 @@ -9,6 +9,7 @@ from pypy.lang.js.execution import ThrowException, JsTypeError from pypy.rlib.objectmodel import we_are_translated from pypy.rlib.streamio import open_file_as_stream +from pypy.lang.js.jscode import JsCode ASTBUILDER = ASTBuilder() @@ -551,7 +552,10 @@ def run(self, script): """run the interpreter""" - return script.execute(self.global_context) + bytecode = JsCode() + script.emit(bytecode) + bytecode.run(self.global_context) + # XXX not sure what this should return def wrap_arguments(pyargs): "receives a list of arguments and wrap then in their js equivalents" Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jscode.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jscode.py Sat Mar 15 02:28:50 2008 @@ -1,7 +1,9 @@ -from pypy.lang.js.jsobj import W_IntNumber, W_FloatNumber, W_String +from pypy.lang.js.jsobj import W_IntNumber, W_FloatNumber, W_String,\ + W_Array, W_PrimitiveObject, W_Reference, ActivationObject +from pypy.lang.js.execution import JsTypeError from pypy.rlib.unroll import unrolling_iterable -from pypy.lang.js.baseop import plus +from pypy.lang.js.baseop import plus, sub class AlreadyRun(Exception): pass @@ -128,8 +130,8 @@ def __init__(self, value): self.w_intvalue = W_IntNumber(int(value)) - def eval(self, ctx): - return self.w_intvalue + def eval(self, ctx, stack): + stack.append(self.w_intvalue) def __repr__(self): return 'LOAD_INTCONSTANT %s' % (self.w_intvalue.intval,) @@ -148,8 +150,8 @@ def __init__(self, value): self.w_stringvalue = W_String(value) - def eval(self, ctx): - return self.w_stringvalue + def eval(self, ctx, stack): + stack.append(self.w_stringvalue) def get_literal(self): return W_String(self.strval).ToString() @@ -161,8 +163,8 @@ def __init__(self, identifier): self.identifier = identifier - def eval(self, ctx): - return ctx.resolve_identifier(self.identifier) + def eval(self, ctx, stack): + stack.append(ctx.resolve_identifier(self.identifier).GetValue()) def __repr__(self): return 'LOAD_VARIABLE "%s"' % (self.identifier,) @@ -171,12 +173,12 @@ def __init__(self, counter): self.counter = counter - def eval(self, ctx): + def eval(self, ctx, stack): proto = ctx.get_global().Get('Array').Get('prototype') array = W_Array(ctx, Prototype=proto, Class = proto.Class) - for i in range(len(self.nodes)): - array.Put(str(i), self.nodes[i].eval(ctx).GetValue()) - return array + for i in range(self.counter): + array.Put(str(self.counter - i - 1), stack.pop().GetValue()) + stack.append(array) def __repr__(self): return 'LOAD_ARRAY %d' % (self.counter,) @@ -196,8 +198,10 @@ def __init__(self, name): self.name = name - def eval(self, ctx): - XXX + def eval(self, ctx, stack): + value = stack.pop().GetValue() + ctx.assign(self.name, value) + stack.append(value) def __repr__(self): return 'STORE "%s"' % self.name @@ -206,11 +210,15 @@ def __init__(self, listofnames): self.listofnames = listofnames + def eval(self, ctx, stack): + XXX + def __repr__(self): return 'LOAD_OBJECT %r' % (self.listofnames,) class SUB(BaseBinaryOperation): - pass + def operation(self, ctx, left, right): + return sub(ctx, left, right) class ADD(BaseBinaryOperation): def operation(self, ctx, left, right): @@ -302,7 +310,30 @@ pass class POP(Opcode): - pass + def eval(self, ctx, stack): + stack.pop() + +class CALL(Opcode): + def eval(self, ctx, stack): + r1 = stack.pop() + args = stack.pop() + r3 = r1.GetValue() + if not isinstance(r3, W_PrimitiveObject): + raise ThrowException(W_String("it is not a callable")) + + if isinstance(r1, W_Reference): + r6 = r1.GetBase() + else: + r6 = None + if isinstance(args, ActivationObject): + r7 = None + else: + r7 = r6 + try: + res = r3.Call(ctx=ctx, args=args.tolist(), this=r7) + except JsTypeError: + raise ThrowException(W_String('it is not a function')) + stack.append(res) OpcodeMap = {} Modified: pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py Sat Mar 15 02:28:50 2008 @@ -496,7 +496,6 @@ self.this = scope[-1] else: self.this = this - # create a fast lookup if variable is None: self.variable = self.scope[0] else: @@ -512,7 +511,13 @@ return ""%(self.scope, self.variable) def assign(self, name, value): - pass + for obj in self.scope: + assert isinstance(obj, W_PrimitiveObject) + if obj.HasProperty(name): + obj.Put(name, value) + return + # if not, we need to put this thing in current scope + self.scope[0].Put(name, value) def get_global(self): return self.scope[-1] @@ -573,11 +578,13 @@ self.base = base self.property_name = property_name - def GetValue(self): + def check_empty(self): if self.base is None: exception = "ReferenceError: %s is not defined"%(self.property_name,) - raise ThrowException(W_String(exception)) - + raise ThrowException(W_String(exception)) + + def GetValue(self): + self.check_empty() return self.base.Get(self.property_name) def PutValue(self, w, ctx): Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Sat Mar 15 02:28:50 2008 @@ -9,8 +9,6 @@ W_PrimitiveObject, W_Reference, ActivationObject, W_Array, W_Boolean,\ w_Null, W_BaseNumber, isnull_or_undefined from pypy.rlib.parsing.ebnfparse import Symbol, Nonterminal -from pypy.rlib.rarithmetic import r_uint, intmask, INFINITY, NAN, ovfcheck,\ - isnan, isinf from pypy.lang.js.execution import ExecutionReturned, JsTypeError,\ ThrowException from pypy.lang.js.jscode import JsCode, JsFunction @@ -262,27 +260,16 @@ -class Call(BinaryOp): - def eval(self, ctx): - r1 = self.left.eval(ctx) - r2 = self.right.eval(ctx) - r3 = r1.GetValue() - if not isinstance(r3, W_PrimitiveObject): - raise ThrowException(W_String("it is not a callable")) - - if isinstance(r1, W_Reference): - r6 = r1.GetBase() - else: - r6 = None - if isinstance(r2, ActivationObject): - r7 = None - else: - r7 = r6 - try: - res = r3.Call(ctx=ctx, args=r2.get_args(), this=r7) - except JsTypeError: - raise ThrowException(W_String('it is not a function')) - return res +class Call(Expression): + def __init__(self, pos, left, args): + self.pos = pos + self.left = left + self.args = args + + def emit(self, bytecode): + self.args.emit(bytecode) + self.left.emit(bytecode) + bytecode.emit('CALL') class Comma(BinaryOp): def eval(self, ctx): @@ -707,6 +694,10 @@ def eval(self, ctx): return W_List([node.eval(ctx).GetValue() for node in self.nodes]) + def emit(self, bytecode): + for node in self.nodes: + node.emit(bytecode) + bytecode.emit('LOAD_ARRAY', len(self.nodes)) ############################################################################## # @@ -755,18 +746,6 @@ val = fleft / fright return W_FloatNumber(val) -def sub(ctx, nleft, nright): - if isinstance(nleft, W_IntNumber) and isinstance(nright, W_IntNumber): - ileft = nleft.ToInt32() - iright = nright.ToInt32() - try: - return W_IntNumber(ovfcheck(ileft - iright)) - except OverflowError: - return W_FloatNumber(float(ileft) - float(iright)) - fleft = nleft.ToNumber() - fright = nright.ToNumber() - return W_FloatNumber(fleft - fright) - class Plus(BinaryNumberOp): operation_name = 'ADD' @@ -914,6 +893,10 @@ for node in self.nodes: node.emit(bytecode) + # we don't need to pop after certain instructions, let's + # list them + if not isinstance(node, Return): + bytecode.emit('POP') def execute(self, ctx): for varname in self.var_decl: @@ -941,9 +924,8 @@ self.pos = pos self.body = body - def execute(self, ctx): - return self.body.execute(ctx) - + def emit(self, bytecode): + self.body.emit(bytecode) class Return(Statement): def __init__(self, pos, expr): Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py Sat Mar 15 02:28:50 2008 @@ -4,7 +4,7 @@ from pypy.lang.js.operations import AEC, IntNumber, FloatNumber, Position, Plus from pypy.lang.js.jsobj import W_Object, ExecutionContext, W_Root, w_Null from pypy.lang.js.execution import ThrowException -from pypy.lang.js.jscode import JsCode +from pypy.lang.js.jscode import JsCode, POP def test_simple(): bytecode = JsCode() @@ -33,7 +33,13 @@ jsint = interpreter.Interpreter() ctx = jsint.w_Global try: - code_val = jsint.run(interpreter.load_source(code, '')).GetValue() + bytecode = JsCode() + interpreter.load_source(code, '').emit(bytecode) + # XXX terrible hack + assert isinstance(bytecode.opcodes[-1], POP) + bytecode.opcodes.pop() + bytecode.run(ExecutionContext([ctx]), check_stack=False) + code_val = bytecode.stack[0].GetValue() except ThrowException, excpt: code_val = excpt.exception print code_val, value @@ -52,7 +58,6 @@ jsint = interpreter.Interpreter() py.test.raises(value, 'jsint.run(interpreter.load_source(code, ""))') - def test_interp_parse(): yield assertv, "1+1;", 2 yield assertp, "print(1+2+3); print(1);", ["6", "1"] Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Sat Mar 15 02:28:50 2008 @@ -442,14 +442,23 @@ def test_function_decl(self): self.check('function f(x, y, z) {x;}', - ['DECLARE_FUNCTION f [\'x\', \'y\', \'z\'] [\n LOAD_VARIABLE "x"\n]']) + ['DECLARE_FUNCTION f [\'x\', \'y\', \'z\'] [\n LOAD_VARIABLE "x"\n POP\n]']) def test_function_expression(self): self.check('var x = function() {return x}',[ 'DECLARE_VAR "x"', 'DECLARE_FUNCTION [] [\n LOAD_VARIABLE "x"\n RETURN\n]', 'LOAD_FUNCTION', - 'STORE "x"']) + 'STORE "x"', + 'POP']) + + def test_call(self): + self.check('print("stuff")',[ + 'LOAD_STRINGCONSTANT "stuff"', + 'LOAD_ARRAY 1', + 'LOAD_VARIABLE "print"', + 'CALL', + 'POP']) from pypy.lang.js.jsparser import parse From fijal at codespeak.net Sat Mar 15 03:11:24 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sat, 15 Mar 2008 03:11:24 +0100 (CET) Subject: [pypy-svn] r52545 - in pypy/branch/jit-refactoring/pypy/lang/js: . test Message-ID: <20080315021124.3F38416A04F@codespeak.net> Author: fijal Date: Sat Mar 15 03:11:22 2008 New Revision: 52545 Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py pypy/branch/jit-refactoring/pypy/lang/js/jscode.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Log: More tests passing. Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py Sat Mar 15 03:11:22 2008 @@ -286,7 +286,7 @@ return operations.MemberAssignment(pos, left.left, left.right, right, atype) elif isinstance(left, MemberDot): - return operations.MemberDotAssignment(pos, left.left, left.right, + return operations.MemberDotAssignment(pos, left.left, left.name, right, atype) else: raise ParseError(left.pos, "Invalid lefthand expression") Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jscode.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jscode.py Sat Mar 15 03:11:22 2008 @@ -1,6 +1,7 @@ from pypy.lang.js.jsobj import W_IntNumber, W_FloatNumber, W_String,\ - W_Array, W_PrimitiveObject, W_Reference, ActivationObject + W_Array, W_PrimitiveObject, W_Reference, ActivationObject,\ + create_object from pypy.lang.js.execution import JsTypeError from pypy.rlib.unroll import unrolling_iterable from pypy.lang.js.baseop import plus, sub @@ -112,8 +113,8 @@ class BaseBinaryOperation(Opcode): def eval(self, ctx, stack): - right = stack.pop() - left = stack.pop() + right = stack.pop().GetValue() + left = stack.pop().GetValue() stack.append(self.operation(ctx, left, right)) class BaseUnaryOperation(Opcode): @@ -208,14 +209,29 @@ class LOAD_OBJECT(Opcode): def __init__(self, listofnames): - self.listofnames = listofnames + self.listofnames = reversed(listofnames) def eval(self, ctx, stack): - XXX + w_obj = create_object(ctx, 'Object') + for name in self.listofnames: + w_elem = stack.pop().GetValue() + w_obj.Put(name, w_elem) + stack.append(w_obj) def __repr__(self): return 'LOAD_OBJECT %r' % (self.listofnames,) +class LOAD_MEMBER(Opcode): + def __init__(self, name): + self.name = name + + def eval(self, ctx, stack): + w_obj = stack.pop().GetValue().ToObject(ctx) + stack.append(W_Reference(self.name, w_obj)) + + def __repr__(self): + return 'LOAD_MEMBER "%s"' % (self.name,) + class SUB(BaseBinaryOperation): def operation(self, ctx, left, right): return sub(ctx, left, right) Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Sat Mar 15 03:11:22 2008 @@ -133,11 +133,10 @@ bytecode.emit('STORE_MEMBER') class MemberDotAssignment(Assignment): - def __init__(self, pos, what, item, right, operand): + def __init__(self, pos, what, name, right, operand): self.pos = pos self.what = what - assert isinstance(item, Identifier) - self.itemname = item.name + self.itemname = name self.right = right self.operand = operand @@ -301,6 +300,16 @@ class MemberDot(BinaryOp): "this is for object.name" + def __init__(self, pos, left, name): + assert isinstance(name, Identifier) + self.name = name.name + self.left = left + self.pos = pos + + def emit(self, bytecode): + self.left.emit(bytecode) + bytecode.emit('LOAD_MEMBER', self.name) + def eval(self, ctx): w_obj = self.left.eval(ctx).GetValue().ToObject(ctx) name = self.right.get_literal() @@ -865,14 +874,6 @@ prop.emit(bytecode) names.append(prop.identifier) bytecode.emit('LOAD_OBJECT', names) - - def eval(self, ctx): - w_obj = create_object(ctx, 'Object') - for prop in self.nodes: - name = prop.left.eval(ctx).GetPropertyName() - w_expr = prop.right.eval(ctx).GetValue() - w_obj.Put(name, w_expr) - return w_obj class SourceElements(Statement): """ Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py Sat Mar 15 03:11:22 2008 @@ -85,7 +85,7 @@ def test_object_access(): yield assertp, "x={d:3}; print(x.d);", "3" yield assertp, "x={d:3}; print(x.d.d);", "undefined" - yield assertp, "x={d:3, z:4}; print(x.d+x.z);", "7" + yield assertp, "x={d:3, z:4}; print(x.d-x.z);", "-1" def test_object_access_index(): assertp('x={d:"x"}; print(x["d"]);', 'x') Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Sat Mar 15 03:11:22 2008 @@ -460,6 +460,16 @@ 'CALL', 'POP']) + def test_member(self): + self.check('a.b', ['LOAD_VARIABLE "a"', + 'LOAD_MEMBER "b"', + 'POP']) + self.check('a.b = 3', ['LOAD_INTCONSTANT 3', + 'LOAD_STRINGCONSTANT "b"', + 'LOAD_VARIABLE "a"', + 'STORE_MEMBER', + 'POP']) + from pypy.lang.js.jsparser import parse def test_simplesemicolon(): From arigo at codespeak.net Sat Mar 15 08:57:14 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 08:57:14 +0100 (CET) Subject: [pypy-svn] r52546 - pypy/dist/pypy/rlib Message-ID: <20080315075714.818F416A033@codespeak.net> Author: arigo Date: Sat Mar 15 08:57:12 2008 New Revision: 52546 Modified: pypy/dist/pypy/rlib/rsha.py Log: Avoid allocation during the main loop. Speed-up: 33%. Still slow; CPython uses a more efficient algorithm. Modified: pypy/dist/pypy/rlib/rsha.py ============================================================================== --- pypy/dist/pypy/rlib/rsha.py (original) +++ pypy/dist/pypy/rlib/rsha.py Sat Mar 15 08:57:12 2008 @@ -44,19 +44,17 @@ hx[(e>>12)&0xF], hx[(e>>8)&0xF], hx[(e>>4)&0xF], hx[e&0xF], ]) -def _string2uintlist(s, start=0, count=16): +def _string2uintlist(s, start, count, result): """Build a list of count r_uint's by unpacking the string s[start:start+4*count] in big-endian order. """ - result = [] for i in range(count): p = start + i * 4 x = r_uint(ord(s[p+3])) x |= r_uint(ord(s[p+2])) << 8 x |= r_uint(ord(s[p+1])) << 16 x |= r_uint(ord(s[p])) << 24 - result.append(x) - return result + result[i] = x # ====================================================================== @@ -103,6 +101,7 @@ "Initialisation." self.count = r_ulonglong(0) # total number of bytes self.input = "" # pending unprocessed data, < 64 bytes + self.uintbuffer = [r_uint(0)] * 80 # Initial 160 bit message digest (5 times 32 bit). self.H0 = r_uint(0x67452301L) @@ -114,8 +113,8 @@ def _transform(self, W): for t in range(16, 80): - W.append(_rotateLeft( - W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16], 1)) + W[t] = _rotateLeft( + W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16], 1) A = self.H0 B = self.H1 @@ -174,12 +173,12 @@ # Append length (before padding). assert len(self.input) == 56 - bits = _string2uintlist(self.input, 0, 56 // 4) + W = self.uintbuffer + _string2uintlist(self.input, 0, 14, W) length_in_bits = count << 3 - bits.append(r_uint(length_in_bits >> 32)) - bits.append(r_uint(length_in_bits)) - - self._transform(bits) + W[14] = r_uint(length_in_bits >> 32) + W[15] = r_uint(length_in_bits) + self._transform(W) # Store state in digest. digest = digestfunc(self.H0, self.H1, self.H2, self.H3, self.H4) @@ -222,11 +221,14 @@ assert partLen > 0 if leninBuf >= partLen: + W = self.uintbuffer self.input = self.input + inBuf[:partLen] - self._transform(_string2uintlist(self.input)) + _string2uintlist(self.input, 0, 16, W) + self._transform(W) i = partLen while i + 64 <= leninBuf: - self._transform(_string2uintlist(inBuf, i)) + _string2uintlist(inBuf, i, 16, W) + self._transform(W) i = i + 64 else: self.input = inBuf[i:leninBuf] From arigo at codespeak.net Sat Mar 15 09:10:39 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 09:10:39 +0100 (CET) Subject: [pypy-svn] r52547 - pypy/dist/pypy/rlib Message-ID: <20080315081039.089BE16A016@codespeak.net> Author: arigo Date: Sat Mar 15 09:10:38 2008 New Revision: 52547 Modified: pypy/dist/pypy/rlib/rsha.py Log: Completely unroll the inner tool by default. Modified: pypy/dist/pypy/rlib/rsha.py ============================================================================== --- pypy/dist/pypy/rlib/rsha.py (original) +++ pypy/dist/pypy/rlib/rsha.py Sat Mar 15 09:10:38 2008 @@ -62,6 +62,9 @@ # # ====================================================================== +UNROLL_ALL = True # this algorithm should be fastest & biggest + + def f0_19(B, C, D): return (B & C) | ((~ B) & D) @@ -86,6 +89,8 @@ ] unroll_f_K = unrolling_iterable(zip(f, K)) +if UNROLL_ALL: + unroll_range_20 = unrolling_iterable(range(20)) class RSHA(object): """RPython-level SHA object. @@ -134,8 +139,12 @@ """ t0 = 0 for f, K in unroll_f_K: - for t in range(t0, t0+20): - TEMP = _rotateLeft(A, 5) + f(B, C, D) + E + W[t] + K + if UNROLL_ALL: + rng20 = unroll_range_20 + else: + rng20 = range(20) + for t in rng20: + TEMP = _rotateLeft(A, 5) + f(B, C, D) + E + W[t0+t] + K E = D D = C C = _rotateLeft(B, 30) From arigo at codespeak.net Sat Mar 15 09:15:34 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 09:15:34 +0100 (CET) Subject: [pypy-svn] r52548 - pypy/dist/pypy/rlib Message-ID: <20080315081534.B210716A054@codespeak.net> Author: arigo Date: Sat Mar 15 09:15:34 2008 New Revision: 52548 Modified: pypy/dist/pypy/rlib/rmd5.py Log: The same allocation-avoiding approach for rmd5. Modified: pypy/dist/pypy/rlib/rmd5.py ============================================================================== --- pypy/dist/pypy/rlib/rmd5.py (original) +++ pypy/dist/pypy/rlib/rmd5.py Sat Mar 15 09:15:34 2008 @@ -66,19 +66,17 @@ hx[(d>>20)&0xF], hx[(d>>16)&0xF], hx[(d>>28)&0xF], hx[(d>>24)&0xF], ]) -def _string2uintlist(s, start=0, count=16): +def _string2uintlist(s, start, count, result): """Build a list of count r_uint's by unpacking the string s[start:start+4*count] in little-endian order. """ - result = [] for i in range(count): p = start + i * 4 x = r_uint(ord(s[p])) x |= r_uint(ord(s[p+1])) << 8 x |= r_uint(ord(s[p+2])) << 16 x |= r_uint(ord(s[p+3])) << 24 - result.append(x) - return result + result[i] = x # ====================================================================== @@ -136,6 +134,7 @@ """ self.count = r_ulonglong(0) # total number of bytes self.input = "" # pending unprocessed data, < 64 bytes + self.uintbuffer = [r_uint(0)] * 16 # Load magic initialization constants. self.A = r_uint(0x67452301L) @@ -269,12 +268,12 @@ # Append length (before padding). assert len(self.input) == 56 - bits = _string2uintlist(self.input, 0, 56 // 4) + W = self.uintbuffer + _string2uintlist(self.input, 0, 14, W) length_in_bits = count << 3 - bits.append(r_uint(length_in_bits)) - bits.append(r_uint(length_in_bits >> 32)) - - self._transform(bits) + W[14] = r_uint(length_in_bits) + W[15] = r_uint(length_in_bits >> 32) + self._transform(W) # Store state in digest. digest = digestfunc(self.A, self.B, self.C, self.D) @@ -315,11 +314,14 @@ assert partLen > 0 if leninBuf >= partLen: + W = self.uintbuffer self.input = self.input + inBuf[:partLen] - self._transform(_string2uintlist(self.input)) + _string2uintlist(self.input, 0, 16, W) + self._transform(W) i = partLen while i + 64 <= leninBuf: - self._transform(_string2uintlist(inBuf, i)) + _string2uintlist(inBuf, i, 16, W) + self._transform(W) i = i + 64 else: self.input = inBuf[i:leninBuf] From arigo at codespeak.net Sat Mar 15 09:41:10 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 09:41:10 +0100 (CET) Subject: [pypy-svn] r52549 - pypy/dist/pypy/translator Message-ID: <20080315084110.8D24B16A026@codespeak.net> Author: arigo Date: Sat Mar 15 09:41:10 2008 New Revision: 52549 Modified: pypy/dist/pypy/translator/simplify.py Log: Update comment. Modified: pypy/dist/pypy/translator/simplify.py ============================================================================== --- pypy/dist/pypy/translator/simplify.py (original) +++ pypy/dist/pypy/translator/simplify.py Sat Mar 15 09:41:10 2008 @@ -772,8 +772,8 @@ if not newlist_v or not loops: return - # XXX works with Python 2.4 only: find calls to append encoded as - # getattr/simple_call pairs + # XXX works with Python >= 2.4 only: find calls to append encoded as + # getattr/simple_call pairs, as produced by the LIST_APPEND bytecode. for block in graph.iterblocks(): for i in range(len(block.operations)-1): op = block.operations[i] From arigo at codespeak.net Sat Mar 15 10:04:55 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 10:04:55 +0100 (CET) Subject: [pypy-svn] r52550 - in pypy/dist/pypy: objspace/flow translator/test Message-ID: <20080315090455.9F64B16A054@codespeak.net> Author: arigo Date: Sat Mar 15 10:04:53 2008 New Revision: 52550 Modified: pypy/dist/pypy/objspace/flow/objspace.py pypy/dist/pypy/translator/test/test_geninterp.py Log: experimental: get rid of the AttributeError and TypeError exceptions produced by the flow object space (unless, of course, we're geninterp; add a test for this case) Modified: pypy/dist/pypy/objspace/flow/objspace.py ============================================================================== --- pypy/dist/pypy/objspace/flow/objspace.py (original) +++ pypy/dist/pypy/objspace/flow/objspace.py Sat Mar 15 10:04:53 2008 @@ -449,6 +449,14 @@ return w_res def handle_implicit_exceptions(self, exceptions): + if not exceptions: + return + if not self.config.translation.builtins_can_raise_exceptions: + # clean up 'exceptions' by removing the non-RPythonic exceptions + # which might be listed for geninterp. + exceptions = [exc for exc in exceptions + if exc is not TypeError and + exc is not AttributeError] if exceptions: # catch possible exceptions implicitly. If the OperationError # below is not caught in the same function, it will produce an Modified: pypy/dist/pypy/translator/test/test_geninterp.py ============================================================================== --- pypy/dist/pypy/translator/test/test_geninterp.py (original) +++ pypy/dist/pypy/translator/test/test_geninterp.py Sat Mar 15 10:04:53 2008 @@ -284,3 +284,7 @@ result = fn("abc") assert result == u"abc" and type(result) is unicode + def test_attributeerror(self): + fn = self.build_interpfunc(snippet.t_attrerror) + result = fn(42) + assert result == 567 From arigo at codespeak.net Sat Mar 15 10:05:14 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 10:05:14 +0100 (CET) Subject: [pypy-svn] r52551 - pypy/dist/pypy/translator/test Message-ID: <20080315090514.DED6C16A054@codespeak.net> Author: arigo Date: Sat Mar 15 10:05:14 2008 New Revision: 52551 Modified: pypy/dist/pypy/translator/test/snippet.py Log: This goes with the previous checkin. Modified: pypy/dist/pypy/translator/test/snippet.py ============================================================================== --- pypy/dist/pypy/translator/test/snippet.py (original) +++ pypy/dist/pypy/translator/test/snippet.py Sat Mar 15 10:05:14 2008 @@ -626,6 +626,12 @@ def t_neg_long(): return -132L +def t_attrerror(x): + try: + return x.foobar + except AttributeError: + return 567 + # --------------------(Currently) Non runnable Functions --------------------- From arigo at codespeak.net Sat Mar 15 10:05:54 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 10:05:54 +0100 (CET) Subject: [pypy-svn] r52552 - in pypy/dist/pypy: config translator translator/test Message-ID: <20080315090554.D319B16A05B@codespeak.net> Author: arigo Date: Sat Mar 15 10:05:53 2008 New Revision: 52552 Modified: pypy/dist/pypy/config/translationoption.py pypy/dist/pypy/translator/simplify.py pypy/dist/pypy/translator/test/test_simplify.py Log: Fix a case for list comprehension detection. Modified: pypy/dist/pypy/config/translationoption.py ============================================================================== --- pypy/dist/pypy/config/translationoption.py (original) +++ pypy/dist/pypy/config/translationoption.py Sat Mar 15 10:05:53 2008 @@ -135,7 +135,7 @@ "operations that results from a list comprehension and " "attempt to pre-allocate the list", default=False, - cmdline=None), + cmdline='--listcompr'), ChoiceOption("fork_before", "(UNIX) Create restartable checkpoint before step", ["annotate", "rtype", "backendopt", "database", "source", Modified: pypy/dist/pypy/translator/simplify.py ============================================================================== --- pypy/dist/pypy/translator/simplify.py (original) +++ pypy/dist/pypy/translator/simplify.py Sat Mar 15 10:05:53 2008 @@ -744,12 +744,12 @@ if (len(block.operations) == 1 and block.operations[0].opname == 'next' and block.exitswitch == c_last_exception and - len(block.exits) == 2 and - block.exits[1].exitcase is StopIteration and - block.exits[0].exitcase is None): - # it's a straightforward loop start block - loopnextblocks.append((block, block.operations[0].args[0])) - continue + len(block.exits) >= 2): + cases = [link.exitcase for link in block.exits] + if None in cases and StopIteration in cases: + # it's a straightforward loop start block + loopnextblocks.append((block, block.operations[0].args[0])) + continue for op in block.operations: if op.opname == 'newlist' and not op.args: vlist = variable_families.find_rep(op.result) @@ -958,9 +958,13 @@ # ... and when the iterator is exhausted, we should no longer # reach 'append' at all. - assert loopnextblock.exits[1].exitcase is StopIteration - stopblock = loopnextblock.exits[1].target - if self.reachable(stopblock, appendblock, avoid=newlistblock): + stopblocks = [link.target for link in loopnextblock.exits + if link.exitcase is not None] + accepted = True + for stopblock1 in stopblocks: + if self.reachable(stopblock1, appendblock, avoid=newlistblock): + accepted = False + if not accepted: continue # now explicitly find the "loop body" blocks: they are the ones @@ -1000,7 +1004,8 @@ # Found a suitable loop, let's patch the graph: assert iterblock not in loopbody assert loopnextblock in loopbody - assert stopblock not in loopbody + for stopblock1 in stopblocks: + assert stopblock1 not in loopbody # at StopIteration, the new list is exactly of the same length as # the one we iterate over if it's not possible to skip the appendblock @@ -1040,7 +1045,7 @@ continue # list not passed along this link anyway hints = {'fence': True} if (exactlength and block is loopnextblock and - link.target is stopblock): + link.target in stopblocks): hints['exactlength'] = True chints = Constant(hints) newblock = insert_empty_block(None, link) Modified: pypy/dist/pypy/translator/test/test_simplify.py ============================================================================== --- pypy/dist/pypy/translator/test/test_simplify.py (original) +++ pypy/dist/pypy/translator/test/test_simplify.py Sat Mar 15 10:05:53 2008 @@ -220,6 +220,30 @@ 'hint': 2, } +def test_detect_list_comprehension_with_exc(): + def g(x): + return x * 17 + def free_some_stuff(): + pass + def f1(l): + try: + return [g(x) for x in l] + finally: + free_some_stuff() + + t = TranslationContext(list_comprehension_operations=True) + graph = t.buildflowgraph(f1) + if conftest.option.view: + graph.show() + assert summary(graph) == { + 'newlist': 1, + 'iter': 1, + 'next': 1, + 'getattr': 1, + 'simple_call': 4, + 'hint': 2, + } + class TestLLSpecializeListComprehension: typesystem = 'lltype' From arigo at codespeak.net Sat Mar 15 10:24:59 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 10:24:59 +0100 (CET) Subject: [pypy-svn] r52553 - in pypy/dist/pypy/translator: . test Message-ID: <20080315092459.BD54F16A047@codespeak.net> Author: arigo Date: Sat Mar 15 10:24:59 2008 New Revision: 52553 Modified: pypy/dist/pypy/translator/simplify.py pypy/dist/pypy/translator/test/test_simplify.py Log: Test and fix. Modified: pypy/dist/pypy/translator/simplify.py ============================================================================== --- pypy/dist/pypy/translator/simplify.py (original) +++ pypy/dist/pypy/translator/simplify.py Sat Mar 15 10:24:59 2008 @@ -812,13 +812,15 @@ self.variable_families = variable_families self.reachable_cache = {} - def enum_blocks_from(self, fromblock, avoid): + def enum_blocks_with_vlist_from(self, fromblock, avoid): found = {avoid: True} pending = [fromblock] while pending: block = pending.pop() if block in found: continue + if not self.vlist_alive(block): + continue yield block found[block] = True for exit in block.exits: @@ -986,8 +988,9 @@ # This candidate loop is acceptable if the list is not escaping # too early, i.e. in the loop header or in the loop body. - loopheader = list(self.enum_blocks_from(newlistblock, + loopheader = list(self.enum_blocks_with_vlist_from(newlistblock, avoid=loopnextblock)) + assert loopheader[0] is newlistblock escapes = False for block in loopheader + loopbody.keys(): assert self.vlist_alive(block) Modified: pypy/dist/pypy/translator/test/test_simplify.py ============================================================================== --- pypy/dist/pypy/translator/test/test_simplify.py (original) +++ pypy/dist/pypy/translator/test/test_simplify.py Sat Mar 15 10:24:59 2008 @@ -202,47 +202,63 @@ e = py.test.raises(LLException, 'interp.eval_graph(graph, [])') assert 'ValueError' in str(e) -def test_detect_list_comprehension(): - def f1(l): - return [x*17 for x in l] - - t = TranslationContext(list_comprehension_operations=True) - graph = t.buildflowgraph(f1) - if conftest.option.view: - graph.show() - assert summary(graph) == { - 'newlist': 1, - 'iter': 1, - 'next': 1, - 'mul': 1, - 'getattr': 1, - 'simple_call': 1, - 'hint': 2, - } - -def test_detect_list_comprehension_with_exc(): - def g(x): - return x * 17 - def free_some_stuff(): - pass - def f1(l): - try: - return [g(x) for x in l] - finally: - free_some_stuff() - - t = TranslationContext(list_comprehension_operations=True) - graph = t.buildflowgraph(f1) - if conftest.option.view: - graph.show() - assert summary(graph) == { - 'newlist': 1, - 'iter': 1, - 'next': 1, - 'getattr': 1, - 'simple_call': 4, - 'hint': 2, - } +class TestDetectListComprehension: + def check(self, f1, expected): + t = TranslationContext(list_comprehension_operations=True) + graph = t.buildflowgraph(f1) + if conftest.option.view: + graph.show() + assert summary(graph) == expected + + def test_simple(self): + def f1(l): + return [x*17 for x in l] + self.check(f1, { + 'newlist': 1, + 'iter': 1, + 'next': 1, + 'mul': 1, + 'getattr': 1, + 'simple_call': 1, + 'hint': 2, + }) + + def test_with_exc(self): + def g(x): + return x * 17 + def free_some_stuff(): + pass + def f1(l): + try: + return [g(x) for x in l] + finally: + free_some_stuff() + self.check(f1, { + 'newlist': 1, + 'iter': 1, + 'next': 1, + 'getattr': 1, + 'simple_call': 4, + 'hint': 2, + }) + + def test_canraise_before_iter(self): + def g(l): + return l + def f1(l): + try: + return [x*17 for x in g(l)] + except ValueError: + return [] + self.check(f1, { + 'newlist': 2, + 'iter': 1, + 'next': 1, + 'mul': 1, + 'getattr': 1, + 'simple_call': 2, + 'hint': 2, + }) class TestLLSpecializeListComprehension: typesystem = 'lltype' From arigo at codespeak.net Sat Mar 15 11:58:08 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 11:58:08 +0100 (CET) Subject: [pypy-svn] r52554 - pypy/dist/pypy/lib/test2 Message-ID: <20080315105808.DCBBB16A060@codespeak.net> Author: arigo Date: Sat Mar 15 11:58:06 2008 New Revision: 52554 Modified: pypy/dist/pypy/lib/test2/test_array.py Log: Skip test. Modified: pypy/dist/pypy/lib/test2/test_array.py ============================================================================== --- pypy/dist/pypy/lib/test2/test_array.py (original) +++ pypy/dist/pypy/lib/test2/test_array.py Sat Mar 15 11:58:06 2008 @@ -42,6 +42,9 @@ execfile(str(path), myarraymodule.__dict__) cls.array = myarraymodule + def test_unicode(self): + py.test.skip("no 'u' type code in CPython's struct module") + class AppTestArray(BaseArrayTests): usemodules = ['struct'] From arigo at codespeak.net Sat Mar 15 12:01:42 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 12:01:42 +0100 (CET) Subject: [pypy-svn] r52555 - pypy/dist/pypy/lib Message-ID: <20080315110142.DF61916A060@codespeak.net> Author: arigo Date: Sat Mar 15 12:01:41 2008 New Revision: 52555 Modified: pypy/dist/pypy/lib/array.py Log: Fix the bad performance of an array.__setitem__ case that turns out to be used by real apps (bittorrent). Modified: pypy/dist/pypy/lib/array.py ============================================================================== --- pypy/dist/pypy/lib/array.py (original) +++ pypy/dist/pypy/lib/array.py Sat Mar 15 12:01:41 2008 @@ -406,20 +406,28 @@ " to array slice") seqlength = len(self) start, stop, step = i.indices(seqlength) - if start < 0: - start = 0 - if stop < start: - stop = start - assert stop <= seqlength - asslength = stop - start - if step != 1 or len(x) != asslength: + if step != 1: sublist = self.tolist() # fall-back sublist[i] = x.tolist() self._clear() self.fromlist(sublist) return - self._data[start * self.itemsize : - stop * self.itemsize] = x._data + if start < 0: + start = 0 + if stop < start: + stop = start + assert stop <= seqlength + boundary1 = start * self.itemsize + boundary2 = stop * self.itemsize + boundary2new = boundary1 + len(x._data) + if boundary2 == boundary2new: + self._data[boundary1:boundary2] = x._data + else: + newdata = bytebuffer(len(self._data) + boundary2new-boundary2) + newdata[:boundary1] = self._data[:boundary1] + newdata[boundary1:boundary2new] = x._data + newdata[boundary2new:] = self._data[boundary2:] + self._data = newdata else: seqlength = len(self) if i < 0: From arigo at codespeak.net Sat Mar 15 12:11:30 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 12:11:30 +0100 (CET) Subject: [pypy-svn] r52556 - pypy/dist/pypy/module/select Message-ID: <20080315111130.3107E16A066@codespeak.net> Author: arigo Date: Sat Mar 15 12:11:29 2008 New Revision: 52556 Modified: pypy/dist/pypy/module/select/app_select.py pypy/dist/pypy/module/select/interp_select.py Log: Accept float arguments to poll.poll(). Modified: pypy/dist/pypy/module/select/app_select.py ============================================================================== --- pypy/dist/pypy/module/select/app_select.py (original) +++ pypy/dist/pypy/module/select/app_select.py Sat Mar 15 12:11:29 2008 @@ -59,7 +59,7 @@ if (not hasattr(timeout, '__int__') and not hasattr(timeout, '__float__')): raise TypeError('timeout must be a float or None') - ret = dict(p.poll(int(float(timeout) * 1000))) + ret = dict(p.poll(float(timeout) * 1000.0)) else: ret = dict(p.poll()) Modified: pypy/dist/pypy/module/select/interp_select.py ============================================================================== --- pypy/dist/pypy/module/select/interp_select.py (original) +++ pypy/dist/pypy/module/select/interp_select.py Sat Mar 15 12:11:29 2008 @@ -1,3 +1,4 @@ +import math from pypy.interpreter.typedef import TypeDef from pypy.interpreter.baseobjspace import Wrappable from pypy.interpreter.gateway import W_Root, ObjSpace, interp2app @@ -53,7 +54,14 @@ if space.is_w(w_timeout, space.w_None): timeout = -1 else: - timeout = space.int_w(w_timeout) + timeout = space.float_w(w_timeout) + # round non-integral floats upwards (in theory, with timeout=2.5 + # we should wait at least 2.5ms, so 2ms is not enough) + try: + timeout = int(math.ceil(timeout)) + except (OverflowError, ValueError): + raise OperationError(space.w_ValueError, + space.wrap("math range error")) try: retval = rpoll.poll(self.fddict, timeout) From arigo at codespeak.net Sat Mar 15 13:07:44 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 13:07:44 +0100 (CET) Subject: [pypy-svn] r52557 - pypy/dist/pypy/config Message-ID: <20080315120744.E06CE16A034@codespeak.net> Author: arigo Date: Sat Mar 15 13:07:43 2008 New Revision: 52557 Modified: pypy/dist/pypy/config/pypyoption.py Log: Suggest --listcompr with --faassen. It seems to work and gives a good speed-up for os.read(), because it makes a copy of the data with a list comprehension over the characters. Modified: pypy/dist/pypy/config/pypyoption.py ============================================================================== --- pypy/dist/pypy/config/pypyoption.py (original) +++ pypy/dist/pypy/config/pypyoption.py Sat Mar 15 13:07:43 2008 @@ -278,6 +278,7 @@ # ("objspace.std.withfastslice", True), ("objspace.std.withprebuiltchar", True), ("objspace.std.optimized_int_add", True), + ("translation.list_comprehension_operations",True), ], cmdline="--allopts --faassen", negation=False), From arigo at codespeak.net Sat Mar 15 16:47:56 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 16:47:56 +0100 (CET) Subject: [pypy-svn] r52558 - in pypy/branch/jit-hotpath/pypy: jit/hintannotator jit/rainbow jit/rainbow/test rlib Message-ID: <20080315154756.7751416A08E@codespeak.net> Author: arigo Date: Sat Mar 15 16:47:55 2008 New Revision: 52558 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py pypy/branch/jit-hotpath/pypy/rlib/jit.py Log: Handle void variables across the jit_merge_point(). Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Sat Mar 15 16:47:55 2008 @@ -1,4 +1,4 @@ -from pypy.objspace.flow.model import checkgraph, copygraph +from pypy.objspace.flow.model import checkgraph, copygraph, Constant from pypy.objspace.flow.model import Block, Link, SpaceOperation, Variable from pypy.translator.unsimplify import split_block, varoftype from pypy.translator.simplify import join_blocks @@ -6,6 +6,7 @@ from pypy.jit.hintannotator.model import SomeLLAbstractConstant, OriginFlags from pypy.annotation import model as annmodel from pypy.rpython.rtyper import LowLevelOpList +from pypy.rpython.lltypesystem import lltype from pypy.rlib.jit import JitHintError @@ -94,12 +95,14 @@ portalopindex = portalblock.operations.index(portalop) # split the block just before the jit_merge_point() if portalopindex > 0: - split_block(hannotator, portalblock, portalopindex) + link = split_block(hannotator, portalblock, portalopindex) + portalblock = link.target + portalop = portalblock.operations[0] # split again, this time enforcing the order of the live vars # specified by the user in the jit_merge_point() call - _, portalblock, portalop = find_jit_merge_point(graph) - assert portalop is portalblock.operations[0] - livevars = portalop.args[1:] + assert portalop.opname == 'jit_merge_point' + livevars = [v for v in portalop.args[1:] + if v.concretetype is not lltype.Void] link = split_block(hannotator, portalblock, 0, livevars) return link.target else: @@ -109,17 +112,30 @@ vars = [varoftype(v.concretetype, name=v) for v in graph.getargs()] newblock = Block(vars) + op = graph.startblock.operations[0] + assert op.opname == 'jit_merge_point' + assert op.args[0].value is drivercls + allvars = [] + i = 0 + for v in op.args[1:]: + if v.concretetype is lltype.Void: + allvars.append(Constant(None, concretetype=lltype.Void)) + else: + allvars.append(vars[i]) + i += 1 + assert i == len(vars) + llops = LowLevelOpList(rtyper) # generate ops to make an instance of DriverCls classdef = rtyper.annotator.bookkeeper.getuniqueclassdef(drivercls) s_instance = annmodel.SomeInstance(classdef) r_instance = rtyper.getrepr(s_instance) v_self = r_instance.new_instance(llops) - # generate ops to store the 'reds' variables on 'self' + # generate ops to store the 'greens' and 'reds' variables on 'self' num_greens = len(drivercls.greens) num_reds = len(drivercls.reds) - assert len(vars) == num_greens + num_reds - for name, v_value in zip(drivercls.reds, vars[num_greens:]): + assert len(allvars) == num_greens + num_reds + for name, v_value in zip(drivercls.greens + drivercls.reds, allvars): r_instance.setfield(v_self, name, v_value, llops) # generate a call to on_enter_jit(self) on_enter_jit_func = drivercls.on_enter_jit.im_func @@ -128,10 +144,13 @@ c_func = r_func.get_unique_llfn() llops.genop('direct_call', [c_func, v_self]) # generate ops to reload the 'reds' variables from 'self' - newvars = vars[:num_greens] - for name, v_value in zip(drivercls.reds, vars[num_greens:]): + # XXX Warning! the 'greens' variables are not reloaded. This is + # a bit of a mess color-wise, and probably not useful. + newvars = allvars[:num_greens] + for name, v_value in zip(drivercls.reds, allvars[num_greens:]): v_value = r_instance.getfield(v_self, name, llops) newvars.append(v_value) + newvars = [v for v in newvars if v.concretetype is not lltype.Void] # done, fill the block and link it to make it the startblock newblock.operations[:] = llops newblock.closeblock(Link(newvars, graph.startblock)) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sat Mar 15 16:47:55 2008 @@ -1378,14 +1378,15 @@ return c def decode_hp_hint_args(self, op): - # Returns (list-of-green-vars, list-of-red-vars). + # Returns (list-of-green-vars, list-of-red-vars) without Voids. drivercls = op.args[0].value numgreens = len(drivercls.greens) numreds = len(drivercls.reds) greens_v = op.args[1:1+numgreens] reds_v = op.args[1+numgreens:] assert len(reds_v) == numreds - return greens_v, reds_v + return ([v for v in greens_v if v.concretetype is not lltype.Void], + [v for v in reds_v if v.concretetype is not lltype.Void]) def check_hp_hint_args(self, op): # Check the colors of the jit_merge_point() and can_enter_jit() Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Sat Mar 15 16:47:55 2008 @@ -352,6 +352,29 @@ "run_machine_code 2", ]) + def test_on_enter_jit_many_vars(self): + class MyJitDriver(JitDriver): + greens = ['void1', 'm'] + reds = ['void2', 'n'] + def on_enter_jit(self): + self.n += self.m # doesn't make sense, just for testing + # note that the green 'self.m' cannot be modified + # (changes would not be reloaded into the 'm' var currently) + + def ll_function(n, m): + MyJitDriver.jit_merge_point(n=n, m=m, void1=None, void2=None) + MyJitDriver.can_enter_jit(n=n, m=m, void1=None, void2=None) + hint(m, concrete=True) + return n + 5 + + res = self.run(ll_function, [2, 200], threshold=1, small=True) + assert res == 207 + self.check_traces([ + "jit_compile 200", + "done at hp_return", + "run_machine_code 200 2", + ]) + def test_hp_tlr(self): from pypy.jit.tl import tlr Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py Sat Mar 15 16:47:55 2008 @@ -258,6 +258,9 @@ self.check_insns(int_add=0, int_mul=0) def test_more_promotes(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'm', 'i', 's'] S = lltype.GcStruct('S', ('x', lltype.Signed), ('y', lltype.Signed)) def ll_two(s, i, m): if i > 4: @@ -279,7 +282,8 @@ s.y = 0 i = 0 while i < n: - hint(None, global_merge_point=True) + MyJitDriver.jit_merge_point(n=n, m=m, i=i, s=s) + MyJitDriver.can_enter_jit(n=n, m=m, i=i, s=s) k = ll_two(s, i, m) if m & 1: k *= 3 @@ -290,7 +294,7 @@ i += j return s.x + s.y * 17 - res = self.interpret(ll_function, [100, 2]) + res = self.run(ll_function, [100, 2], threshold=3) assert res == ll_function(100, 2) def test_mixed_merges(self): @@ -323,22 +327,30 @@ assert res == ll_function(6, 3, 2, 2) def test_green_across_global_mp(self): - py.test.skip("void vars not handled correctly") + class MyJitDriver(JitDriver): + greens = ['n1', 'n2'] + reds = ['total', 'n3', 'n4'] def ll_function(n1, n2, n3, n4, total): while n2: - hint(None, global_merge_point=True) - total += n3 - hint(n4, concrete=True) + MyJitDriver.jit_merge_point(n1=n1, n2=n2, n3=n3, n4=n4, + total=total) + MyJitDriver.can_enter_jit(n1=n1, n2=n2, n3=n3, n4=n4, + total=total) + total += n4 + total *= n2 hint(n3, concrete=True) hint(n2, concrete=True) hint(n1, concrete=True) n2 -= 1 return total - void = lambda s: None - ll_function.convert_arguments = [void, int, int, void, int] + def main(n2, n4, total): + return ll_function(None, n2, None, n4, total) + + res = self.run(main, [7, 3, 100], threshold=2) + assert res == main(7, 3, 100) - res = self.interpret(ll_function, [None, 4, 3, None, 100], [0]) - assert res == ll_function(None, 4, 3, None, 100) + res = self.run(main, [7, 3, 100], threshold=1) + assert res == main(7, 3, 100) def test_remembers_across_mp(self): def ll_function(x, flag): Modified: pypy/branch/jit-hotpath/pypy/rlib/jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/jit.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/jit.py Sat Mar 15 16:47:55 2008 @@ -178,6 +178,10 @@ def _emulate_method_calls(cls, bookkeeper, livevars_s): # annotate "cls.on_enter_jit()" if it is defined + # on_enter_jit(self) is called with a copy of the value of the + # red and green variables. The red variables can be modified + # in order to give hints to the JIT about the redboxes. The + # green variables should not be changed. from pypy.annotation import model as annmodel if hasattr(cls, 'on_enter_jit'): classdef = bookkeeper.getuniqueclassdef(cls) From arigo at codespeak.net Sat Mar 15 17:01:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 17:01:09 +0100 (CET) Subject: [pypy-svn] r52559 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080315160109.4940016A099@codespeak.net> Author: arigo Date: Sat Mar 15 17:01:07 2008 New Revision: 52559 Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py - copied, changed from r52557, pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Log: Starting to port some of the tests from test_interpreter.py. From arigo at codespeak.net Sat Mar 15 17:12:42 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 17:12:42 +0100 (CET) Subject: [pypy-svn] r52560 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080315161242.8DECA16A0AD@codespeak.net> Author: arigo Date: Sat Mar 15 17:12:42 2008 New Revision: 52560 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: Update more tests. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sat Mar 15 17:12:42 2008 @@ -30,81 +30,79 @@ x -= 1 return tot - res = self.run(ll_function, [7, 2], threshold=5) - assert res == 14 - self.check_nothing_compiled_at_all() - res = self.run(ll_function, [7, 2], threshold=1) assert res == 14 self.check_insns_excluding_return({'int_add': 7}) - def test_green_switch(self): + def test_ifs(self): class MyJitDriver(JitDriver): greens = ['green'] - reds = ['x', 'y'] + reds = ['x', 'y', 'i'] def f(green, x, y): - MyJitDriver.jit_merge_point(green=green, x=x, y=y) - MyJitDriver.can_enter_jit(green=green, x=x, y=y) - green = hint(green, concrete=True) - if green: - return x + y - return x - y - res = self.run(f, [1, 1, 2], threshold=2) - assert res == 3 - self.check_nothing_compiled_at_all() - res = self.run(f, [0, 1, 2], threshold=2) - assert res == -1 - self.check_nothing_compiled_at_all() - res = self.run(f, [1, 1, 2], threshold=1) - assert res == 3 - self.check_insns_excluding_return({"int_add": 1}) - res = self.run(f, [0, 1, 2], threshold=1) - assert res == -1 - self.check_insns_excluding_return({"int_sub": 1}) + i = 1024 + while i > 0: + i >>= 1 + MyJitDriver.jit_merge_point(green=green, x=x, y=y, i=i) + MyJitDriver.can_enter_jit(green=green, x=x, y=y, i=i) + green = hint(green, concrete=True) + if x: # red if, and compiling pause + res = 100 + else: + res = 1 + if y > 5: # red if + res += 50 + if green: # green if + res *= x + y + else: + res *= x - y + return res + for g in [0, 1]: + for x in [0, 1]: + for y in [4, 77]: + res = self.run(f, [g, x, y], threshold=3) + assert res == f(g, x, y) def test_simple_opt_const_propagation2(self): + class MyJitDriver(JitDriver): + greens = ['x', 'y'] + reds = [] def ll_function(x, y): - return x + y - res = self.interpret(ll_function, [5, 7], [0, 1]) + MyJitDriver.jit_merge_point(x=x, y=y) + MyJitDriver.can_enter_jit(x=x, y=y) + hint(x, concrete=True) + hint(y, concrete=True) + x = hint(x, variable=True) + y = hint(y, variable=True) + return x + (-y) + res = self.run(ll_function, [5, -7], threshold=2) assert res == 12 - self.check_insns({}) - - def test_simple_opt_const_propagation1(self): - def ll_function(x): - return -x - res = self.interpret(ll_function, [5], [0]) - assert res == -5 - self.check_insns({}) + self.check_nothing_compiled_at_all() + res = self.run(ll_function, [5, -7], threshold=1) + assert res == 12 + self.check_insns_excluding_return({}) def test_loop_folding(self): + class MyJitDriver(JitDriver): + greens = ['x', 'y'] + reds = [] def ll_function(x, y): + MyJitDriver.jit_merge_point(x=x, y=y) + MyJitDriver.can_enter_jit(x=x, y=y) + hint(x, concrete=True) + hint(y, concrete=True) + x = hint(x, variable=True) + y = hint(y, variable=True) tot = 0 - x = hint(x, concrete=True) while x: tot += y x -= 1 return tot - res = self.interpret(ll_function, [7, 2], [0, 1]) + res = self.run(ll_function, [7, 2], threshold=2) assert res == 14 - self.check_insns({}) - - def test_red_switch(self): - def f(x, y): - if x: - return x - return y - res = self.interpret(f, [1, 2]) - assert res == 1 - - def test_merge(self): - def f(x, y, z): - if x: - a = y - z - else: - a = y + z - return 1 + a - res = self.interpret(f, [1, 2, 3]) - assert res == 0 + self.check_nothing_compiled_at_all() + res = self.run(ll_function, [7, 2], threshold=1) + assert res == 14 + self.check_insns_excluding_return({}) def test_loop_merging(self): def ll_function(x, y): From arigo at codespeak.net Sat Mar 15 17:32:02 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 17:32:02 +0100 (CET) Subject: [pypy-svn] r52561 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080315163202.55C8716A095@codespeak.net> Author: arigo Date: Sat Mar 15 17:32:01 2008 New Revision: 52561 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: More test converted. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Sat Mar 15 17:32:01 2008 @@ -9,7 +9,8 @@ P_HOTPATH = HintAnnotatorPolicy(oopspec=True, novirtualcontainer=True, - hotpath=True) + hotpath=True, + entrypoint_returns_red=False) class Exit(Exception): def __init__(self, result): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sat Mar 15 17:32:01 2008 @@ -225,160 +225,138 @@ self.check_insns({'int_gt': 1}) def test_arith_plus_minus(self): + class MyJitDriver(JitDriver): + greens = ['encoded_insn', 'nb_insn'] + reds = ['i', 'x', 'y'] def ll_plus_minus(encoded_insn, nb_insn, x, y): - acc = x - pc = 0 - while pc < nb_insn: - op = (encoded_insn >> (pc*4)) & 0xF - op = hint(op, concrete=True) - if op == 0xA: - acc += y - elif op == 0x5: - acc -= y - pc += 1 + i = 1024 + while i > 0: + i >>= 1 + MyJitDriver.jit_merge_point(encoded_insn=encoded_insn, + nb_insn=nb_insn, x=x, y=y, i=i) + MyJitDriver.can_enter_jit(encoded_insn=encoded_insn, + nb_insn=nb_insn, x=x, y=y, i=i) + hint(nb_insn, concrete=True) + acc = x + pc = 0 + while pc < nb_insn: + op = (encoded_insn >> (pc*4)) & 0xF + op = hint(op, concrete=True) + if op == 0xA: + acc += y + elif op == 0x5: + acc -= y + pc += 1 return acc assert ll_plus_minus(0xA5A, 3, 32, 10) == 42 - res = self.interpret(ll_plus_minus, [0xA5A, 3, 32, 10], [0, 1]) + res = self.run(ll_plus_minus, [0xA5A, 3, 32, 10], threshold=2) assert res == 42 - self.check_insns({'int_add': 2, 'int_sub': 1}) - - def test_call_simple(self): - def ll_add_one(x): - return x + 1 - def ll_function(y): - return ll_add_one(y) - res = self.interpret(ll_function, [5], []) - assert res == 6 - self.check_insns({'int_add': 1}) - - def test_call_2(self): - def ll_add_one(x): - return x + 1 - def ll_function(y): - return ll_add_one(y) + y - res = self.interpret(ll_function, [5], []) - assert res == 11 - self.check_insns({'int_add': 2}) + self.check_insns_in_loops({'int_add': 2, 'int_sub': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_call_3(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'y'] def ll_add_one(x): return x + 1 def ll_two(x): return ll_add_one(ll_add_one(x)) - x def ll_function(y): - return ll_two(y) * y - res = self.interpret(ll_function, [5], []) + i = 1024 + while i > 0: + i >>= 1 + MyJitDriver.jit_merge_point(y=y, i=i) + MyJitDriver.can_enter_jit(y=y, i=i) + res = ll_two(y) * y + return res + res = self.run(ll_function, [5], threshold=2) assert res == 10 - self.check_insns({'int_add': 2, 'int_sub': 1, 'int_mul': 1}) - - def test_call_4(self): - def ll_two(x): - if x > 0: - return x + 5 - else: - return x - 4 - def ll_function(y): - return ll_two(y) * y - - res = self.interpret(ll_function, [3], []) - assert res == 24 - self.check_insns({'int_gt': 1, 'int_add': 1, - 'int_sub': 1, 'int_mul': 1}) - - res = self.interpret(ll_function, [-3], []) - assert res == 21 - self.check_insns({'int_gt': 1, 'int_add': 1, - 'int_sub': 1, 'int_mul': 1}) - - def test_call_5(self): - def ll_two(x): - if x > 0: - return x + 5 - else: - return x - 4 - def ll_function(y): - if y > 2: - return ll_two(y) * y - else: - return ll_two(y + 3) * y - - res = self.interpret(ll_function, [3], []) - assert res == 24 - self.check_insns({'int_gt': 3, 'int_add': 3, - 'int_sub': 2, 'int_mul': 2}) - - res = self.interpret(ll_function, [-3], []) - assert res == 12 - self.check_insns({'int_gt': 3, 'int_add': 3, - 'int_sub': 2, 'int_mul': 2}) - - def test_call_6(self): - def ll_two(x): - if x > 0: - return x + 5 - else: - return x - 4 - def ll_function(y): - if y > 2: - y -= 2 - return ll_two(y) * y - - res = self.interpret(ll_function, [3], []) - assert res == 6 - self.check_insns({'int_gt': 2, 'int_add': 1, - 'int_sub': 2, 'int_mul': 1}) - - res = self.interpret(ll_function, [-3], []) - assert res == 21 - self.check_insns({'int_gt': 2, 'int_add': 1, - 'int_sub': 2, 'int_mul': 1}) + self.check_insns_in_loops({'int_add': 2, 'int_sub': 1, 'int_mul': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_void_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['y', 'i'] def ll_do_nothing(x): pass def ll_function(y): - ll_do_nothing(y) + i = 1024 + while i > 0: + i >>= 1 + MyJitDriver.jit_merge_point(y=y, i=i) + MyJitDriver.can_enter_jit(y=y, i=i) + ll_do_nothing(y) return y - res = self.interpret(ll_function, [3], []) + res = self.run(ll_function, [3], threshold=2) assert res == 3 + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) - def test_green_call(self): - def ll_add_one(x): - return x+1 - def ll_function(y): - z = ll_add_one(y) - z = hint(z, concrete=True) - return z + def test_green_return(self): + class MyJitDriver(JitDriver): + greens = ['x'] + reds = [] + def ll_function(x): + MyJitDriver.jit_merge_point(x=x) + MyJitDriver.can_enter_jit(x=x) + return hint(x, concrete=True) + 1 - res = self.interpret(ll_function, [3], [0]) + res = self.run(ll_function, [3], threshold=1) assert res == 4 - self.check_insns({}) + self.check_insns_excluding_return({}) - def test_green_call_void_return(self): + def test_void_return(self): + class MyJitDriver(JitDriver): + greens = ['x'] + reds = [] + def ll_function(x): + MyJitDriver.jit_merge_point(x=x) + MyJitDriver.can_enter_jit(x=x) + hint(x, concrete=True) + + res = self.run(ll_function, [3], threshold=1) + assert res is None + self.check_insns_excluding_return({}) + + def test_fbinterp_void_return(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i'] + def ll_function(): + i = 1024 + while i > 0: + i >>= 1 + MyJitDriver.jit_merge_point(i=i) + MyJitDriver.can_enter_jit(i=i) + + res = self.run(ll_function, [], threshold=2) + assert res is None + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) + + def test_green_call(self): + class MyJitDriver(JitDriver): + greens = ['y'] + reds = ['i'] def ll_boring(x): return + def ll_add_one(x): + return x+1 def ll_function(y): - z = ll_boring(y) - z = hint(y, concrete=True) + i = 1024 + while i > 0: + i >>= 1 + MyJitDriver.jit_merge_point(y=y, i=i) + MyJitDriver.can_enter_jit(y=y, i=i) + ll_boring(y) + z = ll_add_one(y) + z = hint(z, concrete=True) return z - res = self.interpret(ll_function, [3], [0]) - assert res == 3 - self.check_insns({}) - - def test_split_on_green_return(self): - def ll_two(x): - if x > 0: - return 17 - else: - return 22 - def ll_function(x): - n = ll_two(x) - return hint(n+1, variable=True) - res = self.interpret(ll_function, [-70], []) - assert res == 23 - self.check_insns({'int_gt': 1}) + res = self.run(ll_function, [3], threshold=2) + assert res == 4 + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_recursive_call(self): def indirection(n, fudge): From arigo at codespeak.net Sat Mar 15 17:45:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 17:45:09 +0100 (CET) Subject: [pypy-svn] r52562 - in pypy/branch/jit-hotpath/pypy/jit: hintannotator rainbow/test Message-ID: <20080315164509.CC81C16A09F@codespeak.net> Author: arigo Date: Sat Mar 15 17:45:09 2008 New Revision: 52562 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/policy.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: More test conversions, up to the first one that will require work :-) Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/policy.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/policy.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/policy.py Sat Mar 15 17:45:09 2008 @@ -1,3 +1,4 @@ +from pypy.rlib.objectmodel import instantiate from pypy.annotation import policy from pypy.annotation.specialize import getuniquenondirectgraph from pypy.translator.translator import graphof @@ -21,6 +22,12 @@ if hotpath is not None: self.hotpath = hotpath + def copy(self, **kwds): + new = instantiate(self.__class__) + new.__dict__.update(self.__dict__) + HintAnnotatorPolicy.__init__(new, **kwds) + return new + def look_inside_graph(self, graph): return True Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Sat Mar 15 17:45:09 2008 @@ -7,10 +7,15 @@ from pypy.rpython.llinterp import LLInterpreter from pypy import conftest -P_HOTPATH = HintAnnotatorPolicy(oopspec=True, - novirtualcontainer=True, - hotpath=True, - entrypoint_returns_red=False) +def make_hot_policy(policy): + if not policy.hotpath: + policy = policy.copy(oopspec = True, + novirtualcontainer = True, + hotpath = True, + entrypoint_returns_red = False) + return policy + +P_HOTPATH = make_hot_policy(HintAnnotatorPolicy()) class Exit(Exception): def __init__(self, result): @@ -53,6 +58,7 @@ def run(self, main, main_args, threshold, policy=P_HOTPATH, small=False): # xxx caching of tests doesn't work - do we care? + policy = make_hot_policy(policy) self._serialize(main, main_args, policy=policy, backendoptimize=True) self._rewrite(threshold, small=small) return self._run(main, main_args) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sat Mar 15 17:45:09 2008 @@ -1,17 +1,15 @@ import py from pypy.rpython.lltypesystem import lltype from pypy.rlib.jit import JitDriver, hint, JitHintError +from pypy.jit.hintannotator.policy import StopAtXPolicy from pypy.jit.rainbow.test import test_hotpath import sys -def StopAtXPolicy(*args): - py.test.skip("fix this test") - class TestHotInterpreter(test_hotpath.HotPathTest): - def interpret(self, main, ll_values, opt_consts=[], backendoptimize=None): + def interpret(self, main, ll_values, opt_consts=[], **kwds): py.test.skip("fix this test") def interpret_raises(self, Exception, main, ll_values, opt_consts=[]): py.test.skip("fix this test") @@ -761,17 +759,31 @@ self.check_insns({}) def test_residual_red_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'x'] def g(x): return x+1 - def f(x): - return 2*g(x) + i = 1024 + while i > 0: + i >>= 1 + MyJitDriver.jit_merge_point(x=x, i=i) + MyJitDriver.can_enter_jit(x=x, i=i) + res = 2*g(x) + return res - res = self.interpret(f, [20], [], policy=StopAtXPolicy(g)) + res = self.run(f, [20], threshold=2, policy=StopAtXPolicy(g)) assert res == 42 - self.check_insns(int_add=0) + self.check_insns_in_loops({'direct_call': 1, 'int_mul': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_residual_red_call_with_exc(self): + py.test.skip("in-progress") + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'x'] + def h(x): if x > 0: return x+1 @@ -782,20 +794,25 @@ return 2*h(x) def f(x): - hint(None, global_merge_point=True) - try: - return g(x) - except ValueError: - return 7 + i = 1024 + while i > 0: + i >>= 1 + MyJitDriver.jit_merge_point(x=x, i=i) + MyJitDriver.can_enter_jit(x=x, i=i) + try: + res = g(x) + except ValueError: + res = 7 + return res stop_at_h = StopAtXPolicy(h) - res = self.interpret(f, [20], [], policy=stop_at_h) + res = self.run(f, [20], threshold=2, policy=stop_at_h) assert res == 42 - self.check_insns(int_add=0) + self.check_insns_in_loops(int_add=0, int_mul=1) - res = self.interpret(f, [-20], [], policy=stop_at_h) + res = self.run(f, [-20], threshold=2, policy=stop_at_h) assert res == 7 - self.check_insns(int_add=0) + self.check_insns_in_loops(int_add=0, int_mul=0) def test_red_call_ignored_result(self): def g(n): From briandorsey at codespeak.net Sat Mar 15 19:14:20 2008 From: briandorsey at codespeak.net (briandorsey at codespeak.net) Date: Sat, 15 Mar 2008 19:14:20 +0100 (CET) Subject: [pypy-svn] r52563 - pypy/extradoc/talk/pycon2008 Message-ID: <20080315181420.6F31016A078@codespeak.net> Author: briandorsey Date: Sat Mar 15 19:14:19 2008 New Revision: 52563 Modified: pypy/extradoc/talk/pycon2008/pytest.txt Log: pre-talk edits Modified: pypy/extradoc/talk/pycon2008/pytest.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/pytest.txt (original) +++ pypy/extradoc/talk/pycon2008/pytest.txt Sat Mar 15 19:14:19 2008 @@ -11,11 +11,9 @@ Intro ========== -* if you think 5 lines are more than 2 - * minimal boilerplate code -* cross-project testing tool +* general purpose testing tool * developed partly for purposes of PyPy @@ -30,7 +28,7 @@ * setup/teardown on many levels (module, class, function) -* generative tests: +* generative tests:: def test_one(): yield function, arg @@ -71,7 +69,7 @@ * -k selects tests -* -k classname.methodname works as well (XXX trunk only???) +* -k classname.methodname works as well (trunk only) * -k -name selects all but name @@ -80,7 +78,7 @@ installation ============= -* easy_install pylib XXX check +* easy_install py * run py.test on your testing directory @@ -96,7 +94,7 @@ * rsyncs local dir, no need to copy files -XXX demo +* demo web reporter ============= @@ -110,7 +108,7 @@ * conftest.py does the "magic" -* you can add options per-project (XXX demo) +* you can add options per-project * you can change the way tests are run (validating ReST, running ecma test suite, etc.) @@ -129,8 +127,6 @@ * reporter hooks (trunk only) -XXX demo - future ========== @@ -138,4 +134,3 @@ * cleanup a bit, more plugin architecture -* ... From lac at codespeak.net Sat Mar 15 19:19:18 2008 From: lac at codespeak.net (lac at codespeak.net) Date: Sat, 15 Mar 2008 19:19:18 +0100 (CET) Subject: [pypy-svn] r52564 - in pypy/dist/pypy: config doc/config Message-ID: <20080315181918.7A71A16A0A5@codespeak.net> Author: lac Date: Sat Mar 15 19:19:17 2008 New Revision: 52564 Modified: pypy/dist/pypy/config/makerestdoc.py pypy/dist/pypy/doc/config/commandline.txt Log: Fix misspelling of 'Overview' Modified: pypy/dist/pypy/config/makerestdoc.py ============================================================================== --- pypy/dist/pypy/config/makerestdoc.py (original) +++ pypy/dist/pypy/config/makerestdoc.py Sat Mar 15 19:19:17 2008 @@ -180,7 +180,7 @@ def make_cmdline_overview(descr): content = Rest( - Title("Overwiew of Command Line Options for '%s'" % (descr._name, ), + Title("Overview of Command Line Options for '%s'" % (descr._name, ), abovechar="=", belowchar="=")) cmdlines = [] config = Config(descr) Modified: pypy/dist/pypy/doc/config/commandline.txt ============================================================================== --- pypy/dist/pypy/doc/config/commandline.txt (original) +++ pypy/dist/pypy/doc/config/commandline.txt Sat Mar 15 19:19:17 2008 @@ -1,4 +1,4 @@ .. intentionally empty, but contains the following comment to fool py.test: - overwiew of command line options for objspace - overwiew of command line options for translation + overview of command line options for objspace + overview of command line options for translation From lac at codespeak.net Sat Mar 15 19:22:32 2008 From: lac at codespeak.net (lac at codespeak.net) Date: Sat, 15 Mar 2008 19:22:32 +0100 (CET) Subject: [pypy-svn] r52565 - pypy/dist/pypy/doc/config Message-ID: <20080315182232.CD2D416A033@codespeak.net> Author: lac Date: Sat Mar 15 19:22:32 2008 New Revision: 52565 Modified: pypy/dist/pypy/doc/config/index.txt Log: missed an 'overwiew' Modified: pypy/dist/pypy/doc/config/index.txt ============================================================================== --- pypy/dist/pypy/doc/config/index.txt (original) +++ pypy/dist/pypy/doc/config/index.txt Sat Mar 15 19:22:32 2008 @@ -44,9 +44,9 @@ .. image:: ../image/compat-matrix.png .. _`configuration`: ../configuration.html -.. _`objspace options`: commandline.html#overwiew-of-command-line-options-for-objspace -.. _`object space options`: commandline.html#overwiew-of-command-line-options-for-objspace -.. _`translation options`: commandline.html#overwiew-of-command-line-options-for-translation +.. _`objspace options`: commandline.html#overview-of-command-line-options-for-objspace +.. _`object space options`: commandline.html#overview-of-command-line-options-for-objspace +.. _`translation options`: commandline.html#overview-of-command-line-options-for-translation .. _`overview`: commandline.html .. _`Standard Interpreter Optimizations`: ../interpreter-optimizations.html .. _`What PyPy can do for your objects`: ../objspace-proxies.html From briandorsey at codespeak.net Sat Mar 15 19:22:40 2008 From: briandorsey at codespeak.net (briandorsey at codespeak.net) Date: Sat, 15 Mar 2008 19:22:40 +0100 (CET) Subject: [pypy-svn] r52566 - pypy/extradoc/talk/pycon2008 Message-ID: <20080315182240.75B3B16A07D@codespeak.net> Author: briandorsey Date: Sat Mar 15 19:22:40 2008 New Revision: 52566 Modified: pypy/extradoc/talk/pycon2008/pytest.txt Log: more last minute changes Modified: pypy/extradoc/talk/pycon2008/pytest.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/pytest.txt (original) +++ pypy/extradoc/talk/pycon2008/pytest.txt Sat Mar 15 19:22:40 2008 @@ -11,16 +11,16 @@ Intro ========== -* minimal boilerplate code - * general purpose testing tool +* minimal boilerplate code + * developed partly for purposes of PyPy Writing tests with py.test =========================== -* almost identical to nose +* almost identical to Nose * def ``test_foo():`` defines test function @@ -134,3 +134,5 @@ * cleanup a bit, more plugin architecture +* more common interface with Nose (skip, raises, etc) + From arigo at codespeak.net Sat Mar 15 22:04:05 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 15 Mar 2008 22:04:05 +0100 (CET) Subject: [pypy-svn] r52567 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080315210405.7B2CD16A089@codespeak.net> Author: arigo Date: Sat Mar 15 22:04:03 2008 New Revision: 52567 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: Improve the tests (see big comment). Fallback interp calls to functions that have both red and green args. Residual calls, with exception checking. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sat Mar 15 22:04:03 2008 @@ -32,10 +32,11 @@ class CallDesc: __metaclass__ = cachedtype - def __init__(self, RGenOp, exceptiondesc, FUNCTYPE): + def __init__(self, RGenOp, exceptiondesc, FUNCTYPE, colororder=None): self.exceptiondesc = exceptiondesc self.sigtoken = RGenOp.sigToken(FUNCTYPE.TO) self.result_kind = RGenOp.kindToken(FUNCTYPE.TO.RESULT) + self.colororder = colororder # xxx what if the result is virtualizable? self.redboxbuilder = rvalue.ll_redboxbuilder(FUNCTYPE.TO.RESULT) whatever_return_value = FUNCTYPE.TO.RESULT._defl() @@ -52,16 +53,16 @@ self.gv_whatever_return_value = RGenOp.constPrebuiltGlobal( whatever_return_value) - def perform_call(rgenop, gv_fnptr, greenargs): + def perform_call(rgenop, gv_fnptr, args_gv): fnptr = gv_fnptr.revealconst(FUNCTYPE) - assert len(greenargs) + voidargcount == numargs + assert len(args_gv) + voidargcount == numargs args = () j = 0 for ARG in argiter: if ARG == lltype.Void: args += (None, ) else: - genconst = greenargs[j] + genconst = args_gv[j] arg = genconst.revealconst(ARG) args += (arg, ) j += 1 @@ -77,6 +78,7 @@ return True def green_call(self, interpreter, gv_fnptr, greenargs): + assert self.colororder is None rgenop = interpreter.jitstate.curbuilder.rgenop try: gv_result = self.perform_call(rgenop, gv_fnptr, greenargs) @@ -90,6 +92,25 @@ if gv_result is not None: interpreter.green_result(gv_result) + def perform_call_mixed(self, rgenop, gv_fnptr, greens_gv, reds_gv): + if self.colororder is None: + args_gv = greens_gv + reds_gv + else: + args_gv = [] + gi = 0 + ri = 0 + for c in self.colororder: + if c == 'g': + gv = greens_gv[gi] + gi += 1 + else: + gv = reds_gv[ri] + ri += 1 + args_gv.append(gv) + assert gi == len(greens_gv) + assert ri == len(reds_gv) + return self.perform_call(rgenop, gv_fnptr, args_gv) + class IndirectCallsetDesc(object): __metaclass__ = cachedtype @@ -264,8 +285,22 @@ RESULT = graph.getreturnvar().concretetype FUNCTYPE = lltype.FuncType(ARGS, RESULT) + # if the graph takes both red and green arguments, we need + # a way for the fallback interp to rezip the two lists + # 'greenargs' and 'redargs' into a single one + colororder = "" + in_order = True # "in order" means allgreens+allreds + for v in graph.getargs(): + if self.hannotator.binding(v).is_green(): + if "r" in colororder: + in_order = False + colororder += "g" + else: + colororder += "r" + if in_order: + colororder = None owncalldesc = CallDesc(self.RGenOp, self.exceptiondesc, - lltype.Ptr(FUNCTYPE)) + lltype.Ptr(FUNCTYPE), colororder) ownfnptr = lltype.functionptr(FUNCTYPE, graph.name, graph=graph) gv_ownfnptr = self.RGenOp.constPrebuiltGlobal(ownfnptr) return owncalldesc, gv_ownfnptr @@ -987,10 +1022,14 @@ if v.concretetype == lltype.Void: continue emitted_args.append(self.serialize_oparg("red", v)) - self.emit("red_residual_call") + if self.hannotator.policy.hotpath: + self.emit("hp_residual_call") + else: + self.emit("red_residual_call") self.emit(func, pos, withexc, has_result, len(emitted_args)) self.emit(*emitted_args) - self.emit(self.promotiondesc_position(lltype.Signed)) + if not self.hannotator.policy.hotpath: + self.emit(self.promotiondesc_position(lltype.Signed)) if has_result: self.register_redvar(op.result) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sat Mar 15 22:04:03 2008 @@ -85,12 +85,11 @@ Xxx("capture_exception") def run_directly(self, greenargs, redargs, targetbytecode): - assert not (greenargs and redargs) # XXX for now calldesc = targetbytecode.owncalldesc try: - gv_res = calldesc.perform_call(self.rgenop, - targetbytecode.gv_ownfnptr, - greenargs or redargs) + gv_res = calldesc.perform_call_mixed(self.rgenop, + targetbytecode.gv_ownfnptr, + greenargs, redargs) except Exception, e: self.capture_exception(e) gv_res = calldesc.gv_whatever_return_value @@ -248,7 +247,12 @@ @arguments("green", "green_varargs", "jumptargets") def opimpl_green_switch(self, exitcase, cases, targets): - Xxx("green_switch") + arg = exitcase.revealconst(lltype.Signed) + assert len(cases) == len(targets) + for i in range(len(cases)): + if arg == cases[i].revealconst(lltype.Signed): + self.pc = targets[i] + break @arguments("bool", "red", "red", "jumptarget") def opimpl_red_goto_ifptrnonzero(self, reverse, gv_ptr, gv_switch, target): @@ -337,12 +341,6 @@ def opimpl_red_oopspec_call_noresult_3(self, oopspec, deepfrozen, arg1, arg2, arg3): self.oopspec_call(oopspec, [arg1, arg2, arg3]) - @arguments("red", "calldesc", "bool", "bool", "red_varargs", - "promotiondesc") - def opimpl_red_residual_call(self, gv_func, calldesc, withexc, has_result, - redargs, promotiondesc): - Xxx("red_residual_call") - @arguments("metacalldesc", "red_varargs", returns="red") def opimpl_metacall(self, metafunc, redargs): Xxx("metacall") @@ -392,7 +390,9 @@ @arguments("red", "fielddesc", "bool", returns="green_from_red") def opimpl_green_getfield(self, gv_struct, fielddesc, deepfrozen): - Xxx("green_getfield") + gv_res = fielddesc.getfield_if_non_null(self.rgenop, gv_struct) + assert gv_res is not None, "segfault!" + return gv_res @arguments("red", "fielddesc", "red") def opimpl_red_setfield(self, gv_dest, fielddesc, gv_value): @@ -479,6 +479,17 @@ gv_res = self.run_directly(greenargs, redargs, targetbytecode) self.green_result(gv_res) + @arguments("red", "calldesc", "bool", "bool", "red_varargs") + def opimpl_hp_residual_call(self, gv_func, calldesc, withexc, has_result, + redargs_gv): + try: + gv_res = calldesc.perform_call(self.rgenop, gv_func, redargs_gv) + except Exception, e: + self.capture_exception(e) + gv_res = calldesc.gv_whatever_return_value + if has_result: + self.red_result(gv_res) + def hp_return(self): frame = self.current_source_jitframe.backframe if frame is None: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Sat Mar 15 22:04:03 2008 @@ -97,9 +97,12 @@ self.maybe_enter_jit_fn = maybe_enter_jit def make_descs(self): - ERASED = self.RGenOp.erasedType(lltype.Bool) - self.bool_hotpromotiondesc = rhotpath.HotPromotionDesc(ERASED, - self.RGenOp) + HotPromotionDesc = rhotpath.HotPromotionDesc + RGenOp = self.RGenOp + EBOOL = RGenOp.erasedType(lltype.Bool) + ESIGNED = RGenOp.erasedType(lltype.Signed) + self.bool_hotpromotiondesc = HotPromotionDesc(EBOOL, RGenOp) + self.signed_hotpromotiondesc = HotPromotionDesc(ESIGNED, RGenOp) def rewrite_graphs(self): for graph in self.hintannotator.base_translator.graphs: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Sat Mar 15 22:04:03 2008 @@ -908,6 +908,16 @@ opimpl_hp_gray_direct_call = opimpl_hp_red_direct_call opimpl_hp_yellow_direct_call = opimpl_hp_red_direct_call + @arguments("red", "calldesc", "bool", "bool", "red_varargs") + def opimpl_hp_residual_call(self, funcbox, calldesc, withexc, has_result, + redargs): + result = rtimeshift.gen_residual_call(self.jitstate, calldesc, + funcbox, redargs) + if has_result: + self.red_result(result) + rhotpath.hp_after_residual_call(self.jitstate, self.hotrunnerdesc, + withexc, True) + def hp_return(self): frame = self.frame.backframe if frame is None: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Sat Mar 15 22:04:03 2008 @@ -23,7 +23,7 @@ interp.frame.local_green = greenargs interp.graphsigtoken = graphsigtoken -def leave_graph(interp): +def leave_graph(interp, store_back_exception=True): jitstate = interp.jitstate exceptiondesc = interp.exceptiondesc builder = jitstate.curbuilder @@ -277,13 +277,16 @@ # compile from that state interpreter = self.hotrunnerdesc.interpreter interpreter.newjitstate(jitstate) - interpreter.green_result(gv_value) jitstate.curbuilder = self.flexswitch.add_case(gv_value) + self.prepare_compiler(interpreter, gv_value) compile(interpreter) # done greenkey = GreenKey([gv_value], self.hotpromotiondesc.greenkeydesc) self.counters[greenkey] = -1 # means "compiled" + def prepare_compiler(self, interpreter, gv_value): + interpreter.green_result(gv_value) + def hotsplit(jitstate, hotrunnerdesc, switchbox, falsepath_pc, truepath_pc): @@ -298,7 +301,8 @@ hotpromotiondesc) generate_fallback_code(fbp, hotpromotiondesc, promotebox) -def generate_fallback_code(fbp, hotpromotiondesc, switchbox): +def generate_fallback_code(fbp, hotpromotiondesc, switchbox, + check_exceptions=False): jitstate = fbp.saved_jitstate incoming = jitstate.enter_block_sweep_virtualizables() switchblock = rtimeshift.enter_next_block(jitstate, incoming) @@ -307,7 +311,17 @@ flexswitch, default_builder = jitstate.curbuilder.flexswitch(gv_switchvar, incoming_gv) jitstate.curbuilder = default_builder + # default case of the switch: + exceptiondesc = fbp.hotrunnerdesc.exceptiondesc + if check_exceptions: + # virtualize the exception into the jitstate (xxx fragile code) + prevtypebox = jitstate.exc_type_box + prevvaluebox = jitstate.exc_value_box + exceptiondesc.fetch_global_excdata(jitstate) + incoming_gv.append(jitstate.exc_type_box.genvar) + incoming_gv.append(jitstate.exc_value_box.genvar) + frameinfo = default_builder.get_frame_info(incoming_gv) fbp.set_machine_code_info(flexswitch, frameinfo) ll_fbp = _cast_fallback_point_to_base_ptr(fbp) @@ -321,11 +335,18 @@ # The call above may either return normally, meaning that more machine # code was compiled and we should loop back to 'switchblock' to enter it, # or it may have set an exception. - exceptiondesc = fbp.hotrunnerdesc.exceptiondesc gv_exc_type = exceptiondesc.genop_get_exc_type(default_builder) gv_noexc = default_builder.genop_ptr_iszero( exceptiondesc.exc_type_kind, gv_exc_type) excpath_builder = default_builder.jump_if_false(gv_noexc, []) + + if check_exceptions: + # unvirtualize the exception + exceptiondesc.store_global_excdata(jitstate) + incoming_gv.pop() + incoming_gv.pop() + jitstate.exc_type_box = prevtypebox + jitstate.exc_value_box = prevvaluebox default_builder.finish_and_goto(incoming_gv, switchblock) jitstate.curbuilder = excpath_builder @@ -345,3 +366,52 @@ return cast_instance_to_base_ptr(instance) else: return instance + +# ____________________________________________________________ + +# support for reading the state after a residual call, XXX a bit lengthy + +class AfterResidualCallFallbackPoint(PromoteFallbackPoint): + + def __init__(self, jitstate, hotrunnerdesc, promotebox, hotpromotiondesc, + check_forced): + PromoteFallbackPoint.__init__(self, jitstate, hotrunnerdesc, + promotebox, hotpromotiondesc) + self.check_forced = check_forced + + @specialize.arglltype(2) + def prepare_fallbackinterp(self, fallbackinterp, value): + fallbackinterp.local_red.pop() # remove the temporary flagbox + + def prepare_compiler(self, interpreter, gv_value): + # remove the temporary flagbox + flagbox = interpreter.frame.local_boxes.pop() + exceptiondesc = self.hotrunnerdesc.exceptiondesc + rtimeshift.residual_fetch(interpreter.jitstate, exceptiondesc, + self.check_forced, flagbox) + + +def hp_after_residual_call(jitstate, hotrunnerdesc, withexc, check_forced): + if withexc: + exceptiondesc = hotrunnerdesc.exceptiondesc + else: + exceptiondesc = None + gv_flags = rtimeshift.gvflags_after_residual_call(jitstate, + exceptiondesc, + check_forced) + if gv_flags is None: + return # nothing to check + # XXX slightly hackish: the gv_flags needs to be in local_boxes + # to be passed along to the new block + assert not gv_flags.is_const + tok_signed = hotrunnerdesc.RGenOp.kindToken(lltype.Signed) + flagbox = rvalue.IntRedBox(tok_signed, gv_flags) + jitstate.frame.local_boxes.append(flagbox) + + hotpromotiondesc = hotrunnerdesc.signed_hotpromotiondesc + fbp = AfterResidualCallFallbackPoint(jitstate, hotrunnerdesc, + flagbox, hotpromotiondesc, + check_forced) + generate_fallback_code(fbp, hotpromotiondesc, flagbox, + check_exceptions=withexc) + assert 0, "unreachable" Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sat Mar 15 22:04:03 2008 @@ -6,6 +6,24 @@ import sys +# ------------------------------------------------------------------------ +# A note about these tests. Their portal function is generally structured +# like this: +# +# i = 1024 +# while i > 0: +# ...real test code here... +# MyJitDriver.jit_merge_point(...) +# MyJitDriver.can_enter_jit(...) +# +# and we use a threshold of 2, typically. This ensures that in a single +# call, the test code is run in all three ways: +# - first it runs directly +# - then we start the JIT but immediately pause at the 'i > 0' check, +# so that the real test code runs in the fallback interp +# - then we JIT everything +# ------------------------------------------------------------------------ + class TestHotInterpreter(test_hotpath.HotPathTest): @@ -21,16 +39,16 @@ def ll_function(x, y): tot = 0 while x: # conversion from green '0' to red 'tot' - MyJitDriver.jit_merge_point(x=x, y=y, tot=tot) - MyJitDriver.can_enter_jit(x=x, y=y, tot=tot) hint(x, concrete=True) tot += y x -= 1 + MyJitDriver.jit_merge_point(x=x, y=y, tot=tot) + MyJitDriver.can_enter_jit(x=x, y=y, tot=tot) return tot res = self.run(ll_function, [7, 2], threshold=1) assert res == 14 - self.check_insns_excluding_return({'int_add': 7}) + self.check_insns_excluding_return({'int_add': 6}) def test_ifs(self): class MyJitDriver(JitDriver): @@ -225,15 +243,11 @@ def test_arith_plus_minus(self): class MyJitDriver(JitDriver): greens = ['encoded_insn', 'nb_insn'] - reds = ['i', 'x', 'y'] + reds = ['i', 'x', 'y', 'acc'] def ll_plus_minus(encoded_insn, nb_insn, x, y): i = 1024 while i > 0: i >>= 1 - MyJitDriver.jit_merge_point(encoded_insn=encoded_insn, - nb_insn=nb_insn, x=x, y=y, i=i) - MyJitDriver.can_enter_jit(encoded_insn=encoded_insn, - nb_insn=nb_insn, x=x, y=y, i=i) hint(nb_insn, concrete=True) acc = x pc = 0 @@ -245,6 +259,12 @@ elif op == 0x5: acc -= y pc += 1 + MyJitDriver.jit_merge_point(encoded_insn=encoded_insn, + nb_insn=nb_insn, x=x, y=y, i=i, + acc=acc) + MyJitDriver.can_enter_jit(encoded_insn=encoded_insn, + nb_insn=nb_insn, x=x, y=y, i=i, + acc=acc) return acc assert ll_plus_minus(0xA5A, 3, 32, 10) == 42 res = self.run(ll_plus_minus, [0xA5A, 3, 32, 10], threshold=2) @@ -255,7 +275,7 @@ def test_call_3(self): class MyJitDriver(JitDriver): greens = [] - reds = ['i', 'y'] + reds = ['i', 'y', 'res'] def ll_add_one(x): return x + 1 def ll_two(x): @@ -264,33 +284,69 @@ i = 1024 while i > 0: i >>= 1 - MyJitDriver.jit_merge_point(y=y, i=i) - MyJitDriver.can_enter_jit(y=y, i=i) res = ll_two(y) * y + MyJitDriver.jit_merge_point(y=y, i=i, res=res) + MyJitDriver.can_enter_jit(y=y, i=i, res=res) return res res = self.run(ll_function, [5], threshold=2) assert res == 10 self.check_insns_in_loops({'int_add': 2, 'int_sub': 1, 'int_mul': 1, 'int_gt': 1, 'int_rshift': 1}) + def test_call_mixed_color_args(self): + class MyJitDriver(JitDriver): + greens = ['g1', 'g2'] + reds = ['r1', 'r2', 'i', 'res'] + + def ll_grr(a, b, c): return a + 3*b + 7*c + def ll_rgr(a, b, c): return a + 3*b + 7*c + def ll_rrg(a, b, c): return a + 3*b + 7*c + def ll_ggr(a, b, c): return a + 3*b + 7*c + def ll_grg(a, b, c): return a + 3*b + 7*c + def ll_rgg(a, b, c): return a + 3*b + 7*c + + def ll_function(g1, g2, r1, r2): + i = 1024 + while i > 0: + i >>= 1 + res = (ll_grr(g1, r1, r2) * 1 + + ll_rgr(r1, g2, r2) * 10 + + ll_rrg(r2, r1, g1) * 100 + + ll_ggr(g1, g2, r2) * 1000 + + ll_grg(g2, r2, g1) * 10000 + + ll_rgg(r1, g2, g1) * 100000) + hint(g1, concrete=True) + hint(g2, concrete=True) + MyJitDriver.jit_merge_point(g1=g1, g2=g2, r1=r1, r2=r2, + i=i, res=res) + MyJitDriver.can_enter_jit(g1=g1, g2=g2, r1=r1, r2=r2, + i=i, res=res) + return res + res = self.run(ll_function, [1, 2, 4, 8], threshold=2) + assert res == ll_function(1, 2, 4, 8) + def test_void_call(self): class MyJitDriver(JitDriver): greens = [] reds = ['y', 'i'] - def ll_do_nothing(x): - pass + S = lltype.GcStruct('S', ('x', lltype.Signed)) + def ll_do_nothing(s, x): + s.x = x + 1 def ll_function(y): i = 1024 while i > 0: i >>= 1 + s = lltype.malloc(S) + ll_do_nothing(s, y) + y = s.x MyJitDriver.jit_merge_point(y=y, i=i) MyJitDriver.can_enter_jit(y=y, i=i) - ll_do_nothing(y) return y res = self.run(ll_function, [3], threshold=2) - assert res == 3 - self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) + assert res == ll_function(3) + self.check_insns_in_loops({'int_add': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_green_return(self): class MyJitDriver(JitDriver): @@ -761,16 +817,16 @@ def test_residual_red_call(self): class MyJitDriver(JitDriver): greens = [] - reds = ['i', 'x'] + reds = ['i', 'x', 'res'] def g(x): return x+1 def f(x): i = 1024 while i > 0: i >>= 1 - MyJitDriver.jit_merge_point(x=x, i=i) - MyJitDriver.can_enter_jit(x=x, i=i) res = 2*g(x) + MyJitDriver.jit_merge_point(x=x, i=i, res=res) + MyJitDriver.can_enter_jit(x=x, i=i, res=res) return res res = self.run(f, [20], threshold=2, policy=StopAtXPolicy(g)) @@ -779,10 +835,9 @@ 'int_gt': 1, 'int_rshift': 1}) def test_residual_red_call_with_exc(self): - py.test.skip("in-progress") class MyJitDriver(JitDriver): greens = [] - reds = ['i', 'x'] + reds = ['i', 'x', 'res'] def h(x): if x > 0: @@ -797,12 +852,12 @@ i = 1024 while i > 0: i >>= 1 - MyJitDriver.jit_merge_point(x=x, i=i) - MyJitDriver.can_enter_jit(x=x, i=i) try: res = g(x) except ValueError: res = 7 + MyJitDriver.jit_merge_point(x=x, i=i, res=res) + MyJitDriver.can_enter_jit(x=x, i=i, res=res) return res stop_at_h = StopAtXPolicy(h) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Sat Mar 15 22:04:03 2008 @@ -585,7 +585,7 @@ gv_result = builder.genop_call(calldesc.sigtoken, gv_funcbox, args_gv) return calldesc.redboxbuilder(calldesc.result_kind, gv_result) -def after_residual_call(jitstate, exceptiondesc, check_forced): +def gvflags_after_residual_call(jitstate, exceptiondesc, check_forced): builder = jitstate.curbuilder if check_forced: gv_flags = jitstate.check_forced_after_residual_call() @@ -602,6 +602,11 @@ else: assert gv_flags is None exceptiondesc.fetch_global_excdata(jitstate) + return gv_flags + +def after_residual_call(jitstate, exceptiondesc, check_forced): + gv_flags = gvflags_after_residual_call(jitstate, exceptiondesc, + check_forced) if gv_flags is None: gv_flags = builder.rgenop.constPrebuiltGlobal(0) return rvalue.IntRedBox(builder.rgenop.kindToken(lltype.Signed), gv_flags) From cami at codespeak.net Sat Mar 15 23:10:03 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sat, 15 Mar 2008 23:10:03 +0100 (CET) Subject: [pypy-svn] r52568 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080315221003.E7CAD16A0D8@codespeak.net> Author: cami Date: Sat Mar 15 23:10:01 2008 New Revision: 52568 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Log: heavy refactoring of op-code methods. prepared non-working op-code list. Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Sat Mar 15 23:10:01 2008 @@ -5,1565 +5,946 @@ """ from pypy.lang.gameboy import constants -class CPU(object): - - # Registers - a = 0 - b = 0 - c = 0 - d = 0 - f = 0 - d = 0 - l = 0 - sp = 0; - pc = 0; - - # Interrupt Flags - ime = False; - halted = False; - cycles = 0; - - # Interrupt Controller - #Interrupt - interrupt = None; - - # memory Access - #memory - memory = None; - - - # ROM Access - rom = []; - - def __init__(self, interrupt, memory): - self.interrupt = interrupt; - self.memory = memory; - self.reset(); - - - def getBC(self): - return (self.b << 8) + self.c; - - - def getDE(self): - return (self.d << 8) + self.e; - - - def getHL(self): - return (self.h << 8) + self.l; - - - def getSP(self): - return self.sp; - - - def getPC(self): - return self.pc; - - - def getAF(self): - return (self.a << 8) + self.f; - - def getIF(self): - val = 0x00 - #if (self.ime ? 0x01 : 0x00) + (self.halted ? 0x80 : 0x00); - if self.ime: - val = 0x01 - if self.halted: - val += 0x80 - return val - - - def setROM(self, banks): - self.rom = banks; - - - def reset(self): - self.a = 0x01; - self.f = 0x80; - self.b = 0x00; - self.c = 0x13; - self.d = 0x00; - self.e = 0xD8; - self.h = 0x01; - self.l = 0x4D; - self.sp = 0xFFFE; - self.pc = 0x0100; - - self.ime = false; - self.halted = false; - - self.cycles = 0; - - - def emulate(self, ticks): - self.cycles += ticks; - - self.interrupt(); - - while (self.cycles > 0): - self.execute(); - - - # Interrupts - def interrupt(self): - if (self.halted): - if (self.interrupt.isPending()): - self.halted = false; - # Zerd no Densetsu - self.cycles -= 4; - elif (self.cycles > 0): - self.cycles = 0; - if (self.ime): - if (self.interrupt.isPending()): - if (self.interrupt.isPending(constants.VBLANK)): - self.interrupt(0x40); - self.interrupt.lower(constants.VBLANK); - elif (self.interrupt.isPending(constants.LCD)): - self.interrupt(0x48); - self.interrupt.lower(constants.LCD); - elif (self.interrupt.isPending(constants.TIMER)): - self.interrupt(0x50); - self.interrupt.lower(constants.TIMER); - elif (self.interrupt.isPending(constants.SERIAL)): - self.interrupt(0x58); - self.interrupt.lower(constants.SERIAL); - elif (self.interrupt.isPending(constants.JOYPAD)): - self.interrupt(0x60); - self.interrupt.lower(constants.JOYPAD); - - - def interrupt(self, address): - self.ime = false; - self.call(address); - - - # Execution - def execute(self): - self.execute(self.fetch()); - - - def execute(self, opcode): - result = { 0x00:self.nop(), - # LD (nnnn),SP - 0x08:self.load_mem_SP(), - - # STOP - 0x10:self.stop(), - - # JR nn - 0x18:SELF.JR_nn(), - - # JR cc,nn - 0x20:self.jr_NZ_nn(), - 0x28:self.jr_Z_nn(), - 0x30:self.jr_NC_nn(), - 0x38:self.jr_C_nn(), - - # LD rr,nnnn - 0x01:self.ld_BC_nnnn(), - 0x11:self.ld_DE_nnnn(), - 0x21:self.ld_HL_nnnn(), - 0x31:self.ld_SP_nnnn(), - - # ADD HL,rr - 0x09:self.add_HL_BC(), - 0x19:self.add_HL_DE(), - 0x29:self.add_HL_HL(), - 0x39:self.add_HL_SP(), - - # LD (BC),A - 0x02:self.ld_BCi_A(), - - # LD A,(BC) - 0x0A:self.ld_A_BCi(), - - # LD (DE),A - 0x12:self.ld_DEi_A(), - - # LD A,(DE) - 0x1A:self.load_A_DEi(), - - # LDI (HL),A - 0x22:self.ldi_HLi_A(), +class Register(object): - # LDI A,(HL) - 0x2A:self.ldi_A_HLi(), + cpu = None - # LDD (HL),A - 0x32:self.ldd_HLi_A(), - - # LDD A,(HL) - 0x3A:self.ldd_A_HLi(), - - # INC rr - 0x03:self.inc_BC(), - 0x13:self.inc_DE(), - 0x23:self.inc_HL(), - 0x33:self.inc_SP(), - - # DEC rr - 0x0B:self.dec_BC(), - 0x1B:self.dec_DE(), - 0x2B:self.dec_HL(), - 0x3B:self.dec_SP(), - - # XXX Should be ranges - 0x04:self.inc - 0x05:self.dec - 0x06:self.ld_nn - - # RLCA - 0x07:self.rlca(), - - # RRCA - 0x0F:self.rrca(), - - # RLA - 0x17:self.rla(), - - # RRA - 0x1F:self.rra(), - - # DAA - 0x27:self.daa(), - - # CPL - 0x2F:self.cpl(), - - # SCF - 0x37:self.scf(), - - # CCF - 0x3F:self.ccf(), - - # HALT - 0x76:self.halt(), - - # XXX Should be ranges - 0x40:self.ld - 0x48:self.ld - 0x50:self.ld - 0x58:self.ld - 0x60:self.ld - 0x68:self.ld - 0x70:self.ld - 0x78:self.ld - 0x80:self.add - 0x88:self.adc - 0x90:self.sub - 0x98:self.sbc - 0xA0:self.AND - 0xA8:self.xOR - 0xB0:self.OR - 0xB8:self.cp - - # RET cc - 0xC0:self.ret_NZ(), - 0xC8:self.ret_Z(), - 0xD0:self.ret_NC(), - 0xD8:self.ret_C(), - - # LDH (nn),A - 0xE0:self.ldh_mem_A(), - - # ADD SP,nn - 0xE8:self.add_SP_nn(), - - # LDH A,(nn) - 0xF0:self.ldh_A_mem(), - - # LD HL,SP+nn - 0xF8:self.ld_HP_SP_nn(), - - # POP rr - 0xC1:self.pop_BC(), - 0xD1:self.pop_DE(), - 0xE1:self.pop_HL(), - 0xF1:self.pop_AF(), - - # RET - 0xC9:self.ret(), - - # RETI - 0xD9:self.reti(), - - # LD PC,HL - 0xE9:self.ld_PC_HL(), - - # LD SP,HL - 0xF9:self.ld_SP_HL(), - - # JP cc,nnnn - 0xC2:self.jp_NZ_nnnn(), - 0xCA:self.jp_Z_nnnn(), - 0xD2:self.jp_NC_nnnn(), - 0xDA:self.jp_C_nnnn(), - - # LDH (C),A - 0xE2:self.ldh_Ci_A(), - - # LD (nnnn),A - 0xEA:self.ld_mem_A(), - - # LDH A,(C) - 0xF2:self.ldh_A_Ci(), + def __init__(self, cpu, value=0): + self.cpu = cpu + self.set(value) + + def set(self, value): + self.value = value + self.cpu.cycles -= 1 + + def get(self): + return self.value + + +class DoubleRegister(Register): + + value = 0 + cpu = None + + def __init__(self, cpu, hi=0, lo=None): + self.cpu = cpu + self.set(hi, lo); + + def set(self, hi, lo=None): + if (lo is None): + self.value = hi + self.cpu.cycles -= 1 + else: + self.value = (hi << 8) + lo + self.cpu.cycles -= 2 + + def setHi(self, hi): + self.set(hi, this.getLo()) - # LD A,(nnnn) - 0xFA:self.ld_A_mem(), + def setLo(self, lo): + self.set(self.getHi(), lo) + + def get(self): + return self.value + + def getHi(self): + return (self.value >> 8) & 0xFF + + def getLo(self): + return self.value & 0xFF + + def inc(self): + self.value = (self.value +1) & 0xFFFF + self.cpu.cycles -= 2 + + def dec(self): + self.value = (self.value - 1) & 0xFFFF + self.cpu.cycles -= 2 + + def add(self, n): + self.value = (self.value + n) & 0xFFFF + self.cpu.cycles -= 3 - # JP nnnn - 0xC3:self.jp_nnnn(), - - 0xCB:self.fetchExecute(), - - # DI - 0xF3:self.di(), - - # EI - 0xFB:self.ei(), - - # CALL cc,nnnn - 0xC4:self.call_NZ_nnnn(), - 0xCC:self.call_Z_nnnn(), - 0xD4:self.call_NC_nnnn(), - 0xDC:self.call_C_nnnn(), - - # PUSH rr - 0xC5:self.push_BC(), - 0xD5:self.push_DE(), - 0xE5:self.push_HL(), - 0xF5:self.push_AF(), - - # CALL nnnn - 0xCD:self.call_nnnn(), - - # ADD A,nn - 0xC6:self.add_A_nn(), - - # ADC A,nn - 0xCE:self.adc_A_nn(), - - # SUB A,nn - 0xD6:self.sub_A_nn(), - - # SBC A,nn - 0xDE:self.sbc_A_nn(), - - # AND A,nn - 0xE6:self.AND_A_nn(), - - # XOR A,nn - 0xEE:self.xOR_A_nn(), - - # OR A,nn - 0xF6:self.OR_A_nn(), - - # CP A,nn - 0xFE:self.cp_A_nn(), - - # RST nn - 0xC7:self.rst(0x00), - 0xCF:self.rst(0x08), - 0xD7:self.rst(0x10), - 0xDF:self.rst(0x18), - 0xE7:self.rst(0x20), - 0xEF:self.rst(0x28), - 0xF7:self.rst(0x30), - 0xFF:self.rst(0x38) - }[opcode]() - def fetchExecute(self): - result = [ - self.rlc, - self.rrc, - self.rl, - self.rr, - self.sla, - self.sra, - self.swap, - self.srl, - self.bit - self.set_0 - self.set_1 - self.set_2 - self.set_3 - self.set_4 - self.set_5 - self.set_6 - self.set_7 - self.res_0, - self.res_1, - self.res_2, - self.res_3, - self.res_4, - self.res_5, - self.res_6, - self.res_7, - ][self.fetch()]() - - - # memory Access - def read(self, address): - self.cycles -= 1 - return self.memory.read(address); +class CPU(object): - def write(self, address, data): - self.memory.write(address, data); - self.cycles -= 1 - + # Registers + a = 0 + bc = None + de = None + f = 0 + hl = None + sp = None + pc = None + + # Interrupt Flags + ime = False + halted = False + cycles = 0 + + # Interrupt Controller + #Interrupt + interrupt = None + + # memory Access + #memory + memory = None + + + # ROM Access + rom = [] + + def __init__(self, interrupt, memory): + self.interrupt = interrupt + self.memory = memory + self.bc = DoubleRegister() + self.de = DoubleRegister() + self.hl = DoubleRegister() + self.pc = DoubleRegister() + self.sp = DoubleRegister() + self.reset() + + + def getAF(self): + return (self.a << 8) + self.f + + + def getIF(self): + val = 0x00 + #if (self.ime ? 0x01 : 0x00) + (self.halted ? 0x80 : 0x00) + if self.ime: + val = 0x01 + if self.halted: + val += 0x80 + return val + + + def setA(self, value): + self.a = value + self.cycles -= 1 + + def getA(self): + return self.a + + def setF(self, value): + self.f = value + self.cycles -= 1 + + def getF(self): + return self.f + + + def setROM(self, banks): + self.rom = banks + + + def reset(self): + self.a = 0x01 + self.f = 0x80 + self.bc.set(0x0013) + self.de.set(0x00D8) + self.hl.set(0x014D) + self.sp.set(0xFFFE) + self.pc.set(0x0100) + + self.ime = False + self.halted = False + + self.cycles = 0 + + + def emulate(self, ticks): + self.cycles += ticks + self.interrupt() + while (self.cycles > 0): + self.execute() + + + # Interrupts + def interrupt(self): + if (self.halted): + if (self.interrupt.isPending()): + self.halted = False + # Zerd no Densetsu + self.cycles -= 4 + elif (self.cycles > 0): + self.cycles = 0 + if (self.ime and self.interrupt.isPending()): + if (self.interrupt.isPending(constants.VBLANK)): + self.interrupt(0x40) + self.interrupt.lower(constants.VBLANK) + elif (self.interrupt.isPending(constants.LCD)): + self.interrupt(0x48) + self.interrupt.lower(constants.LCD) + elif (self.interrupt.isPending(constants.TIMER)): + self.interrupt(0x50) + self.interrupt.lower(constants.TIMER) + elif (self.interrupt.isPending(constants.SERIAL)): + self.interrupt(0x58) + self.interrupt.lower(constants.SERIAL) + elif (self.interrupt.isPending(constants.JOYPAD)): + self.interrupt(0x60) + self.interrupt.lower(constants.JOYPAD) + + + def interrupt(self, address): + self.ime = False + self.call(address) + + + # Execution + def execute(self): + self.execute(self.fetch()) + - def read(self, hi, lo): + # memory Access, 1 cycle + def read(self, address): self.cycles -= 1 - return self.read((hi << 8) + lo); + return self.memory.read(address) - - def write(self, hi, lo, data): - self.write((hi << 8) + lo, data); + + def read(self, hi, lo): + return self.read((hi << 8) + lo) + + # 2 cycles + def write(self, address, data): + self.memory.write(address, data) self.cycles -= 2 - # Fetching - def fetch(self): - self.cycles -=1 - - if (self.pc <= 0x3FFF): - self.pc+=1 - return self.rom[self.pc] & 0xFF; - - data = self.memory.read(self.pc); - self.pc = (self.pc + 1) & 0xFFFF; - return data; - - - # Stack - def push(self, data): - self.sp = (self.sp - 1) & 0xFFFF; - self.memory.write(self.sp, data); - - - def pop(self): - data = self.memory.read(self.sp); - self.sp = (self.sp + 1) & 0xFFFF; - return data; - - - def call(self, address): - self.push(self.pc >> 8); - self.push(self.pc & 0xFF); - self.pc = address; - - - # ALU - def add(self, data): - s = (self.a + data) & 0xFF; - self.f = 0 - if s == 0: - self.f = constants.Z_FLAG - if s < self.a: - self.f += constants.C_FLAG - if (s & 0x0F) < (self.a & 0x0F): - self.f += constants.H_FLAG - self.a = s; - - - def adc(self, data): - s = self.a + data + ((self.f & constants.C_FLAG) >> 4); - self.f = 0 - if (s & 0xFF) == 0: - self.f += constants.Z_FLAG - if s >= 0x100: - self.f += constants.C_FLAG - if ((s ^ self.a ^ data) & 0x10) != 0: - self.f += constants.H_FLAG - self.a = s & 0xFF; - - - def sub(self, data): - s = (self.a - data) & 0xFF; - self.f = constants.N_FLAG - if s == 0: - self.f += constants.Z_FLAG - if s > self.a: - self.f += constants.C_FLAG - if (s & 0x0F) > (self.a & 0x0F): - self.f += constants.H_FLAG - - self.a = s; - - - def sbc(self, data): - s = self.a - data - ((self.f & constants.C_FLAG) >> 4); - self.f = constants.N_FLAG - if (s & 0xFF) == 0: - self.f += constants.Z_FLAG - if (s & 0xFF00) != 0: - self.f += constants.C_FLAG - if ((s ^ self.a ^ data) & 0x10) != 0: - self.f += constants.H_FLAG - self.a = s & 0xFF; - - - def AND(self, data): - self.a &= data; - self.f = 0 - if self.a == 0: - self.f = constants.Z_FLAG - - - def xOR(self, data): - self.a ^= data; - self.f = 0 - if self.a == 0: - self.f = constants.Z_FLAG - - - def cpuOR(self, data): - self.a |= data; - self.f = 0 - if self.a == 0: - self.f = constants.Z_FLAG - - - def cp(self, data): - s = (self.a - data) & 0xFF; - self.f = constants.N_FLAG - if s==0: - self.f += constants.Z_FLAG - if s > self.a: - self.f += constants.C_FLAG - if (s & 0x0F) > (self.a & 0x0F): - self.f += constants.H_FLAG - - - def inc(self, data): - data = (data + 1) & 0xFF; - self.f = 0 - if data == 0: - self.f += constants.Z_FLAG - if (data & 0x0F) == 0x00: - self.f += constants.H_FLAG - self.f += (self.f & constants.C_FLAG); - return data; - - - def dec(self, data): - data = (data - 1) & 0xFF; - self.f = 0 - if data == 0: - self.f += constants.Z_FLAG - if (data & 0x0F) == 0x0F: - self.f += constants.H_FLAG - self.f += (self.f & constants.C_FLAG) + constants.N_FLAG; - return data; - - - def rlc(self, data): - s = ((data & 0x7F) << 1) + ((data & 0x80) >> 7); - self.f = 0 - if s == 0: - self.f += constants.Z_FLAG - if (data & 0x80) != 0: - self.f += constants.C_FLAG - return s; - - - def rl(self, data): - s = ((data & 0x7F) << 1) - if (self.f & constants.C_FLAG) != 0: - self.f += 0x01; - self.f =0 - if (s == 0): - self.f += constants.Z_FLAG - if (data & 0x80) != 0: - self.f += constants.C_FLAG - return s; - - - def rrc(self, data): - s = (data >> 1) + ((data & 0x01) << 7); - self.f = 0 - if s == 0: - self.f += constants.Z_FLAG - if (data & 0x01) != 0: - self.f += constants.C_FLAG - return s; - - - def rr(self, data): - s = (data >> 1) + ((self.f & constants.C_FLAG) << 3); - self.f = 0 - if s == 0: - self.f += constants.Z_FLAG - if (data & 0x01) != 0: - self.f += constants.C_FLAG - return s; - - - def sla(self, data): - s = (data << 1) & 0xFF; - self.f = 0 - if s == 0: - self.f += constants.Z_FLAG - if (data & 0x80) != 0: - self.f += constants.C_FLAG - return s; - - - def sra(self, data): - s = (data >> 1) + (data & 0x80); - self.f = 0 - if s == 0: - self.f += constants.Z_FLAG - if (data & 0x01) != 0: - self.f += constants.C_FLAG - return s; - - - def srl(self, data): - s = (data >> 1); - self.f = 0 - if s == 0 : - self.f += constants.Z_FLAG - if (data & 0x01) != 0: - self.f += constants.C_FLAG - return s; - - - def swap(self, data): - s = ((data << 4) & 0xF0) + ((data >> 4) & 0x0F); - self.f = 0 - if s == 0: - self.f += constants.Z_FLAG - return s; - - - def bit(self, n, data): - self.f = (self.f & constants.C_FLAG) + constants.H_FLAG - if (data & (1 << n)) == 0: - self.f += constants.Z_FLAG - - - def add(self, hi, lo): - s = ((self.h << 8) + self.l + (hi << 8) + lo) & 0xFFFF; - self.f = (self.f & constants.Z_FLAG) - if ((s >> 8) & 0x0F) < (self.h & 0x0F): - self.f += constants.H_FLAG - self.f += s < (self.h << 8) - if self.l: - self.f += constants.C_FLAG - self.l = s & 0xFF; - self.h = s >> 8; - - - def ld(self, setter, getter): - setter(getter()); - - def ld_nn(self, setter): - self(setter, self.fetch()); - - # LD A,(rr) - def ld_A_BCi(self): - self.seta(self.read(self.b, self.c)); - - def load_A_DEi(self): - self.seta(self.read(self.d, self.e)); - - # LD A,(nnnn) - def ld_A_mem(self): - lo = self.fetch(); - hi = self.fetch(); - self.seta(self.read(hi, lo)); - - # LD (rr),A - def ld_BCi_A(self): - self.write(self.b, self.c, self.a); - - def ld_DEi_A(self): - self.write(self.d, self.e, self.a); - - # LD (nnnn),SP - def load_mem_SP(self): - lo = self.fetch(); - hi = self.fetch(); - address = (hi << 8) + lo; - - self.write(address, self.sp & 0xFF); - self.write((address + 1) & 0xFFFF, self.sp >> 8); - - self.cycles -= 5; - - - # LD (nnnn),A - def ld_mem_A(self): - lo = self.fetch(); - hi = self.fetch(); - self.write(hi, lo, self.a); - self.cycles -= 4; - - - # LDH A,(nn) - def ldh_A_mem(self): - self.a = self.read(0xFF00 + self.fetch()); - self.cycles -= 3; - - - # LDH (nn),A - def ldh_mem_A(self): - self.write(0xFF00 + self.fetch(), self.a); - self.cycles -= 3; - - - # LDH A,(C) - def ldh_A_Ci(self): - self.a = self.read(0xFF00 + self.c); - self.cycles -= 2; - - - # LDH (C),A - def ldh_Ci_A(self): - self.write(0xFF00 + self.c, self.a); - self.cycles -= 2; - - - # LDI (HL),A - def ldi_HLi_A(self): - self.write(self.h, self.l, self.a); - self.l = (self.l + 1) & 0xFF; - if (self.l == 0): - self.h = (self.h + 1) & 0xFF; - self.cycles -= 2; - - - # LDI A,(HL) - def ldi_A_HLi(self): - self.a = self.read(self.h, self.l); - self.l = (self.l + 1) & 0xFF; - if (self.l == 0): - self.h = (self.h + 1) & 0xFF; - self.cycles -= 2; - - - # LDD (HL),A - def ldd_HLi_A(self): - self.write(self.h, self.l, self.a); - self.l = (self.l - 1) & 0xFF; - if (self.l == 0xFF): - self.h = (self.h - 1) & 0xFF; - self.cycles -= 2; - - - # LDD A,(HL) - def ldd_A_HLi(self): - self.a = self.read(self.h, self.l); - self.l = (self.l - 1) & 0xFF; - if (self.l == 0xFF): - self.h = (self.h - 1) & 0xFF; - self.cycles -= 2; - - - # LD rr,nnnn - def ld_BC_nnnn(self): - self.c = self.fetch(); - self.b = self.fetch(); - self.cycles -= 3; - - - def ld_DE_nnnn(self): - self.e = self.fetch(); - self.d = self.fetch(); - self.cycles -= 3; - - - def ld_HL_nnnn(self): - self.l = self.fetch(); - self.h = self.fetch(); - self.cycles -= 3; - - - def ld_SP_nnnn(self): - lo = self.fetch(); - hi = self.fetch(); - self.sp = (hi << 8) + lo; - self.cycles -= 3; - - - # LD SP,HL - def ld_SP_HL(self): - self.sp = (self.h << 8) + self.l; - self.cycles -= 2; - - - # PUSH rr - def push_BC(self): - self.push(self.b); - self.push(self.c); - self.cycles -= 4; - - - def push_DE(self): - self.push(self.d); - self.push(self.e); - self.cycles -= 4; - - - def push_HL(self): - self.push(self.h); - self.push(self.l); - self.cycles -= 4; - - - def push_AF(self): - self.push(self.a); - self.push(self.f); - self.cycles -= 4; - + def write(self, hi, lo, data): + self.write((hi << 8) + lo, data) - # POP rr - def pop_BC(self): - self.c = self.pop(); - self.b = self.pop(); - self.cycles -= 3; + # Fetching 1 cycle + def fetch(self): + self.cycles += 1 + if (self.pc.get() <= 0x3FFF): + self.pc.inc() #?2 cycles + return self.rom[self.pc.get()] & 0xFF + data = self.memory.read(self.pc.get()) + self.pc.inc() #?2 cycles + return data + + + # Stack, 2 cycles + def push(self, data): + self.sp.dec() #?2 cycles + self.memory.write(self.sp.get(), data) + + # 1 cycle + def pop(self): + data = self.memory.read(self.sp.get()) + self.sp.inc() #?2 cycles + self.cycles += 1 + return data + + # 4 cycles + def call(self, address): + self.push(self.pc.getHi()) # 2 cycles + self.push(self.pc.getLo()) # 2 cycles + self.pc.set(address) # 1 cycle + self.cycles += 1 + + + # ALU, 1 cycle + def addA(self, data): + s = (self.a + data) & 0xFF + self.f = 0 + if s == 0: + self.f = constants.Z_FLAG + if s < self.a: + self.f += constants.C_FLAG + if (s & 0x0F) < (self.a & 0x0F): + self.f += constants.H_FLAG + self.setA(s) # 1 cycle + + #?2 cycles + def addHL(self, register): + s = (self.hl.get() + register.get()) & 0xFFFF + self.f = (self.f & constants.Z_FLAG) + if ((s >> 8) & 0x0F) < (self.hl.getHi() & 0x0F): + self.f += constants.H_FLAG + if s < self.hl.get(): + self.f += constants.C_FLAG + self.cycles -= 1 + self.hl.set(s); # 1 cycle - def pop_DE(self): - self.e = self.pop(); - self.d = self.pop(); - self.cycles -= 3; - - - def pop_HL(self): - self.l = self.pop(); - self.h = self.pop(); - self.cycles -= 3; - - - def pop_AF(self): - self.f = self.pop(); - self.a = self.pop(); - self.cycles -= 3; - - - # XXX ADD A,r - def add(self): - self.add(self.b); - self.cycles -= 1; # 2 for hli - - # ADD A,nn - def add_A_nn(self): - self.add(self.fetch()); - self.cycles -= 2; - - - # ADC A,r - def adc_A_B(self): - self.adc(self.b); - self.cycles -= 1; - - - def adc_A_C(self): - self.adc(self.c); - self.cycles -= 1; - - - def adc_A_D(self): - self.adc(self.d); - self.cycles -= 1; - - - def adc_A_E(self): - self.adc(self.e); - self.cycles -= 1; - - - def adc_A_H(self): - self.adc(self.h); - self.cycles -= 1; - - - def adc_A_L(self): - self.adc(self.l); - self.cycles -= 1; - - - def adc_A_A(self): - self.adc(self.a); - self.cycles -= 1; - - - # ADC A,nn - def adc_A_nn(self): - self.adc(self.fetch()); - self.cycles -= 2; - - - # ADC A,(HL) - def adc_A_HLi(self): - self.adc(self.read(self.h, self.l)); - self.cycles -= 2; - - - # SUB A,r - def sub_A_B(self): - self.sub(self.b); - self.cycles -= 1; - - - def sub_A_C(self): - self.sub(self.c); - self.cycles -= 1; - - - def sub_A_D(self): - self.sub(self.d); - self.cycles -= 1; - - - def sub_A_E(self): - self.sub(self.e); - self.cycles -= 1; - - - def sub_A_H(self): - self.sub(self.h); - self.cycles -= 1; - - - def sub_A_L(self): - self.sub(self.l); - self.cycles -= 1; - - - def sub_A_A(self): - self.sub(self.a); - self.cycles -= 1; - - - # SUB A,nn - def sub_A_nn(self): - self.sub(self.fetch()); - self.cycles -= 2; - - - # SUB A,(HL) - def sub_A_HLi(self): - self.sub(self.read(self.h, self.l)); - self.cycles -= 2; - - - # SBC A,r - def sbc_A_B(self): - self.sbc(self.b); - self.cycles -= 1; - - - def sbc_A_C(self): - self.sbc(self.c); - self.cycles -= 1; - - - def sbc_A_D(self): - self.sbc(self.d); - self.cycles -= 1; - - - def sbc_A_E(self): - self.sbc(self.e); - self.cycles -= 1; - - - def sbc_A_H(self): - self.sbc(self.h); - self.cycles -= 1; - - - def sbc_A_L(self): - self.sbc(self.l); - self.cycles -= 1; - - - def sbc_A_A(self): - self.sbc(self.a); - self.cycles -= 1; - - - # SBC A,nn - def sbc_A_nn(self): - self.sbc(self.fetch()); - self.cycles -= 2; - - - # SBC A,(HL) - def sbc_A_HLi(self): - self.sbc(self.read(self.h, self.l)); - self.cycles -= 2; - - - # AND A,r - def AND_A_B(self): - self.AND(self.b); - self.cycles -= 1; - - - def AND_A_C(self): - self.AND(self.c); - self.cycles -= 1; - - - def AND_A_D(self): - self.AND(self.d); - self.cycles -= 1; - - - def AND_A_E(self): - self.AND(self.e); - self.cycles -= 1; - - - def AND_A_H(self): - self.AND(self.h); - self.cycles -= 1; - - - def AND_A_L(self): - self.AND(self.l); - self.cycles -= 1; - - - def AND_A_A(self): - self.AND(self.a); - self.cycles -= 1; - - - # AND A,nn - def AND_A_nn(self): - self.AND(self.fetch()); - self.cycles -= 2; - - - # AND A,(HL) - def AND_A_HLi(self): - self.AND(self.read(self.h, self.l)); - self.cycles -= 2; - - - # XOR A,r - def xOR_A_B(self): - self.xOR(self.b); - self.cycles -= 1; - - - def xOR_A_C(self): - self.xOR(self.c); - self.cycles -= 1; - - - def xOR_A_D(self): - self.xOR(self.d); - self.cycles -= 1; - - - def xOR_A_E(self): - self.xOR(self.e); - self.cycles -= 1; - - - def xOR_A_H(self): - self.xOR(self.h); - self.cycles -= 1; - - - def xOR_A_L(self): - self.xOR(self.l); - self.cycles -= 1; - - - def xOR_A_A(self): - self.xOR(self.a); - self.cycles -= 1; - - - # XOR A,nn - def xOR_A_nn(self): - self.xOR(self.fetch()); - self.cycles -= 2; - - - # XOR A,(HL) - def xOR_A_HLi(self): - self.xOR(self.read(self.h, self.l)); - self.cycles -= 2; - - - # XXX OR A,r - def OR(self, getter): - self.OR(getter()); - self.cycles -= 1; # 2 for hli - - # OR A,nn - def OR_A_nn(self): - self.OR(self.fetch) - - - # XXX CP A,r - def cp(self, getter): - self.cp(getter()); - self.cycles -= 1; - - # CP A,nn - def cp_nn(self): - self.cp(self.fetch); - - # CP A,(HL) - def cp_A_HLi(self): - self.cp(self.read(self.h, self.l)); - self.cycles -= 2; - - - # INC r - def inc_B(self): - self.b = self.inc(self.b); - self.cycles -= 1; # XXX 1 cycle less - - # DEC r - def dec_B(self): - self.b = self.dec(self.b); - self.cycles -= 1; - - - def dec_C(self): - self.c = self.dec(self.c); - self.cycles -= 1; - - - def dec_D(self): - self.d = self.dec(self.d); - self.cycles -= 1; - - - def dec_E(self): - self.e = self.dec(self.e); - self.cycles -= 1; - - - def dec_H(self): - self.h = self.dec(self.h); - self.cycles -= 1; - - - def dec_L(self): - self.l = self.dec(self.l); - self.cycles -= 1; - - - def dec_A(self): - self.a = self.dec(self.a); - self.cycles -= 1; - - - # DEC (HL) - def dec_HLi(self): - self.write(self.h, self.l, self.dec(self.read(self.h, self.l))); - self.cycles -= 3; - - - # CPL - def cpl(self): - self.a ^= 0xFF; - self.f |= constants.N_FLAG + constants.H_FLAG; - - - # DAA - def daa(self): - delta = 0; - if ((self.f & constants.H_FLAG) != 0 or (self.a & 0x0F) > 0x09): - delta |= 0x06; - if ((self.f & constants.C_FLAG) != 0 or (self.a & 0xF0) > 0x90): - delta |= 0x60; - if ((self.a & 0xF0) > 0x80 and (self.a & 0x0F) > 0x09): - delta |= 0x60; - if ((self.f & constants.N_FLAG) == 0): - self.a = (self.a + delta) & 0xFF; - else: - self.a = (self.a - delta) & 0xFF; - - self.f = (self.f & constants.N_FLAG) - if delta >= 0x60: - self.f += constants.C_FLAG - if self.a == 0: - self.f += constants.Z_FLAG - - self.cycles -= 1; - - - # ADD HL,rr - def add_HL_BC(self): - self.add(self.b, self.c); - self.cycles -= 2; - - - def add_HL_DE(self): - self.add(self.d, self.e); - self.cycles -= 2; - - - def add_HL_HL(self): - self.add(self.h, self.l); - self.cycles -= 2; - - - def add_HL_SP(self): - self.add(self.sp >> 8, self.sp & 0xFF); - self.cycles -= 2; - - - # INC rr - def inc_BC(self): - self.c = (self.c + 1) & 0xFF; - if (self.c == 0x00): - self.b = (self.b + 1) & 0xFF; - self.cycles -= 2; - - - def inc_DE(self): - self.e = (self.e + 1) & 0xFF; - if (self.e == 0x00): - self.d = (self.d + 1) & 0xFF; - self.cycles -= 2; - - - def inc_HL(self): - self.l = (self.l + 1) & 0xFF; - if (self.l == 0x00): - self.h = (self.h + 1) & 0xFF; - self.cycles -= 2; - - - def inc_SP(self): - self.sp = (self.sp + 1) & 0xFFFF; - self.cycles -= 2; - + # 1 cycle + def adc(self, getter): + s = self.a + getter() + ((self.f & constants.C_FLAG) >> 4) + self.f = 0 + if (s & 0xFF) == 0: + self.f += constants.Z_FLAG + if s >= 0x100: + self.f += constants.C_FLAG + if ((s ^ self.a ^ getter()) & 0x10) != 0: + self.f += constants.H_FLAG + self.setA(s & 0xFF) # 1 cycle + + # 1 cycle + def sub(self, getter): + s = (self.a - getter()) & 0xFF + self.f = constants.N_FLAG + if s == 0: + self.f += constants.Z_FLAG + if s > self.a: + self.f += constants.C_FLAG + if (s & 0x0F) > (self.a & 0x0F): + self.f += constants.H_FLAG + self.setA(s) # 1 cycle + + # 1 cycle + def sbc(self, getter): + s = self.a - getter() - ((self.f & constants.C_FLAG) >> 4) + self.f = constants.N_FLAG + if (s & 0xFF) == 0: + self.f += constants.Z_FLAG + if (s & 0xFF00) != 0: + self.f += constants.C_FLAG + if ((s ^ self.a ^ getter()) & 0x10) != 0: + self.f += constants.H_FLAG + self.setA(s & 0xFF) # 1 cycle + + # 1 cycle + def AND(self, getter): + self.setA(self.a & getter()) # 1 cycle + self.f = 0 + if self.a == 0: + self.f = constants.Z_FLAG + + # 1 cycle + def XOR(self, getter): + self.setA( self.a ^ getter()) # 1 cycle + self.f = 0 + if self.a == 0: + self.f = constants.Z_FLAG + + # 1 cycle + def OR(self, getter): + self.setA(self.a | getter()) # 1 cycle + self.f = 0 + if self.a == 0: + self.f = constants.Z_FLAG + + # 1 cycle + def cpA(self, getter): + s = (self.a - getter()) & 0xFF + self.setF(constants.N_FLAG) #?1 cycle + if s==0: + self.f += constants.Z_FLAG + if s > self.a: + self.f += constants.C_FLAG + if (s & 0x0F) > (self.a & 0x0F): + self.f += constants.H_FLAG + + # 1 cycle + def inc(self, getter, setter): + data = (getter() + 1) & 0xFF + self.setF(0) #?1 cycle + if data == 0: + self.f += constants.Z_FLAG + if (data & 0x0F) == 0x00: + self.f += constants.H_FLAG + self.f += (self.f & constants.C_FLAG) + setter(data) + + # 1 cycle + def dec(self, getter, setter): + data = (getter() - 1) & 0xFF + self.setF(0) #?1 cycle + if data == 0: + self.f += constants.Z_FLAG + if (data & 0x0F) == 0x0F: + self.f += constants.H_FLAG + self.f += (self.f & constants.C_FLAG) + constants.N_FLAG + setter(data) + + # 1 cycle + def rlc(self, getter, setter): + s = ((getter() & 0x7F) << 1) + ((getter() & 0x80) >> 7) + self.setF(0) #?1 cycle + if s == 0: + self.f += constants.Z_FLAG + if (data & 0x80) != 0: + self.f += constants.C_FLAG + setter(s) + + # 1 cycle + def rl(self, getter, setter): + s = ((getter() & 0x7F) << 1) + if (self.f & constants.C_FLAG) != 0: + s += 0x01 + self.setF(0) #?1 cycle + if (s == 0): + self.f += constants.Z_FLAG + if (data & 0x80) != 0: + self.f += constants.C_FLAG + setter(s) + + # 1 cycle + def rrc(self, getter, setter): + s = (getter() >> 1) + ((getter() & 0x01) << 7) + self.setF(0) #?1 cycle + if s == 0: + self.f += constants.Z_FLAG + if (data & 0x01) != 0: + self.f += constants.C_FLAG + setter(s) + + # 1 cycle + def rr(self, getter, setter): + s = (getter() >> 1) + ((self.f & constants.C_FLAG) << 3) + self.fsetF(0) #?1 cycle + if s == 0: + self.f += constants.Z_FLAG + if (data & 0x01) != 0: + self.f += constants.C_FLAG + setter(s) + + # 1 cycle + def sla(self, getter, setter): + s = (getter() << 1) & 0xFF + self.setF(0) #?1 cycle + if s == 0: + self.f += constants.Z_FLAG + if (getter() & 0x80) != 0: + self.f += constants.C_FLAG + setter(s) + + # 1 cycle + def sra(self, getter): + s = (getter() >> 1) + (getter() & 0x80) + self.setF(0) #?1 cycle + if s == 0: + self.f += constants.Z_FLAG + if (data & 0x01) != 0: + self.f += constants.C_FLAG + return s + + # 1 cycle + def srl(self, getter, setter): + s = (getter() >> 1) + self.f = 0 + if s == 0 : + self.f += constants.Z_FLAG + if (data & 0x01) != 0: + self.f += constants.C_FLAG + self.cycles -= 1 + setter(s) - # DEC rr - def dec_BC(self): - self.c = (self.c - 1) & 0xFF; - if (self.c == 0xFF): - self.b = (self.b - 1) & 0xFF; - self.cycles -= 2; + # 1 cycle + def swap(self, getter, setter): + s = ((getter() << 4) & 0xF0) + ((getter() >> 4) & 0x0F) + self.f = 0 + if s == 0: + self.f += constants.Z_FLAG + self.cycles -= 1 + setter(s) + # 2 cycles + def bit(self, n, getter): + self.f = (self.f & constants.C_FLAG) + constants.H_FLAG + if (getter() & (1 << n)) == 0: + self.f += constants.Z_FLAG + self.cycles -= 2 - def dec_DE(self): - self.e = (self.e - 1) & 0xFF; - if (self.e == 0xFF): - self.d = (self.d - 1) & 0xFF; - self.cycles -= 2; + # 2 cycles + def set(self, getter, setter, n): + self.cycles -= 1 # 1 cycle + setter(getter() | (1 << n)) # 1 cycle + + # 1 cycle + def res(self, getter, setter): + setter(getter() & (~(1 << n))) # 1 cycle + + # 1 cycle + def ld(self, setter, getter): + setter(getter()) # 1 cycle - def dec_HL(self): - self.l = (self.l - 1) & 0xFF; - if (self.l == 0xFF): - self.h = (self.h - 1) & 0xFF; - self.cycles -= 2; + # LD A,(nnnn), 4 cycles + def ld_A_mem(self): + lo = self.fetch() # 1 cycle + hi = self.fetch() # 1 cycle + self.setA(self.read(hi, lo)) # 1+1 cycles - def dec_SP(self): - self.sp = (self.sp - 1) & 0xFFFF; - self.cycles -= 2; + # LD (rr),A 2 cycles + def ld_BCi_A(self): + self.write(self.bc.get(), self.a) # 2 cycles + def ld_DEi_A(self): + self.write(self.de.get(), self.a) # 2 cycles - # ADD SP,nn - def add_SP_nn(self): - # TODO convert to byte - offset = self.fetch(); - s = (self.sp + offset) & 0xFFFF; - self.updateFRegisterAfterSP_nn(offset, s) - self.sp = s; - self.cycles -= 4; + # LD (nnnn),SP 5 cycles + def load_mem_SP(self): + lo = self.fetch() # 1 cycle + hi = self.fetch() # 1 cycle + address = (hi << 8) + lo + self.write(address, self.sp.getLo()) # 2 cycles + self.write((address + 1) & 0xFFFF, self.sp.getHi()) # 2 cycles + self.cycles += 1 + # LD (nnnn),A 4 cycles + def ld_mem_A(self): + lo = self.fetch() # 1 cycle + hi = self.fetch() # 1 cycle + self.write(hi, lo, self.a) # 2 cycles + # LDH A,(nn) 3 cycles + def ldh_A_mem(self): + self.setA(self.read(0xFF00 + self.fetch())) # 1+1+1 cycles - # LD HL,SP+nn - def ld_HP_SP_nn(self): - #TODO convert to byte - s = (self.sp + offset) & 0xFFFF; - self.updateFRegisterAfterSP_nn(offset, s) - self.l = s & 0xFF; - self.h = s >> 8; + # LDH (nn),A 3 cycles + def ldh_mem_A(self): + self.write(0xFF00 + self.fetch(), self.a) # 2 + 1 cycles - self.cycles -= 3; + # LDH A,(C) 2 cycles + def ldh_A_Ci(self): + self.setA(self.read(0xFF00 + self.bc.getLo())) # 1+2 cycles - def updateFRegisterAfterSP_nn(self, offset, s): - if (offset >= 0): - self.f = 0 - if s < self.sp: - self.f += constants.C_FLAG - if (s & 0x0F00) < (self.sp & 0x0F00): - self.f += constants.H_FLAG - else: - self.f = 0 - if s > self.sp: - self.f += constants.C_FLAG - if (s & 0x0F00) > (self.sp & 0x0F00): - self.f += constants.H_FLAG - - # RLCA - def rlca(self): - self.f = 0 - if (self.a & 0x80) != 0: - self.f += constants.C_FLAG - self.a = ((self.a & 0x7F) << 1) + ((self.a & 0x80) >> 7); - self.cycles -= 1; - - - # RLA - def rla(self): - s = ((self.a & 0x7F) << 1) - if (self.f & constants.C_FLAG) != 0: - s += 0x01 - self.f = 0 - if (self.a & 0x80) != 0: - self.f += constants.C_FLAG - self.a = s; - self.cycles -= 1; - - - # RRCA - def rrca(self): - self.f = 0 - if (self.a & 0x01) != 0: - self.f += constants.C_FLAG - self.a = ((self.a >> 1) & 0x7F) + ((self.a << 7) & 0x80); - self.cycles -= 1; - - - # RRA - def rra(self): - s = ((self.a >> 1) & 0x7F) - if (self.f & constants.C_FLAG) != 0: - se += 0x80 - self.f = 0 - if (self.a & 0x01) != 0: - self.f += constants.C_FLAG - self.a = s; - self.cycles -= 1; - - # CCF/SCF - def ccf(self): - self.f = (self.f & (constants.Z_FLAG | constants.C_FLAG)) ^ constants.C_FLAG; - - - def scf(self): - self.f = (self.f & constants.Z_FLAG) | constants.C_FLAG; - - - # NOP - def nop(self): - self.cycles -= 1; - - - # JP nnnn - def jp_nnnn(self): - lo = self.fetch(); - hi = self.fetch(); - self.pc = (hi << 8) + lo; - self.cycles -= 4; - - - # LD PC,HL - def ld_PC_HL(self): - self.pc = (self.h << 8) + self.l; - self.cycles -= 1; - - - # JP cc,nnnn - def jp_cc_nnnn(cc): - if (cc): - lo = self.fetch(); - hi = self.fetch(); - self.pc = (hi << 8) + lo; - self.cycles -= 4; - else: - self.pc = (self.pc + 2) & 0xFFFF; - self.cycles -= 3; - - def jp_NZ_nnnn(self): - self.jp_cc_nnnn((self.f & constants.Z_FLAG) == 0); + # LDH (C),A 2 cycles + def ldh_Ci_A(self): + self.write(0xFF00 + self.bc.getLo(), self.a) # 2 cycles - def jp_NC_nnnn(self): - self.jp_cc_nnnn((self.f & constants.C_FLAG) == 0); + # LDI (HL),A 2 cycles + def ldi_HLi_A(self): + self.write(self.hl.get(), self.a) # 2 cycles + self.incDoubleRegister(HL) # 2 cycles + self.cycles += 2 - def jp_Z_nnnn(self): - self.jp_cc_nnnn((self.f & constants.Z_FLAG) != 0); + # LDI A,(HL) 2 cycles + def ldi_A_HLi(self): + self.a = self.read(self.hl.get()) + self.incDoubleRegister(HL) + self.cycles -= 2 - def jp_C_nnnn(self): - self.jp_cc_nnnn((self.f & constants.C_FLAG) != 0); + # LDD (HL),A 2 cycles + def ldd_HLi_A(self): + self.write(self.hl.get(), self.a) # 2 cycles + self.decDoubleRegister(HL) # 2 cycles + self.cycles += 2 + + + # LDD A,(HL) 2 cycles + def ldd_A_HLi(self): + self.a = self.read(self.hl.get()) # 2 cycles + self.decDoubleRegister(HL) # 2 cycles + self.cycles += 2 + + # 3 cycles + def ld_dbRegister_nnnn(self, register): + b = self.fetch() # 1 cycle + a = self.fetch() # 1 cycle + register.set(a, b) # 2 cycles + self.cycles += 1 + + # LD SP,HL 2 cycles + def ld_SP_HL(self): + self.sp.set(self.hl.get()) # 1 cycle + self.cycles -= 1 - # JR +nn - def jr_nn(self): - # TODO convert to byte - offset = self.fetch(); - self.pc = (self.pc + offset) & 0xFFFF; - self.cycles -= 3; + # PUSH rr 4 cycles + def push_dbRegister(self, register): + self.push(register.getHi()) # 2 cycles + self.push(register.getLo()) # 2 cycles + # 4 cycles + def push_AF(self): + self.push(self.a) # 2 cycles + self.push(self.f) # 2 cycles + + + def pop_dbRegister(self, register): + b = self.pop() + a = self.pop() + register.set(a, b) + + + def pop_AF(self): + self.f = self.pop() + self.a = self.pop() + self.cycles -= 3 + + + def cpl(self): + self.a ^= 0xFF + self.f |= constants.N_FLAG + constants.H_FLAG + + + # DAA 1 cycle + def daa(self): + delta = 0 + if ((self.f & constants.H_FLAG) != 0 or (self.a & 0x0F) > 0x09): + delta |= 0x06 + if ((self.f & constants.C_FLAG) != 0 or (self.a & 0xF0) > 0x90): + delta |= 0x60 + if ((self.a & 0xF0) > 0x80 and (self.a & 0x0F) > 0x09): + delta |= 0x60 + if ((self.f & constants.N_FLAG) == 0): + self.setA((self.a + delta) & 0xFF) # 1 cycle + else: + self.setA((self.a - delta) & 0xFF) # 1 cycle + + self.f = (self.f & constants.N_FLAG) + if delta >= 0x60: + self.f += constants.C_FLAG + if self.a == 0: + self.f += constants.Z_FLAG + + + # ADD HL,rr + def add_HL_dbRegister(self, register): + self.addHL(register) + self.cycles -= 2 - # JR cc,+nn - def jr_cc_nn(cc): - if (cc): - # TODO convert to byte - offset = self.fetch(); + # INC rr + def incDoubleRegister(self, register): + register.inc() + + + # DEC rr + def decDoubleRegister(self, register): + register.dec() + + + # ADD SP,nn + def add_SP_nn(self): + # TODO convert to byte + offset = self.fetch() + s = (self.sp.get() + offset) & 0xFFFF + self.updateFRegisterAfterSP_nn(offset, s) + self.sp.set(s) + self.cycles -= 4 - self.pc = (self.pc + offset) & 0xFFFF; - self.cycles -= 3; - else: - self.pc = (self.pc + 1) & 0xFFFF; - self.cycles -= 2; - - def jr_NZ_nn(self): - self.jr_cc_nn((self.f & constants.Z_FLAG) == 0); + # LD HL,SP+nn + def ld_HL_SP_nn(self): + #TODO convert to byte + s = (self.sp.get() + offset) & 0xFFFF + self.updateFRegisterAfterSP_nn(offset, s) + self.hl.set(s) + self.cycles -= 3 + + + def updateFRegisterAfterSP_nn(self, offset, s): + if (offset >= 0): + self.f = 0 + if s < self.sp: + self.f += constants.C_FLAG + if (s & 0x0F00) < (self.sp.get() & 0x0F00): + self.f += constants.H_FLAG + else: + self.f = 0 + if s > self.sp: + self.f += constants.C_FLAG + if (s & 0x0F00) > (self.sp.get() & 0x0F00): + self.f += constants.H_FLAG + + # RLCA + def rlca(self): + self.f = 0 + if (self.a & 0x80) != 0: + self.f += constants.C_FLAG + self.a = ((self.a & 0x7F) << 1) + ((self.a & 0x80) >> 7) + self.cycles -= 1 - def jr_Z_nn(self): - self.jr_cc_nn((self.f & constants.Z_FLAG) != 0); + # RLA + def rla(self): + s = ((self.a & 0x7F) << 1) + if (self.f & constants.C_FLAG) != 0: + s += 0x01 + self.f = 0 + if (self.a & 0x80) != 0: + self.f += constants.C_FLAG + self.a = s + self.cycles -= 1 - def jr_NC_nn(self): - self.jr_cc_nn((self.f & constants.C_FLAG) == 0); + # RRCA + def rrca(self): + self.f = 0 + if (self.a & 0x01) != 0: + self.f += constants.C_FLAG + self.a = ((self.a >> 1) & 0x7F) + ((self.a << 7) & 0x80) + self.cycles -= 1 - def jr_C_nn(self): - self.jr_cc_nn((self.f & constants.C_FLAG) != 0); + # RRA + def rra(self): + s = ((self.a >> 1) & 0x7F) + if (self.f & constants.C_FLAG) != 0: + se += 0x80 + self.f = 0 + if (self.a & 0x01) != 0: + self.f += constants.C_FLAG + self.a = s + self.cycles -= 1 - # CALL nnnn - def call_nnnn(self): - lo = self.fetch(); - hi = self.fetch(); - self.call((hi << 8) + lo); - self.cycles -= 6; + # CCF/SCF + def ccf(self): + self.f = (self.f & (constants.Z_FLAG | constants.C_FLAG)) ^ constants.C_FLAG - # CALL cc,nnnn - def call_cc_nnnn(cc): - if (cc): - lo = self.fetch(); - hi = self.fetch(); - self.call((hi << 8) + lo); - self.cycles -= 6; - else: - self.pc = (self.pc + 2) & 0xFFFF; - self.cycles -= 3; - + def scf(self): + self.f = (self.f & constants.Z_FLAG) | constants.C_FLAG - def call_NZ_nnnn(self): - self.call_cc_nnnn((self.f & constants.Z_FLAG) == 0); + # NOP 1 cycle + def nop(self): + self.cycles -= 1 - def call_NC_nnnn(self): - self.call_cc_nnnn((self.f & constants.C_FLAG) == 0); + # LD PC,HL, 1 cycle + def ld_PC_HL(self): + self.pc.set(self.hl.get()) # 1 cycle + - def call_Z_nnnn(self): - self.call_cc_nnnn((self.f & constants.Z_FLAG) != 0); + # JP nnnn, 4 cycles + def jp_nnnn(self): + lo = self.fetch() # 1 cycle + hi = self.fetch() # 1 cycle + self.pc.set(hi,lo) # 2 cycles - def call_C_nnnn(self): - self.call_cc_nnnn((self.f & constants.C_FLAG) != 0); + # JP cc,nnnn 3,4 cycles + def jp_cc_nnnn(cc): + if (cc): + self.jp_nnnn() # 4 cycles + else: + self.pc.add(2) # 3 cycles + + # JR +nn, 3 cycles + def jr_nn(self): + self.pc.add(self.fetch()) # 3 + 1 cycles + self.cycles += 1 - # RET - def ret(self): - lo = self.pop(); - hi = self.pop(); - self.pc = (hi << 8) + lo; - self.cycles -= 4; + # JR cc,+nn, 2,3 cycles + def jr_cc_nn(cc): + if (cc): + self.pc.add(self.fetch()) # 3 cycles + else: + self.pc.inc() #?2 cycles + - # RET cc - def ret_cc(cc): - if (cc): - lo = self.pop(); - hi = self.pop(); - self.pc = (hi << 8) + lo; - self.cycles -= 5; - else: - self.cycles -= 2; + # CALL nnnn, 6 cycles + def call_nnnn(self): + lo = self.fetch() # 1 cycle + hi = self.fetch() # 1 cycle + self.call((hi << 8) + lo) # 4 cycles - def ret_NZ(self): - self.ret_cc((self.f & constants.Z_FLAG) == 0); + # CALL cc,nnnn, 3,6 cycles + def call_cc_nnnn(cc): + if (cc): + self.call_nnnn() # 6 cycles + else: + self.pc.add(2) # 3 cycles + + def isNZ(self): + return (self.f & constants.Z_FLAG) == 0 - def ret_NC(self): - self.ret_cc((self.f & constants.C_FLAG) == 0); + def isNC(self): + return (self.f & constants.C_FLAG) == 0 - def ret_Z(self): - self.ret_cc((self.f & constants.Z_FLAG) != 0); + def isZ(self): + return (self.f & constants.Z_FLAG) != 0 - def ret_C(self): - self.ret_cc((self.f & constants.C_FLAG) != 0); + def isC(self): + return (self.f & constants.C_FLAG) != 0 - # RST nn - def rst(self, nn): - self.call(nn); - self.cycles -= 4; + # RET 4 cycles + def ret(self): + lo = self.pop() # 1 cycle + hi = self.pop() # 1 cycle + self.pc.set(hi, lo) # 2 cycles - # RETI - def reti(self): - lo = self.pop(); - hi = self.pop(); - self.pc = (hi << 8) + lo; - # enable interrupts - self.ime = true; - self.cycles -= 4; - # execute next instruction - self.execute(); - # check pending interrupts - self.interrupt(); + # RET cc 2,5 cycles + def ret_cc(cc): + if (cc): + self.ret() # 4 cycles + # FIXME mybe this should be the same + self.cycles -= 1 + else: + self.cycles -= 2 - # DI/EI - def di(self): - # disable interrupts - self.ime = false; - self.cycles -= 1; + # RETI 4 cycles + def reti(self): + self.ret() # 4 cyclces + # enable interrupts + self.ime = True + # execute next instruction + self.execute() + # check pending interrupts + self.interrupt() - def ei(self): - # enable interrupts - self.ime = true; - self.cycles -= 1; - # execute next instruction - self.execute(); - # check pending interrupts - self.interrupt(); - # HALT/STOP - def halt(self): - self.halted = true; - # emulate bug when interrupts are pending - if (not self.ime and self.interrupt.isPending()): - self.execute(self.memory.read(self.pc)); - # check pending interrupts - self.interrupt(); + # RST nn 4 cycles + def rst(self, nn): + self.call(nn) # 4 cycles - def stop(self): - self.fetch(); + # DI/EI 1 cycle + def di(self): + # disable interrupts + self.ime = False + self.cycles -= 1; + # 1 cycle + def ei(self): + # enable interrupts + self.ime = True + self.cycles -= 1 + # execute next instruction + self.execute() + # check pending interrupts + self.interrupt() + + + # HALT/STOP + def halt(self): + self.halted = True + # emulate bug when interrupts are pending + if (not self.ime and self.interrupt.isPending()): + self.execute(self.memory.read(self.pc.get())) + # check pending interrupts + self.interrupt() + + + def stop(self): + self.fetch() + + + +SINGLE_OP_CODES = [ + (0x00, nop) + (0x08, load_mem_SP), + (0x10, stop), + (0x18, jr_nn), + (0x02, ld_BCi_A), + (0x12, ld_DEi_A), + (0x22, ldi_HLi_A), + (0x32, ldd_HLi_A), + (0x0A, ld_A_BCi), + (0x1A, load_A_DEi), + (0x2A, ldi_A_HLi), + (0x3A, ldd_A_HLi), + (0x07, rlca), + (0x0F, rrca), + (0x17, rla), + (0x1F, rra), + (0x27, daa), + (0x2F, cpl), + (0x37, scf), + (0x3F, ccf), + (0xF3, di), + (0xFB, ei), + (0xE2, ldh_Ci_A), + (0xEA, ld_mem_A), + (0xF2, ldh_A_Ci), + (0xFA, ld_A_mem), + (0xC3, jp_nnnn), + (0xC9, ret), + (0xD9, reti), + (0xE9, ld_PC_HL), + (0xF9, ld_SP_HL), + (0xE0, ldh_mem_A), + (0xE8, add_SP_nn), + (0xF0, ldh_A_mem), + (0xF8, ld_HL_SP_nn), + (0xCB,) + (0xCD, call_nnnn), + (0xC6, add_A_nn), + (0xCE, adc_A_nn), + (0xD6, sub_A_nn), + (0xDE, sbc_A_nn), + (0xE6, and_A_nn), + (0xEE, xor_A_nn), + (0xF6, or_A_nn), + (0xFE, cp_A_nn), + (0xC7, rst(0x00)), + (0xCF, rst(0x08)), + (0xD7, rst(0x10)), + (0xDF, rst(0x18)), + (0xE7, rst(0x20)), + (0xEF, rst(0x28)), + (0xF7, rst(0x30)), + (0xFF, rst(0x38)) + (0x76, halt), +] + +METHOD_OP_CODES = [ + (0x01, 0x10, ld_nnnn, [BC, DE, HL, SP]), + (0x09, 0x10, add_HL, [BC, DE, HL, SP]), + (0x03, 0x10, inc, [BC, DE, HL, SP]), + (0x0B, 0x10, dec, [BC, DE, HL, SP]), + + (0xC0, 0x08, ret, [NZ, Z, NC, C]), + (0xC2, 0x08, jp_nnnn, [NZ, Z, NC, C]), + (0xC4, 0x08, call_nnnn, [NZ, Z, NC, C]), + (0x20, 0x08, jr_nn, [NZ, Z, NC, C]), + + (0xC1, 0x10, pop, [BC, DE, HL, AF]), + (0xC5, 0x10, push, [BC, DE, HL, AF]), + + (0x01, 0x10, ld_nnnn, [BC, DE, HL, SP]), + (0x09, 0x10, add_HL, [BC, DE, HL, SP]), + (0x03, 0x10, inc, [BC, DE, HL, SP]), + (0x0B, 0x10, dec, [BC, DE, HL, SP]), + + (0xC0, 0x08, ret, [NZ, Z, NC, C]), + (0xC2, 0x08, jp_nnnn, [NZ, Z, NC, C]), + (0xC4, 0x08, call_nnnn, [NZ, Z, NC, C]), + + (0xC1, 0x10, pop, [BC, DE, HL, AF]), + (0xC5, 0x10, push, [BC, DE, HL, AF]) +] + +REGISTER_GROUP_OP_CODES = [ + (0x04, 0x08, inc), + (0x05, 0x08, dec), + (0x06, 0x08, ld_nn), + (0x80, 0x01, add_A), + (0x88, 0x01, adc_A), + (0x90, 0x01, sub_A), + (0x98, 0x01, sbc_A), + (0xA0, 0x01, and_A), + (0xA8, 0x01, xor_A), + (0xB0, 0x01, or_A), + (0xB8, 0x01, cp_A), + (0x00, 0x01, rlc), + (0x08, 0x01, rrc), + (0x10, 0x01, rl), + (0x18, 0x01, rr), + (0x20, 0x01, sla), + (0x28, 0x01, sra), + (0x30, 0x01, swap), + (0x38, 0x01, srl), + (0x40, 0x01, bit, range(0, 8)), + (0xC0, 0x01, set, range(0, 8)), + (0x80, 0x01, res, range(0, 8)) +] From cami at codespeak.net Sun Mar 16 01:12:57 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sun, 16 Mar 2008 01:12:57 +0100 (CET) Subject: [pypy-svn] r52570 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080316001257.8E04016A0F2@codespeak.net> Author: cami Date: Sun Mar 16 01:12:55 2008 New Revision: 52570 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Log: non-working version. reduced loc to under 1000. POP-Code mapping still unimplemented. double checked the cycle lengths with the original java file. ready to implement tests for cycles Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Sun Mar 16 01:12:55 2008 @@ -3,6 +3,7 @@ from pypy.lang.gameboy import constants + def hasCartridgeBattery(self, cartridgeType): return (cartridgeType == constants.TYPE_MBC1_RAM_BATTERY \ or cartridgeType == constants.TYPE_MBC2_BATTERY \ @@ -127,7 +128,7 @@ self.ram = [] - for i in range(0,ramSize): + for i in range(0, ramSize): self.ram[i] = 0xFF if self.store.hasBattery(cartridgeName): @@ -153,7 +154,7 @@ if self.rom.length < 0x0150: return false; checksum = 0xE7; - for address in range(0x0134,0x014C): + for address in range(0x0134, 0x014C): checksum = (checksum - (rom[address] & 0xFF)) & 0xFF; return (checksum == self.getHeaderChecksum()) @@ -529,7 +530,7 @@ self.setRAM(ram); - def reset(): + def reset(): super.reset() @@ -640,7 +641,7 @@ return 0xFF; - def write(self, address, data): + def write(self, address, data): if (address <= 0x1FFF): # 0000-1FFF self.ramFlag = data; @@ -707,6 +708,8 @@ self.clockTime = now - elapsed; + + CATRIDGE_TYPE_RANGES = [ (constants.TYPE_MBC1, constants.TYPE_MBC1_RAM_BATTERY, MBC1), (constants.TYPE_MBC2, constants.TYPE_MBC2_BATTERY, MBC2), Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Sun Mar 16 01:12:55 2008 @@ -21,7 +21,8 @@ def get(self): return self.value - +# ___________________________________________________________________________ + class DoubleRegister(Register): value = 0 @@ -67,9 +68,9 @@ self.cpu.cycles -= 3 +# ___________________________________________________________________________ class CPU(object): - # Registers a = 0 bc = None @@ -92,7 +93,6 @@ #memory memory = None - # ROM Access rom = [] @@ -113,7 +113,6 @@ def getIF(self): val = 0x00 - #if (self.ime ? 0x01 : 0x00) + (self.halted ? 0x80 : 0x00) if self.ime: val = 0x01 if self.halted: @@ -154,6 +153,19 @@ self.cycles = 0 + + def zFlagAdd(self, s, resetF=False): + if (resetF): + self.f = 0 + if s == 0: + self.f = constants.Z_FLAG + + def cFlagAdd(self, s, compareAnd=0x01, resetF=False): + if (resetF): + self.f = 0 + if (s & compareAnd) != 0: + self.f += constants.C_FLAG + def emulate(self, ticks): self.cycles += ticks @@ -193,12 +205,14 @@ self.ime = False self.call(address) - # Execution - def execute(self): + def fetchExecute(self): self.execute(self.fetch()) - + def execute(self, opCode): + OP_CODES[opCode](self) + + # memory Access, 1 cycle def read(self, address): self.cycles -= 1 @@ -217,7 +231,6 @@ def write(self, hi, lo, data): self.write((hi << 8) + lo, data) - # Fetching 1 cycle def fetch(self): self.cycles += 1 @@ -228,7 +241,6 @@ self.pc.inc() #?2 cycles return data - # Stack, 2 cycles def push(self, data): self.sp.dec() #?2 cycles @@ -248,13 +260,10 @@ self.pc.set(address) # 1 cycle self.cycles += 1 - # ALU, 1 cycle def addA(self, data): s = (self.a + data) & 0xFF - self.f = 0 - if s == 0: - self.f = constants.Z_FLAG + self.zFlagAdd(s, resetF=True) if s < self.a: self.f += constants.C_FLAG if (s & 0x0F) < (self.a & 0x0F): @@ -285,11 +294,22 @@ self.setA(s & 0xFF) # 1 cycle # 1 cycle + def sbc(self, getter): + s = self.a - getter() - ((self.f & constants.C_FLAG) >> 4) + self.f = constants.N_FLAG + if (s & 0xFF) == 0: + self.f += constants.Z_FLAG + if (s & 0xFF00) != 0: + self.f += constants.C_FLAG + if ((s ^ self.a ^ getter()) & 0x10) != 0: + self.f += constants.H_FLAG + self.setA(s & 0xFF) # 1 cycle + + # 1 cycle def sub(self, getter): s = (self.a - getter()) & 0xFF self.f = constants.N_FLAG - if s == 0: - self.f += constants.Z_FLAG + self.zFlagAdd(s) if s > self.a: self.f += constants.C_FLAG if (s & 0x0F) > (self.a & 0x0F): @@ -297,151 +317,102 @@ self.setA(s) # 1 cycle # 1 cycle - def sbc(self, getter): - s = self.a - getter() - ((self.f & constants.C_FLAG) >> 4) - self.f = constants.N_FLAG - if (s & 0xFF) == 0: - self.f += constants.Z_FLAG - if (s & 0xFF00) != 0: + def cpA(self, getter): + s = (self.a - getter()) & 0xFF + self.setF(constants.N_FLAG) #?1 cycle + self.zFlagAdd(self.a) + if s > self.a: self.f += constants.C_FLAG - if ((s ^ self.a ^ getter()) & 0x10) != 0: - self.f += constants.H_FLAG - self.setA(s & 0xFF) # 1 cycle + if (s & 0x0F) > (self.a & 0x0F): + self.f += constants.H_FLAG + # 1 cycle def AND(self, getter): self.setA(self.a & getter()) # 1 cycle - self.f = 0 - if self.a == 0: - self.f = constants.Z_FLAG + self.zFlagAdd(self.a, resetF=True) # 1 cycle def XOR(self, getter): self.setA( self.a ^ getter()) # 1 cycle - self.f = 0 - if self.a == 0: - self.f = constants.Z_FLAG + self.zFlagAdd(self.a, resetF=True) # 1 cycle def OR(self, getter): self.setA(self.a | getter()) # 1 cycle - self.f = 0 - if self.a == 0: - self.f = constants.Z_FLAG + self.zFlagAdd(self.a, resetF=True) + - # 1 cycle - def cpA(self, getter): - s = (self.a - getter()) & 0xFF - self.setF(constants.N_FLAG) #?1 cycle - if s==0: - self.f += constants.Z_FLAG - if s > self.a: - self.f += constants.C_FLAG - if (s & 0x0F) > (self.a & 0x0F): - self.f += constants.H_FLAG # 1 cycle def inc(self, getter, setter): data = (getter() + 1) & 0xFF - self.setF(0) #?1 cycle - if data == 0: - self.f += constants.Z_FLAG - if (data & 0x0F) == 0x00: - self.f += constants.H_FLAG - self.f += (self.f & constants.C_FLAG) - setter(data) + self.decIncFlagFinish(data) # 1 cycle def dec(self, getter, setter): data = (getter() - 1) & 0xFF + self.decIncFlagFinish(data) + self.f += constants.N_FLAG + + def decIncFlagFinish(data): self.setF(0) #?1 cycle - if data == 0: - self.f += constants.Z_FLAG + self.zFlagAdd(data) if (data & 0x0F) == 0x0F: - self.f += constants.H_FLAG - self.f += (self.f & constants.C_FLAG) + constants.N_FLAG + self.f += constants.H_FLAG + self.f += (self.f & constants.C_FLAG) setter(data) + # 1 cycle def rlc(self, getter, setter): s = ((getter() & 0x7F) << 1) + ((getter() & 0x80) >> 7) - self.setF(0) #?1 cycle - if s == 0: - self.f += constants.Z_FLAG - if (data & 0x80) != 0: - self.f += constants.C_FLAG - setter(s) + flagsAndSetterFinish(s, getter, 0x80) # 1 cycle def rl(self, getter, setter): s = ((getter() & 0x7F) << 1) if (self.f & constants.C_FLAG) != 0: s += 0x01 - self.setF(0) #?1 cycle - if (s == 0): - self.f += constants.Z_FLAG - if (data & 0x80) != 0: - self.f += constants.C_FLAG - setter(s) + flagsAndSetterFinish(s, getter, 0x80) #?1 cycle # 1 cycle def rrc(self, getter, setter): s = (getter() >> 1) + ((getter() & 0x01) << 7) - self.setF(0) #?1 cycle - if s == 0: - self.f += constants.Z_FLAG - if (data & 0x01) != 0: - self.f += constants.C_FLAG - setter(s) + flagsAndSetterFinish(s, getter) #?1 cycle # 1 cycle def rr(self, getter, setter): s = (getter() >> 1) + ((self.f & constants.C_FLAG) << 3) - self.fsetF(0) #?1 cycle - if s == 0: - self.f += constants.Z_FLAG - if (data & 0x01) != 0: - self.f += constants.C_FLAG - setter(s) + flagsAndSetterFinish(s, getter) #?1 cycle - # 1 cycle + # 2 cycles def sla(self, getter, setter): s = (getter() << 1) & 0xFF - self.setF(0) #?1 cycle - if s == 0: - self.f += constants.Z_FLAG - if (getter() & 0x80) != 0: - self.f += constants.C_FLAG - setter(s) + flagsAndSetterFinish(s, getter, 0x80) #?1 cycle # 1 cycle - def sra(self, getter): + def sra(self, getter, setter): s = (getter() >> 1) + (getter() & 0x80) - self.setF(0) #?1 cycle - if s == 0: - self.f += constants.Z_FLAG - if (data & 0x01) != 0: - self.f += constants.C_FLAG - return s + flagsAndSetterFinish(s, getter) #?1 cycle # 1 cycle def srl(self, getter, setter): s = (getter() >> 1) - self.f = 0 - if s == 0 : - self.f += constants.Z_FLAG - if (data & 0x01) != 0: - self.f += constants.C_FLAG - self.cycles -= 1 + flagsAndSetterFinish(s, getter) #?1 cycle + + # 1 cycle + def flagsAndSetterFinish(self, s, setter, compareAnd=0x01): + self.setF(0) # 1 cycle + self.zFlagAdd(s) + self.cFlagAdd(getter(), compareAnd) setter(s) # 1 cycle def swap(self, getter, setter): s = ((getter() << 4) & 0xF0) + ((getter() >> 4) & 0x0F) - self.f = 0 - if s == 0: - self.f += constants.Z_FLAG - self.cycles -= 1 + self.setF(0) # 1 cycle + self.zFlagAdd(s) setter(s) # 2 cycles @@ -451,6 +422,32 @@ self.f += constants.Z_FLAG self.cycles -= 2 + # RLCA 1 cycle + def rlca(self): + self.cFlagAdd(self.a, 0x80, resetF=True) + self.setA(((self.a & 0x7F) << 1) + ((self.a & 0x80) >> 7)) + + # RLA 1 cycle + def rla(self): + s = ((self.a & 0x7F) << 1) + if (self.f & constants.C_FLAG) != 0: + s += 0x01 + self.cFlagAdd(self.a, 0x80, resetF=True) + self.setA(s) # 1 cycle + + # RRCA 1 cycle + def rrca(self): + self.cFlagAdd(self.a, resetF=True) + self.setA(((self.a >> 1) & 0x7F) + ((self.a << 7) & 0x80)) #1 cycle + + # RRA 1 cycle + def rra(self): + s = ((self.a >> 1) & 0x7F) + if (self.f & constants.C_FLAG) != 0: + s += 0x80 + self.cFlagAdd(self.a, resetF=True) + self.setA(s) # 1 cycle + # 2 cycles def set(self, getter, setter, n): self.cycles -= 1 # 1 cycle @@ -464,21 +461,15 @@ def ld(self, setter, getter): setter(getter()) # 1 cycle - # LD A,(nnnn), 4 cycles def ld_A_mem(self): lo = self.fetch() # 1 cycle hi = self.fetch() # 1 cycle self.setA(self.read(hi, lo)) # 1+1 cycles - # LD (rr),A 2 cycles - def ld_BCi_A(self): - self.write(self.bc.get(), self.a) # 2 cycles - - def ld_DEi_A(self): - self.write(self.de.get(), self.a) # 2 cycles - + def ld_dbRegisteri_A(self, register): + self.write(register.get(), self.a) # 2 cycles # LD (nnnn),SP 5 cycles def load_mem_SP(self): @@ -498,17 +489,27 @@ # LDH A,(nn) 3 cycles def ldh_A_mem(self): self.setA(self.read(0xFF00 + self.fetch())) # 1+1+1 cycles - - - # LDH (nn),A 3 cycles - def ldh_mem_A(self): - self.write(0xFF00 + self.fetch(), self.a) # 2 + 1 cycles - - + # LDH A,(C) 2 cycles def ldh_A_Ci(self): self.setA(self.read(0xFF00 + self.bc.getLo())) # 1+2 cycles + + # LDI A,(HL) 2 cycles + def ldi_A_HLi(self): + self.a = self.read(self.hl.get()) # 1 cycle + self.hl.inc()# 2 cycles + self.cycles += 1 + + # LDD A,(HL) 2 cycles + def ldd_A_HLi(self): + self.a = self.read(self.hl.get()) # 1 cycle + self.hl.dec() # 2 cycles + self.cycles += 1 + + # LDH (nn),A 3 cycles + def ldh_mem_A(self): + self.write(0xFF00 + self.fetch(), self.a) # 2 + 1 cycles # LDH (C),A 2 cycles def ldh_Ci_A(self): @@ -518,70 +519,47 @@ # LDI (HL),A 2 cycles def ldi_HLi_A(self): self.write(self.hl.get(), self.a) # 2 cycles - self.incDoubleRegister(HL) # 2 cycles + self.hl.inc() # 2 cycles self.cycles += 2 - - # LDI A,(HL) 2 cycles - def ldi_A_HLi(self): - self.a = self.read(self.hl.get()) - self.incDoubleRegister(HL) - self.cycles -= 2 - - # LDD (HL),A 2 cycles def ldd_HLi_A(self): self.write(self.hl.get(), self.a) # 2 cycles - self.decDoubleRegister(HL) # 2 cycles + self.hl.dec() # 2 cycles self.cycles += 2 - - # LDD A,(HL) 2 cycles - def ldd_A_HLi(self): - self.a = self.read(self.hl.get()) # 2 cycles - self.decDoubleRegister(HL) # 2 cycles - self.cycles += 2 - - # 3 cycles - def ld_dbRegister_nnnn(self, register): - b = self.fetch() # 1 cycle - a = self.fetch() # 1 cycle - register.set(a, b) # 2 cycles - self.cycles += 1 - # LD SP,HL 2 cycles def ld_SP_HL(self): self.sp.set(self.hl.get()) # 1 cycle self.cycles -= 1 - # PUSH rr 4 cycles def push_dbRegister(self, register): self.push(register.getHi()) # 2 cycles self.push(register.getLo()) # 2 cycles + # 4 cycles def push_AF(self): self.push(self.a) # 2 cycles self.push(self.f) # 2 cycles - - def pop_dbRegister(self, register): - b = self.pop() - a = self.pop() - register.set(a, b) + # 3 cycles + def pop_dbRegister(self, register, getter): + b = getter() # 1 cycle + a = getter() # 1 cycle + register.set(a, b) # 2 cycles + self.cycles += 1 - + # 3 cycles def pop_AF(self): - self.f = self.pop() - self.a = self.pop() - self.cycles -= 3 + self.f = self.pop() # 1 cycle + self.setA(self.pop()) # 1+1 cycle def cpl(self): self.a ^= 0xFF self.f |= constants.N_FLAG + constants.H_FLAG - # DAA 1 cycle def daa(self): delta = 0 @@ -599,102 +577,42 @@ self.f = (self.f & constants.N_FLAG) if delta >= 0x60: self.f += constants.C_FLAG - if self.a == 0: - self.f += constants.Z_FLAG - - - # ADD HL,rr - def add_HL_dbRegister(self, register): - self.addHL(register) - self.cycles -= 2 - + self.zFlagAdd(self.a) # INC rr def incDoubleRegister(self, register): register.inc() - # DEC rr def decDoubleRegister(self, register): register.dec() - - # ADD SP,nn + # ADD SP,nn 4 cycles def add_SP_nn(self): - # TODO convert to byte - offset = self.fetch() - s = (self.sp.get() + offset) & 0xFFFF - self.updateFRegisterAfterSP_nn(offset, s) - self.sp.set(s) - self.cycles -= 4 - - + self.sp.set(sel.SP_nn()) # 1+1 cycle + self.cycles -= 2 - # LD HL,SP+nn + # LD HL,SP+nn ? 3 cycles def ld_HL_SP_nn(self): - #TODO convert to byte - s = (self.sp.get() + offset) & 0xFFFF - self.updateFRegisterAfterSP_nn(offset, s) - self.hl.set(s) - self.cycles -= 3 - + self.hl.set(sel.SP_nn()) #?1+1 cycle + self.cycles -= 1 - def updateFRegisterAfterSP_nn(self, offset, s): + # 1 cycle + def SP_nn(self): + offset = self.fetch() # 1 cycle + s = (self.sp.get() + offset) & 0xFFFF + self.f = 0 if (offset >= 0): - self.f = 0 - if s < self.sp: + if s < self.sp.get(): self.f += constants.C_FLAG if (s & 0x0F00) < (self.sp.get() & 0x0F00): self.f += constants.H_FLAG else: - self.f = 0 - if s > self.sp: + if s > self.sp.get(): self.f += constants.C_FLAG if (s & 0x0F00) > (self.sp.get() & 0x0F00): self.f += constants.H_FLAG - # RLCA - def rlca(self): - self.f = 0 - if (self.a & 0x80) != 0: - self.f += constants.C_FLAG - self.a = ((self.a & 0x7F) << 1) + ((self.a & 0x80) >> 7) - self.cycles -= 1 - - - # RLA - def rla(self): - s = ((self.a & 0x7F) << 1) - if (self.f & constants.C_FLAG) != 0: - s += 0x01 - self.f = 0 - if (self.a & 0x80) != 0: - self.f += constants.C_FLAG - self.a = s - self.cycles -= 1 - - - # RRCA - def rrca(self): - self.f = 0 - if (self.a & 0x01) != 0: - self.f += constants.C_FLAG - self.a = ((self.a >> 1) & 0x7F) + ((self.a << 7) & 0x80) - self.cycles -= 1 - - - # RRA - def rra(self): - s = ((self.a >> 1) & 0x7F) - if (self.f & constants.C_FLAG) != 0: - se += 0x80 - self.f = 0 - if (self.a & 0x01) != 0: - self.f += constants.C_FLAG - self.a = s - self.cycles -= 1 - - # CCF/SCF def ccf(self): self.f = (self.f & (constants.Z_FLAG | constants.C_FLAG)) ^ constants.C_FLAG @@ -703,16 +621,13 @@ def scf(self): self.f = (self.f & constants.Z_FLAG) | constants.C_FLAG - # NOP 1 cycle def nop(self): self.cycles -= 1 - # LD PC,HL, 1 cycle def ld_PC_HL(self): self.pc.set(self.hl.get()) # 1 cycle - # JP nnnn, 4 cycles def jp_nnnn(self): @@ -720,21 +635,18 @@ hi = self.fetch() # 1 cycle self.pc.set(hi,lo) # 2 cycles - # JP cc,nnnn 3,4 cycles def jp_cc_nnnn(cc): if (cc): self.jp_nnnn() # 4 cycles else: self.pc.add(2) # 3 cycles - # JR +nn, 3 cycles def jr_nn(self): self.pc.add(self.fetch()) # 3 + 1 cycles self.cycles += 1 - # JR cc,+nn, 2,3 cycles def jr_cc_nn(cc): if (cc): @@ -742,14 +654,12 @@ else: self.pc.inc() #?2 cycles - # CALL nnnn, 6 cycles def call_nnnn(self): lo = self.fetch() # 1 cycle hi = self.fetch() # 1 cycle self.call((hi << 8) + lo) # 4 cycles - # CALL cc,nnnn, 3,6 cycles def call_cc_nnnn(cc): if (cc): @@ -773,27 +683,24 @@ def isC(self): return (self.f & constants.C_FLAG) != 0 - # RET 4 cycles def ret(self): lo = self.pop() # 1 cycle hi = self.pop() # 1 cycle self.pc.set(hi, lo) # 2 cycles - # RET cc 2,5 cycles def ret_cc(cc): if (cc): self.ret() # 4 cycles - # FIXME mybe this should be the same + # FIXME maybe this should be the same self.cycles -= 1 else: self.cycles -= 2 - # RETI 4 cycles def reti(self): - self.ret() # 4 cyclces + self.ret() # 4 cycles # enable interrupts self.ime = True # execute next instruction @@ -801,13 +708,10 @@ # check pending interrupts self.interrupt() - - # RST nn 4 cycles def rst(self, nn): self.call(nn) # 4 cycles - # DI/EI 1 cycle def di(self): # disable interrupts @@ -824,7 +728,6 @@ # check pending interrupts self.interrupt() - # HALT/STOP def halt(self): self.halted = True @@ -841,110 +744,126 @@ SINGLE_OP_CODES = [ - (0x00, nop) - (0x08, load_mem_SP), - (0x10, stop), - (0x18, jr_nn), - (0x02, ld_BCi_A), - (0x12, ld_DEi_A), - (0x22, ldi_HLi_A), - (0x32, ldd_HLi_A), - (0x0A, ld_A_BCi), - (0x1A, load_A_DEi), - (0x2A, ldi_A_HLi), - (0x3A, ldd_A_HLi), - (0x07, rlca), - (0x0F, rrca), - (0x17, rla), - (0x1F, rra), - (0x27, daa), - (0x2F, cpl), - (0x37, scf), - (0x3F, ccf), - (0xF3, di), - (0xFB, ei), - (0xE2, ldh_Ci_A), - (0xEA, ld_mem_A), - (0xF2, ldh_A_Ci), - (0xFA, ld_A_mem), - (0xC3, jp_nnnn), - (0xC9, ret), - (0xD9, reti), - (0xE9, ld_PC_HL), - (0xF9, ld_SP_HL), - (0xE0, ldh_mem_A), - (0xE8, add_SP_nn), - (0xF0, ldh_A_mem), - (0xF8, ld_HL_SP_nn), - (0xCB,) - (0xCD, call_nnnn), - (0xC6, add_A_nn), - (0xCE, adc_A_nn), - (0xD6, sub_A_nn), - (0xDE, sbc_A_nn), - (0xE6, and_A_nn), - (0xEE, xor_A_nn), - (0xF6, or_A_nn), - (0xFE, cp_A_nn), - (0xC7, rst(0x00)), - (0xCF, rst(0x08)), - (0xD7, rst(0x10)), - (0xDF, rst(0x18)), - (0xE7, rst(0x20)), - (0xEF, rst(0x28)), - (0xF7, rst(0x30)), - (0xFF, rst(0x38)) - (0x76, halt), + (0x00, CPU.nop) + (0x08, CPU.load_mem_SP), + (0x10, CPU.stop), + (0x18, CPU.jr_nn), + (0x02, CPU.ld_BCi_A), + (0x12, CPU.ld_DEi_A), + (0x22, CPU.ldi_HLi_A), + (0x32, CPU.ldd_HLi_A), + (0x0A, CPU.ld_A_BCi), + (0x1A, CPU.load_A_DEi), + (0x2A, CPU.ldi_A_HLi), + (0x3A, CPU.ldd_A_HLi), + (0x07, CPU.rlca), + (0x0F, CPU.rrca), + (0x17, CPU.rla), + (0x1F, CPU.rra), + (0x27, CPU.daa), + (0x2F, CPU.cpl), + (0x37, CPU.scf), + (0x3F, CPU.ccf), + (0xF3, CPU.di), + (0xFB, CPU.ei), + (0xE2, CPU.ldh_Ci_A), + (0xEA, CPU.ld_mem_A), + (0xF2, CPU.ldh_A_Ci), + (0xFA, CPU.ld_A_mem), + (0xC3, CPU.jp_nnnn), + (0xC9, CPU.ret), + (0xD9, CPU.reti), + (0xE9, CPU.ld_PC_HL), + (0xF9, CPU.ld_SP_HL), + (0xE0, CPU.ldh_mem_A), + (0xE8, CPU.add_SP_nn), + (0xF0, CPU.ldh_A_mem), + (0xF8, CPU.ld_HL_SP_nn), + (0xCB, CPU.fetchExecute) + (0xCD, CPU.call_nnnn), + (0xC6, CPU.add_A_nn), + (0xCE, CPU.adc_A_nn), + (0xD6, CPU.sub_A_nn), + (0xDE, CPU.sbc_A_nn), + (0xE6, CPU.and_A_nn), + (0xEE, CPU.xor_A_nn), + (0xF6, CPU.or_A_nn), + (0xFE, CPU.cp_A_nn), + (0xC7, lambda s: CPU.rst(s, 0x00)), + (0xCF, lambda s: CPU.rst(s, 0x08)), + (0xD7, lambda s: CPU.rst(s, 0x10)), + (0xDF, lambda s: CPU.rst(s, 0x18)), + (0xE7, lambda s: CPU.rst(s, 0x20)), + (0xEF, lambda s: CPU.rst(s, 0x28)), + (0xF7, lambda s: CPU.rst(s, 0x30)), + (0xFF, lambda s: CPU.rst(s, 0x38)) + (0x76, CPU.halt), ] METHOD_OP_CODES = [ - (0x01, 0x10, ld_nnnn, [BC, DE, HL, SP]), - (0x09, 0x10, add_HL, [BC, DE, HL, SP]), - (0x03, 0x10, inc, [BC, DE, HL, SP]), - (0x0B, 0x10, dec, [BC, DE, HL, SP]), - - (0xC0, 0x08, ret, [NZ, Z, NC, C]), - (0xC2, 0x08, jp_nnnn, [NZ, Z, NC, C]), - (0xC4, 0x08, call_nnnn, [NZ, Z, NC, C]), - (0x20, 0x08, jr_nn, [NZ, Z, NC, C]), - - (0xC1, 0x10, pop, [BC, DE, HL, AF]), - (0xC5, 0x10, push, [BC, DE, HL, AF]), - - (0x01, 0x10, ld_nnnn, [BC, DE, HL, SP]), - (0x09, 0x10, add_HL, [BC, DE, HL, SP]), - (0x03, 0x10, inc, [BC, DE, HL, SP]), - (0x0B, 0x10, dec, [BC, DE, HL, SP]), + (0x01, 0x10, CPU.ld_nnnn, [BC, DE, HL, SP]), + (0x09, 0x10, CPU.add_HL, [BC, DE, HL, SP]), + (0x03, 0x10, CPU.inc, [BC, DE, HL, SP]), + (0x0B, 0x10, CPU.dec, [BC, DE, HL, SP]), - (0xC0, 0x08, ret, [NZ, Z, NC, C]), - (0xC2, 0x08, jp_nnnn, [NZ, Z, NC, C]), - (0xC4, 0x08, call_nnnn, [NZ, Z, NC, C]), + (0xC0, 0x08, CPU.ret, [NZ, Z, NC, C]), + (0xC2, 0x08, CPU.jp_nnnn, [NZ, Z, NC, C]), + (0xC4, 0x08, CPU.call_nnnn, [NZ, Z, NC, C]), + (0x20, 0x08, CPU.jr_nn, [NZ, Z, NC, C]), - (0xC1, 0x10, pop, [BC, DE, HL, AF]), - (0xC5, 0x10, push, [BC, DE, HL, AF]) + (0xC1, 0x10, CPU.pop, [BC, DE, HL, AF]), + (0xC5, 0x10, CPU.push, [BC, DE, HL, AF]) ] REGISTER_GROUP_OP_CODES = [ - (0x04, 0x08, inc), - (0x05, 0x08, dec), - (0x06, 0x08, ld_nn), - (0x80, 0x01, add_A), - (0x88, 0x01, adc_A), - (0x90, 0x01, sub_A), - (0x98, 0x01, sbc_A), - (0xA0, 0x01, and_A), - (0xA8, 0x01, xor_A), - (0xB0, 0x01, or_A), - (0xB8, 0x01, cp_A), - (0x00, 0x01, rlc), - (0x08, 0x01, rrc), - (0x10, 0x01, rl), - (0x18, 0x01, rr), - (0x20, 0x01, sla), - (0x28, 0x01, sra), - (0x30, 0x01, swap), - (0x38, 0x01, srl), - (0x40, 0x01, bit, range(0, 8)), - (0xC0, 0x01, set, range(0, 8)), - (0x80, 0x01, res, range(0, 8)) + (0x04, 0x08, CPU.inc), + (0x05, 0x08, CPU.dec), + (0x06, 0x08, CPU.ld_nn), + (0x80, 0x01, CPU.add_A), + (0x88, 0x01, CPU.adc_A), + (0x90, 0x01, CPU.sub_A), + (0x98, 0x01, CPU.sbc_A), + (0xA0, 0x01, CPU.and_A), + (0xA8, 0x01, CPU.xor_A), + (0xB0, 0x01, CPU.or_A), + (0xB8, 0x01, CPU.cp_A), + (0x00, 0x01, CPU.rlc), + (0x08, 0x01, CPU.rrc), + (0x10, 0x01, CPU.rl), + (0x18, 0x01, CPU.rr), + (0x20, 0x01, CPU.sla), + (0x28, 0x01, CPU.sra), + (0x30, 0x01, CPU.swap), + (0x38, 0x01, CPU.srl), + (0x40, 0x01, CPU.bit, range(0, 8)), + (0xC0, 0x01, CPU.set, range(0, 8)), + (0x80, 0x01, CPU.res, range(0, 8)) ] + + +def create_group_op_codes(table): + opCodes = []; + return opCodes + +def create_method_op_codes(table): + opCodes = []; + return opCodes + +SINGLE_OP_CODES.extend(create_group_op_codes(REGISTER_GROUP_OP_CODES)) +SINGLE_OP_CODES.extend(create_method_op_codes(METHOD_OP_CODES)) + + +def initialize_op_code_table(table): + result = [None] * 256 + for entry in table: + if len(entry) == 2: + positions = [entry[0]] + else: + positions = range(entry[0], entry[1]+1) + for pos in positions: + result[pos] = entry[-1] + assert None not in result + return result + +OP_CODES = initialize_op_code_table(SINGLE_OP_CODES) + From cami at codespeak.net Sun Mar 16 01:33:12 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sun, 16 Mar 2008 01:33:12 +0100 (CET) Subject: [pypy-svn] r52571 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080316003312.46F8616A11B@codespeak.net> Author: cami Date: Sun Mar 16 01:33:11 2008 New Revision: 52571 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Log: fixed a small bug in gameboy.py. dropped some empty lines in sound.py and video.py. Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py Sun Mar 16 01:33:11 2008 @@ -97,7 +97,7 @@ self.getreceiver(address).write(address, data) def read(self, address): - self.getreceiver().read(address) + self.getreceiver(address).read(address) def getreceiver(self, address): if 0x0000 <= address <= 0x7FFF: Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py Sun Mar 16 01:33:11 2008 @@ -256,16 +256,12 @@ def updateAudio(self): if ((self.nr52 & 0x80) == 0): return - if ((self.nr52 & 0x01) != 0): self.updateAudio1(); - if ((self.nr52 & 0x02) != 0): self.updateAudio2(); - if ((self.nr52 & 0x04) != 0): self.updateAudio3(); - if ((self.nr52 & 0x08) != 0): self.updateAudio4(); @@ -273,19 +269,14 @@ def mixAudio(self,buffer, length): for index in range(0, length): buffer[index] = 0; - if ((self.nr52 & 0x80) == 0): return - if ((self.nr52 & 0x01) != 0): self.mixAudio1(buffer, length); - if ((self.nr52 & 0x02) != 0): self.mixAudio2(buffer, length); - if ((self.nr52 & 0x04) != 0): self.mixAudio3(buffer, length); - if ((self.nr52 & 0x08) != 0): self.mixAudio4(buffer, length); @@ -340,18 +331,13 @@ def setAudio1Playback(self, data): self.nr14 = data; - self.audio1Frequency = self.frequencyTable[self.nr13 + ((self.nr14 & 0x07) << 8)]; - if ((self.nr14 & 0x80) != 0): self.nr52 |= 0x01; - if ((self.nr14 & 0x40) != 0 and self.audio1Length == 0): self.audio1Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)); - self.audio1SweepLength = (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); - self.audio1Volume = self.nr12 >> 4; self.audio1EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr12 & 0x07); @@ -400,7 +386,6 @@ elif (self.nr11 & 0xC0) == 0x80: wavePattern = 0x10 wavePattern << 22; - for index in range(0, length, 3): self.audio1Index += self.audio1Frequency; if ((self.audio1Index & (0x1F << 22)) >= wavePattern): @@ -456,16 +441,12 @@ def setAudio2Playback(self, data): self.nr24 = data; - self.audio2Frequency = self.frequencyTable[self.nr23\ + ((self.nr24 & 0x07) << 8)]; - if ((self.nr24 & 0x80) != 0): self.nr52 |= 0x02; - if ((self.nr24 & 0x40) != 0 and self.audio2Length == 0): self.audio2Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); - self.audio2Volume = self.nr22 >> 4; self.audio2EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr22 & 0x07); @@ -476,7 +457,6 @@ self.audio2Length-=1; if (self.audio2Length <= 0): self.nr52 &= ~0x02; - if (self.audio2EnvelopeLength > 0): self.audio2EnvelopeLength-=1; @@ -498,10 +478,8 @@ elif (self.nr21 & 0xC0) == 0x80: wavePattern = 0x10 wavePattern << 22; - for index in range(0, length): self.audio2Index += self.audio2Frequency; - if ((self.audio2Index & (0x1F << 22)) >= wavePattern): if ((self.nr51 & 0x20) != 0): buffer[index + 0] -= self.audio2Volume; @@ -557,9 +535,7 @@ def setAudio3Playback(self, data): self.nr34 = data; - self.audio3Frequency = self.frequencyTable[((self.nr34 & 0x07) << 8) + self.nr33] >> 1; - if ((self.nr34 & 0x80) != 0 and (self.nr30 & 0x80) != 0): self.nr52 |= 0x04; if ((self.nr34 & 0x40) != 0 and self.audio3Length == 0): @@ -653,13 +629,10 @@ self.nr44 = data; if ((self.nr44 & 0x80) != 0): self.nr52 |= 0x08; - if ((self.nr44 & 0x40) != 0 and self.audio4Length == 0): self.audio4Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); - self.audio4Volume = self.nr42 >> 4; self.audio4EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr42 & 0x07); - self.audio4Index = 0; @@ -669,17 +642,14 @@ self.audio4Length-=1; if (self.audio4Length <= 0): self.nr52 &= ~0x08; - if (self.audio4EnvelopeLength > 0): self.audio4EnvelopeLength-=1; - if (self.audio4EnvelopeLength <= 0): if ((self.nr42 & 0x08) != 0): if (self.audio4Volume < 15): self.audio4Volume+=1; elif (self.audio4Volume > 0): self.audio4Volume-=1; - self.audio4EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr42 & 0x07); @@ -687,7 +657,6 @@ for index in range(0, length, 2): self.audio4Index += self.audio4Frequency; polynomial; - if ((self.nr43 & 0x08) != 0): # 7 steps self.audio4Index &= 0x7FFFFF; @@ -696,7 +665,6 @@ # 15 steps self.audio4Index &= 0x7FFFFFFF; polynomial = self.noiseStep15Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31); - if ((polynomial & 1) != 0): if ((self.nr51 & 0x80) != 0): buffer[index + 0] -= self.audio4Volume; @@ -739,7 +707,6 @@ # Frequency Table Generation def generateFrequencyTables(self): sampleRate = self.driver.getSampleRate(); - # frequency = (4194304 / 32) / (2048 - period) Hz for period in range(0, 2048): skip = (((constants.GAMEBOY_CLOCK << 10) / sampleRate) << (22 - 8)) / (2048 - period); Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Sun Mar 16 01:33:11 2008 @@ -248,12 +248,9 @@ self.ly = 0 self.clearFrame() - - # don't draw window if it was not enabled and not being drawn before if ((self.lcdc & 0x20) == 0 and (data & 0x20) != 0 and self.wly == 0 and self.ly > self.wy): self.wly = 144 - self.lcdc = data @@ -350,7 +347,6 @@ self.interrupt.raiseInterrupt(constants.LCD) else: self.stat &= 0xFB - if (self.ly < 144): self.stat = (self.stat & 0xFC) | 0x02 self.cycles += constants.MODE_2_TICKS @@ -375,7 +371,6 @@ def emulateVBlank(self): if (self.vblank): self.vblank = False - self.stat = (self.stat & 0xFC) | 0x01 self.cycles += constants.MODE_1_TICKS - constants.MODE_1_BEGIN_TICKS # V-Blank interrupt @@ -439,14 +434,12 @@ def drawBackground(self): y = (self.scy + self.ly) & 0xFF x = self.scx & 0xFF - tileMap = constants.VRAM_MAP_A if (self.lcdc & 0x08) != 0: tileMap = constants.VRAM_MAP_B tileData = constants.VRAM_DATA_B if (self.lcdc & 0x10) != 0: tileData = constants.VRAM_DATA_A - tileMap += ((y >> 3) << 5) + (x >> 3) tileData += (y & 7) << 1 self.drawTiles(8 - (x & 7), tileMap, tileData) @@ -460,10 +453,8 @@ tileData = constants.VRAM_DATA_B if (self.lcdc & 0x10) != 0: tileData = constants.VRAM_DATA_A - tileMap += (self.wly >> 3) << 5 tileData += (self.wly & 7) << 1 - self.drawTiles(self.wx + 1, tileMap, tileData) self.wly+=1 @@ -690,12 +681,10 @@ pattern1 = self.line[x + 1] pattern2 = self.line[x + 2] pattern3 = self.line[x + 3] - pixels[offset + 0] = self.palette[pattern0] pixels[offset + 1] = self.palette[pattern1] pixels[offset + 2] = self.palette[pattern2] pixels[offset + 3] = self.palette[pattern3] - offset += 4 From cami at codespeak.net Sun Mar 16 10:15:24 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sun, 16 Mar 2008 10:15:24 +0100 (CET) Subject: [pypy-svn] r52572 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080316091524.0505816A145@codespeak.net> Author: cami Date: Sun Mar 16 10:15:23 2008 New Revision: 52572 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Log: cami started to code the opCode tables. need to split up into 2 tables due to overlapping opCodes. introduced the fetchExecute method, which should use the FetchExecuteOpCode table Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Sun Mar 16 10:15:23 2008 @@ -86,11 +86,9 @@ cycles = 0 # Interrupt Controller - #Interrupt interrupt = None # memory Access - #memory memory = None # ROM Access @@ -106,11 +104,9 @@ self.sp = DoubleRegister() self.reset() - def getAF(self): return (self.a << 8) + self.f - def getIF(self): val = 0x00 if self.ime: @@ -119,26 +115,54 @@ val += 0x80 return val - + def getA(self): + return self.a + def setA(self, value): self.a = value self.cycles -= 1 - def getA(self): - return self.a - + def getB(self): + return self.bc.getHi() + + def setB(self, value): + self.bc.setHi(value) + + def getC(self): + return self.bc.getLo() + + def setC(self, value): + self.bc.setLo(value) + + def getD(self): + return self.de.getHi() + + def setD(self, value): + self.de.setHi(value) + + def getE(self): + return self.de.getLo() + + def setE(self, value): + self.de.setLo(value) + def setF(self, value): self.f = value self.cycles -= 1 def getF(self): - return self.f - - + return self.f + + def getHLi(self): + return self.read(self.hl.get()) + + def setHLi(self, value): + self.write(self.hl.get(), value) + self.cycles += 1 + def setROM(self, banks): self.rom = banks - def reset(self): self.a = 0x01 self.f = 0x80 @@ -153,7 +177,6 @@ self.cycles = 0 - def zFlagAdd(self, s, resetF=False): if (resetF): self.f = 0 @@ -165,7 +188,6 @@ self.f = 0 if (s & compareAnd) != 0: self.f += constants.C_FLAG - def emulate(self, ticks): self.cycles += ticks @@ -173,7 +195,6 @@ while (self.cycles > 0): self.execute() - # Interrupts def interrupt(self): if (self.halted): @@ -199,7 +220,6 @@ elif (self.interrupt.isPending(constants.JOYPAD)): self.interrupt(0x60) self.interrupt.lower(constants.JOYPAD) - def interrupt(self, address): self.ime = False @@ -207,17 +227,15 @@ # Execution def fetchExecute(self): - self.execute(self.fetch()) + FETCHEXEC_OP_CODES[self.fetch()](self) def execute(self, opCode): OP_CODES[opCode](self) - # memory Access, 1 cycle def read(self, address): self.cycles -= 1 return self.memory.read(address) - def read(self, hi, lo): return self.read((hi << 8) + lo) @@ -227,7 +245,6 @@ self.memory.write(address, data) self.cycles -= 2 - def write(self, hi, lo, data): self.write((hi << 8) + lo, data) @@ -235,21 +252,21 @@ def fetch(self): self.cycles += 1 if (self.pc.get() <= 0x3FFF): - self.pc.inc() #?2 cycles + self.pc.inc() # 2 cycles return self.rom[self.pc.get()] & 0xFF data = self.memory.read(self.pc.get()) - self.pc.inc() #?2 cycles + self.pc.inc() # 2 cycles return data # Stack, 2 cycles def push(self, data): - self.sp.dec() #?2 cycles + self.sp.dec() # 2 cycles self.memory.write(self.sp.get(), data) # 1 cycle def pop(self): data = self.memory.read(self.sp.get()) - self.sp.inc() #?2 cycles + self.sp.inc() # 2 cycles self.cycles += 1 return data @@ -270,7 +287,7 @@ self.f += constants.H_FLAG self.setA(s) # 1 cycle - #?2 cycles + # 2 cycles def addHL(self, register): s = (self.hl.get() + register.get()) & 0xFFFF self.f = (self.f & constants.Z_FLAG) @@ -319,13 +336,12 @@ # 1 cycle def cpA(self, getter): s = (self.a - getter()) & 0xFF - self.setF(constants.N_FLAG) #?1 cycle + self.setF(constants.N_FLAG) # 1 cycle self.zFlagAdd(self.a) if s > self.a: self.f += constants.C_FLAG if (s & 0x0F) > (self.a & 0x0F): self.f += constants.H_FLAG - # 1 cycle def AND(self, getter): @@ -342,8 +358,6 @@ self.setA(self.a | getter()) # 1 cycle self.zFlagAdd(self.a, resetF=True) - - # 1 cycle def inc(self, getter, setter): data = (getter() + 1) & 0xFF @@ -356,14 +370,13 @@ self.f += constants.N_FLAG def decIncFlagFinish(data): - self.setF(0) #?1 cycle + self.setF(0) # 1 cycle self.zFlagAdd(data) if (data & 0x0F) == 0x0F: self.f += constants.H_FLAG self.f += (self.f & constants.C_FLAG) setter(data) - # 1 cycle def rlc(self, getter, setter): s = ((getter() & 0x7F) << 1) + ((getter() & 0x80) >> 7) @@ -374,32 +387,32 @@ s = ((getter() & 0x7F) << 1) if (self.f & constants.C_FLAG) != 0: s += 0x01 - flagsAndSetterFinish(s, getter, 0x80) #?1 cycle + flagsAndSetterFinish(s, getter, 0x80) # 1 cycle # 1 cycle def rrc(self, getter, setter): s = (getter() >> 1) + ((getter() & 0x01) << 7) - flagsAndSetterFinish(s, getter) #?1 cycle + flagsAndSetterFinish(s, getter) # 1 cycle # 1 cycle def rr(self, getter, setter): s = (getter() >> 1) + ((self.f & constants.C_FLAG) << 3) - flagsAndSetterFinish(s, getter) #?1 cycle + flagsAndSetterFinish(s, getter) # 1 cycle # 2 cycles def sla(self, getter, setter): s = (getter() << 1) & 0xFF - flagsAndSetterFinish(s, getter, 0x80) #?1 cycle + flagsAndSetterFinish(s, getter, 0x80) # 1 cycle # 1 cycle def sra(self, getter, setter): s = (getter() >> 1) + (getter() & 0x80) - flagsAndSetterFinish(s, getter) #?1 cycle + flagsAndSetterFinish(s, getter) # 1 cycle # 1 cycle def srl(self, getter, setter): s = (getter() >> 1) - flagsAndSetterFinish(s, getter) #?1 cycle + flagsAndSetterFinish(s, getter) # 1 cycle # 1 cycle def flagsAndSetterFinish(self, s, setter, compareAnd=0x01): @@ -416,7 +429,7 @@ setter(s) # 2 cycles - def bit(self, n, getter): + def bit(self, getter, setter, n): self.f = (self.f & constants.C_FLAG) + constants.H_FLAG if (getter() & (1 << n)) == 0: self.f += constants.Z_FLAG @@ -454,11 +467,11 @@ setter(getter() | (1 << n)) # 1 cycle # 1 cycle - def res(self, getter, setter): + def res(self, getter, setter, n): setter(getter() & (~(1 << n))) # 1 cycle # 1 cycle - def ld(self, setter, getter): + def ld(self, getter, setter): setter(getter()) # 1 cycle # LD A,(nnnn), 4 cycles @@ -506,7 +519,6 @@ self.hl.dec() # 2 cycles self.cycles += 1 - # LDH (nn),A 3 cycles def ldh_mem_A(self): self.write(0xFF00 + self.fetch(), self.a) # 2 + 1 cycles @@ -515,7 +527,6 @@ def ldh_Ci_A(self): self.write(0xFF00 + self.bc.getLo(), self.a) # 2 cycles - # LDI (HL),A 2 cycles def ldi_HLi_A(self): self.write(self.hl.get(), self.a) # 2 cycles @@ -555,7 +566,6 @@ self.f = self.pop() # 1 cycle self.setA(self.pop()) # 1+1 cycle - def cpl(self): self.a ^= 0xFF self.f |= constants.N_FLAG + constants.H_FLAG @@ -573,7 +583,6 @@ self.setA((self.a + delta) & 0xFF) # 1 cycle else: self.setA((self.a - delta) & 0xFF) # 1 cycle - self.f = (self.f & constants.N_FLAG) if delta >= 0x60: self.f += constants.C_FLAG @@ -592,9 +601,9 @@ self.sp.set(sel.SP_nn()) # 1+1 cycle self.cycles -= 2 - # LD HL,SP+nn ? 3 cycles + # LD HL,SP+nn 3 cycles def ld_HL_SP_nn(self): - self.hl.set(sel.SP_nn()) #?1+1 cycle + self.hl.set(sel.SP_nn()) # 1+1 cycle self.cycles -= 1 # 1 cycle @@ -652,7 +661,7 @@ if (cc): self.pc.add(self.fetch()) # 3 cycles else: - self.pc.inc() #?2 cycles + self.pc.inc() # 2 cycles # CALL nnnn, 6 cycles def call_nnnn(self): @@ -667,19 +676,15 @@ else: self.pc.add(2) # 3 cycles - def isNZ(self): return (self.f & constants.Z_FLAG) == 0 - def isNC(self): return (self.f & constants.C_FLAG) == 0 - def isZ(self): return (self.f & constants.Z_FLAG) != 0 - def isC(self): return (self.f & constants.C_FLAG) != 0 @@ -737,7 +742,6 @@ # check pending interrupts self.interrupt() - def stop(self): self.fetch() @@ -800,25 +804,10 @@ (0x76, CPU.halt), ] -METHOD_OP_CODES = [ - (0x01, 0x10, CPU.ld_nnnn, [BC, DE, HL, SP]), - (0x09, 0x10, CPU.add_HL, [BC, DE, HL, SP]), - (0x03, 0x10, CPU.inc, [BC, DE, HL, SP]), - (0x0B, 0x10, CPU.dec, [BC, DE, HL, SP]), - - (0xC0, 0x08, CPU.ret, [NZ, Z, NC, C]), - (0xC2, 0x08, CPU.jp_nnnn, [NZ, Z, NC, C]), - (0xC4, 0x08, CPU.call_nnnn, [NZ, Z, NC, C]), - (0x20, 0x08, CPU.jr_nn, [NZ, Z, NC, C]), - - (0xC1, 0x10, CPU.pop, [BC, DE, HL, AF]), - (0xC5, 0x10, CPU.push, [BC, DE, HL, AF]) -] REGISTER_GROUP_OP_CODES = [ (0x04, 0x08, CPU.inc), - (0x05, 0x08, CPU.dec), - (0x06, 0x08, CPU.ld_nn), + (0x05, 0x08, CPU.dec), (0x80, 0x01, CPU.add_A), (0x88, 0x01, CPU.adc_A), (0x90, 0x01, CPU.sub_A), @@ -837,20 +826,58 @@ (0x38, 0x01, CPU.srl), (0x40, 0x01, CPU.bit, range(0, 8)), (0xC0, 0x01, CPU.set, range(0, 8)), - (0x80, 0x01, CPU.res, range(0, 8)) + (0x80, 0x01, CPU.res, range(0, 8)), + (0x06, 0x08, CPU.ld_nn), + (0x40, 0x01, CPU.res, range(0, 8)) ] +GROUP_CODES_GETTERS = (CPU.getB, CPU.getC, CPU.getD, CPU.getE, CPU.getH, CPU.getL, CPU.getHLi, CPU.getA) +GROUP_CODES_SETTERS = (CPU.setB, CPU.setC, CPU.setD, CPU.setE, CPU.setH, CPU.setL, CPU.setHLi, CPU.setA) def create_group_op_codes(table): - opCodes = []; + opCodes = [None] * 0xFF; + for entry in table: + startCode = entry[0] + step = entry[1] + method = entry[2] + getters = GROUP_CODES_GETTERS + if len(entry) == 4: + for i in range(0, 8): + for n in entry[3]: + opCodes[startCode+step*i] = lambda me: method(me, GROUP_CODES_GETTERS[i], GROUP_CODES_SETTERS[i], n) + else: + for i in range(0, 8): + opCodes[startCode+step*i] = lambda me: method(me, GROUP_CODES_GETTERS[i], GROUP_CODES_SETTERS[i]) return opCodes +SINGLE_OP_CODES.extend(create_group_op_codes(REGISTER_GROUP_OP_CODES)) + -def create_method_op_codes(table): + +REGISTER_OP_CODES = [ + (0x01, 0x10, CPU.ld_nnnn, [BC, DE, HL, SP]), + (0x09, 0x10, CPU.addHL, [BC, DE, HL, SP]), + (0x03, 0x10, CPU.inc, [BC, DE, HL, SP]), + (0x0B, 0x10, CPU.dec, [BC, DE, HL, SP]), + + (0xC0, 0x08, CPU.ret, [NZ, Z, NC, C]), + (0xC2, 0x08, CPU.jp_nnnn, [NZ, Z, NC, C]), + (0xC4, 0x08, CPU.call_nnnn, [NZ, Z, NC, C]), + (0x20, 0x08, CPU.jr_nn, [NZ, Z, NC, C]), + + (0xC1, 0x10, CPU.pop, [BC, DE, HL, AF]), + (0xC5, 0x10, CPU.push, [BC, DE, HL, AF]) +] + +def create_register_op_codes(table): opCodes = []; + for entry in table: + startCode = entry[0] + step = entry[1] + commandBase = entry[2] + changing = entry[3] return opCodes -SINGLE_OP_CODES.extend(create_group_op_codes(REGISTER_GROUP_OP_CODES)) -SINGLE_OP_CODES.extend(create_method_op_codes(METHOD_OP_CODES)) +SINGLE_OP_CODES.extend(create_register_op_codes(REGISTER_OP_CODES)) def initialize_op_code_table(table): From arigo at codespeak.net Sun Mar 16 12:00:26 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 12:00:26 +0100 (CET) Subject: [pypy-svn] r52577 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080316110026.EEF1B16A144@codespeak.net> Author: arigo Date: Sun Mar 16 12:00:24 2008 New Revision: 52577 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: Indirect calls. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 16 12:00:24 2008 @@ -578,6 +578,7 @@ def register_redvar(self, arg, where=-1, verbose=True): assert arg not in self.redvar_positions + assert getattr(arg, 'concretetype', '?') is not lltype.Void if where == -1: where = self.free_red[self.current_block] self.free_red[self.current_block] += 1 @@ -591,6 +592,7 @@ def register_greenvar(self, arg, where=None, check=True, verbose=True): assert isinstance(arg, flowmodel.Variable) or not check + assert getattr(arg, 'concretetype', '?') is not lltype.Void if where is None: where = self.free_green[self.current_block] self.free_green[self.current_block] += 1 @@ -825,11 +827,15 @@ return handler(op, arg, result) def handle_concrete_hint(self, op, arg, result): + if arg.concretetype is lltype.Void: + return assert self.hannotator.binding(arg).is_green() assert self.hannotator.binding(result).is_green() self.register_greenvar(result, self.green_position(arg)) def handle_variable_hint(self, op, arg, result): + if arg.concretetype is lltype.Void: + return assert not self.hannotator.binding(result).is_green() if self.hannotator.binding(arg).is_green(): resultindex = self.convert_to_red(arg) @@ -838,12 +844,16 @@ self.register_redvar(result, self.redvar_position(arg)) def handle_deepfreeze_hint(self, op, arg, result): + if arg.concretetype is lltype.Void: + return if self.varcolor(result) == "red": self.register_redvar(result, self.redvar_position(arg)) else: self.register_greenvar(result, self.green_position(arg)) def handle_promote_hint(self, op, arg, result): + if arg.concretetype is lltype.Void: + return if self.varcolor(arg) == "green": self.register_greenvar(result, self.green_position(arg)) return @@ -912,6 +922,37 @@ has_result = (self.varcolor(op.result) != "gray" and op.result.concretetype != lltype.Void) + if self.hannotator.policy.hotpath: + if not targets: + self.handle_residual_call(op, withexc) + return + if not has_result: + kind = "gray" + # for now, let's try to promote all indirect calls + self.emit("hp_promote") + self.emit(fnptrindex) + self.emit(self.promotiondesc_position(op.args[0].concretetype)) + greenfnptrindex = self.register_greenvar(("promoted fnptr", op), + check=False) + args = targets.values()[0].getargs() + emitted_args = self.args_of_call(op.args[1:-1], args) + self.emit("hp_%s_indirect_call" % (kind,)) + self.emit(*emitted_args) + setdescindex = self.indirectcalldesc_position(targets) + self.emit(greenfnptrindex, setdescindex) + if has_result: + assert self.varcolor(op.result) == "red" + if kind != "red": + assert kind == "yellow" + tmpindex = self.register_greenvar(("tmpresult", op), + check=False) + self.emit("make_redbox") + self.emit(tmpindex) + self.emit(self.type_position(op.result.concretetype)) + self.register_redvar(op.result) + return + + # ---------- non-hotpath logic follows ---------- emitted_args = [] for v in op.args[1:-1]: if v.concretetype == lltype.Void: @@ -1019,8 +1060,8 @@ func = self.serialize_oparg("red", fnptr) emitted_args = [] for v in op.args[1:]: - if v.concretetype == lltype.Void: - continue + if v.concretetype == lltype.Void: # for indirect_call, this also + continue # skips the last argument emitted_args.append(self.serialize_oparg("red", v)) if self.hannotator.policy.hotpath: self.emit("hp_residual_call") Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sun Mar 16 12:00:24 2008 @@ -85,10 +85,13 @@ Xxx("capture_exception") def run_directly(self, greenargs, redargs, targetbytecode): - calldesc = targetbytecode.owncalldesc + return self.perform_call_mixed(greenargs, redargs, + targetbytecode.gv_ownfnptr, + targetbytecode.owncalldesc) + + def perform_call_mixed(self, greenargs, redargs, gv_func, calldesc): try: - gv_res = calldesc.perform_call_mixed(self.rgenop, - targetbytecode.gv_ownfnptr, + gv_res = calldesc.perform_call_mixed(self.rgenop, gv_func, greenargs, redargs) except Exception, e: self.capture_exception(e) @@ -304,11 +307,6 @@ gv_res = calldesc.perform_call(self.rgenop, gv_fnptr, greenargs) self.green_result(gv_res) - @arguments("green_varargs", "red_varargs", "red", "indirectcalldesc") - def opimpl_indirect_call_const(self, greenargs, redargs, - gv_funcptr, callset): - Xxx("indirect_call_const") - @arguments("oopspec", "bool", returns="red") def opimpl_red_oopspec_call_0(self, oopspec, deepfrozen): return self.oopspec_call(oopspec, []) @@ -441,7 +439,10 @@ @arguments("red", "green", "green", returns="green") def opimpl_is_constant(self, arg, true, false): - Xxx("is_constant") + # we could return either true or false here, but 'false' is probably + # better because there is no point in fallback-interpreting the clever + # logic that typically follows the 'true' case. + return false # hotpath-specific operations @@ -479,6 +480,26 @@ gv_res = self.run_directly(greenargs, redargs, targetbytecode) self.green_result(gv_res) + @arguments("green_varargs", "red_varargs", "green", "indirectcalldesc") + def opimpl_hp_red_indirect_call(self, greenargs, redargs, gv_funcptr, + callset): + gv_res = self.perform_call_mixed(greenargs, redargs, gv_funcptr, + callset.calldesc) + self.red_result(gv_res) + + @arguments("green_varargs", "red_varargs", "green", "indirectcalldesc") + def opimpl_hp_gray_indirect_call(self, greenargs, redargs, gv_funcptr, + callset): + self.perform_call_mixed(greenargs, redargs, gv_funcptr, + callset.calldesc) + + @arguments("green_varargs", "red_varargs", "green", "indirectcalldesc") + def opimpl_hp_yellow_indirect_call(self, greenargs, redargs, gv_funcptr, + callset): + gv_res = self.perform_call_mixed(greenargs, redargs, gv_funcptr, + callset.calldesc) + self.green_result(gv_res) + @arguments("red", "calldesc", "bool", "bool", "red_varargs") def opimpl_hp_residual_call(self, gv_func, calldesc, withexc, has_result, redargs_gv): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Sun Mar 16 12:00:24 2008 @@ -896,8 +896,7 @@ promotebox, promotiondesc) assert False, "unreachable" - @arguments("green_varargs", "red_varargs", "bytecode") - def opimpl_hp_red_direct_call(self, greenargs, redargs, targetbytecode): + def hp_direct_call(self, greenargs, redargs, targetbytecode): frame = rtimeshift.VirtualFrame(self.frame, None) self.frame = self.jitstate.frame = frame frame.pc = 0 @@ -905,9 +904,23 @@ frame.local_boxes = redargs frame.local_green = greenargs + @arguments("green_varargs", "red_varargs", "bytecode") + def opimpl_hp_red_direct_call(self, greenargs, redargs, targetbytecode): + self.hp_direct_call(greenargs, redargs, targetbytecode) + opimpl_hp_gray_direct_call = opimpl_hp_red_direct_call opimpl_hp_yellow_direct_call = opimpl_hp_red_direct_call + @arguments("green_varargs", "red_varargs", "green", "indirectcalldesc") + def opimpl_hp_red_indirect_call(self, greenargs, redargs, gv_funcptr, + callset): + addr = gv_funcptr.revealconst(llmemory.Address) + bytecode = callset.bytecode_for_address(addr) + self.hp_direct_call(greenargs, redargs, bytecode) + + opimpl_hp_gray_indirect_call = opimpl_hp_red_indirect_call + opimpl_hp_yellow_indirect_call = opimpl_hp_red_indirect_call + @arguments("red", "calldesc", "bool", "bool", "red_varargs") def opimpl_hp_residual_call(self, funcbox, calldesc, withexc, has_result, redargs): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 12:00:24 2008 @@ -12,6 +12,7 @@ # # i = 1024 # while i > 0: +# i >>= 1 # ...real test code here... # MyJitDriver.jit_merge_point(...) # MyJitDriver.can_enter_jit(...) @@ -879,10 +880,14 @@ res = self.interpret(f, [4, 212], []) assert res == 212 - def test_simple_meth(self): + def test_simple_yellow_meth(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['flag', 'res', 'i'] + class Base(object): def m(self): - raise NotImplementedError + return 21 pass # for inspect.getsource() bugs class Concrete(Base): @@ -891,43 +896,61 @@ pass # for inspect.getsource() bugs def f(flag): - if flag: - o = Base() - else: - o = Concrete() - return o.m() - - res = self.interpret(f, [0], [0]) - assert res == 42 - self.check_insns({}) + i = 1024 + while i > 0: + i >>= 1 + if flag: + o = Base() + else: + o = Concrete() + res = o.m() # yellow call + MyJitDriver.jit_merge_point(flag=flag, res=res, i=i) + MyJitDriver.can_enter_jit(flag=flag, res=res, i=i) + return res - res = self.interpret(f, [0], []) + res = self.run(f, [0], threshold=2) assert res == 42 - self.check_insns(indirect_call=0) + self.check_insns_in_loops({'int_is_true': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_simple_red_meth(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['flag', 'res', 'i'] + class Base(object): - def m(self, n): - raise NotImplementedError + def m(self, i): + return 21 + i pass # for inspect.getsource() bugs class Concrete(Base): - def m(self, n): - return 21*n + def m(self, i): + return 42 - i pass # for inspect.getsource() bugs - def f(flag, x): - if flag: - o = Base() - else: - o = Concrete() - return o.m(x) + def f(flag): + i = 1024 + while i > 0: + i >>= 1 + if flag: + o = Base() + else: + o = Concrete() + res = o.m(i) # red call + MyJitDriver.jit_merge_point(flag=flag, res=res, i=i) + MyJitDriver.can_enter_jit(flag=flag, res=res, i=i) + return res - res = self.interpret(f, [0, 2], [0]) + res = self.run(f, [0], threshold=2) assert res == 42 - self.check_insns({'int_mul': 1}) + self.check_insns_in_loops({'int_is_true': 1, 'int_sub': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_simple_red_meth_vars_around(self): + class MyJitDriver(JitDriver): + greens = ['y'] + reds = ['flag', 'x', 'z', 'res', 'i'] + class Base(object): def m(self, n): raise NotImplementedError @@ -939,27 +962,48 @@ pass # for inspect.getsource() bugs def f(flag, x, y, z): - if flag: - o = Base() - else: - o = Concrete() - return (o.m(x)+y)-z + i = 1024 + while i > 0: + i >>= 1 + if flag: + o = Base() + else: + o = Concrete() + hint(y, concrete=True) + res = (o.m(x)+y)-z + MyJitDriver.jit_merge_point(flag=flag, res=res, i=i, + x=x, y=y, z=z) + MyJitDriver.can_enter_jit(flag=flag, res=res, i=i, + x=x, y=y, z=z) + return res - res = self.interpret(f, [0, 2, 7, 5], [0]) + res = self.run(f, [0, 2, 7, 5], threshold=2) assert res == 44 - self.check_insns({'int_mul': 1, 'int_add': 1, 'int_sub': 1}) + self.check_insns_in_loops({'int_is_true': 1, + 'int_mul': 1, 'int_add': 1, 'int_sub': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_green_red_mismatch_in_call(self): + class MyJitDriver(JitDriver): + greens = ['x', 'y'] + reds = ['u', 'res', 'i'] + def add(a,b, u): return a+b def f(x, y, u): - r = add(x+1,y+1, u) - z = x+y - z = hint(z, concrete=True) + r # this checks that 'r' is green - return hint(z, variable=True) + i = 1024 + while i > 0: + i >>= 1 + r = add(x+1,y+1, u) + z = x+y + z = hint(z, concrete=True) + r # this checks that 'r' is green + res = hint(z, variable=True) + MyJitDriver.jit_merge_point(x=x, y=y, u=u, res=res, i=i) + MyJitDriver.can_enter_jit(x=x, y=y, u=u, res=res, i=i) + return res - res = self.interpret(f, [4, 5, 0], []) + res = self.run(f, [4, 5, 0], threshold=2) assert res == 20 @@ -976,6 +1020,10 @@ assert res == 120 def test_simple_indirect_call(self): + class MyJitDriver(JitDriver): + greens = ['flag'] + reds = ['v', 'res', 'i'] + def g1(v): return v * 2 @@ -983,17 +1031,28 @@ return v + 2 def f(flag, v): - if hint(flag, concrete=True): - g = g1 - else: - g = g2 - return g(v) + i = 1024 + while i > 0: + i >>= 1 + if hint(flag, concrete=True): + g = g1 + else: + g = g2 + res = g(v) + MyJitDriver.jit_merge_point(flag=flag, v=v, res=res, i=i) + MyJitDriver.can_enter_jit(flag=flag, v=v, res=res, i=i) + return res - res = self.interpret(f, [0, 40], [0]) + res = self.run(f, [0, 40], threshold=2) assert res == 42 - self.check_insns({'int_add': 1}) + self.check_insns_in_loops({'int_add': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_normalize_indirect_call(self): + class MyJitDriver(JitDriver): + greens = ['flag'] + reds = ['v', 'res', 'i'] + def g1(v): return -17 @@ -1001,21 +1060,32 @@ return v + 2 def f(flag, v): - if hint(flag, concrete=True): - g = g1 - else: - g = g2 - return g(v) + i = 1024 + while i > 0: + i >>= 1 + if hint(flag, concrete=True): + g = g1 + else: + g = g2 + res = g(v) + MyJitDriver.jit_merge_point(flag=flag, v=v, res=res, i=i) + MyJitDriver.can_enter_jit(flag=flag, v=v, res=res, i=i) + return res - res = self.interpret(f, [0, 40], [0]) + res = self.run(f, [0, 40], threshold=2) assert res == 42 - self.check_insns({'int_add': 1}) + self.check_insns_in_loops({'int_add': 1, + 'int_gt': 1, 'int_rshift': 1}) - res = self.interpret(f, [1, 40], [0]) + res = self.run(f, [1, 40], threshold=2) assert res == -17 - self.check_insns({}) + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_normalize_indirect_call_more(self): + class MyJitDriver(JitDriver): + greens = ['flag'] + reds = ['v', 'res', 'i'] + def g1(v): if v >= 0: return -17 @@ -1026,28 +1096,38 @@ return v + 2 def f(flag, v): - w = g1(v) - if hint(flag, concrete=True): - g = g1 - else: - g = g2 - return g(v) + w + i = 1024 + while i > 0: + i >>= 1 + w = g1(v) + if hint(flag, concrete=True): + g = g1 + else: + g = g2 + res = g(v) + w + MyJitDriver.jit_merge_point(flag=flag, v=v, res=res, i=i) + MyJitDriver.can_enter_jit(flag=flag, v=v, res=res, i=i) + return res - res = self.interpret(f, [0, 40], [0]) + res = self.run(f, [0, 40], threshold=2) assert res == 25 - self.check_insns({'int_add': 2, 'int_ge': 1}) + self.check_insns_in_loops({'int_add': 2, 'int_ge': 1, + 'int_gt': 1, 'int_rshift': 1}) - res = self.interpret(f, [1, 40], [0]) + res = self.run(f, [1, 40], threshold=2) assert res == -34 - self.check_insns({'int_ge': 2, 'int_add': 1}) + self.check_insns_in_loops({'int_ge': 2, + 'int_gt': 1, 'int_rshift': 1}) - res = self.interpret(f, [0, -1000], [0]) + res = self.run(f, [0, -1000], threshold=2) assert res == f(False, -1000) - self.check_insns({'int_add': 2, 'int_ge': 1}) + self.check_insns_in_loops({'int_add': 2, 'int_ge': 1, + 'int_gt': 1, 'int_rshift': 1}) - res = self.interpret(f, [1, -1000], [0]) + res = self.run(f, [1, -1000], threshold=2) assert res == f(True, -1000) - self.check_insns({'int_ge': 2, 'int_add': 1}) + self.check_insns_in_loops({'int_ge': 2, + 'int_gt': 1, 'int_rshift': 1}) def test_green_char_at_merge(self): def f(c, x): From arigo at codespeak.net Sun Mar 16 12:30:04 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 12:30:04 +0100 (CET) Subject: [pypy-svn] r52583 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080316113004.BB4E416A134@codespeak.net> Author: arigo Date: Sun Mar 16 12:30:04 2008 New Revision: 52583 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: Better test coverage for simple structs and arrays. Also fixed green_getfield to not rely on constant-folding of red boxes. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 16 12:30:04 2008 @@ -1198,7 +1198,7 @@ assert op.args[1].value != 'vable_access' # non virtual case - index = self.serialize_oparg("red", args[0]) + index = self.serialize_oparg(color, args[0]) fieldname = args[1].value s_struct = self.hannotator.binding(args[0]) deepfrozen = s_struct.deepfrozen @@ -1206,8 +1206,9 @@ fielddescindex = self.fielddesc_position(PTRTYPE.TO, fieldname) if fielddescindex == -1: # Void field return - self.emit("%s_getfield" % (color, ), index, fielddescindex, deepfrozen) + self.emit("%s_getfield" % (color, ), index, fielddescindex) if color == "red": + self.emit(deepfrozen) self.register_redvar(op.result) else: self.register_greenvar(op.result) @@ -1239,17 +1240,22 @@ self.emit("red_setfield", destboxindex, fielddescindex, valboxindex) def serialize_op_getarrayitem(self, op): + color = self.opcolor(op) arrayvar, indexvar = op.args PTRTYPE = arrayvar.concretetype if PTRTYPE.TO.OF is lltype.Void: return deepfrozen = self.hannotator.binding(arrayvar).deepfrozen fielddescindex = self.arrayfielddesc_position(PTRTYPE.TO) - arrayindex = self.serialize_oparg("red", arrayvar) - index = self.serialize_oparg("red", indexvar) - self.emit("red_getarrayitem", arrayindex, fielddescindex, index, - deepfrozen) - self.register_redvar(op.result) + arrayindex = self.serialize_oparg(color, arrayvar) + index = self.serialize_oparg(color, indexvar) + self.emit("%s_getarrayitem" % (color, )) + self.emit(arrayindex, fielddescindex, index) + if color == "red": + self.emit(deepfrozen) + self.register_redvar(op.result) + else: + self.register_greenvar(op.result) def serialize_op_setarrayitem(self, op): args = op.args @@ -1273,7 +1279,7 @@ if PTRTYPE.TO.OF is lltype.Void: return fielddescindex = self.arrayfielddesc_position(PTRTYPE.TO) - arrayindex = self.serialize_oparg("red", arrayvar) + arrayindex = self.serialize_oparg(color, arrayvar) self.emit("%s_getarraysize" % (color, ), arrayindex, fielddescindex) if color == "red": self.register_redvar(op.result) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sun Mar 16 12:30:04 2008 @@ -386,8 +386,8 @@ assert gv_res is not None, "segfault!" return gv_res - @arguments("red", "fielddesc", "bool", returns="green_from_red") - def opimpl_green_getfield(self, gv_struct, fielddesc, deepfrozen): + @arguments("green", "fielddesc", returns="green") + def opimpl_green_getfield(self, gv_struct, fielddesc): gv_res = fielddesc.getfield_if_non_null(self.rgenop, gv_struct) assert gv_res is not None, "segfault!" return gv_res @@ -398,7 +398,10 @@ @arguments("red", "arraydesc", "red", "bool", returns="red") def opimpl_red_getarrayitem(self, gv_array, fielddesc, gv_index, deepfrozen): - Xxx("red_getarrayitem") + gv_res = fielddesc.getarrayitem_if_non_null(self.rgenop, + gv_array, gv_index) + assert gv_res is not None, "segfault!" + return gv_res @arguments("red", "arraydesc", "red", "red") def opimpl_red_setarrayitem(self, gv_dest, fielddesc, gv_index, gv_value): @@ -406,11 +409,22 @@ @arguments("red", "arraydesc", returns="red") def opimpl_red_getarraysize(self, gv_array, fielddesc): - Xxx("red_getarraysize") + gv_res = fielddesc.getarraysize_if_non_null(self.rgenop, gv_array) + assert gv_res is not None, "segfault!" + return gv_res - @arguments("red", "arraydesc", returns="green_from_red") + @arguments("green", "arraydesc", "green", returns="green") + def opimpl_green_getarrayitem(self, gv_array, fielddesc, gv_index): + gv_res = fielddesc.getarrayitem_if_non_null(self.rgenop, + gv_array, gv_index) + assert gv_res is not None, "segfault!" + return gv_res + + @arguments("green", "arraydesc", returns="green") def opimpl_green_getarraysize(self, gv_array, fielddesc): - Xxx("green_getarraysize") + gv_res = fielddesc.getarraysize_if_non_null(self.rgenop, gv_array) + assert gv_res is not None, "segfault!" + return gv_res @arguments("red", "interiordesc", "bool", "red_varargs", returns="red") def opimpl_red_getinteriorfield(self, gv_struct, interiordesc, deepfrozen, Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Sun Mar 16 12:30:04 2008 @@ -4,6 +4,7 @@ from pypy.rlib.debug import debug_print from pypy.jit.timeshifter import rtimeshift, rcontainer, rvalue from pypy.jit.timeshifter.greenkey import empty_key, GreenKey, newgreendict +from pypy.jit.timeshifter.oop import SegfaultException from pypy.jit.rainbow import rhotpath from pypy.rpython.lltypesystem import lltype, llmemory @@ -789,10 +790,12 @@ return rtimeshift.gengetfield(self.jitstate, deepfrozen, fielddesc, structbox) - @arguments("red", "fielddesc", "bool", returns="green_from_red") - def opimpl_green_getfield(self, structbox, fielddesc, deepfrozen): - return rtimeshift.gengetfield(self.jitstate, deepfrozen, fielddesc, - structbox) + @arguments("green", "fielddesc", returns="green") + def opimpl_green_getfield(self, gv_struct, fielddesc): + gv_res = fielddesc.getfield_if_non_null(self.rgenop, gv_struct) + if gv_res is None: + raise SegfaultException + return gv_res @arguments("red", "fielddesc", "red") def opimpl_red_setfield(self, destbox, fielddesc, valuebox): @@ -813,9 +816,21 @@ def opimpl_red_getarraysize(self, arraybox, fielddesc): return rtimeshift.gengetarraysize(self.jitstate, fielddesc, arraybox) - @arguments("red", "arraydesc", returns="green_from_red") - def opimpl_green_getarraysize(self, arraybox, fielddesc): - return rtimeshift.gengetarraysize(self.jitstate, fielddesc, arraybox) + @arguments("green", "arraydesc", "green", returns="green") + def opimpl_green_getarrayitem(self, gv_array, fielddesc, gv_index): + gv_res = fielddesc.getarrayitem_if_non_null(self.rgenop, + gv_array, gv_index) + if gv_res is None: + raise SegfaultException # XXX should probably just raise it + # from fielddesc.getarrayitem() + return gv_res + + @arguments("green", "arraydesc", returns="green") + def opimpl_green_getarraysize(self, gv_array, fielddesc): + gv_res = fielddesc.getarraysize_if_non_null(self.rgenop, gv_array) + if gv_res is None: + raise SegfaultException + return gv_res @arguments("red", "interiordesc", "bool", "red_varargs", returns="red") def opimpl_red_getinteriorfield(self, structbox, interiordesc, deepfrozen, Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 12:30:04 2008 @@ -432,45 +432,102 @@ hints={'immutable': True}) def ll_function(s): - return s.hello * s.world + i = 1024 + while i > 0: + i >>= 1 + s1 = s + if MyJitDriver.case >= 2: + hint(s1, concrete=True) # green + if MyJitDriver.case == 3: + s1 = hint(s1, variable=True) # constant redbox + # + res = s1.hello * s1.world + # + MyJitDriver.jit_merge_point(s=s, i=i, res=res) + MyJitDriver.can_enter_jit(s=s, i=i, res=res) + return res - def struct_S(string): - items = string.split(',') - assert len(items) == 2 + def main(x, y): s1 = lltype.malloc(S) - s1.hello = int(items[0]) - s1.world = int(items[1]) - return s1 - ll_function.convert_arguments = [struct_S] + s1.hello = x + s1.world = y + return ll_function(s1) - res = self.interpret(ll_function, ["6,7"], []) + class MyJitDriver(JitDriver): + greens = [] + reds = ['s', 'i', 'res'] + case = 1 + res = self.run(main, [6, 7], threshold=2) assert res == 42 - self.check_insns({'getfield': 2, 'int_mul': 1}) - res = self.interpret(ll_function, ["8,9"], [0]) + self.check_insns_in_loops({'getfield': 2, 'int_mul': 1, + 'int_gt': 1, 'int_rshift': 1}) + + class MyJitDriver(JitDriver): + greens = ['s'] + reds = ['i', 'res'] + case = 2 + res = self.run(main, [8, 9], threshold=2) assert res == 72 - self.check_insns({}) + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) + + class MyJitDriver(JitDriver): + greens = ['s'] + reds = ['i', 'res'] + case = 3 + res = self.run(main, [10, 11], threshold=2) + assert res == 110 + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_simple_array(self): A = lltype.GcArray(lltype.Signed, hints={'immutable': True}) def ll_function(a): - return a[0] * a[1] + i = 1024 + while i > 0: + i >>= 1 + a1 = a + if MyJitDriver.case >= 2: + hint(a1, concrete=True) # green + if MyJitDriver.case == 3: + a1 = hint(a1, variable=True) # constant redbox + # + res = a1[0] * a1[1] + len(a1) + # + MyJitDriver.jit_merge_point(a=a, i=i, res=res) + MyJitDriver.can_enter_jit(a=a, i=i, res=res) + return res - def int_array(string): - items = [int(x) for x in string.split(',')] - n = len(items) - a1 = lltype.malloc(A, n) - for i in range(n): - a1[i] = items[i] - return a1 - ll_function.convert_arguments = [int_array] + def main(x, y): + a = lltype.malloc(A, 2) + a[0] = x + a[1] = y + return ll_function(a) - res = self.interpret(ll_function, ["6,7"], []) - assert res == 42 - self.check_insns({'getarrayitem': 2, 'int_mul': 1}) - res = self.interpret(ll_function, ["8,3"], [0]) - assert res == 24 - self.check_insns({}) + class MyJitDriver(JitDriver): + greens = [] + reds = ['a', 'i', 'res'] + case = 1 + res = self.run(main, [6, 7], threshold=2) + assert res == 44 + self.check_insns_in_loops({'getarrayitem': 2, 'int_mul': 1, + 'getarraysize': 1, 'int_add': 1, + 'int_gt': 1, 'int_rshift': 1}) + + class MyJitDriver(JitDriver): + greens = ['a'] + reds = ['i', 'res'] + case = 2 + res = self.run(main, [8, 9], threshold=2) + assert res == 74 + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) + + class MyJitDriver(JitDriver): + greens = ['a'] + reds = ['i', 'res'] + case = 3 + res = self.run(main, [10, 11], threshold=2) + assert res == 112 + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_arraysize(self): A = lltype.GcArray(lltype.Signed) @@ -1740,3 +1797,7 @@ return f(space, x, y) res = self.interpret(main2, [5, 6], policy=StopAtXPolicy(g)) assert res == 11 + + + #def test_handle_SegfaultException(self): + # ... Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Sun Mar 16 12:30:04 2008 @@ -618,18 +618,18 @@ self.varsizealloctoken = RGenOp.varsizeAllocToken(TYPE) self.indexkind = RGenOp.kindToken(lltype.Signed) - def getarrayitem_if_non_null(jitstate, genvar, gv_index): + def getarrayitem_if_non_null(rgenop, genvar, gv_index): array = genvar.revealconst(self.PTRTYPE) index = gv_index.revealconst(lltype.Signed) if array and 0 <= index < len(array): # else don't constant-fold res = array[index] - return rvalue.ll_gv_fromvalue(jitstate, res) + return rgenop.genconst(res) self.getarrayitem_if_non_null = getarrayitem_if_non_null - def getarraysize_if_non_null(jitstate, genvar): + def getarraysize_if_non_null(rgenop, genvar): array = genvar.revealconst(self.PTRTYPE) if array: # else don't constant-fold res = len(array) - return rvalue.ll_gv_fromvalue(jitstate, res) + return rgenop.genconst(res) self.getarraysize_if_non_null = getarraysize_if_non_null # ____________________________________________________________ Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Sun Mar 16 12:30:04 2008 @@ -167,7 +167,7 @@ if ((fielddesc.immutable or deepfrozen) and argbox.is_constant() and indexbox.is_constant()): resgv = fielddesc.getarrayitem_if_non_null( - jitstate, argbox.getgenvar(jitstate), + jitstate.curbuilder.rgenop, argbox.getgenvar(jitstate), indexbox.getgenvar(jitstate)) if resgv is not None: return fielddesc.makebox(jitstate, resgv) @@ -204,7 +204,7 @@ def gengetarraysize(jitstate, fielddesc, argbox): if argbox.is_constant(): resgv = fielddesc.getarraysize_if_non_null( - jitstate, argbox.getgenvar(jitstate)) + jitstate.curbuilder.rgenop, argbox.getgenvar(jitstate)) if resgv is not None: return rvalue.redboxbuilder_int(fielddesc.indexkind, resgv) genvar = jitstate.curbuilder.genop_getarraysize( From arigo at codespeak.net Sun Mar 16 12:41:01 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 12:41:01 +0100 (CET) Subject: [pypy-svn] r52586 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080316114101.225B316A151@codespeak.net> Author: arigo Date: Sun Mar 16 12:41:00 2008 New Revision: 52586 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: More passing tests. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 12:41:00 2008 @@ -529,28 +529,6 @@ assert res == 112 self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) - def test_arraysize(self): - A = lltype.GcArray(lltype.Signed) - def ll_function(a): - return len(a) - - def int_array(string): - items = [int(x) for x in string.split(',')] - n = len(items) - a1 = lltype.malloc(A, n) - for i in range(n): - a1[i] = items[i] - return a1 - ll_function.convert_arguments = [int_array] - - res = self.interpret(ll_function, ["6,7"], []) - assert res == 2 - self.check_insns({'getarraysize': 1}) - res = self.interpret(ll_function, ["8,3,3,4,5"], [0]) - assert res == 5 - self.check_insns({}) - - def test_degenerated_before_return(self): S = lltype.GcStruct('S', ('n', lltype.Signed)) T = lltype.GcStruct('T', ('s', S), ('n', lltype.Float)) @@ -629,34 +607,64 @@ assert res == 4 * 4 def test_degenerate_with_voids(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'res'] S = lltype.GcStruct('S', ('y', lltype.Void), ('x', lltype.Signed)) def ll_function(): - s = lltype.malloc(S) - s.x = 123 - return s - res = self.interpret(ll_function, [], []) + i = 1024 + while i > 0: + i >>= 1 + # + res = lltype.malloc(S) + res.x = 123 + # + MyJitDriver.jit_merge_point(i=i, res=res) + MyJitDriver.can_enter_jit(i=i, res=res) + return res + + res = self.run(ll_function, [], threshold=2) assert res.x == 123 + # ATM 'res' is forced at each iteration, because it gets merged with + # the 'res' that comes from outside (the first copy of the loop body + # which exists outside the portal, up to the jit_merge_point) + self.check_insns_in_loops({'malloc': 1, 'setfield': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_plus_minus(self): - py.test.skip("fix this test") + class MyJitDriver(JitDriver): + greens = ['s'] + reds = ['x', 'y', 'i', 'acc'] def ll_plus_minus(s, x, y): - acc = x - n = len(s) - pc = 0 - while pc < n: - op = s[pc] - op = hint(op, concrete=True) - if op == '+': - acc += y - elif op == '-': - acc -= y - pc += 1 + i = 1024 + while i > 0: + i >>= 1 + # + acc = x + n = len(s) + pc = 0 + while pc < n: + op = s[pc] + op = hint(op, concrete=True) + if op == '+': + acc += y + elif op == '-': + acc -= y + pc += 1 + # + MyJitDriver.jit_merge_point(s=s, x=x, y=y, i=i, acc=acc) + MyJitDriver.can_enter_jit(s=s, x=x, y=y, i=i, acc=acc) return acc - ll_plus_minus.convert_arguments = [LLSupport.to_rstr, int, int] - res = self.interpret(ll_plus_minus, ["+-+", 0, 2], [0]) - assert res == ll_plus_minus("+-+", 0, 2) - self.check_insns({'int_add': 2, 'int_sub': 1}) + + def main(copies, x, y): + s = "+%s+" % ("-" * copies,) + return ll_plus_minus(s, x, y) + + res = self.run(main, [5, 0, 2], threshold=2) + assert res == ll_plus_minus("+-----+", 0, 2) + self.check_insns_in_loops({'int_add': 2, 'int_sub': 5, + 'int_gt': 1, 'int_rshift': 1}) def test_red_virtual_container(self): # this checks that red boxes are able to be virtualized dynamically by From arigo at codespeak.net Sun Mar 16 13:38:19 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 13:38:19 +0100 (CET) Subject: [pypy-svn] r52594 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080316123819.5A60016A144@codespeak.net> Author: arigo Date: Sun Mar 16 13:38:18 2008 New Revision: 52594 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: getinteriorfield & co Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 16 13:38:18 2008 @@ -1298,16 +1298,17 @@ op, PTRTYPE, len(op.args) - 1) if interiordescindex == -1: # Void field return None - structindex = self.serialize_oparg("red", structvar) + structindex = self.serialize_oparg(color, structvar) deepfrozen = self.hannotator.binding(structvar).deepfrozen indexes = [] for arg in indices_v: - indexes.append(self.serialize_oparg("red", arg)) + indexes.append(self.serialize_oparg(color, arg)) self.emit("%s_getinteriorfield" % color, structindex, - interiordescindex, deepfrozen) + interiordescindex) self.emit(len(indexes)) self.emit(*indexes) if color == "red": + self.emit(deepfrozen) self.register_redvar(op.result) else: self.register_greenvar(op.result) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sun Mar 16 13:38:18 2008 @@ -378,69 +378,59 @@ @arguments("arraydesc", "red", returns="red") def opimpl_red_malloc_varsize_array(self, arraytypedesc, gv_size): - Xxx("red_malloc_varsize_array") + size = gv_size.revealconst(lltype.Signed) + return arraytypedesc.allocate(self.rgenop, size) @arguments("red", "fielddesc", "bool", returns="red") def opimpl_red_getfield(self, gv_struct, fielddesc, deepfrozen): - gv_res = fielddesc.getfield_if_non_null(self.rgenop, gv_struct) - assert gv_res is not None, "segfault!" - return gv_res + return fielddesc.perform_getfield(self.rgenop, gv_struct) @arguments("green", "fielddesc", returns="green") def opimpl_green_getfield(self, gv_struct, fielddesc): - gv_res = fielddesc.getfield_if_non_null(self.rgenop, gv_struct) - assert gv_res is not None, "segfault!" - return gv_res + return fielddesc.perform_getfield(self.rgenop, gv_struct) @arguments("red", "fielddesc", "red") def opimpl_red_setfield(self, gv_dest, fielddesc, gv_value): - fielddesc.setfield(self.rgenop, gv_dest, gv_value) + fielddesc.perform_setfield(self.rgenop, gv_dest, gv_value) @arguments("red", "arraydesc", "red", "bool", returns="red") def opimpl_red_getarrayitem(self, gv_array, fielddesc, gv_index, deepfrozen): - gv_res = fielddesc.getarrayitem_if_non_null(self.rgenop, - gv_array, gv_index) - assert gv_res is not None, "segfault!" - return gv_res + return fielddesc.perform_getarrayitem(self.rgenop, gv_array, gv_index) @arguments("red", "arraydesc", "red", "red") def opimpl_red_setarrayitem(self, gv_dest, fielddesc, gv_index, gv_value): - Xxx("red_setarrayitem") + fielddesc.perform_setarrayitem(self.rgenop, gv_dest, gv_index, + gv_value) @arguments("red", "arraydesc", returns="red") def opimpl_red_getarraysize(self, gv_array, fielddesc): - gv_res = fielddesc.getarraysize_if_non_null(self.rgenop, gv_array) - assert gv_res is not None, "segfault!" - return gv_res + return fielddesc.perform_getarraysize(self.rgenop, gv_array) @arguments("green", "arraydesc", "green", returns="green") def opimpl_green_getarrayitem(self, gv_array, fielddesc, gv_index): - gv_res = fielddesc.getarrayitem_if_non_null(self.rgenop, - gv_array, gv_index) - assert gv_res is not None, "segfault!" - return gv_res + return fielddesc.perform_getarrayitem(self.rgenop, gv_array, gv_index) @arguments("green", "arraydesc", returns="green") def opimpl_green_getarraysize(self, gv_array, fielddesc): - gv_res = fielddesc.getarraysize_if_non_null(self.rgenop, gv_array) - assert gv_res is not None, "segfault!" - return gv_res - - @arguments("red", "interiordesc", "bool", "red_varargs", returns="red") - def opimpl_red_getinteriorfield(self, gv_struct, interiordesc, deepfrozen, - indexes_gv): - Xxx("red_getinteriorfield") - - @arguments("red", "interiordesc", "bool", "red_varargs", - returns="green_from_red") - def opimpl_green_getinteriorfield(self, gv_struct, interiordesc, deepfrozen, + return fielddesc.perform_getarraysize(self.rgenop, gv_array) + + @arguments("red", "interiordesc", "red_varargs", "bool", returns="red") + def opimpl_red_getinteriorfield(self, gv_struct, interiordesc, + indexes_gv, deepfrozen): + return interiordesc.perform_getinteriorfield(self.rgenop, gv_struct, + indexes_gv) + + @arguments("green", "interiordesc", "green_varargs", returns="green") + def opimpl_green_getinteriorfield(self, gv_struct, interiordesc, indexes_gv): - Xxx("green_getinteriorfield") + return interiordesc.perform_getinteriorfield(self.rgenop, gv_struct, + indexes_gv) @arguments("red", "interiordesc", "red_varargs", "red") def opimpl_red_setinteriorfield(self, gv_dest, interiordesc, indexes_gv, gv_value): - Xxx("red_setinteriorfield") + interiordesc.perform_setinteriorfield(self.rgenop, gv_dest, indexes_gv, + gv_value) @arguments("red", "interiordesc", "red_varargs", returns="red") def opimpl_red_getinteriorarraysize(self, gv_array, interiordesc, indexes_gv): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Sun Mar 16 13:38:18 2008 @@ -4,7 +4,7 @@ from pypy.rlib.debug import debug_print from pypy.jit.timeshifter import rtimeshift, rcontainer, rvalue from pypy.jit.timeshifter.greenkey import empty_key, GreenKey, newgreendict -from pypy.jit.timeshifter.oop import SegfaultException +from pypy.jit.timeshifter.rcontainer import SegfaultException from pypy.jit.rainbow import rhotpath from pypy.rpython.lltypesystem import lltype, llmemory @@ -792,10 +792,7 @@ @arguments("green", "fielddesc", returns="green") def opimpl_green_getfield(self, gv_struct, fielddesc): - gv_res = fielddesc.getfield_if_non_null(self.rgenop, gv_struct) - if gv_res is None: - raise SegfaultException - return gv_res + return fielddesc.perform_getfield(self.rgenop, gv_struct) @arguments("red", "fielddesc", "red") def opimpl_red_setfield(self, destbox, fielddesc, valuebox): @@ -818,35 +815,24 @@ @arguments("green", "arraydesc", "green", returns="green") def opimpl_green_getarrayitem(self, gv_array, fielddesc, gv_index): - gv_res = fielddesc.getarrayitem_if_non_null(self.rgenop, - gv_array, gv_index) - if gv_res is None: - raise SegfaultException # XXX should probably just raise it - # from fielddesc.getarrayitem() - return gv_res + return fielddesc.perform_getarrayitem(self.rgenop, gv_array, gv_index) @arguments("green", "arraydesc", returns="green") def opimpl_green_getarraysize(self, gv_array, fielddesc): - gv_res = fielddesc.getarraysize_if_non_null(self.rgenop, gv_array) - if gv_res is None: - raise SegfaultException - return gv_res - - @arguments("red", "interiordesc", "bool", "red_varargs", returns="red") - def opimpl_red_getinteriorfield(self, structbox, interiordesc, deepfrozen, - indexboxes): - return interiordesc.gengetinteriorfield(self.jitstate, deepfrozen, - structbox, indexboxes) + return fielddesc.perform_getarraysize(self.rgenop, gv_array) - @arguments("red", "interiordesc", "bool", "red_varargs", - returns="green_from_red") - def opimpl_green_getinteriorfield(self, structbox, interiordesc, deepfrozen, - indexboxes): - # XXX make a green version that does not use the constant folding of - # the red one + @arguments("red", "interiordesc", "red_varargs", "bool", returns="red") + def opimpl_red_getinteriorfield(self, structbox, interiordesc, + indexboxes, deepfrozen): return interiordesc.gengetinteriorfield(self.jitstate, deepfrozen, structbox, indexboxes) + @arguments("green", "interiordesc", "green_varargs", returns="green") + def opimpl_green_getinteriorfield(self, gv_struct, interiordesc, + indexes_gv): + return interiordesc.perform_getinteriorfield(self.rgenop, gv_struct, + indexes_gv) + @arguments("red", "interiordesc", "red_varargs", "red") def opimpl_red_setinteriorfield(self, destbox, interiordesc, indexboxes, valuebox): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 13:38:18 2008 @@ -670,68 +670,111 @@ # this checks that red boxes are able to be virtualized dynamically by # the compiler (the P_NOVIRTUAL policy prevents the hint-annotator from # marking variables in blue) + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'i', 'res'] S = lltype.GcStruct('S', ('n', lltype.Signed)) - def ll_function(n): + def make(n): s = lltype.malloc(S) s.n = n - return s.n - res = self.interpret(ll_function, [42], []) + return s + def ll_function(n): + i = 1024 + while i > 0: + i >>= 1 + # + s = make(n) + res = s.n + # + MyJitDriver.jit_merge_point(n=n, i=i, res=res) + MyJitDriver.can_enter_jit(n=n, i=i, res=res) + return res + res = self.run(ll_function, [42], threshold=2) assert res == 42 - self.check_insns({}) + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_setarrayitem(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'res'] A = lltype.GcArray(lltype.Signed) a = lltype.malloc(A, 2, immortal=True) def ll_function(): - a[0] = 1 - a[1] = 2 - return a[0]+a[1] - - res = self.interpret(ll_function, [], []) + i = 1024 + while i > 0: + i >>= 1 + # + a[0] = 1 + a[1] = 2 + res = a[0]+a[1] + # + MyJitDriver.jit_merge_point(i=i, res=res) + MyJitDriver.can_enter_jit(i=i, res=res) + return res + res = self.run(ll_function, [], threshold=2) assert res == 3 + self.check_insns_in_loops({'setarrayitem': 2, + 'getarrayitem': 2, 'int_add': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_red_array(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['x', 'y', 'n', 'i', 'res'] A = lltype.GcArray(lltype.Signed) def ll_function(x, y, n): - a = lltype.malloc(A, 2) - a[0] = x - a[1] = y - return a[n]*len(a) + i = 1024 + while i > 0: + i >>= 1 + # + a = lltype.malloc(A, 2) + a[0] = x + a[1] = y + res = a[n]*len(a) + n = 1 - n + # + MyJitDriver.jit_merge_point(x=x, y=y, n=n, i=i, res=res) + MyJitDriver.can_enter_jit(x=x, y=y, n=n, i=i, res=res) + return res - res = self.interpret(ll_function, [21, -21, 0], []) + res = self.run(ll_function, [21, -21, 0], threshold=2) assert res == 42 - self.check_insns({'malloc_varsize': 1, - 'setarrayitem': 2, 'getarrayitem': 1, - 'getarraysize': 1, 'int_mul': 1}) - - res = self.interpret(ll_function, [21, -21, 1], []) - assert res == -42 - self.check_insns({'malloc_varsize': 1, - 'setarrayitem': 2, 'getarrayitem': 1, - 'getarraysize': 1, 'int_mul': 1}) + self.check_insns_in_loops({'malloc_varsize': 1, + 'setarrayitem': 2, 'getarrayitem': 1, + 'getarraysize': 1, 'int_mul': 1, + 'int_sub': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_red_struct_array(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['x', 'y', 'n', 'i', 'res'] S = lltype.Struct('s', ('x', lltype.Signed)) A = lltype.GcArray(S) def ll_function(x, y, n): - a = lltype.malloc(A, 2) - a[0].x = x - a[1].x = y - return a[n].x*len(a) + i = 1024 + while i > 0: + i >>= 1 + # + a = lltype.malloc(A, 2) + a[0].x = x + a[1].x = y + res = a[n].x*len(a) + n = 1 - n + # + MyJitDriver.jit_merge_point(x=x, y=y, n=n, i=i, res=res) + MyJitDriver.can_enter_jit(x=x, y=y, n=n, i=i, res=res) + return res - res = self.interpret(ll_function, [21, -21, 0], []) + res = self.run(ll_function, [21, -21, 0], threshold=2) assert res == 42 - self.check_insns({'malloc_varsize': 1, - 'setinteriorfield': 2, 'getinteriorfield': 1, - 'getarraysize': 1, 'int_mul': 1}) - - res = self.interpret(ll_function, [21, -21, 1], []) - assert res == -42 - self.check_insns({'malloc_varsize': 1, - 'setinteriorfield': 2, 'getinteriorfield': 1, - 'getarraysize': 1, 'int_mul': 1}) - + self.check_insns_in_loops({'malloc_varsize': 1, + 'setinteriorfield': 2, + 'getinteriorfield': 1, + 'getarraysize': 1, 'int_mul': 1, + 'int_sub': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_red_varsized_struct(self): A = lltype.Array(lltype.Signed) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py Sun Mar 16 13:38:18 2008 @@ -1,5 +1,5 @@ from pypy.jit.timeshifter import rvalue, rtimeshift -from pypy.jit.timeshifter.rcontainer import cachedtype +from pypy.jit.timeshifter.rcontainer import cachedtype, SegfaultException from pypy.rlib.objectmodel import we_are_translated from pypy.rlib.unroll import unrolling_iterable from pypy.rpython.llinterp import LLInterpreter @@ -9,9 +9,6 @@ from pypy.translator import exceptiontransform -class SegfaultException(Exception): - "Signals a run-time segfault detected at compile-time." - class Index: def __init__(self, n): self.n = n Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Sun Mar 16 13:38:18 2008 @@ -13,6 +13,10 @@ debug_print = lloperation.llop.debug_print debug_pdb = lloperation.llop.debug_pdb +class SegfaultException(Exception): + "Signals a run-time segfault detected at compile-time." + + class AbstractContainer(object): _attrs_ = [] @@ -376,29 +380,45 @@ lastoffset = path[-1] lastfielddesc = fielddescs[-1] immutable = LASTCONTAINER._hints.get('immutable', False) - getinterior_initial = make_interior_getter(fielddescs[:-1]) + perform_getinterior_initial, gengetinterior_initial = \ + make_interior_getter(fielddescs[:-1]) + + def perform_getinteriorfield(rgenop, genvar, indexes_gv): + ptr = perform_getinterior_initial(rgenop, genvar, indexes_gv) + if lastoffset is None: # getarrayitem + lastindex = indexes_gv[-1].revealconst(lltype.Signed) + result = ptr[lastindex] + else: # getfield + result = getattr(ptr, lastfielddesc.fieldname) + return rgenop.genconst(result) + + def perform_setinteriorfield(rgenop, genvar, indexes_gv, + gv_newvalue): + ptr = perform_getinterior_initial(rgenop, genvar, indexes_gv) + newvalue = gv_newvalue.revealconst(TYPE) + if lastoffset is None: # setarrayitem + lastindex = indexes_gv[-1].revealconst(lltype.Signed) + ptr[lastindex] = newvalue + else: # setfield + setattr(ptr, lastfielddesc.fieldname, newvalue) def gengetinteriorfield(jitstate, deepfrozen, argbox, indexboxes): if (immutable or deepfrozen) and argbox.is_constant(): - ptr = rvalue.ll_getvalue(argbox, PTRTYPE) - if ptr: # else don't constant-fold the segfault... - i = 0 - for offset in unroll_path: - if offset is None: # array substruct - indexbox = indexboxes[i] - i += 1 - if not indexbox.is_constant(): - break # non-constant array index - index = rvalue.ll_getvalue(indexbox, - lltype.Signed) - ptr = ptr[index] - else: - ptr = getattr(ptr, offset) + # try to constant-fold + indexes_gv = unbox_indexes(jitstate, indexboxes) + if indexes_gv is not None: + try: + gv_res = perform_getinteriorfield( + jitstate.curbuilder.rgenop, + argbox.getgenvar(jitstate), + indexes_gv) + except SegfaultException: + pass else: # constant-folding: success - assert i == len(indexboxes) - return rvalue.ll_fromvalue(jitstate, ptr) - argbox = getinterior_initial(jitstate, argbox, indexboxes) + return lastfielddesc.makebox(jitstate, gv_res) + + argbox = gengetinterior_initial(jitstate, argbox, indexboxes) if lastoffset is None: # getarrayitem indexbox = indexboxes[-1] genvar = jitstate.curbuilder.genop_getarrayitem( @@ -410,7 +430,7 @@ return argbox.op_getfield(jitstate, lastfielddesc) def gensetinteriorfield(jitstate, destbox, valuebox, indexboxes): - destbox = getinterior_initial(jitstate, destbox, indexboxes) + destbox = gengetinterior_initial(jitstate, destbox, indexboxes) if lastoffset is None: # setarrayitem indexbox = indexboxes[-1] genvar = jitstate.curbuilder.genop_setarrayitem( @@ -422,34 +442,37 @@ else: # setfield destbox.op_setfield(jitstate, lastfielddesc, valuebox) + self.perform_getinteriorfield = perform_getinteriorfield + self.perform_setinteriorfield = perform_setinteriorfield self.gengetinteriorfield = gengetinteriorfield self.gensetinteriorfield = gensetinteriorfield else: assert isinstance(TYPE, lltype.Array) arrayfielddesc = ArrayFieldDesc(RGenOp, TYPE) - getinterior_all = make_interior_getter(fielddescs) + perform_getinterior_all, gengetinterior_all = \ + make_interior_getter(fielddescs) + + def perform_getinteriorarraysize(rgenop, genvar, indexes_gv): + ptr = perform_getinterior_all(rgenop, genvar, indexes_gv) + return rgenop.genconst(len(ptr)) def gengetinteriorarraysize(jitstate, argbox, indexboxes): if argbox.is_constant(): - ptr = rvalue.ll_getvalue(argbox, PTRTYPE) - if ptr: # else don't constant-fold the segfault... - i = 0 - for offset in unroll_path: - if offset is None: # array substruct - indexbox = indexboxes[i] - i += 1 - if not indexbox.is_constant(): - break # non-constant array index - index = rvalue.ll_getvalue(indexbox, - lltype.Signed) - ptr = ptr[index] - else: - ptr = getattr(ptr, offset) + # try to constant-fold + indexes_gv = unbox_indexes(jitstate, indexboxes) + if indexes_gv is not None: + try: + array = perform_getinterior_all( + jitstate.curbuilder.rgenop, + argbox.getgenvar(jitstate), + indexes_gv) + except SegfaultException: + pass else: # constant-folding: success - assert i == len(indexboxes) - return rvalue.ll_fromvalue(jitstate, len(ptr)) + return rvalue.ll_fromvalue(jitstate, len(array)) + argbox = getinterior_all(jitstate, argbox, indexboxes) genvar = jitstate.curbuilder.genop_getarraysize( arrayfielddesc.arraytoken, @@ -463,7 +486,10 @@ def make_interior_getter(fielddescs, _cache={}): - # returns a 'getinterior(jitstate, argbox, indexboxes)' function + # returns two functions: + # * perform_getinterior(rgenop, gv_arg, indexes_gv) + # * gengetinterior(jitstate, argbox, indexboxes) + # key = tuple(fielddescs) try: return _cache[key] @@ -471,8 +497,26 @@ unroll_fielddescs = unrolling_iterable([ (fielddesc, isinstance(fielddesc, ArrayFieldDesc)) for fielddesc in fielddescs]) + FIRSTPTRTYPE = fielddescs[0].PTRTYPE - def getinterior(jitstate, argbox, indexboxes): + def perform_getinterior(rgenop, gv_arg, indexes_gv): + ptr = gv_arg.revealconst(FIRSTPTRTYPE) + if not ptr: + raise SegfaultException # don't constant-fold + i = 0 + for fielddesc, is_array in unroll_fielddescs: + if is_array: # array substruct + index = indexes_gv[i].revealconst(lltype.Signed) + i += 1 + if 0 <= i < len(ptr): + ptr = ptr[i] + else: + raise SegfaultException # index out of bounds + else: + ptr = getattr(ptr, fielddesc.fieldname) + return ptr + + def gengetinterior(jitstate, argbox, indexboxes): i = 0 for fielddesc, is_array in unroll_fielddescs: if is_array: # array substruct @@ -488,8 +532,17 @@ assert isinstance(argbox, rvalue.PtrRedBox) return argbox - _cache[key] = getinterior - return getinterior + result = perform_getinterior, gengetinterior + _cache[key] = result + return result + +def unbox_indexes(jitstate, indexboxes): + indexes_gv = [] + for box in indexboxes: + if not indexbox.is_constant(): + return None # non-constant array index + indexes_gv.append(indexbox.getgenvar(jitstate)) + return indexes_gv # ____________________________________________________________ @@ -567,23 +620,24 @@ T = self.PTRTYPE.TO self.fieldname = name self.fieldtoken = RGenOp.fieldToken(T, name) - def getfield_if_non_null(rgenop, genvar): + def perform_getfield(rgenop, genvar): ptr = genvar.revealconst(PTRTYPE) - if ptr: - res = getattr(ptr, name) - return rgenop.genconst(res) - self.getfield_if_non_null = getfield_if_non_null + if not ptr: + raise SegfaultException + res = getattr(ptr, name) + return rgenop.genconst(res) + self.perform_getfield = perform_getfield if not isinstance(FIELDTYPE, lltype.ContainerType): self._define_setfield(FIELDTYPE) def _define_setfield(self, FIELDTYPE): PTRTYPE = self.PTRTYPE name = self.fieldname - def setfield(rgenop, genvar, gv_newvalue): + def perform_setfield(rgenop, genvar, gv_newvalue): ptr = genvar.revealconst(PTRTYPE) newvalue = gv_newvalue.revealconst(FIELDTYPE) setattr(ptr, name, newvalue) - self.setfield = setfield + self.perform_setfield = perform_setfield def compact_repr(self): # goes in ll helper names return "Fld_%s_in_%s" % (self.fieldname, self.PTRTYPE._short_name()) @@ -618,19 +672,36 @@ self.varsizealloctoken = RGenOp.varsizeAllocToken(TYPE) self.indexkind = RGenOp.kindToken(lltype.Signed) - def getarrayitem_if_non_null(rgenop, genvar, gv_index): + def perform_getarrayitem(rgenop, genvar, gv_index): array = genvar.revealconst(self.PTRTYPE) index = gv_index.revealconst(lltype.Signed) if array and 0 <= index < len(array): # else don't constant-fold res = array[index] return rgenop.genconst(res) - self.getarrayitem_if_non_null = getarrayitem_if_non_null - def getarraysize_if_non_null(rgenop, genvar): + else: + raise SegfaultException + self.perform_getarrayitem = perform_getarrayitem + + def perform_getarraysize(rgenop, genvar): array = genvar.revealconst(self.PTRTYPE) - if array: # else don't constant-fold - res = len(array) - return rgenop.genconst(res) - self.getarraysize_if_non_null = getarraysize_if_non_null + if not array: # don't constant-fold + raise SegfaultException + res = len(array) + return rgenop.genconst(res) + self.perform_getarraysize = perform_getarraysize + + def perform_setarrayitem(rgenop, genvar, gv_index, gv_newvalue): + array = genvar.revealconst(self.PTRTYPE) + index = gv_index.revealconst(lltype.Signed) + newvalue = gv_newvalue.revealconst(TYPE.OF) + array[index] = newvalue + self.perform_setarrayitem = perform_setarrayitem + + def allocate(rgenop, size): + a = lltype.malloc(TYPE, size) + return rgenop.genconst(a) + self.allocate = allocate + # ____________________________________________________________ class FrozenVirtualStruct(FrozenContainer): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Sun Mar 16 13:38:18 2008 @@ -144,9 +144,12 @@ def gengetfield(jitstate, deepfrozen, fielddesc, argbox): assert isinstance(argbox, rvalue.PtrRedBox) if (fielddesc.immutable or deepfrozen) and argbox.is_constant(): - resgv = fielddesc.getfield_if_non_null( + try: + resgv = fielddesc.perform_getfield( jitstate.curbuilder.rgenop, argbox.getgenvar(jitstate)) - if resgv is not None: + except rcontainer.SegfaultException: + pass + else: return fielddesc.makebox(jitstate, resgv) return argbox.op_getfield(jitstate, fielddesc) @@ -166,10 +169,13 @@ def gengetarrayitem(jitstate, deepfrozen, fielddesc, argbox, indexbox): if ((fielddesc.immutable or deepfrozen) and argbox.is_constant() and indexbox.is_constant()): - resgv = fielddesc.getarrayitem_if_non_null( + try: + resgv = fielddesc.perform_getarrayitem( jitstate.curbuilder.rgenop, argbox.getgenvar(jitstate), indexbox.getgenvar(jitstate)) - if resgv is not None: + except rcontainer.SegfaultException: + pass + else: return fielddesc.makebox(jitstate, resgv) genvar = jitstate.curbuilder.genop_getarrayitem( fielddesc.arraytoken, @@ -203,9 +209,12 @@ def gengetarraysize(jitstate, fielddesc, argbox): if argbox.is_constant(): - resgv = fielddesc.getarraysize_if_non_null( + try: + resgv = fielddesc.perform_getarraysize( jitstate.curbuilder.rgenop, argbox.getgenvar(jitstate)) - if resgv is not None: + except rcontainer.SegfaultException: + pass + else: return rvalue.redboxbuilder_int(fielddesc.indexkind, resgv) genvar = jitstate.curbuilder.genop_getarraysize( fielddesc.arraytoken, From arigo at codespeak.net Sun Mar 16 13:45:34 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 13:45:34 +0100 (CET) Subject: [pypy-svn] r52595 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080316124534.6CF8616A134@codespeak.net> Author: arigo Date: Sun Mar 16 13:45:34 2008 New Revision: 52595 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: More interior & co. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 16 13:45:34 2008 @@ -1338,10 +1338,10 @@ interiordescindex, indices_v = self.interiordesc( op, PTRTYPE, len(op.args) - 1) assert interiordescindex != -1 - structindex = self.serialize_oparg("red", structvar) + structindex = self.serialize_oparg(color, structvar) indexes = [] for arg in indices_v: - indexes.append(self.serialize_oparg("red", arg)) + indexes.append(self.serialize_oparg(color, arg)) self.emit("%s_getinteriorarraysize" % color, structindex, interiordescindex) self.emit(len(indexes)) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sun Mar 16 13:45:34 2008 @@ -374,7 +374,8 @@ @arguments("structtypedesc", "red", returns="red") def opimpl_red_malloc_varsize_struct(self, structtypedesc, gv_size): - Xxx("red_malloc_varsize_struct") + size = gv_size.revealconst(lltype.Signed) + return structtypedesc.allocate_varsize(self.rgenop, size) @arguments("arraydesc", "red", returns="red") def opimpl_red_malloc_varsize_array(self, arraytypedesc, gv_size): @@ -433,13 +434,18 @@ gv_value) @arguments("red", "interiordesc", "red_varargs", returns="red") - def opimpl_red_getinteriorarraysize(self, gv_array, interiordesc, indexes_gv): - Xxx("red_getinteriorarraysize") + def opimpl_red_getinteriorarraysize(self, gv_array, interiordesc, + indexes_gv): + return interiordesc.perform_getinteriorarraysize(self.rgenop, + gv_array, + indexes_gv) - @arguments("red", "interiordesc", "red_varargs", returns="green_from_red") + @arguments("green", "interiordesc", "green_varargs", returns="green") def opimpl_green_getinteriorarraysize(self, gv_array, interiordesc, indexes_gv): - Xxx("green_getinteriorarraysize") + return interiordesc.perform_getinteriorarraysize(self.rgenop, + gv_array, + indexes_gv) @arguments("red", "green", "green", returns="green") def opimpl_is_constant(self, arg, true, false): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Sun Mar 16 13:45:34 2008 @@ -843,13 +843,12 @@ return interiordesc.gengetinteriorarraysize( self.jitstate, arraybox, indexboxes) - @arguments("red", "interiordesc", "red_varargs", returns="green_from_red") - def opimpl_green_getinteriorarraysize(self, arraybox, interiordesc, - indexboxes): - # XXX make a green version that does not use the constant folding of - # the red one - return interiordesc.gengetinteriorarraysize( - self.jitstate, arraybox, indexboxes) + @arguments("green", "interiordesc", "green_varargs", returns="green") + def opimpl_green_getinteriorarraysize(self, gv_array, interiordesc, + indexes_gv): + return interiordesc.perform_getinteriorarraysize(self.rgenop, + gv_array, + indexes_gv) @arguments("red", "green", "green", returns="green") def opimpl_is_constant(self, arg, true, false): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 13:45:34 2008 @@ -777,25 +777,32 @@ 'int_gt': 1, 'int_rshift': 1}) def test_red_varsized_struct(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['x', 'y', 'n', 'i', 'res'] A = lltype.Array(lltype.Signed) S = lltype.GcStruct('S', ('foo', lltype.Signed), ('a', A)) def ll_function(x, y, n): - s = lltype.malloc(S, 3) - s.foo = len(s.a)-1 - s.a[0] = x - s.a[1] = y - return s.a[n]*s.foo + i = 1024 + while i > 0: + i >>= 1 + # + s = lltype.malloc(S, 3) + s.foo = len(s.a)-1 + s.a[0] = x + s.a[1] = y + res = s.a[n]*s.foo + n = 1 - n + # + MyJitDriver.jit_merge_point(x=x, y=y, n=n, i=i, res=res) + MyJitDriver.can_enter_jit(x=x, y=y, n=n, i=i, res=res) + return res - res = self.interpret(ll_function, [21, -21, 0], []) + res = self.run(ll_function, [21, -21, 0], threshold=2) assert res == 42 self.check_insns(malloc_varsize=1, getinteriorarraysize=1) - res = self.interpret(ll_function, [21, -21, 1], []) - assert res == -42 - self.check_insns(malloc_varsize=1, - getinteriorarraysize=1) - def test_array_of_voids(self): A = lltype.GcArray(lltype.Void) def ll_function(n): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Sun Mar 16 13:45:34 2008 @@ -105,7 +105,7 @@ if fixsize: self._define_devirtualize() - self._define_allocate() + self._define_allocate(fixsize) def _compute_fielddescs(self, RGenOp): @@ -139,13 +139,20 @@ self.fielddesc_by_name = fielddesc_by_name self.innermostdesc = innermostdesc - def _define_allocate(self): + def _define_allocate(self, fixsize): TYPE = self.TYPE descs = unrolling_iterable(self.fielddescs) - def allocate(rgenop): - s = lltype.malloc(TYPE) - return rgenop.genconst(s) + if fixsize: + def allocate(rgenop): + s = lltype.malloc(TYPE) + return rgenop.genconst(s) + self.allocate = allocate + else: + def allocate_varsize(rgenop, size): + s = lltype.malloc(TYPE, size) + return rgenop.genconst(s) + self.allocate_varsize = allocate_varsize def populate(content_boxes, gv_s, box_gv_reader): s = gv_s.revealconst(lltype.Ptr(TYPE)) @@ -159,8 +166,6 @@ tgt = lltype.cast_pointer(desc.PTRTYPE, s) setattr(tgt, desc.fieldname, v) i += 1 - - self.allocate = allocate self.populate = populate def _define_devirtualize(self): @@ -473,12 +478,13 @@ # constant-folding: success return rvalue.ll_fromvalue(jitstate, len(array)) - argbox = getinterior_all(jitstate, argbox, indexboxes) + argbox = gengetinterior_all(jitstate, argbox, indexboxes) genvar = jitstate.curbuilder.genop_getarraysize( arrayfielddesc.arraytoken, argbox.getgenvar(jitstate)) return rvalue.IntRedBox(arrayfielddesc.indexkind, genvar) + self.perform_getinteriorarraysize = perform_getinteriorarraysize self.gengetinteriorarraysize = gengetinteriorarraysize def _freeze_(self): From arigo at codespeak.net Sun Mar 16 14:16:46 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 14:16:46 +0100 (CET) Subject: [pypy-svn] r52598 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080316131646.C168D16A003@codespeak.net> Author: arigo Date: Sun Mar 16 14:16:45 2008 New Revision: 52598 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: More tests. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 14:16:45 2008 @@ -1,6 +1,7 @@ import py from pypy.rpython.lltypesystem import lltype from pypy.rlib.jit import JitDriver, hint, JitHintError +from pypy.rlib.objectmodel import keepalive_until_here from pypy.jit.hintannotator.policy import StopAtXPolicy from pypy.jit.rainbow.test import test_hotpath @@ -804,16 +805,28 @@ getinteriorarraysize=1) def test_array_of_voids(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'i', 'res'] A = lltype.GcArray(lltype.Void) def ll_function(n): - a = lltype.malloc(A, 3) - a[1] = None - b = a[n] - res = a, b - keepalive_until_here(b) # to keep getarrayitem around + i = 1024 + while i > 0: + i >>= 1 + # + a = lltype.malloc(A, 3) + a[1] = None + b = a[n] + res = a, b + # we mention 'b' to prevent the getarrayitem operation + # from disappearing + keepalive_until_here(b) + # + MyJitDriver.jit_merge_point(n=n, i=i, res=res) + MyJitDriver.can_enter_jit(n=n, i=i, res=res) return res - res = self.interpret(ll_function, [2], []) + res = self.run(ll_function, [2], threshold=3) assert len(res.item0) == 3 def test_red_propagate(self): @@ -828,39 +841,70 @@ assert res == 24 self.check_insns({'int_lt': 1, 'int_mul': 1}) - def test_red_subcontainer(self): + def test_red_subcontainer_escape(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['k', 'i', 'res'] S = lltype.GcStruct('S', ('n', lltype.Signed)) - T = lltype.GcStruct('T', ('s', S), ('n', lltype.Float)) + T = lltype.GcStruct('T', ('s', S), ('n', lltype.Signed)) def ll_function(k): - t = lltype.malloc(T) - s = t.s - s.n = k - if k < 0: - return -123 - result = s.n * (k-1) - keepalive_until_here(t) - return result - res = self.interpret(ll_function, [7], []) - assert res == 42 - self.check_insns({'int_lt': 1, 'int_mul': 1, 'int_sub': 1}) + i = 1024 + while i > 0: + i >>= 1 + # + t = lltype.malloc(T) + if k < 0: + s = lltype.cast_pointer(lltype.Ptr(S), t) + else: + s = t.s + s.n = k + t.n = k*k + res = s + # + MyJitDriver.jit_merge_point(k=k, i=i, res=res) + MyJitDriver.can_enter_jit(k=k, i=i, res=res) + return res + res = self.run(ll_function, [7], threshold=2) + assert res.n == 7 + assert lltype.cast_pointer(lltype.Ptr(T), res).n == 49 + self.check_insns_in_loops(malloc=1, setfield=2) + + res = self.run(ll_function, [-6], threshold=2) + assert res.n == -6 + assert lltype.cast_pointer(lltype.Ptr(T), res).n == 36 + self.check_insns_in_loops(malloc=1, setfield=2) def test_red_subcontainer_cast(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['k', 'i', 'res'] S = lltype.GcStruct('S', ('n', lltype.Signed)) T = lltype.GcStruct('T', ('s', S), ('n', lltype.Float)) def ll_function(k): - t = lltype.malloc(T) - s = lltype.cast_pointer(lltype.Ptr(S), t) - s.n = k - if k < 0: - return -123 - result = s.n * (k-1) - keepalive_until_here(t) - return result - res = self.interpret(ll_function, [7], []) - assert res == 42 - self.check_insns({'int_lt': 1, 'int_mul': 1, 'int_sub': 1}) - + i = 1024*1024 + while i > 0: + i >>= 1 + # + t = lltype.malloc(T) + if k < 5: + s = lltype.cast_pointer(lltype.Ptr(S), t) + else: + s = t.s + s.n = k + if k < 0: + res = -123 + else: + res = s.n * (k-1) + keepalive_until_here(t) + k += 1 + # + MyJitDriver.jit_merge_point(k=k, i=i, res=res) + MyJitDriver.can_enter_jit(k=k, i=i, res=res) + return res + res = self.run(ll_function, [-10], threshold=2) + assert res == 10*9 + self.check_insns_in_loops(malloc=0, getfield=0, setfield=0) def test_merge_structures(self): S = lltype.GcStruct('S', ('n', lltype.Signed)) From arigo at codespeak.net Sun Mar 16 14:58:41 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 14:58:41 +0100 (CET) Subject: [pypy-svn] r52599 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080316135841.F0B9416A0CD@codespeak.net> Author: arigo Date: Sun Mar 16 14:58:39 2008 New Revision: 52599 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Log: test_known_nonzero. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 16 14:58:39 2008 @@ -426,23 +426,29 @@ reverse = False elif srcopname == 'ptr_iszero': reverse = True + if reverse is not None: + ptrindex = self.serialize_oparg("red", srcargs[0]) falserenaming = self.insert_renaming(linkfalse) truerenaming = self.insert_renaming(linktrue) if self.hannotator.policy.hotpath and color == "red": self.emit("hp_red_goto_iftrue") elif reverse is not None: - ptrindex = self.serialize_oparg("red", srcargs[0]) self.emit("red_goto_ifptrnonzero") self.emit(reverse) self.emit(ptrindex) + reverse = None else: self.emit("%s_goto_iftrue" % color) self.emit(index) self.emit(tlabel(linktrue)) + if reverse is not None: + self.emit("hp_learn_boolvalue", reverse, ptrindex) self.emit(*falserenaming) self.make_bytecode_block(linkfalse.target, insert_goto=True) self.emit(label(linktrue)) + if reverse is not None: + self.emit("hp_learn_boolvalue", not reverse, ptrindex) self.emit(*truerenaming) self.make_bytecode_block(linktrue.target, insert_goto=True) else: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sun Mar 16 14:58:39 2008 @@ -278,11 +278,15 @@ @arguments("red", "red", returns="red") def opimpl_red_ptr_eq(self, gv_ptr1, gv_ptr2): - Xxx("red_ptr_eq") + addr1 = gv_ptr1.revealconst(llmemory.Address) + addr2 = gv_ptr2.revealconst(llmemory.Address) + return self.rgenop.genconst(addr1 == addr2) @arguments("red", "red", returns="red") def opimpl_red_ptr_ne(self, gv_ptr1, gv_ptr2): - Xxx("red_ptr_ne") + addr1 = gv_ptr1.revealconst(llmemory.Address) + addr2 = gv_ptr2.revealconst(llmemory.Address) + return self.rgenop.genconst(addr1 != addr2) @arguments("red_varargs") @@ -550,6 +554,10 @@ else: self.green_result(gv_result) + @arguments("bool", "red") + def opimpl_hp_learn_boolvalue(self, boolval, gv_value): + pass + # ____________________________________________________________ # construction-time helpers Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Sun Mar 16 14:58:39 2008 @@ -964,6 +964,10 @@ else: self.green_result(gv_result) + @arguments("bool", "red") + def opimpl_hp_learn_boolvalue(self, boolval, redbox): + redbox.learn_boolvalue(self.jitstate, boolval) + # ____________________________________________________________ # construction-time interface Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Sun Mar 16 14:58:39 2008 @@ -125,7 +125,8 @@ def check_insns_in_loops(self, expected=None, **counts): if self.translate_support_code: return # XXX it would be nice to check insns in this case too - self.insns_in_loops = summary_loops(self.get_residual_graph()) + graph = self.get_residual_graph() + self.insns_in_loops = summary_loops(graph) if expected is not None: assert self.insns_in_loops == expected for opname, count in counts.items(): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 14:58:39 2008 @@ -1326,61 +1326,80 @@ assert count_depth(res) == 2 def test_known_nonzero(self): + class MyJitDriver(JitDriver): + greens = ['x'] + reds = ['y', 'res', 'i'] S = lltype.GcStruct('s', ('x', lltype.Signed)) global_s = lltype.malloc(S, immortal=True) global_s.x = 100 - def h(): - s = lltype.malloc(S) - s.x = 50 - return s + def h(i): + if i < 30: + return global_s + else: + return lltype.nullptr(S) def g(s, y): if s: return s.x * 5 else: return -12 + y def f(x, y): - hint(None, global_merge_point=True) - x = hint(x, concrete=True) - if x == 1: - return g(lltype.nullptr(S), y) - elif x == 2: - return g(global_s, y) - elif x == 3: - s = lltype.malloc(S) - s.x = y - return g(s, y) - elif x == 4: - s = h() - return g(s, y) - else: - s = h() - if s: - return g(s, y) + i = 1024 + while i > 0: + i >>= 1 + # + x = hint(x, concrete=True) + if x == 1: + res = g(lltype.nullptr(S), y) + elif x == 2: + res = g(global_s, y) + elif x == 3: + s = lltype.malloc(S) + s.x = y + res = g(s, y) + elif x == 4: + s = h(i) + res = g(s, y) else: - return 0 + s = h(i) + if s: + res = g(s, y) + else: + res = 0 + # + MyJitDriver.jit_merge_point(x=x, y=y, res=res, i=i) + MyJitDriver.can_enter_jit(x=x, y=y, res=res, i=i) + return res P = StopAtXPolicy(h) - res = self.interpret(f, [1, 10], [0], policy=P) + res = self.run(f, [1, 10], threshold=2, policy=P) assert res == -2 - self.check_insns(int_mul=0, int_add=1) + self.check_insns_in_loops({'int_add': 1, + 'int_gt': 1, 'int_rshift': 1}) - res = self.interpret(f, [2, 10], [0], policy=P) + res = self.run(f, [2, 10], threshold=2, policy=P) assert res == 500 - self.check_insns(int_mul=1, int_add=0) + self.check_insns_in_loops({'getfield': 1, 'int_mul': 1, + 'int_gt': 1, 'int_rshift': 1}) - res = self.interpret(f, [3, 10], [0], policy=P) + res = self.run(f, [3, 10], threshold=2, policy=P) assert res == 50 - self.check_insns(int_mul=1, int_add=0) + self.check_insns_in_loops({'int_mul': 1, + 'int_gt': 1, 'int_rshift': 1}) - res = self.interpret(f, [4, 10], [0], policy=P) - assert res == 250 - self.check_insns(int_mul=1, int_add=1) - - res = self.interpret(f, [5, 10], [0], policy=P) - assert res == 250 - self.check_insns(int_mul=1, int_add=0) + res = self.run(f, [4, 10], threshold=2, policy=P) + assert res == 500 + self.check_insns_in_loops({'direct_call': 1, 'ptr_nonzero': 1, + 'getfield': 1, 'int_mul': 1, + 'int_add': 1, + 'int_gt': 1, 'int_rshift': 1}) + + res = self.run(f, [5, 10], threshold=2, policy=P) + assert res == 500 + self.check_insns_in_loops({'direct_call': 1, 'ptr_nonzero': 1, + 'getfield': 1, 'int_mul': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_debug_assert_ptr_nonzero(self): S = lltype.GcStruct('s', ('x', lltype.Signed)) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Sun Mar 16 14:58:39 2008 @@ -234,7 +234,8 @@ return self.residual_graph def check_insns(self, expected=None, **counts): - self.insns = summary(self.get_residual_graph()) + graph = self.get_residual_graph() + self.insns = summary(graph) if expected is not None: assert self.insns == expected for opname, count in counts.items(): From arigo at codespeak.net Sun Mar 16 15:11:06 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 15:11:06 +0100 (CET) Subject: [pypy-svn] r52600 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080316141106.56A2716A095@codespeak.net> Author: arigo Date: Sun Mar 16 15:11:05 2008 New Revision: 52600 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Log: Ah, I missed the existing opimpl_learn_nonzeroness(). Merge the two copies of that functionality and add test. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 16 15:11:05 2008 @@ -443,12 +443,12 @@ self.emit(index) self.emit(tlabel(linktrue)) if reverse is not None: - self.emit("hp_learn_boolvalue", reverse, ptrindex) + self.emit("learn_boolvalue", ptrindex, reverse) self.emit(*falserenaming) self.make_bytecode_block(linkfalse.target, insert_goto=True) self.emit(label(linktrue)) if reverse is not None: - self.emit("hp_learn_boolvalue", not reverse, ptrindex) + self.emit("learn_boolvalue", ptrindex, not reverse) self.emit(*truerenaming) self.make_bytecode_block(linktrue.target, insert_goto=True) else: @@ -902,7 +902,7 @@ srcopname, srcargs = self.trace_back_bool_var(self.current_block, v) if srcopname in ('ptr_iszero', 'ptr_nonzero'): arg = self.serialize_oparg("red", srcargs[0]) - self.emit("learn_nonzeroness", arg, srcopname == "ptr_nonzero") + self.emit("learn_boolvalue", arg, srcopname == "ptr_nonzero") def serialize_op_direct_call(self, op): kind, withexc = self.guess_call_kind(op) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sun Mar 16 15:11:05 2008 @@ -288,6 +288,10 @@ addr2 = gv_ptr2.revealconst(llmemory.Address) return self.rgenop.genconst(addr1 != addr2) + @arguments("red", "bool") + def opimpl_learn_boolvalue(self, gv_value, boolval): + pass + @arguments("red_varargs") def opimpl_make_new_redvars(self, local_red): @@ -554,10 +558,6 @@ else: self.green_result(gv_result) - @arguments("bool", "red") - def opimpl_hp_learn_boolvalue(self, boolval, gv_value): - pass - # ____________________________________________________________ # construction-time helpers Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Sun Mar 16 15:11:05 2008 @@ -541,8 +541,8 @@ ptrbox2, True) @arguments("red", "bool") - def opimpl_learn_nonzeroness(self, ptrbox, nonzero): - rtimeshift.learn_nonzeroness(self.jitstate, ptrbox, nonzero) + def opimpl_learn_boolvalue(self, redbox, boolval): + redbox.learn_boolvalue(self.jitstate, boolval) @arguments() def opimpl_red_return(self): @@ -964,10 +964,6 @@ else: self.green_result(gv_result) - @arguments("bool", "red") - def opimpl_hp_learn_boolvalue(self, boolval, redbox): - redbox.learn_boolvalue(self.jitstate, boolval) - # ____________________________________________________________ # construction-time interface Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 15:11:05 2008 @@ -1,6 +1,7 @@ import py from pypy.rpython.lltypesystem import lltype from pypy.rlib.jit import JitDriver, hint, JitHintError +from pypy.rlib.debug import ll_assert from pypy.rlib.objectmodel import keepalive_until_here from pypy.jit.hintannotator.policy import StopAtXPolicy from pypy.jit.rainbow.test import test_hotpath @@ -1402,28 +1403,42 @@ 'int_gt': 1, 'int_rshift': 1}) def test_debug_assert_ptr_nonzero(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['m', 'res', 'i'] S = lltype.GcStruct('s', ('x', lltype.Signed)) - def h(): - s = lltype.malloc(S) - s.x = 42 - return s + global_s = lltype.malloc(S) + global_s.x = 42 + def h(flag): + if flag: + return global_s + else: + return lltype.nullptr(S) def g(s): # assumes that s is not null here ll_assert(bool(s), "please don't give me a null") return 5 def f(m): - hint(None, global_merge_point=True) - s = h() - n = g(s) - if not s: - n *= m - return n + i = 1024 + while i > 0: + i >>= 1 + # + s = h(m) + n = g(s) + if not s: + n *= m + res = n + # + MyJitDriver.jit_merge_point(m=m, res=res, i=i) + MyJitDriver.can_enter_jit(m=m, res=res, i=i) + return res P = StopAtXPolicy(h) - res = self.interpret(f, [17], [], policy=P) + res = self.run(f, [17], threshold=2, policy=P) assert res == 5 - self.check_insns(int_mul=0) + self.simplify_graph() # to remove ptr_nonzero with unused result + self.check_insns_in_loops(int_mul=0, ptr_iszero=0, ptr_nonzero=0) def test_indirect_red_call(self): def h1(n): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Sun Mar 16 15:11:05 2008 @@ -1,5 +1,6 @@ import py from pypy.translator.translator import TranslationContext, graphof +from pypy.translator.simplify import simplify_graph from pypy.jit.codegen.llgraph.rgenop import RGenOp as LLRGenOp from pypy.jit.hintannotator.annotator import HintAnnotator from pypy.jit.hintannotator.policy import StopAtXPolicy, HintAnnotatorPolicy @@ -233,6 +234,10 @@ def get_residual_graph(self): return self.residual_graph + def simplify_graph(self): + graph = self.get_residual_graph() + simplify_graph(graph) + def check_insns(self, expected=None, **counts): graph = self.get_residual_graph() self.insns = summary(graph) From arigo at codespeak.net Sun Mar 16 15:39:46 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 15:39:46 +0100 (CET) Subject: [pypy-svn] r52601 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080316143946.0CD53169F91@codespeak.net> Author: arigo Date: Sun Mar 16 15:39:46 2008 New Revision: 52601 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: More tests. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 16 15:39:46 2008 @@ -1060,7 +1060,7 @@ def handle_residual_call(self, op, withexc): fnptr = op.args[0] - pos = self.calldesc_position(lltype.typeOf(fnptr.value)) + pos = self.calldesc_position(fnptr.concretetype) has_result = (self.varcolor(op.result) != "gray" and op.result.concretetype != lltype.Void) func = self.serialize_oparg("red", fnptr) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 15:39:46 2008 @@ -1441,21 +1441,32 @@ self.check_insns_in_loops(int_mul=0, ptr_iszero=0, ptr_nonzero=0) def test_indirect_red_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'x', 'res', 'i'] def h1(n): return n*2 def h2(n): return n*4 l = [h1, h2] def f(n, x): - h = l[n&1] - return h(n) + x + i = 1024 + while i > 0: + i >>= 1 + # + h = l[n&1] + res = h(n) + x + # + MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) + MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + return res - P = StopAtXPolicy() - res = self.interpret(f, [7, 3], policy=P) + res = self.run(f, [7, 3], threshold=2) assert res == f(7,3) - self.check_insns(indirect_call=1, direct_call=1) + self.check_insns_in_loops(int_mul=1) # call target eagerly promoted def test_indirect_red_call_with_exc(self): + py.test.skip("only interesting if the call target is not promoted") def h1(n): if n < 0: raise ValueError @@ -1486,35 +1497,94 @@ self.check_insns(indirect_call=1) def test_indirect_gray_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'x', 'res', 'i'] def h1(w, n): w[0] = n*2 def h2(w, n): w[0] = n*4 l = [h1, h2] def f(n, x): - w = [0] - h = l[n&1] - h(w, n) - return w[0] + x + i = 1024 + while i > 0: + i >>= 1 + # + w = [0] + h = l[n&1] + h(w, n) + res = w[0] + x + # + MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) + MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + return res - P = StopAtXPolicy() - res = self.interpret(f, [7, 3], policy=P) + res = self.run(f, [7, 3], threshold=2) assert res == f(7,3) def test_indirect_residual_red_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'x', 'res', 'i'] def h1(n): return n*2 def h2(n): return n*4 l = [h1, h2] def f(n, x): - h = l[n&1] - return h(n) + x + i = 1024 + while i > 0: + i >>= 1 + # + h = l[n&1] + res = h(n) + x + # + MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) + MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + return res P = StopAtXPolicy(h1, h2) - res = self.interpret(f, [7, 3], policy=P) + res = self.run(f, [7, 3], threshold=2, policy=P) assert res == f(7,3) - self.check_insns(indirect_call=1) + self.check_insns_in_loops({'int_and': 1, + 'direct_call': 1, # to list.getitem + 'indirect_call': 1, + 'int_add': 1, + 'int_gt': 1, 'int_rshift': 1}) + + def test_indirect_residual_red_call_with_exc(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'x', 'res', 'i'] + def h1(n): + if n < 0: + raise ValueError + return n*2 + def h2(n): + return n*4 + l = [h1, h2] + def f(n, x): + i = 1024 + while i > 0: + i >>= 1 + # + h = l[n&1] + try: + res = h(n) + x + except ValueError: + res = -42 + # + MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) + MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + return res + + P = StopAtXPolicy(h1, h2) + res = self.run(f, [7, 3], threshold=2, policy=P) + assert res == f(7,3) + + res = self.run(f, [-2, 3], threshold=2, policy=P) + assert res == f(-2, 3) == -42 + self.check_insns_in_loops(indirect_call=1, int_add=0, int_mul=0) def test_constant_indirect_red_call(self): def h1(m, n, x): @@ -1523,10 +1593,18 @@ return x*4 l = [h1, h2] def f(m, n, x): - m = hint(m, concrete=True) - frozenl = hint(l, deepfreeze=True) - h = frozenl[n&1] - return h(m, 5, x) + i = 1024 + while i > 0: + i >>= 1 + # + m = hint(m, concrete=True) + frozenl = hint(l, deepfreeze=True) + h = frozenl[n&1] + res = h(m, 5, x) + # + MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) + MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + return res P = StopAtXPolicy() res = self.interpret(f, [1, 7, 3], [0, 1], policy=P) From arigo at codespeak.net Sun Mar 16 16:08:28 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 16:08:28 +0100 (CET) Subject: [pypy-svn] r52605 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080316150828.A43CA16A095@codespeak.net> Author: arigo Date: Sun Mar 16 16:08:27 2008 New Revision: 52605 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: More tests. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 16:08:27 2008 @@ -1587,6 +1587,9 @@ self.check_insns_in_loops(indirect_call=1, int_add=0, int_mul=0) def test_constant_indirect_red_call(self): + class MyJitDriver(JitDriver): + greens = ['m', 'n'] + reds = ['x', 'res', 'i'] def h1(m, n, x): return x-2 def h2(m, n, x): @@ -1598,23 +1601,28 @@ i >>= 1 # m = hint(m, concrete=True) + hint(n, concrete=True) frozenl = hint(l, deepfreeze=True) - h = frozenl[n&1] + h = frozenl[hint(n, variable=True) & 1] res = h(m, 5, x) # - MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) - MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + MyJitDriver.jit_merge_point(m=m, n=n, x=x, res=res, i=i) + MyJitDriver.can_enter_jit(m=m, n=n, x=x, res=res, i=i) return res - P = StopAtXPolicy() - res = self.interpret(f, [1, 7, 3], [0, 1], policy=P) + res = self.run(f, [1, 7, 3], threshold=2) assert res == f(1,7,3) - self.check_insns({'int_mul': 1}) - res = self.interpret(f, [1, 4, 113], [0, 1], policy=P) + self.check_insns_in_loops({'int_mul': 1, + 'int_gt': 1, 'int_rshift': 1}) + res = self.run(f, [1, 4, 113], threshold=2) assert res == f(1,4,113) - self.check_insns({'int_sub': 1}) + self.check_insns_in_loops({'int_sub': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_constant_indirect_red_call_no_result(self): + class MyJitDriver(JitDriver): + greens = ['m', 'n'] + reds = ['x', 'res', 'i'] class A: pass glob_a = A() @@ -1624,19 +1632,27 @@ glob_a.x = x*4 l = [h1, h2] def f(m, n, x): - m = hint(m, concrete=True) - frozenl = hint(l, deepfreeze=True) - h = frozenl[n&1] - h(m, 5, x) - return glob_a.x + i = 1024 + while i > 0: + i >>= 1 + # + m = hint(m, concrete=True) + hint(n, concrete=True) + frozenl = hint(l, deepfreeze=True) + h = frozenl[hint(n, variable=True) & 1] + h(m, 5, x) + res = glob_a.x + # + MyJitDriver.jit_merge_point(m=m, n=n, x=x, res=res, i=i) + MyJitDriver.can_enter_jit(m=m, n=n, x=x, res=res, i=i) + return res - P = StopAtXPolicy() - res = self.interpret(f, [1, 7, 3], [0, 1], policy=P) + res = self.run(f, [1, 7, 3], threshold=2) assert res == f(1,7,3) - self.check_insns(int_mul=1, int_sub=0) - res = self.interpret(f, [1, 4, 113], [0, 1], policy=P) + self.check_insns_in_loops(int_mul=1, int_sub=0, setfield=1, getfield=1) + res = self.run(f, [1, 4, 113], threshold=2) assert res == f(1,4,113) - self.check_insns(int_sub=1, int_mul=0) + self.check_insns_in_loops(int_mul=0, int_sub=1, setfield=1, getfield=1) def test_indirect_sometimes_residual_pure_red_call(self): def h1(x): From arigo at codespeak.net Sun Mar 16 16:28:51 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 16:28:51 +0100 (CET) Subject: [pypy-svn] r52606 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080316152851.B72DB1684D4@codespeak.net> Author: arigo Date: Sun Mar 16 16:28:51 2008 New Revision: 52606 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: More tests. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 16:28:51 2008 @@ -1655,49 +1655,71 @@ self.check_insns_in_loops(int_mul=0, int_sub=1, setfield=1, getfield=1) def test_indirect_sometimes_residual_pure_red_call(self): + class MyJitDriver(JitDriver): + greens = ['n'] + reds = ['x', 'res', 'i'] def h1(x): return x-2 def h2(x): return x*4 l = [h1, h2] def f(n, x): - hint(None, global_merge_point=True) - hint(n, concrete=True) - frozenl = hint(l, deepfreeze=True) - h = frozenl[n&1] - return h(x) + i = 1024 + while i > 0: + i >>= 1 + # + hint(n, concrete=True) + frozenl = hint(l, deepfreeze=True) + h = frozenl[n&1] + res = h(x) + # + MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) + MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + return res P = StopAtXPolicy(h1) P.oopspec = True - res = self.interpret(f, [7, 3], [], policy=P) + res = self.run(f, [7, 3], threshold=2, policy=P) assert res == f(7,3) - self.check_insns({'int_mul': 1}) - res = self.interpret(f, [4, 113], [], policy=P) + self.check_insns_in_loops({'int_mul': 1, + 'int_gt': 1, 'int_rshift': 1}) + res = self.run(f, [4, 113], threshold=2, policy=P) assert res == f(4,113) - self.check_insns({'direct_call': 1}) + self.check_insns_in_loops({'direct_call': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_indirect_sometimes_residual_pure_but_fixed_red_call(self): + class MyJitDriver(JitDriver): + greens = ['n', 'x'] + reds = ['i', 'res'] def h1(x): return x-2 def h2(x): return x*4 l = [h1, h2] def f(n, x): - hint(None, global_merge_point=True) - frozenl = hint(l, deepfreeze=True) - h = frozenl[n&1] - z = h(x) - hint(z, concrete=True) - return z + i = 1024 + while i > 0: + i >>= 1 + # + frozenl = hint(l, deepfreeze=True) + h = frozenl[n&1] + z = h(x) + hint(z, concrete=True) + res = hint(z, variable=True) + # + MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) + MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + return res P = StopAtXPolicy(h1) P.oopspec = True - res = self.interpret(f, [7, 3], [], policy=P) + res = self.run(f, [7, 3], threshold=2, policy=P) assert res == f(7,3) - self.check_insns({}) - res = self.interpret(f, [4, 113], [], policy=P) + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) + res = self.run(f, [4, 113], threshold=2, policy=P) assert res == f(4,113) - self.check_insns({}) + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_manual_marking_of_pure_functions(self): d = {} From arigo at codespeak.net Sun Mar 16 16:43:16 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 16:43:16 +0100 (CET) Subject: [pypy-svn] r52607 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080316154316.16D1216A06B@codespeak.net> Author: arigo Date: Sun Mar 16 16:43:16 2008 New Revision: 52607 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: Red switches (easy: just add hp_promote in front to make it a green switch) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 16 16:43:16 2008 @@ -452,7 +452,18 @@ self.emit(*truerenaming) self.make_bytecode_block(linktrue.target, insert_goto=True) else: - assert self.varcolor(block.exitswitch) == "green" + if self.varcolor(block.exitswitch) == "green": + switchvaridx = self.serialize_oparg("green", block.exitswitch) + else: + assert self.hannotator.policy.hotpath + TYPE = block.exitswitch.concretetype + self.emit("hp_promote") + self.emit(self.serialize_oparg("red", block.exitswitch)) + self.emit(self.promotiondesc_position(TYPE)) + switchvaridx = self.register_greenvar( + ("promoted", block.exitswitch), + check=False) + for link in block.exits: if link.exitcase == 'default': defaultlink = link @@ -467,7 +478,7 @@ cases = [self.serialize_oparg("green", case) for case in cases] targets = [tlabel(link) for link in switchlinks] self.emit("green_switch") - self.emit(self.serialize_oparg("green", block.exitswitch)) + self.emit(switchvaridx) self.emit(len(cases), *cases) self.emit(len(targets), *targets) self.emit(*defaultrenaming) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 16:43:16 2008 @@ -1722,6 +1722,9 @@ self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_manual_marking_of_pure_functions(self): + class MyJitDriver(JitDriver): + greens = ['n'] + reds = ['i', 'res'] d = {} def h1(s): try: @@ -1731,23 +1734,30 @@ return r h1._pure_function_ = True def f(n): - hint(None, global_merge_point=True) - hint(n, concrete=True) - if n == 0: - s = 123 - else: - s = 567 - a = h1(s) - return hint(a, variable=True) + i = 1024 + while i > 0: + i >>= 1 + # + hint(n, concrete=True) + if n == 0: + s = 123 + else: + s = 567 + a = h1(s) + res = hint(a, variable=True) + # + MyJitDriver.jit_merge_point(n=n, res=res, i=i) + MyJitDriver.can_enter_jit(n=n, res=res, i=i) + return res P = StopAtXPolicy(h1) P.oopspec = True - res = self.interpret(f, [0], [], policy=P) + res = self.run(f, [0], threshold=2, policy=P) assert res == 123 * 15 - self.check_insns({}) - res = self.interpret(f, [4], [], policy=P) + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) + res = self.run(f, [4], threshold=2, policy=P) assert res == 567 * 15 - self.check_insns({}) + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_red_int_add_ovf(self): @@ -1853,6 +1863,9 @@ assert res == -7 def test_switch(self): + class MyJitDriver(JitDriver): + greens = ['m'] + reds = ['n', 'i', 'res'] def g(n, x): if n == 0: return 12 + x @@ -1865,13 +1878,21 @@ else: return 90 + x def f(n, m): - x = g(n, n) # gives a red switch - y = g(hint(m, concrete=True), n) # gives a green switch - return x - y + i = 1024 + while i > 0: + i >>= 1 + # + x = g(n, n) # gives a red switch + y = g(hint(m, concrete=True), n) # gives a green switch + res = x - y + # + MyJitDriver.jit_merge_point(n=n, m=m, res=res, i=i) + MyJitDriver.can_enter_jit(n=n, m=m, res=res, i=i) + return res - res = self.interpret(f, [7, 2], backendoptimize=True) + res = self.run(f, [7, 2], threshold=2) assert res == 78 - 90 - res = self.interpret(f, [8, 1], backendoptimize=True) + res = self.run(f, [8, 1], threshold=2) assert res == 90 - 34 def test_switch_char(self): From cami at codespeak.net Sun Mar 16 16:47:32 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sun, 16 Mar 2008 16:47:32 +0100 (CET) Subject: [pypy-svn] r52608 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080316154732.CC46916A073@codespeak.net> Author: cami Date: Sun Mar 16 16:47:32 2008 New Revision: 52608 Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Log: implemented test.. Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Sun Mar 16 16:47:32 2008 @@ -7,67 +7,66 @@ class Register(object): - - cpu = None - - def __init__(self, cpu, value=0): - self.cpu = cpu - self.set(value) - - def set(self, value): - self.value = value - self.cpu.cycles -= 1 - - def get(self): - return self.value - + + def __init__(self, cpu, value=0): + self.cpu = cpu + self.set(value) + + def set(self, value): + self.value = value + self.cpu.cycles -= 1 + + def get(self): + return self.value + # ___________________________________________________________________________ class DoubleRegister(Register): - - value = 0 - cpu = None - - def __init__(self, cpu, hi=0, lo=None): - self.cpu = cpu - self.set(hi, lo); - - def set(self, hi, lo=None): - if (lo is None): - self.value = hi - self.cpu.cycles -= 1 - else: - self.value = (hi << 8) + lo - self.cpu.cycles -= 2 - - def setHi(self, hi): - self.set(hi, this.getLo()) - - def setLo(self, lo): - self.set(self.getHi(), lo) - - def get(self): - return self.value - - def getHi(self): - return (self.value >> 8) & 0xFF - - def getLo(self): - return self.value & 0xFF - - def inc(self): - self.value = (self.value +1) & 0xFFFF - self.cpu.cycles -= 2 - - def dec(self): - self.value = (self.value - 1) & 0xFFFF - self.cpu.cycles -= 2 - - def add(self, n): - self.value = (self.value + n) & 0xFFFF - self.cpu.cycles -= 3 - - + + cpu = None + + def __init__(self, cpu, hi=0, lo=None): + self.cpu = cpu + self.set(hi, lo); + + def set(self, hi, lo=None): + if (lo is None): + self.value = hi + self.cpu.cycles -= 1 + else: + self.value = (hi << 8) + lo + self.cpu.cycles -= 2 + + def setHi(self, hi): + self.set(hi, self.getLo()) + self.cpu.cycles += 1 + + def setLo(self, lo): + self.set(self.getHi(), lo) + self.cpu.cycles += 1 + + def get(self): + return self.value + + def getHi(self): + return (self.value >> 8) & 0xFF + + def getLo(self): + return self.value & 0xFF + + def inc(self): + self.value = (self.value +1) & 0xFFFF + self.cpu.cycles -= 2 + + def dec(self): + self.value = (self.value - 1) & 0xFFFF + self.cpu.cycles -= 2 + + def add(self, n): + self.value = (self.value + n) & 0xFFFF + self.cpu.cycles -= 3 + + # ___________________________________________________________________________ class CPU(object): @@ -79,6 +78,7 @@ hl = None sp = None pc = None + af = None # Interrupt Flags ime = False @@ -97,11 +97,11 @@ def __init__(self, interrupt, memory): self.interrupt = interrupt self.memory = memory - self.bc = DoubleRegister() - self.de = DoubleRegister() - self.hl = DoubleRegister() - self.pc = DoubleRegister() - self.sp = DoubleRegister() + self.bc = DoubleRegister(self) + self.de = DoubleRegister(self) + self.hl = DoubleRegister(self) + self.pc = DoubleRegister(self) + self.sp = DoubleRegister(self) self.reset() def getAF(self): @@ -116,49 +116,61 @@ return val def getA(self): - return self.a - + return self.a + def setA(self, value): - self.a = value - self.cycles -= 1 - + self.a = value + self.cycles -= 1 + def getB(self): - return self.bc.getHi() - + return self.bc.getHi() + def setB(self, value): - self.bc.setHi(value) - + self.bc.setHi(value) + def getC(self): - return self.bc.getLo() - + return self.bc.getLo() + def setC(self, value): - self.bc.setLo(value) - + self.bc.setLo(value) + def getD(self): - return self.de.getHi() - + return self.de.getHi() + def setD(self, value): - self.de.setHi(value) - + self.de.setHi(value) + def getE(self): - return self.de.getLo() - + return self.de.getLo() + def setE(self, value): - self.de.setLo(value) - + self.de.setLo(value) + def setF(self, value): - self.f = value - self.cycles -= 1 - + self.f = value + self.cycles -= 1 + def getF(self): - return self.f + return self.f + + def getH(self): + return self.hl.getHi() + def setH(self, value): + self.hl.setHi(value) + + def getL(self): + return self.hl.getLo() + + def setL(self, value): + self.hl.setLo(value) + def getHLi(self): - return self.read(self.hl.get()) - + return self.read(self.hl.get()) + def setHLi(self, value): - self.write(self.hl.get(), value) - self.cycles += 1 + self.write(self.hl.get(), value) + self.cycles += 1 def setROM(self, banks): self.rom = banks @@ -178,14 +190,14 @@ self.cycles = 0 def zFlagAdd(self, s, resetF=False): - if (resetF): - self.f = 0 - if s == 0: + if (resetF): + self.f = 0 + if s == 0: self.f = constants.Z_FLAG def cFlagAdd(self, s, compareAnd=0x01, resetF=False): - if (resetF): - self.f = 0 + if (resetF): + self.f = 0 if (s & compareAnd) != 0: self.f += constants.C_FLAG @@ -230,13 +242,13 @@ FETCHEXEC_OP_CODES[self.fetch()](self) def execute(self, opCode): - OP_CODES[opCode](self) + OP_CODES[opCode](self) # memory Access, 1 cycle def read(self, address): self.cycles -= 1 return self.memory.read(address) - + def read(self, hi, lo): return self.read((hi << 8) + lo) @@ -263,14 +275,14 @@ self.sp.dec() # 2 cycles self.memory.write(self.sp.get(), data) - # 1 cycle + # 1 cycle def pop(self): data = self.memory.read(self.sp.get()) self.sp.inc() # 2 cycles self.cycles += 1 return data - # 4 cycles + # 4 cycles def call(self, address): self.push(self.pc.getHi()) # 2 cycles self.push(self.pc.getLo()) # 2 cycles @@ -377,39 +389,39 @@ self.f += (self.f & constants.C_FLAG) setter(data) - # 1 cycle + # 1 cycle def rlc(self, getter, setter): s = ((getter() & 0x7F) << 1) + ((getter() & 0x80) >> 7) flagsAndSetterFinish(s, getter, 0x80) - # 1 cycle + # 1 cycle def rl(self, getter, setter): s = ((getter() & 0x7F) << 1) if (self.f & constants.C_FLAG) != 0: s += 0x01 flagsAndSetterFinish(s, getter, 0x80) # 1 cycle - # 1 cycle + # 1 cycle def rrc(self, getter, setter): s = (getter() >> 1) + ((getter() & 0x01) << 7) flagsAndSetterFinish(s, getter) # 1 cycle - # 1 cycle + # 1 cycle def rr(self, getter, setter): s = (getter() >> 1) + ((self.f & constants.C_FLAG) << 3) flagsAndSetterFinish(s, getter) # 1 cycle - # 2 cycles + # 2 cycles def sla(self, getter, setter): s = (getter() << 1) & 0xFF flagsAndSetterFinish(s, getter, 0x80) # 1 cycle - # 1 cycle + # 1 cycle def sra(self, getter, setter): s = (getter() >> 1) + (getter() & 0x80) flagsAndSetterFinish(s, getter) # 1 cycle - # 1 cycle + # 1 cycle def srl(self, getter, setter): s = (getter() >> 1) flagsAndSetterFinish(s, getter) # 1 cycle @@ -421,14 +433,14 @@ self.cFlagAdd(getter(), compareAnd) setter(s) - # 1 cycle + # 1 cycle def swap(self, getter, setter): s = ((getter() << 4) & 0xF0) + ((getter() >> 4) & 0x0F) self.setF(0) # 1 cycle self.zFlagAdd(s) setter(s) - # 2 cycles + # 2 cycles def bit(self, getter, setter, n): self.f = (self.f & constants.C_FLAG) + constants.H_FLAG if (getter() & (1 << n)) == 0: @@ -461,16 +473,16 @@ self.cFlagAdd(self.a, resetF=True) self.setA(s) # 1 cycle - # 2 cycles + # 2 cycles def set(self, getter, setter, n): - self.cycles -= 1 # 1 cycle - setter(getter() | (1 << n)) # 1 cycle - + self.cycles -= 1 # 1 cycle + setter(getter() | (1 << n)) # 1 cycle + # 1 cycle def res(self, getter, setter, n): setter(getter() & (~(1 << n))) # 1 cycle - - # 1 cycle + + # 1 cycle def ld(self, getter, setter): setter(getter()) # 1 cycle @@ -480,6 +492,21 @@ hi = self.fetch() # 1 cycle self.setA(self.read(hi, lo)) # 1+1 cycles + def ld_BCi_A(self): + self.write(self.bc.get(), self.a); + self.cycles -= 2; + + def ld_DEi_A(self): + self.write(self.de.get(), self.a); + + def ld_A_BCi(self): + self.a = self.read(self.b, self.c); + self.cycles -= 2; + + def load_A_DEi(self): + self.a = self.read(self.d, self.e); + self.cycles -= 2; + # LD (rr),A 2 cycles def ld_dbRegisteri_A(self, register): self.write(register.get(), self.a) # 2 cycles @@ -492,6 +519,8 @@ self.write(address, self.sp.getLo()) # 2 cycles self.write((address + 1) & 0xFFFF, self.sp.getHi()) # 2 cycles self.cycles += 1 + + # LD (nnnn),A 4 cycles def ld_mem_A(self): @@ -526,6 +555,7 @@ # LDH (C),A 2 cycles def ldh_Ci_A(self): self.write(0xFF00 + self.bc.getLo(), self.a) # 2 cycles + # LDI (HL),A 2 cycles def ldi_HLi_A(self): @@ -555,13 +585,13 @@ self.push(self.f) # 2 cycles # 3 cycles - def pop_dbRegister(self, register, getter): - b = getter() # 1 cycle - a = getter() # 1 cycle - register.set(a, b) # 2 cycles + def pop_dbRegister(self, register, getter): + b = getter() # 1 cycle + a = getter() # 1 cycle + register.set(a, b) # 2 cycles self.cycles += 1 - - # 3 cycles + + # 3 cycles def pop_AF(self): self.f = self.pop() # 1 cycle self.setA(self.pop()) # 1+1 cycle @@ -723,7 +753,7 @@ self.ime = False self.cycles -= 1; - # 1 cycle + # 1 cycle def ei(self): # enable interrupts self.ime = True @@ -748,7 +778,7 @@ SINGLE_OP_CODES = [ - (0x00, CPU.nop) + (0x00, CPU.nop), (0x08, CPU.load_mem_SP), (0x10, CPU.stop), (0x18, CPU.jr_nn), @@ -783,16 +813,16 @@ (0xE8, CPU.add_SP_nn), (0xF0, CPU.ldh_A_mem), (0xF8, CPU.ld_HL_SP_nn), - (0xCB, CPU.fetchExecute) + (0xCB, CPU.fetchExecute), (0xCD, CPU.call_nnnn), - (0xC6, CPU.add_A_nn), - (0xCE, CPU.adc_A_nn), - (0xD6, CPU.sub_A_nn), - (0xDE, CPU.sbc_A_nn), - (0xE6, CPU.and_A_nn), - (0xEE, CPU.xor_A_nn), - (0xF6, CPU.or_A_nn), - (0xFE, CPU.cp_A_nn), + (0xC6, lambda s: CPU.addA(s, CPU.fetch(s))), + (0xCE, lambda s: CPU.adc(s, CPU.fetch(s))), + (0xD6, lambda s: CPU.sub(s, CPU.fetch(s))), + (0xDE, lambda s: CPU.sbc(s, CPU.fetch(s))), + (0xE6, lambda s: CPU.AND(s, CPU.fetch(s))), + (0xEE, lambda s: CPU.XOR(s, CPU.fetch(s))), + (0xF6, lambda s: CPU.OR(s, CPU.fetch(s))), + (0xFE, lambda s: CPU.cpA(s, CPU.fetch(s))), (0xC7, lambda s: CPU.rst(s, 0x00)), (0xCF, lambda s: CPU.rst(s, 0x08)), (0xD7, lambda s: CPU.rst(s, 0x10)), @@ -800,22 +830,22 @@ (0xE7, lambda s: CPU.rst(s, 0x20)), (0xEF, lambda s: CPU.rst(s, 0x28)), (0xF7, lambda s: CPU.rst(s, 0x30)), - (0xFF, lambda s: CPU.rst(s, 0x38)) - (0x76, CPU.halt), + (0xFF, lambda s: CPU.rst(s, 0x38)), + (0x76, CPU.halt) ] REGISTER_GROUP_OP_CODES = [ (0x04, 0x08, CPU.inc), (0x05, 0x08, CPU.dec), - (0x80, 0x01, CPU.add_A), - (0x88, 0x01, CPU.adc_A), - (0x90, 0x01, CPU.sub_A), - (0x98, 0x01, CPU.sbc_A), - (0xA0, 0x01, CPU.and_A), - (0xA8, 0x01, CPU.xor_A), - (0xB0, 0x01, CPU.or_A), - (0xB8, 0x01, CPU.cp_A), + (0x80, 0x01, CPU.addA), + (0x88, 0x01, CPU.adc), + (0x90, 0x01, CPU.sub), + (0x98, 0x01, CPU.sbc), + (0xA0, 0x01, CPU.AND), + (0xA8, 0x01, CPU.XOR), + (0xB0, 0x01, CPU.OR), + (0xB8, 0x01, CPU.cpA), (0x00, 0x01, CPU.rlc), (0x08, 0x01, CPU.rrc), (0x10, 0x01, CPU.rl), @@ -827,57 +857,58 @@ (0x40, 0x01, CPU.bit, range(0, 8)), (0xC0, 0x01, CPU.set, range(0, 8)), (0x80, 0x01, CPU.res, range(0, 8)), - (0x06, 0x08, CPU.ld_nn), + #(0x06, 0x08, CPU.ld_nn), (0x40, 0x01, CPU.res, range(0, 8)) ] GROUP_CODES_GETTERS = (CPU.getB, CPU.getC, CPU.getD, CPU.getE, CPU.getH, CPU.getL, CPU.getHLi, CPU.getA) GROUP_CODES_SETTERS = (CPU.setB, CPU.setC, CPU.setD, CPU.setE, CPU.setH, CPU.setL, CPU.setHLi, CPU.setA) -def create_group_op_codes(table): - opCodes = [None] * 0xFF; - for entry in table: - startCode = entry[0] - step = entry[1] - method = entry[2] - getters = GROUP_CODES_GETTERS - if len(entry) == 4: - for i in range(0, 8): - for n in entry[3]: - opCodes[startCode+step*i] = lambda me: method(me, GROUP_CODES_GETTERS[i], GROUP_CODES_SETTERS[i], n) - else: - for i in range(0, 8): - opCodes[startCode+step*i] = lambda me: method(me, GROUP_CODES_GETTERS[i], GROUP_CODES_SETTERS[i]) - return opCodes -SINGLE_OP_CODES.extend(create_group_op_codes(REGISTER_GROUP_OP_CODES)) - - +def create_group_op_codes(): + opCodes = [None] * 0xFF; + for entry in REGISTER_GROUP_OP_CODES: + startCode = entry[0] + step = entry[1] + method = entry[2] + getters = GROUP_CODES_GETTERS + if len(entry) == 4: + for i in range(0, 8): + for n in entry[3]: + opCodes[startCode+step*i] = lambda me: method(me, GROUP_CODES_GETTERS[i], GROUP_CODES_SETTERS[i], n) + else: + for i in range(0, 8): + opCodes[startCode+step*i] = lambda me: method(me, GROUP_CODES_GETTERS[i], GROUP_CODES_SETTERS[i]) + return opCodes +SINGLE_OP_CODES.extend(create_group_op_codes()) + + + REGISTER_OP_CODES = [ - (0x01, 0x10, CPU.ld_nnnn, [BC, DE, HL, SP]), - (0x09, 0x10, CPU.addHL, [BC, DE, HL, SP]), - (0x03, 0x10, CPU.inc, [BC, DE, HL, SP]), - (0x0B, 0x10, CPU.dec, [BC, DE, HL, SP]), - - (0xC0, 0x08, CPU.ret, [NZ, Z, NC, C]), - (0xC2, 0x08, CPU.jp_nnnn, [NZ, Z, NC, C]), - (0xC4, 0x08, CPU.call_nnnn, [NZ, Z, NC, C]), - (0x20, 0x08, CPU.jr_nn, [NZ, Z, NC, C]), + (0x01, 0x10, lambda s: CPU.pop_dbRegister(s, CPU.fetch), [CPU.bc, CPU.de, CPU.hl, CPU.sp]), + (0x09, 0x10, CPU.addHL, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), + (0x03, 0x10, CPU.inc, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), + (0x0B, 0x10, CPU.dec, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), + + #(0xC0, 0x08, CPU.ret, [NZ, Z, NC, C]), + #(0xC2, 0x08, CPU.jp_nnnn, [NZ, Z, NC, C]), + #(0xC4, 0x08, CPU.call_nnnn, [NZ, Z, NC, C]), + #(0x20, 0x08, CPU.jr_nn, [NZ, Z, NC, C]),""" - (0xC1, 0x10, CPU.pop, [BC, DE, HL, AF]), - (0xC5, 0x10, CPU.push, [BC, DE, HL, AF]) + (0xC1, 0x10, CPU.pop, [CPU.bc, CPU.de, CPU.hl, CPU.af]), + (0xC5, 0x10, CPU.push, [CPU.bc, CPU.de, CPU.hl, CPU.af]) ] -def create_register_op_codes(table): - opCodes = []; - for entry in table: - startCode = entry[0] - step = entry[1] - commandBase = entry[2] - changing = entry[3] - return opCodes +def create_register_op_codes(): + opCodes = []; + for entry in REGISTER_OP_CODES: + startCode = entry[0] + step = entry[1] + commandBase = entry[2] + changing = entry[3] + return opCodes -SINGLE_OP_CODES.extend(create_register_op_codes(REGISTER_OP_CODES)) +SINGLE_OP_CODES.extend(create_register_op_codes()) def initialize_op_code_table(table): @@ -892,5 +923,5 @@ assert None not in result return result -OP_CODES = initialize_op_code_table(SINGLE_OP_CODES) +#OP_CODES = initialize_op_code_table(SINGLE_OP_CODES) Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- (empty file) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Sun Mar 16 16:47:32 2008 @@ -0,0 +1,100 @@ +from pypy.lang.gameboy.cpu import CPU, Register, DoubleRegister + +def get_cpu(): + return CPU([None]*256, None) + +# ------------------------------------------------------------ +# TEST REGISTER +def test_register_constructor(): + register = Register(get_cpu()) + assert register.get() == 0 + value = 10 + register = Register(get_cpu(), value) + assert register.get() == value + +def test_register(): + register = Register(get_cpu()) + value = 2 + oldCycles = register.cpu.cycles + register.set(value) + assert register.get() == value + assert oldCycles-register.cpu.cycles == 1 + +# ------------------------------------------------------------ +# TEST DOUBLE REGISTER + +def test_double_register_constructor(): + register = DoubleRegister(get_cpu()) + assert register.get() == 0 + assert register.getHi() == 0 + assert register.getLo() == 0 + value = 0x1234 + register = DoubleRegister(get_cpu(), value) + assert register.get() == value + +def test_double_register(): + register = DoubleRegister(get_cpu()) + value = 0x1234 + oldCycles = register.cpu.cycles + register.set(value) + assert oldCycles-register.cpu.cycles == 1 + assert register.get() == value + +def test_double_register_hilo(): + register = DoubleRegister(get_cpu()) + value = 0x1234 + valueHi = 0x12 + valueLo = 0x34 + oldCycles = register.cpu.cycles + register.set(valueHi, valueLo) + assert oldCycles-register.cpu.cycles == 2 + assert register.get() == value + assert register.getHi() == valueHi + assert register.getLo() == valueLo + + valueHi = 0x56 + oldCycles = register.cpu.cycles + register.setHi(valueHi) + assert oldCycles-register.cpu.cycles == 1 + assert register.getHi() == valueHi + assert register.getLo() == valueLo + + valueLo = 0x78 + oldCycles = register.cpu.cycles + register.setLo(valueLo) + assert oldCycles-register.cpu.cycles == 1 + assert register.getHi() == valueHi + assert register.getLo() == valueLo + + +def test_double_register_methods(): + value = 0x1234 + register = DoubleRegister(get_cpu(), value) + + oldCycles = register.cpu.cycles + register.inc() + assert oldCycles-register.cpu.cycles == 2 + assert register.get() == value+1 + + oldCycles = register.cpu.cycles + register.dec() + assert oldCycles-register.cpu.cycles == 2 + assert register.get() == value + + addValue = 0x1001 + oldCycles = register.cpu.cycles + register.add(addValue) + assert oldCycles-register.cpu.cycles == 3 + assert register.get() == value+addValue + + + +def setup_module(module): + pass + + + +def test_cycles(): + pass + + From arigo at codespeak.net Sun Mar 16 17:13:44 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 17:13:44 +0100 (CET) Subject: [pypy-svn] r52609 - in pypy/branch/jit-hotpath/pypy/jit: hintannotator rainbow rainbow/test Message-ID: <20080316161344.190D116A087@codespeak.net> Author: arigo Date: Sun Mar 16 17:13:43 2008 New Revision: 52609 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/bookkeeper.py pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: Metacall stubs. Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/bookkeeper.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/bookkeeper.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/bookkeeper.py Sun Mar 16 17:13:43 2008 @@ -101,6 +101,7 @@ newgraph = FunctionGraph('%s_%s' % (graph.name, suffix), newstartblock) newgraph.getreturnvar().concretetype = v_res.concretetype newstartblock.closeblock(Link([v_res], newgraph.returnblock)) + newgraph.ts_stub_for = graph return newgraph Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 16 17:13:43 2008 @@ -301,6 +301,11 @@ colororder = None owncalldesc = CallDesc(self.RGenOp, self.exceptiondesc, lltype.Ptr(FUNCTYPE), colororder) + # detect the special ts_stub or ts_metacall graphs and replace + # a real function pointer to them with a function pointer to + # the graph they are stubs for + if hasattr(graph, 'ts_stub_for'): + graph = graph.ts_stub_for ownfnptr = lltype.functionptr(FUNCTYPE, graph.name, graph=graph) gv_ownfnptr = self.RGenOp.constPrebuiltGlobal(ownfnptr) return owncalldesc, gv_ownfnptr Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 17:13:43 2008 @@ -3,7 +3,7 @@ from pypy.rlib.jit import JitDriver, hint, JitHintError from pypy.rlib.debug import ll_assert from pypy.rlib.objectmodel import keepalive_until_here -from pypy.jit.hintannotator.policy import StopAtXPolicy +from pypy.jit.hintannotator.policy import HintAnnotatorPolicy, StopAtXPolicy from pypy.jit.rainbow.test import test_hotpath import sys @@ -1919,7 +1919,6 @@ assert res == 56 - 90 def test_simple_substitute_graph(self): - py.test.skip("fix this test") class MetaG: def __init__(self, codewriter): @@ -1935,13 +1934,29 @@ bbox.getgenvar(jitstate)) return IntRedBox(abox.kind, gv_result) + class MyJitDriver(JitDriver): + greens = [] + reds = ['a', 'b', 'i', 'res'] + + A = lltype.GcArray(lltype.Signed) + def g(a, b): return a + b def f(a, b): - x = g(a, b) - y = g(b, a) - return x + y + res = lltype.malloc(A, 20) + i = 0 + while i < 10: + # + x = g(a, b) + y = g(b, a) + res[2*i] = x + res[2*i+1] = y + # + MyJitDriver.jit_merge_point(a=a, b=b, res=res, i=i) + MyJitDriver.can_enter_jit(a=a, b=b, res=res, i=i) + i += 1 + return res class MyPolicy(HintAnnotatorPolicy): novirtualcontainer = True @@ -1952,9 +1967,11 @@ else: return True - res = self.interpret(f, [3, 6], policy=MyPolicy()) - assert res == 0 - self.check_insns({'int_add': 1, 'int_sub': 2}) + res = self.run(f, [7, 1], threshold=3, policy=MyPolicy()) + assert list(res) == [8, 8, 8, 8, 8, 8, # direct run + 8, 8, 8, 8, # fallback interp run + 6, -6, 6, -6, 6, -6, 6, -6, 6, -6] # compiled + self.check_insns_in_loops(int_sub=2) def test_substitute_graph_void(self): py.test.skip("fix this test") From cfbolz at codespeak.net Sun Mar 16 17:19:35 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 16 Mar 2008 17:19:35 +0100 (CET) Subject: [pypy-svn] r52610 - in pypy/branch/jit-hotpath/pypy/jit: hintannotator/test rainbow timeshifter Message-ID: <20080316161935.7E8AE16A064@codespeak.net> Author: cfbolz Date: Sun Mar 16 17:19:34 2008 New Revision: 52610 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/greenkey.py Log: make the profiling around promotes less heavy-weight Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py Sun Mar 16 17:19:34 2008 @@ -11,10 +11,10 @@ class TestHotPath(AbstractAnnotatorTest): type_system = 'lltype' - def hannotate(self, func, argtypes, policy=P_HOTPATH): + def hannotate(self, func, argtypes, policy=P_HOTPATH, backendoptimize=True): # change default policy AbstractAnnotatorTest.hannotate(self, func, argtypes, policy=policy, - backendoptimize=True) + backendoptimize=backendoptimize) def test_simple_loop(self): class MyJitDriver(JitDriver): @@ -43,3 +43,24 @@ assert len(graphs) == 1 assert ll_function is graphs[0].func assert 'int_mul' not in summary(graphs[0]) + + def test_call(self): + def add(count, x, y): + result = x + y + can_enter_jit(red=(count, x, y)) + return result + add._dont_inline_ = True + def sub(x, y): + return x - y + sub._dont_inline_ = True + def main(count, x, y): + while True: + jit_merge_point(red=(count, x, y)) + count -= 1 + if not count: + break + if count % 3 == 0: + x = add(count, x, y) + else: + y = sub(x, y) + self.hannotate(main, [int, int, int]) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Sun Mar 16 17:19:34 2008 @@ -2,6 +2,7 @@ RPython support code for the hotpath policy. """ +from pypy.jit.codegen.i386.rgenop import cast_whatever_to_int from pypy.jit.timeshifter import rtimeshift, rvalue from pypy.jit.timeshifter.greenkey import KeyDesc, GreenKey, newgreendict from pypy.rlib.objectmodel import we_are_translated, specialize @@ -242,20 +243,19 @@ def __init__(self, jitstate, hotrunnerdesc, promotebox, hotpromotiondesc): FallbackPoint. __init__(self, jitstate, hotrunnerdesc, promotebox) self.hotpromotiondesc = hotpromotiondesc - self.counters = newgreendict() + self.counters = {} @specialize.arglltype(1) def check_should_compile(self, value): - # XXX incredibly heavy for a supposely lightweight profiling - gv_value = self.hotrunnerdesc.interpreter.rgenop.genconst(value) - greenkey = GreenKey([gv_value], self.hotpromotiondesc.greenkeydesc) - counter = self.counters.get(greenkey, 0) + 1 + # XXX unsafe with a moving GC + hash = cast_whatever_to_int(lltype.typeOf(value), value) + counter = self.counters.get(hash, 0) + 1 threshold = self.hotrunnerdesc.threshold assert counter > 0, ( "reaching a fallback point for an already-compiled path") if counter >= threshold: return True - self.counters[greenkey] = counter + self.counters[hash] = counter return False @specialize.arglltype(2) @@ -265,10 +265,11 @@ @specialize.arglltype(1) def compile_hot_path(self, value): + hash = cast_whatever_to_int(lltype.typeOf(value), value) gv_value = self.hotrunnerdesc.interpreter.rgenop.genconst(value) - self._compile_hot_path(gv_value) + self._compile_hot_path(gv_value, hash) - def _compile_hot_path(self, gv_value): + def _compile_hot_path(self, gv_value, hash): # clone the jitstate memo = rvalue.copy_memo() jitstate = self.saved_jitstate.clone(memo) @@ -281,8 +282,7 @@ self.prepare_compiler(interpreter, gv_value) compile(interpreter) # done - greenkey = GreenKey([gv_value], self.hotpromotiondesc.greenkeydesc) - self.counters[greenkey] = -1 # means "compiled" + self.counters[hash] = -1 # means "compiled" def prepare_compiler(self, interpreter, gv_value): interpreter.green_result(gv_value) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/greenkey.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/greenkey.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/greenkey.py Sun Mar 16 17:19:34 2008 @@ -4,6 +4,8 @@ from pypy.rlib.objectmodel import r_dict from pypy.rpython.lltypesystem import lltype +# XXX green dicts are unsafe with moving GCs + class KeyDesc(object): __metaclass__ = cachedtype From cami at codespeak.net Sun Mar 16 17:23:05 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sun, 16 Mar 2008 17:23:05 +0100 (CET) Subject: [pypy-svn] r52611 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080316162305.A01FA16A083@codespeak.net> Author: cami Date: Sun Mar 16 17:23:05 2008 New Revision: 52611 Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cartridge.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_gameboy.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_interrupt.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_ram.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_serial.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_sound.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_video.py Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Log: added test file templates. added "unfinished" CPU Cycles test fixed minor number assignement bug in DoubleRegister Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Sun Mar 16 17:23:05 2008 @@ -13,7 +13,7 @@ self.set(value) def set(self, value): - self.value = value + self.value = value & 0xFF self.cpu.cycles -= 1 def get(self): @@ -29,19 +29,19 @@ self.cpu = cpu self.set(hi, lo); - def set(self, hi, lo=None): + def set(self, hi=0, lo=None): if (lo is None): - self.value = hi + self.value = (hi & 0xFFFF) self.cpu.cycles -= 1 else: - self.value = (hi << 8) + lo + self.value = ((hi & 0xFF) << 8) + (lo & 0xFF) self.cpu.cycles -= 2 - def setHi(self, hi): + def setHi(self, hi=0): self.set(hi, self.getLo()) self.cpu.cycles += 1 - def setLo(self, lo): + def setLo(self, lo=0): self.set(self.getHi(), lo) self.cpu.cycles += 1 @@ -62,7 +62,7 @@ self.value = (self.value - 1) & 0xFFFF self.cpu.cycles -= 2 - def add(self, n): + def add(self, n=2): self.value = (self.value + n) & 0xFFFF self.cpu.cycles -= 3 @@ -239,9 +239,11 @@ # Execution def fetchExecute(self): - FETCHEXEC_OP_CODES[self.fetch()](self) + global FETCHEXEC_OP_CODES + FETCHEXEC_OP_CODES[self.fetch()](self) def execute(self, opCode): + global OP_CODES OP_CODES[opCode](self) # memory Access, 1 cycle @@ -914,14 +916,15 @@ def initialize_op_code_table(table): result = [None] * 256 for entry in table: + if entry is not tuple: + continue if len(entry) == 2: positions = [entry[0]] else: positions = range(entry[0], entry[1]+1) for pos in positions: result[pos] = entry[-1] - assert None not in result return result -#OP_CODES = initialize_op_code_table(SINGLE_OP_CODES) +OP_CODES = initialize_op_code_table(SINGLE_OP_CODES) Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cartridge.py ============================================================================== Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Sun Mar 16 17:23:05 2008 @@ -48,9 +48,9 @@ oldCycles = register.cpu.cycles register.set(valueHi, valueLo) assert oldCycles-register.cpu.cycles == 2 - assert register.get() == value assert register.getHi() == valueHi assert register.getLo() == valueLo + assert register.get() == value valueHi = 0x56 oldCycles = register.cpu.cycles @@ -88,13 +88,31 @@ assert register.get() == value+addValue +# ------------------------------------------------------------ +# TEST CPU -def setup_module(module): - pass - - +OPCODE_CYCLES = [ + (0x00, 1), + (0x08, 5), + (0x10, 0), + (0x18, 3), + (0x01, 0x31, 0x10, 3) +] def test_cycles(): - pass - + cpu = get_cpu() + for entry in OPCODE_CYCLES: + if len(entry) == 2: + test_cycle(cpu, entry[0], entry[1]) + elif len(entry) == 4: + for opCode in range(entry[0], entry[1], entry[2]): + test_cycle(cpu, opCode, entry[3]) + + + +def test_cycle(cpu, opCode, cycles): + oldCycles = cpu.cycles + cpu.execute(opCode) + assert oldCycles - cpu.cycles == cycles + Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_gameboy.py ============================================================================== Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_interrupt.py ============================================================================== Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py ============================================================================== Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_ram.py ============================================================================== Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_serial.py ============================================================================== Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_sound.py ============================================================================== Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py ============================================================================== Added: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_video.py ============================================================================== From cfbolz at codespeak.net Sun Mar 16 17:25:39 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 16 Mar 2008 17:25:39 +0100 (CET) Subject: [pypy-svn] r52612 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080316162539.DCA1416A0B5@codespeak.net> Author: cfbolz Date: Sun Mar 16 17:25:39 2008 New Revision: 52612 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: typo Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Sun Mar 16 17:25:39 2008 @@ -544,7 +544,7 @@ def unbox_indexes(jitstate, indexboxes): indexes_gv = [] - for box in indexboxes: + for indexbox in indexboxes: if not indexbox.is_constant(): return None # non-constant array index indexes_gv.append(indexbox.getgenvar(jitstate)) From arigo at codespeak.net Sun Mar 16 17:26:03 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 17:26:03 +0100 (CET) Subject: [pypy-svn] r52613 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080316162603.4350116A0B9@codespeak.net> Author: arigo Date: Sun Mar 16 17:26:02 2008 New Revision: 52613 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: Finished the first pass of porting of test_hp_interpreter. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 16 17:26:02 2008 @@ -1974,7 +1974,6 @@ self.check_insns_in_loops(int_sub=2) def test_substitute_graph_void(self): - py.test.skip("fix this test") class MetaG: def __init__(self, codewriter): @@ -1989,6 +1988,10 @@ gv_result = builder.genop1("int_neg", mbox.getgenvar(jitstate)) return IntRedBox(mbox.kind, gv_result) + class MyJitDriver(JitDriver): + greens = ['m'] + reds = ['n', 'i', 'res'] + class Fz(object): x = 10 @@ -2001,10 +2004,18 @@ fz = Fz() def f(n, m): - x = g(fz, n) - y = g(fz, m) - hint(y, concrete=True) - return x + g(fz, y) + i = 1024 + while i > 0: + i >>= 1 + # + x = g(fz, n) # this goes via MetaG + y = g(fz, m) # but this g() runs directly (green call) + hint(y, concrete=True) + res = x + g(fz, y) # this g() too + # + MyJitDriver.jit_merge_point(n=n, m=m, res=res, i=i) + MyJitDriver.can_enter_jit(n=n, m=m, res=res, i=i) + return res class MyPolicy(HintAnnotatorPolicy): novirtualcontainer = True @@ -2015,9 +2026,10 @@ else: return True - res = self.interpret(f, [3, 6], policy=MyPolicy()) + res = self.run(f, [3, 6], threshold=2, policy=MyPolicy()) assert res == -3 + 600 - self.check_insns({'int_neg': 1, 'int_add': 1}) + self.check_insns_in_loops({'int_neg': 1, 'int_add': 1, + 'int_gt': 1, 'int_rshift': 1}) def test_hash_of_green_string_is_green(self): py.test.skip("unfortunately doesn't work") @@ -2063,29 +2075,55 @@ def _freeze_(self): return True + class MyJitDriver(JitDriver): + greens = [] + reds = ['space', 'x', 'y', 'i', 'res'] + def f(space, x, y): - if space.is_true(x): - return space.add(x, y) - return space.sub(6, y) + i = 1024 + while i > 0: + i >>= 1 + # + if space.is_true(x): + res = space.add(x, y) + else: + res = space.sub(6, y) + # + MyJitDriver.jit_merge_point(space=space, x=x, y=y, + res=res, i=i) + MyJitDriver.can_enter_jit(space=space, x=x, y=y, + res=res, i=i) + return res def main1(x, y): return f(space, x, y) space = Space() - res = self.interpret(main1, [5, 6]) + res = self.run(main1, [5, 6], threshold=2) assert res == 11 def g(space, x, y): return space.add(x, y) def f(space, x, y): - if space.is_true(x): - return g(space, x, y) - return space.sub(6, y) + i = 1024 + while i > 0: + i >>= 1 + # + if space.is_true(x): + res = g(space, x, y) + else: + res = space.sub(6, y) + # + MyJitDriver.jit_merge_point(space=space, x=x, y=y, + res=res, i=i) + MyJitDriver.can_enter_jit(space=space, x=x, y=y, + res=res, i=i) + return res def main2(x, y): return f(space, x, y) - res = self.interpret(main2, [5, 6], policy=StopAtXPolicy(g)) + res = self.run(main2, [5, 6], threshold=2, policy=StopAtXPolicy(g)) assert res == 11 From arigo at codespeak.net Sun Mar 16 17:30:05 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 17:30:05 +0100 (CET) Subject: [pypy-svn] r52614 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080316163005.B3DEF16A0F9@codespeak.net> Author: arigo Date: Sun Mar 16 17:30:05 2008 New Revision: 52614 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Log: Import no longer used. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Sun Mar 16 17:30:05 2008 @@ -4,7 +4,6 @@ from pypy.jit.codegen.i386.rgenop import cast_whatever_to_int from pypy.jit.timeshifter import rtimeshift, rvalue -from pypy.jit.timeshifter.greenkey import KeyDesc, GreenKey, newgreendict from pypy.rlib.objectmodel import we_are_translated, specialize from pypy.rpython.annlowlevel import cachedtype, base_ptr_lltype from pypy.rpython.annlowlevel import llhelper @@ -89,7 +88,6 @@ def __init__(self, ERASED, RGenOp): self.RGenOp = RGenOp - self.greenkeydesc = KeyDesc(RGenOp, ERASED) pathkind = "%s path" % (ERASED,) def ll_reach_fallback_point(fallback_point_ptr, value, framebase): From cami at codespeak.net Sun Mar 16 17:30:36 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sun, 16 Mar 2008 17:30:36 +0100 (CET) Subject: [pypy-svn] r52615 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080316163036.53EB516A0EB@codespeak.net> Author: cami Date: Sun Mar 16 17:30:36 2008 New Revision: 52615 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Log: added getter test Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py Sun Mar 16 17:30:36 2008 @@ -63,7 +63,13 @@ N_FLAG = 0x40 H_FLAG = 0x20 -#CPU OP CODES +RESET_A = 0x01 +RESET_F = 0x80 +RESET_BC = 0x0013 +RESET_DE = 0x00D8 +RESET_HL = 0x014D +RESET_SP = 0xFFFE +RESET_PC = 0x0100 # ___________________________________________________________________________ Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Sun Mar 16 17:30:36 2008 @@ -104,6 +104,20 @@ self.sp = DoubleRegister(self) self.reset() + def reset(self): + self.a = 0x01 + self.f = 0x80 + self.bc.set(0x0013) + self.de.set(0x00D8) + self.hl.set(0x014D) + self.sp.set(0xFFFE) + self.pc.set(0x0100) + + self.ime = False + self.halted = False + + self.cycles = 0 + def getAF(self): return (self.a << 8) + self.f @@ -175,19 +189,6 @@ def setROM(self, banks): self.rom = banks - def reset(self): - self.a = 0x01 - self.f = 0x80 - self.bc.set(0x0013) - self.de.set(0x00D8) - self.hl.set(0x014D) - self.sp.set(0xFFFE) - self.pc.set(0x0100) - - self.ime = False - self.halted = False - - self.cycles = 0 def zFlagAdd(self, s, resetF=False): if (resetF): Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Sun Mar 16 17:30:36 2008 @@ -1,4 +1,5 @@ from pypy.lang.gameboy.cpu import CPU, Register, DoubleRegister +import pypy.lang.gameboy.constants def get_cpu(): return CPU([None]*256, None) @@ -91,6 +92,16 @@ # ------------------------------------------------------------ # TEST CPU +def test_getters(): + cpu = get_cpu() + assert cpu.getA() == constants.RESET_A + assert cpu.getF() == constants.RESET_F + assert cpu.bc.get() == constants.RESET_BC + assert cpu.de.get() == constants.RESET_DE + assert cpu.pc.get() == constants.RESET_PC + assert cpu.sp.get() == constants.RESET_SP + + OPCODE_CYCLES = [ (0x00, 1), (0x08, 5), From fijal at codespeak.net Sun Mar 16 17:56:42 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 16 Mar 2008 17:56:42 +0100 (CET) Subject: [pypy-svn] r52616 - pypy/extradoc/talk/pycon2008 Message-ID: <20080316165642.2DD8116A080@codespeak.net> Author: fijal Date: Sun Mar 16 17:56:39 2008 New Revision: 52616 Added: pypy/extradoc/talk/pycon2008/overview1.png - copied unchanged from r52562, pypy/extradoc/talk/sfi2008/overview1.png pypy/extradoc/talk/pycon2008/overview2.png - copied unchanged from r52562, pypy/extradoc/talk/sfi2008/overview2.png pypy/extradoc/talk/pycon2008/sprintintro.txt - copied, changed from r52562, pypy/extradoc/talk/sfi2008/talk.txt Modified: pypy/extradoc/talk/pycon2008/pytest.txt Log: shamelessly steal sprint intro from sfi talk Modified: pypy/extradoc/talk/pycon2008/pytest.txt ============================================================================== --- pypy/extradoc/talk/pycon2008/pytest.txt (original) +++ pypy/extradoc/talk/pycon2008/pytest.txt Sun Mar 16 17:56:39 2008 @@ -30,8 +30,8 @@ * generative tests:: - def test_one(): - yield function, arg + def test_one(): + yield function, arg Automatic test collection ========================== From cfbolz at codespeak.net Sun Mar 16 18:01:43 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 16 Mar 2008 18:01:43 +0100 (CET) Subject: [pypy-svn] r52617 - pypy/branch/gameboy-emulator/pypy/lang/gameboy/test Message-ID: <20080316170143.586D416A092@codespeak.net> Author: cfbolz Date: Sun Mar 16 18:01:42 2008 New Revision: 52617 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Log: fix a test Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Sun Mar 16 18:01:42 2008 @@ -114,14 +114,14 @@ cpu = get_cpu() for entry in OPCODE_CYCLES: if len(entry) == 2: - test_cycle(cpu, entry[0], entry[1]) + cycletest(cpu, entry[0], entry[1]) elif len(entry) == 4: for opCode in range(entry[0], entry[1], entry[2]): - test_cycle(cpu, opCode, entry[3]) + cycletest(cpu, opCode, entry[3]) -def test_cycle(cpu, opCode, cycles): +def cycletest(cpu, opCode, cycles): oldCycles = cpu.cycles cpu.execute(opCode) assert oldCycles - cpu.cycles == cycles From cfbolz at codespeak.net Sun Mar 16 18:12:28 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 16 Mar 2008 18:12:28 +0100 (CET) Subject: [pypy-svn] r52618 - in pypy/branch/jit-hotpath/pypy/jit: rainbow timeshifter Message-ID: <20080316171228.1A2EE16A088@codespeak.net> Author: cfbolz Date: Sun Mar 16 18:12:27 2008 New Revision: 52618 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: more typo-level fixes Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 16 18:12:27 2008 @@ -1072,7 +1072,8 @@ self.emit(func, pos) self.emit(len(emitted_args)) self.emit(*emitted_args) - self.register_greenvar(op.result) + if op.result.concretetype != lltype.Void: + self.register_greenvar(op.result) def handle_residual_call(self, op, withexc): fnptr = op.args[0] Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Sun Mar 16 18:12:27 2008 @@ -616,6 +616,7 @@ def after_residual_call(jitstate, exceptiondesc, check_forced): gv_flags = gvflags_after_residual_call(jitstate, exceptiondesc, check_forced) + builder = jitstate.curbuilder if gv_flags is None: gv_flags = builder.rgenop.constPrebuiltGlobal(0) return rvalue.IntRedBox(builder.rgenop.kindToken(lltype.Signed), gv_flags) From tverwaes at codespeak.net Sun Mar 16 18:21:33 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Sun, 16 Mar 2008 18:21:33 +0100 (CET) Subject: [pypy-svn] r52619 - pypy/branch/gameboy-emulator/pypy/lang/gameboy/test Message-ID: <20080316172133.CD99716A08C@codespeak.net> Author: tverwaes Date: Sun Mar 16 18:21:33 2008 New Revision: 52619 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Log: fixing import (fixing test) Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Sun Mar 16 18:21:33 2008 @@ -1,5 +1,5 @@ from pypy.lang.gameboy.cpu import CPU, Register, DoubleRegister -import pypy.lang.gameboy.constants +from pypy.lang.gameboy import constants def get_cpu(): return CPU([None]*256, None) From cami at codespeak.net Sun Mar 16 20:42:45 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sun, 16 Mar 2008 20:42:45 +0100 (CET) Subject: [pypy-svn] r52621 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080316194245.735BE169EBB@codespeak.net> Author: cami Date: Sun Mar 16 20:42:44 2008 New Revision: 52621 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Log: replaced all tabs with spaces. added skip skiptest Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Sun Mar 16 20:42:44 2008 @@ -4,30 +4,30 @@ from pypy.lang.gameboy import constants -def hasCartridgeBattery(self, cartridgeType): - return (cartridgeType == constants.TYPE_MBC1_RAM_BATTERY \ - or cartridgeType == constants.TYPE_MBC2_BATTERY \ - or cartridgeType == constants.TYPE_MBC3_RTC_BATTERY \ - or cartridgeType == constants.TYPE_MBC3_RTC_RAM_BATTERY \ - or cartridgeType == constants.TYPE_MBC3_RAM_BATTERY \ - or cartridgeType == constants.TYPE_MBC5_RAM_BATTERY \ - or cartridgeType == constants.TYPE_MBC5_RUMBLE_RAM_BATTERY \ - or cartridgeType == constants.TYPE_HUC1_RAM_BATTERY); +def hasCartridgeBattery(self, cartridgeType): + return (cartridgeType == constants.TYPE_MBC1_RAM_BATTERY \ + or cartridgeType == constants.TYPE_MBC2_BATTERY \ + or cartridgeType == constants.TYPE_MBC3_RTC_BATTERY \ + or cartridgeType == constants.TYPE_MBC3_RTC_RAM_BATTERY \ + or cartridgeType == constants.TYPE_MBC3_RAM_BATTERY \ + or cartridgeType == constants.TYPE_MBC5_RAM_BATTERY \ + or cartridgeType == constants.TYPE_MBC5_RUMBLE_RAM_BATTERY \ + or cartridgeType == constants.TYPE_HUC1_RAM_BATTERY); def hasCartridgeType(self, catridgeType): - return constants.CATRIDGE_TYPE_MAPPING.has_key(cartridgeType); + return constants.CATRIDGE_TYPE_MAPPING.has_key(cartridgeType); def createBankController(self, cartridgeType, rom, ram, clock): - if hasCartridgeType(cartridgeType): - return constants.CATRIDGE_TYPE_MAPPING[cartridgeType](rom, ram, clock); - else: - raise InvalidMemoryBankTypeError("Unsupported memory bank controller (0x"+hex(cartridgeType)+")") + if hasCartridgeType(cartridgeType): + return constants.CATRIDGE_TYPE_MAPPING[cartridgeType](rom, ram, clock); + else: + raise InvalidMemoryBankTypeError("Unsupported memory bank controller (0x"+hex(cartridgeType)+")") class InvalidMemoryBankTypeError(Exception): - pass + pass @@ -35,128 +35,128 @@ # CARTRIDGE class Cartridge(object): - - def __init__(self, storeDriver, clockDriver): - self.store = storeDriver - self.clock = clockDriver - - - def initialize(self): - pass - - - def getTitle(self): - pass - - - def getCartridgeType(self): - return self.rom[constants.CARTRIDGE_TYPE_ADDRESS] & 0xFF - - - def getRom(self): - return self.rom - - - def getROMSize(self): - romSize = self.rom[constants.CARTRIDGE_SIZE_ADDRESS] & 0xFF - if romSize>=0x00 and romSize<=0x07: - return 32768 << romSize - return -1 - - - def getRAMSize(self): - return constants.RAM_SIZE_MAPPING[self.rom[constants.RAM_SIZE_ADDRESS]] - - - def getDestinationCode(self): - return self.rom[constants.DESTINATION_CODE_ADDRESS] & 0xFF; - - - def getLicenseeCode(): - return self.rom[constants.LICENSEE_ADDRESS] & 0xFF; - - - def getROMVersion(self): - return self.rom[constants.ROM_VERSION_ADDRESS] & 0xFF; - - - def getHeaderChecksum(self): - return self.rom[constants.HEADER_CHECKSUM_ADDRESS] & 0xFF; - - - def getChecksum(self): - return ((rom[constants.CHECKSUM_A_ADDRESS] & 0xFF) << 8) + (rom[constants.CHECKSUM_B_ADDRESS] & 0xFF); - - - def hasBattery(self): - return hasCartridgeBattery(self.getCartridgeType()) - - - def reset(self): - if not self.hasBattery(): - self.ram[0:len(self.ram):1] = 0xFF; - self.mbc.reset(); - - - def read(self, address): - return self.mbc.read(address); - - - def write(self, address, data): - self.mbc.write(address, data); - - - def load(self, cartridgeName): - romSize = self.store.getCartridgeSize(cartridgeName); - self.rom = range(0, romSize) - for i in range(0, romSize): - self.rom[i] = 0 - - self.store.readCartridge(cartridgeName, self.rom) - - if not self.verifyHeader(): - raise Exeption("Cartridge header is corrupted") - - if romSize < self.getROMSize(): - raise Exeption("Cartridge is truncated") - - ramSize = self.getRAMSize() - - if (getCartridgeType() >= constants.TYPE_MBC2 - and getCartridgeType() <= constants.TYPE_MBC2_BATTERY): - ramSize = 512; - - self.ram = [] - - for i in range(0, ramSize): - self.ram[i] = 0xFF - - if self.store.hasBattery(cartridgeName): - self.store.readBattery(cartridgeName, ram) - - self.mbc = createBankController(self.getCartridgeType(), rom, ram, clock) - - - def save(self, cartridgeName): - if self.hasBattery(): - self.store.writeBattery(cartridgeName, self.ram) - - - def verify(self): - checksum = 0; - for address in range(len(self.rom)): - if address is not 0x014E and address is not 0x014F: - checksum = (checksum + (self.rom[address] & 0xFF)) & 0xFFFF - return (checksum == self.getChecksum()); - - - def verifyHeader(self): - if self.rom.length < 0x0150: - return false; - checksum = 0xE7; - for address in range(0x0134, 0x014C): - checksum = (checksum - (rom[address] & 0xFF)) & 0xFF; - return (checksum == self.getHeaderChecksum()) + + def __init__(self, storeDriver, clockDriver): + self.store = storeDriver + self.clock = clockDriver + + + def initialize(self): + pass + + + def getTitle(self): + pass + + + def getCartridgeType(self): + return self.rom[constants.CARTRIDGE_TYPE_ADDRESS] & 0xFF + + + def getRom(self): + return self.rom + + + def getROMSize(self): + romSize = self.rom[constants.CARTRIDGE_SIZE_ADDRESS] & 0xFF + if romSize>=0x00 and romSize<=0x07: + return 32768 << romSize + return -1 + + + def getRAMSize(self): + return constants.RAM_SIZE_MAPPING[self.rom[constants.RAM_SIZE_ADDRESS]] + + + def getDestinationCode(self): + return self.rom[constants.DESTINATION_CODE_ADDRESS] & 0xFF; + + + def getLicenseeCode(): + return self.rom[constants.LICENSEE_ADDRESS] & 0xFF; + + + def getROMVersion(self): + return self.rom[constants.ROM_VERSION_ADDRESS] & 0xFF; + + + def getHeaderChecksum(self): + return self.rom[constants.HEADER_CHECKSUM_ADDRESS] & 0xFF; + + + def getChecksum(self): + return ((rom[constants.CHECKSUM_A_ADDRESS] & 0xFF) << 8) + (rom[constants.CHECKSUM_B_ADDRESS] & 0xFF); + + + def hasBattery(self): + return hasCartridgeBattery(self.getCartridgeType()) + + + def reset(self): + if not self.hasBattery(): + self.ram[0:len(self.ram):1] = 0xFF; + self.mbc.reset(); + + + def read(self, address): + return self.mbc.read(address); + + + def write(self, address, data): + self.mbc.write(address, data); + + + def load(self, cartridgeName): + romSize = self.store.getCartridgeSize(cartridgeName); + self.rom = range(0, romSize) + for i in range(0, romSize): + self.rom[i] = 0 + + self.store.readCartridge(cartridgeName, self.rom) + + if not self.verifyHeader(): + raise Exeption("Cartridge header is corrupted") + + if romSize < self.getROMSize(): + raise Exeption("Cartridge is truncated") + + ramSize = self.getRAMSize() + + if (getCartridgeType() >= constants.TYPE_MBC2 + and getCartridgeType() <= constants.TYPE_MBC2_BATTERY): + ramSize = 512; + + self.ram = [] + + for i in range(0, ramSize): + self.ram[i] = 0xFF + + if self.store.hasBattery(cartridgeName): + self.store.readBattery(cartridgeName, ram) + + self.mbc = createBankController(self.getCartridgeType(), rom, ram, clock) + + + def save(self, cartridgeName): + if self.hasBattery(): + self.store.writeBattery(cartridgeName, self.ram) + + + def verify(self): + checksum = 0; + for address in range(len(self.rom)): + if address is not 0x014E and address is not 0x014F: + checksum = (checksum + (self.rom[address] & 0xFF)) & 0xFFFF + return (checksum == self.getChecksum()); + + + def verifyHeader(self): + if self.rom.length < 0x0150: + return false; + checksum = 0xE7; + for address in range(0x0134, 0x014C): + checksum = (checksum - (rom[address] & 0xFF)) & 0xFF; + return (checksum == self.getHeaderChecksum()) # ============================================================================== @@ -164,171 +164,171 @@ class MBC(object): - ramEnable = False - - rom = [] - ram = [] - - romSize = 0; - ramSize = 0; - - minRomBankSize = 0 - maxRomBankSize = 0 - - minRamBankSize = 0 - maxRamBankSize = 0 - - romBank = constants.ROM_BANK_SIZE - ramBank = 0 - - - def reset(self): - self.romBank = constants.ROM_BANK_SIZE; - self.ramBank = 0; - self.ramEnable = False; - - def setROM(self, buffer): - banks = len(buffer) / constants.ROM_BANK_SIZE; - if (banks < minRomBankSize or banks > maxRomBankSize): - raise Exception("Invalid constants.ROM size"); - self.rom = buffer; - self.romSize = constants.ROM_BANK_SIZE*banks - 1; - - - def setRAM(buffer): - banks = len(buffer) / constants.RAM_BANK_SIZE; - if (banks < minRamBankSize or banks > maxRamBankSize): - raise Exception("Invalid constants.RAM size"); - self.ram = buffer; - self.ramSize = constants.RAM_BANK_SIZE*banks - 1; - + ramEnable = False + + rom = [] + ram = [] + + romSize = 0; + ramSize = 0; + + minRomBankSize = 0 + maxRomBankSize = 0 + + minRamBankSize = 0 + maxRamBankSize = 0 + + romBank = constants.ROM_BANK_SIZE + ramBank = 0 + + + def reset(self): + self.romBank = constants.ROM_BANK_SIZE; + self.ramBank = 0; + self.ramEnable = False; + + def setROM(self, buffer): + banks = len(buffer) / constants.ROM_BANK_SIZE; + if (banks < minRomBankSize or banks > maxRomBankSize): + raise Exception("Invalid constants.ROM size"); + self.rom = buffer; + self.romSize = constants.ROM_BANK_SIZE*banks - 1; + + + def setRAM(buffer): + banks = len(buffer) / constants.RAM_BANK_SIZE; + if (banks < minRamBankSize or banks > maxRamBankSize): + raise Exception("Invalid constants.RAM size"); + self.ram = buffer; + self.ramSize = constants.RAM_BANK_SIZE*banks - 1; + """ Mario GameBoy (TM) Emulator Memory Bank Controller 1 (2MB constants.ROM, 32KB constants.RAM) -0000-3FFF ROM Bank 0 (16KB) -4000-7FFF ROM Bank 1-127 (16KB) -A000-BFFF RAM Bank 0-3 (8KB) +0000-3FFF ROM Bank 0 (16KB) +4000-7FFF ROM Bank 1-127 (16KB) +A000-BFFF RAM Bank 0-3 (8KB) """ class MBC1(MBC): - - def __init__(self, rom, ram): - self.minRamBankSize = 0 - self.maxRamBankSize = 4 - self.minRomBankSize = 2 - self.maxRomBankSize = 128 - - self.setRom(rom) - self.serRam(ram) - - - def reset(self): - super.reset() - - self.memoryModel = 0 - - - def read(self, address): - if address <= 0x3FFF: - # 0000-3FFF - return self.rom[address] & 0xFF - elif (address <= 0x7FFF): - # 4000-7FFF - return self.rom[romBank + (address & 0x3FFF)] & 0xFF; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF - if (self.ramEnable): - return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; - return 0xFF; - - - def write(self, address, data): - if (address <= 0x1FFF): - # 0000-1FFF - if (self.ramSize > 0): - self.ramEnable = ((data & 0x0A) == 0x0A) - elif (address <= 0x3FFF): - # 2000-3FFF - if ((data & 0x1F) == 0): - data = 1; - if (self.memoryModel == 0): - self.romBank = ((self.romBank & 0x180000) + ((data & 0x1F) << 14)) & self.romSize; - else: - self.romBank = ((data & 0x1F) << 14) & self.romSize; - elif (address <= 0x5FFF): - # 4000-5FFF - if (self.memoryModel == 0): - self.romBank = ((self.romBank & 0x07FFFF) + ((data & 0x03) << 19)) & self.romSize; - else: - self.ramBank = ((data & 0x03) << 13) & self.ramSize; - elif (address <= 0x7FFF): - # 6000-7FFF - self.memoryModel = data & 0x01 - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF - if (self.ramEnable): - self.ram[self.ramBank + (address & 0x1FFF)] = data; - - - - + + def __init__(self, rom, ram): + self.minRamBankSize = 0 + self.maxRamBankSize = 4 + self.minRomBankSize = 2 + self.maxRomBankSize = 128 + + self.setRom(rom) + self.serRam(ram) + + + def reset(self): + super.reset() + + self.memoryModel = 0 + + + def read(self, address): + if address <= 0x3FFF: + # 0000-3FFF + return self.rom[address] & 0xFF + elif (address <= 0x7FFF): + # 4000-7FFF + return self.rom[romBank + (address & 0x3FFF)] & 0xFF; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramEnable): + return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; + return 0xFF; + + + def write(self, address, data): + if (address <= 0x1FFF): + # 0000-1FFF + if (self.ramSize > 0): + self.ramEnable = ((data & 0x0A) == 0x0A) + elif (address <= 0x3FFF): + # 2000-3FFF + if ((data & 0x1F) == 0): + data = 1; + if (self.memoryModel == 0): + self.romBank = ((self.romBank & 0x180000) + ((data & 0x1F) << 14)) & self.romSize; + else: + self.romBank = ((data & 0x1F) << 14) & self.romSize; + elif (address <= 0x5FFF): + # 4000-5FFF + if (self.memoryModel == 0): + self.romBank = ((self.romBank & 0x07FFFF) + ((data & 0x03) << 19)) & self.romSize; + else: + self.ramBank = ((data & 0x03) << 13) & self.ramSize; + elif (address <= 0x7FFF): + # 6000-7FFF + self.memoryModel = data & 0x01 + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramEnable): + self.ram[self.ramBank + (address & 0x1FFF)] = data; + + + + """ Mario GameBoy (TM) Emulator Memory Bank Controller 2 (256KB constants.ROM, 512x4bit constants.RAM) -0000-3FFF ROM Bank 0 (16KB) -4000-7FFF ROM Bank 1-15 (16KB) -A000-A1FF RAM Bank (512x4bit) +0000-3FFF ROM Bank 0 (16KB) +4000-7FFF ROM Bank 1-15 (16KB) +A000-A1FF RAM Bank (512x4bit) """ class MBC2(MBC): - RAM_BANK_SIZE = 512; + RAM_BANK_SIZE = 512; - def __init__(self, rom, ram): - self.minRamBankSize = constants.RAM_BANK_SIZE - self.maxRamBankSize = constants.RAM_BANK_SIZE - self.minRomBankSize = 2 - self.maxRomBankSize = 16 - - self.setROM(rom); - self.setRAM(ram); - - - def reset(self): - super.reset() - - - def read(self, address): - if (address <= 0x3FFF): - # 0000-3FFF - return self.rom[address] & 0xFF; - elif (address <= 0x7FFF): - # 4000-7FFF - return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; - elif (address >= 0xA000 and address <= 0xA1FF): - # A000-A1FF - return self.ram[address & 0x01FF] & 0x0F; - return 0xFF; - - - def write(self, address, data): - if (address <= 0x1FFF): - # 0000-1FFF - if ((address & 0x0100) == 0): - self.ramEnable = ((data & 0x0A) == 0x0A); - elif (address <= 0x3FFF): - # 2000-3FFF - if ((address & 0x0100) != 0): - if ((data & 0x0F) == 0): - data = 1; - self.romBank = ((data & 0x0F) << 14) & self.romSize; - elif (address >= 0xA000 and address <= 0xA1FF): - # A000-A1FF - if (self.ramEnable): - self.ram[address & 0x01FF] = (byte) (data & 0x0F); + def __init__(self, rom, ram): + self.minRamBankSize = constants.RAM_BANK_SIZE + self.maxRamBankSize = constants.RAM_BANK_SIZE + self.minRomBankSize = 2 + self.maxRomBankSize = 16 + + self.setROM(rom); + self.setRAM(ram); + + + def reset(self): + super.reset() + + + def read(self, address): + if (address <= 0x3FFF): + # 0000-3FFF + return self.rom[address] & 0xFF; + elif (address <= 0x7FFF): + # 4000-7FFF + return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; + elif (address >= 0xA000 and address <= 0xA1FF): + # A000-A1FF + return self.ram[address & 0x01FF] & 0x0F; + return 0xFF; + + + def write(self, address, data): + if (address <= 0x1FFF): + # 0000-1FFF + if ((address & 0x0100) == 0): + self.ramEnable = ((data & 0x0A) == 0x0A); + elif (address <= 0x3FFF): + # 2000-3FFF + if ((address & 0x0100) != 0): + if ((data & 0x0F) == 0): + data = 1; + self.romBank = ((data & 0x0F) << 14) & self.romSize; + elif (address >= 0xA000 and address <= 0xA1FF): + # A000-A1FF + if (self.ramEnable): + self.ram[address & 0x01FF] = (byte) (data & 0x0F); """ @@ -336,171 +336,171 @@ Memory Bank Controller 3 (2MB constants.ROM, 32KB constants.RAM, Real Time Clock) -0000-3FFF ROM Bank 0 (16KB) -4000-7FFF ROM Bank 1-127 (16KB) -A000-BFFF RAM Bank 0-3 (8KB) +0000-3FFF ROM Bank 0 (16KB) +4000-7FFF ROM Bank 1-127 (16KB) +A000-BFFF RAM Bank 0-3 (8KB) """ class MBC3(MBC): - #ClockDriver - clock = None; + #ClockDriver + clock = None; - romBank = 0; - ramBank = 0; + romBank = 0; + ramBank = 0; - clockRegister = 0; - clockLatch = 0; - clockTime = 0; - - clockSeconds = 0 - clockMinutes = 0 - clockHours = 0 - clockDays = 0 - clockControl = None - clockLSeconds = 0 - clockLMinutes = 0 - clockLHours = 0 - clockLDaysclockLControl = None - - def __init__(self, rom, ram, clock): - self.minRamBankSize = 0 - self.maxRamBankSize = 4 - self.minRomBankSize = 2 - self.maxRomBankSize = 128 - - self.clock = clock; - - self.setROM(rom); - self.setRAM(ram); - - - def reset(): - super.reset() - - self.clockTime = self.clock.getTime(); - - self.clockLatch = self.clockRegister = 0; - - self.clockSeconds = self.clockMinutes = self.clockHours = self.clockDays = self.clockControl = 0; - self.clockLSeconds = self.clockLMinutes = self.clockLHours = self.clockLDays = self.clockLControl = 0; - - - def read(self, address): - if (address <= 0x3FFF): - # 0000-3FFF - return self.rom[address] & 0xFF; - elif (address <= 0x7FFF): - # 4000-5FFF - return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF - if (self.ramBank >= 0): - return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; - else: - if (self.clockRegister == 0x08): - return self.clockLSeconds; - if (self.clockRegister == 0x09): - return self.clockLMinutes; - if (self.clockRegister == 0x0A): - return self.clockLHours; - if (self.clockRegister == 0x0B): - return self.clockLDays; - if (self.clockRegister == 0x0C): - return self.clockLControl; - return 0xFF; - - - def write(self, address, data): - if (address <= 0x1FFF): - # 0000-1FFF - if (self.ramSize > 0): - self.ramEnable = ((data & 0x0A) == 0x0A); - elif (address <= 0x3FFF): - # 2000-3FFF - if (data == 0): - data = 1; - self.romBank = ((data & 0x7F) << 14) & self.romSize; - elif (address <= 0x5FFF): - # 4000-5FFF - if (data >= 0x00 and data <= 0x03): - self.ramBank = (data << 13) & self.ramSize; - else: - self.ramBank = -1; - self.clockRegister = data; - elif (address <= 0x7FFF): - # 6000-7FFF - if (self.clockLatch == 0 and data == 1): - self.latchClock(); - if (data == 0 or data == 1): - self.clockLatch = data; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF - if (self.ramEnable): - if (self.ramBank >= 0): - # constants.TODO conversion to byte - self.ram[self.ramBank + (address & 0x1FFF)] = data; - else: - self.updateClock(); - - if (self.clockRegister == 0x08): - self.clockSeconds = data; - if (self.clockRegister == 0x09): - self.clockMinutes = data; - if (self.clockRegister == 0x0A): - self.clockHours = data; - if (self.clockRegister == 0x0B): - self.clockDays = data; - if (self.clockRegister == 0x0C): - self.clockControl = (self.clockControl & 0x80) | data; - - - def latchClock(self): - self.updateClock(); - - self.clockLSeconds = self.clockSeconds; - self.clockLMinutes = self.clockMinutes; - self.clockLHours = self.clockHours; - self.clockLDays = self.clockDays & 0xFF; - self.clockLControl = (self.clockControl & 0xFE) | ((self.clockDays >> 8) & 0x01); - - - def updateClock(): - now = self.clock.getTime(); - - if ((self.clockControl & 0x40) == 0): - elapsed = now - self.clockTime; - - while (elapsed >= 246060): - elapsed -= 246060 - self.clockDays+=1 - - while (elapsed >= 6060): - elapsed -= 6060; - self.clockHours+=1 - - while (elapsed >= 60): - elapsed -= 60; - self.clockMinutes+=1 - - self.clockSeconds += elapsed; - - while (self.clockSeconds >= 60): - self.clockSeconds -= 60; - self.clockMinutes+=1 - - while (self.clockMinutes >= 60): - self.clockMinutes -= 60; - self.clockHours+=1 - - while (self.clockHours >= 24): - self.clockHours -= 24; - self.clockDays+=1 - - while (self.clockDays >= 512): - self.clockDays -= 512; - self.clockControl |= 0x80; + clockRegister = 0; + clockLatch = 0; + clockTime = 0; + + clockSeconds = 0 + clockMinutes = 0 + clockHours = 0 + clockDays = 0 + clockControl = None + clockLSeconds = 0 + clockLMinutes = 0 + clockLHours = 0 + clockLDaysclockLControl = None + + def __init__(self, rom, ram, clock): + self.minRamBankSize = 0 + self.maxRamBankSize = 4 + self.minRomBankSize = 2 + self.maxRomBankSize = 128 + + self.clock = clock; + + self.setROM(rom); + self.setRAM(ram); + + + def reset(): + super.reset() + + self.clockTime = self.clock.getTime(); + + self.clockLatch = self.clockRegister = 0; + + self.clockSeconds = self.clockMinutes = self.clockHours = self.clockDays = self.clockControl = 0; + self.clockLSeconds = self.clockLMinutes = self.clockLHours = self.clockLDays = self.clockLControl = 0; + + + def read(self, address): + if (address <= 0x3FFF): + # 0000-3FFF + return self.rom[address] & 0xFF; + elif (address <= 0x7FFF): + # 4000-5FFF + return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramBank >= 0): + return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; + else: + if (self.clockRegister == 0x08): + return self.clockLSeconds; + if (self.clockRegister == 0x09): + return self.clockLMinutes; + if (self.clockRegister == 0x0A): + return self.clockLHours; + if (self.clockRegister == 0x0B): + return self.clockLDays; + if (self.clockRegister == 0x0C): + return self.clockLControl; + return 0xFF; + + + def write(self, address, data): + if (address <= 0x1FFF): + # 0000-1FFF + if (self.ramSize > 0): + self.ramEnable = ((data & 0x0A) == 0x0A); + elif (address <= 0x3FFF): + # 2000-3FFF + if (data == 0): + data = 1; + self.romBank = ((data & 0x7F) << 14) & self.romSize; + elif (address <= 0x5FFF): + # 4000-5FFF + if (data >= 0x00 and data <= 0x03): + self.ramBank = (data << 13) & self.ramSize; + else: + self.ramBank = -1; + self.clockRegister = data; + elif (address <= 0x7FFF): + # 6000-7FFF + if (self.clockLatch == 0 and data == 1): + self.latchClock(); + if (data == 0 or data == 1): + self.clockLatch = data; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramEnable): + if (self.ramBank >= 0): + # constants.TODO conversion to byte + self.ram[self.ramBank + (address & 0x1FFF)] = data; + else: + self.updateClock(); + + if (self.clockRegister == 0x08): + self.clockSeconds = data; + if (self.clockRegister == 0x09): + self.clockMinutes = data; + if (self.clockRegister == 0x0A): + self.clockHours = data; + if (self.clockRegister == 0x0B): + self.clockDays = data; + if (self.clockRegister == 0x0C): + self.clockControl = (self.clockControl & 0x80) | data; + + + def latchClock(self): + self.updateClock(); + + self.clockLSeconds = self.clockSeconds; + self.clockLMinutes = self.clockMinutes; + self.clockLHours = self.clockHours; + self.clockLDays = self.clockDays & 0xFF; + self.clockLControl = (self.clockControl & 0xFE) | ((self.clockDays >> 8) & 0x01); + + + def updateClock(): + now = self.clock.getTime(); + + if ((self.clockControl & 0x40) == 0): + elapsed = now - self.clockTime; + + while (elapsed >= 246060): + elapsed -= 246060 + self.clockDays+=1 + + while (elapsed >= 6060): + elapsed -= 6060; + self.clockHours+=1 + + while (elapsed >= 60): + elapsed -= 60; + self.clockMinutes+=1 + + self.clockSeconds += elapsed; + + while (self.clockSeconds >= 60): + self.clockSeconds -= 60; + self.clockMinutes+=1 + + while (self.clockMinutes >= 60): + self.clockMinutes -= 60; + self.clockHours+=1 + + while (self.clockHours >= 24): + self.clockHours -= 24; + self.clockDays+=1 + + while (self.clockDays >= 512): + self.clockDays -= 512; + self.clockControl |= 0x80; - self.clockTime = now; + self.clockTime = now; @@ -509,73 +509,73 @@ Memory Bank Controller 5 (8MB constants.ROM, 128KB constants.RAM) * -0000-3FFF ROM Bank 0 (16KB) -4000-7FFF ROM Bank 1-511 (16KB) -A000-BFFF RAM Bank 0-15 (8KB) +0000-3FFF ROM Bank 0 (16KB) +4000-7FFF ROM Bank 1-511 (16KB) +A000-BFFF RAM Bank 0-15 (8KB) """ class MBC5(MBC): - romBank = 0; + romBank = 0; - rumble = False; + rumble = False; - def __init__(self, rom, ram, rumble): - self.minRamBankSize = 0 - self.maxRamBankSize = 16 - self.minRomBankSize = 2 - self.maxRomBankSize = 512 - - self.rumble = rumble; - self.setROM(rom); - self.setRAM(ram); - - - def reset(): - super.reset() - - - def read(self, address): - if (address <= 0x3FFF): - # 0000-3FFF - return self.rom[address] & 0xFF; - elif (address <= 0x7FFF): - # 4000-7FFF - return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF - return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; - return 0xFF; - - - def write(self, address, data): - if (address <= 0x1FFF): - # 0000-1FFF - if (self.ramSize > 0): - self.ramEnable = ((data & 0x0A) == 0x0A); - elif (address <= 0x2FFF): - # 2000-2FFF - self.romBank = ((self.romBank & (0x01 << 22)) + ((data & 0xFF) << 14)) & self.romSize; - elif (address <= 0x3FFF): - # 3000-3FFF - self.romBank = ((self.romBank & (0xFF << 14)) + ((data & 0x01) << 22)) & self.romSize; - elif (address <= 0x4FFF): - # 4000-4FFF - if (self.rumble): - self.ramBank = ((data & 0x07) << 13) & self.ramSize; - else: - self.ramBank = ((data & 0x0F) << 13) & self.ramSize; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF - if (self.ramEnable): - #TODO byte conversion - self.ram[self.ramBank + (address & 0x1FFF)] = data; + def __init__(self, rom, ram, rumble): + self.minRamBankSize = 0 + self.maxRamBankSize = 16 + self.minRomBankSize = 2 + self.maxRomBankSize = 512 + + self.rumble = rumble; + self.setROM(rom); + self.setRAM(ram); + + + def reset(): + super.reset() + + + def read(self, address): + if (address <= 0x3FFF): + # 0000-3FFF + return self.rom[address] & 0xFF; + elif (address <= 0x7FFF): + # 4000-7FFF + return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; + return 0xFF; + + + def write(self, address, data): + if (address <= 0x1FFF): + # 0000-1FFF + if (self.ramSize > 0): + self.ramEnable = ((data & 0x0A) == 0x0A); + elif (address <= 0x2FFF): + # 2000-2FFF + self.romBank = ((self.romBank & (0x01 << 22)) + ((data & 0xFF) << 14)) & self.romSize; + elif (address <= 0x3FFF): + # 3000-3FFF + self.romBank = ((self.romBank & (0xFF << 14)) + ((data & 0x01) << 22)) & self.romSize; + elif (address <= 0x4FFF): + # 4000-4FFF + if (self.rumble): + self.ramBank = ((data & 0x07) << 13) & self.ramSize; + else: + self.ramBank = ((data & 0x0F) << 13) & self.ramSize; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramEnable): + #TODO byte conversion + self.ram[self.ramBank + (address & 0x1FFF)] = data; class HuC1(MBC): - def __init__(self, ram, rom): - super.__init__(self, ram, rom) + def __init__(self, ram, rom): + super.__init__(self, ram, rom) """ @@ -583,130 +583,130 @@ Hudson Memory Bank Controller 3 (2MB constants.ROM, 128KB constants.RAM, constants.RTC) -0000-3FFF ROM Bank 0 (16KB) -4000-7FFF ROM Bank 1-127 (16KB) -A000-BFFF RAM Bank 0-15 (8KB) +0000-3FFF ROM Bank 0 (16KB) +4000-7FFF ROM Bank 1-127 (16KB) +A000-BFFF RAM Bank 0-15 (8KB) """ class HuC3(MBC): - clock = None; - - romBank = 0; - - ramFlag = 0; - - ramValue = 0; - - clockRegister = 0; - clockShift = 0; - clockTime = 0; - - def __init__(self, rom, ram, clock): - self.minRamBankSize = 0 - self.maxRamBankSize = 4 - self.minRomBankSize = 2 - self.maxRomBankSize = 128 - self.clock = clock; - self.setROM(rom); - self.setRAM(ram); - - - def reset(): - super.reset() - - self.ramFlag = 0; - self.ramValue = 0; - - self.clockRegister = 0; - self.clockShift = 0; - - self.clockTime = self.clock.getTime(); - - - def read(self, address): - if (address <= 0x3FFF): - # 0000-3FFF - return self.rom[address] & 0xFF; - elif (address <= 0x7FFF): - # 4000-5FFF - return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF - if (self.ramFlag == 0x0C): - return self.ramValue; - elif (self.ramFlag == 0x0D): - return 0x01; - elif (self.ramFlag == 0x0A or self.ramFlag == 0x00): - if (self.ramSize > 0): - return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; - return 0xFF; - - - def write(self, address, data): - if (address <= 0x1FFF): - # 0000-1FFF - self.ramFlag = data; - elif (address <= 0x3FFF): - # 2000-3FFF - if ((data & 0x7F) == 0): - data = 1; - self.romBank = ((data & 0x7F) << 14) & self.romSize; - elif (address <= 0x5FFF): - # 4000-5FFF - self.ramBank = ((data & 0x0F) << 13) & self.ramSize; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF - if (self.ramFlag == 0x0B): - if ((data & 0xF0) == 0x10): - if (self.clockShift <= 24): - self.ramValue = (self.clockRegister >> self.clockShift) & 0x0F; - self.clockShift += 4; - elif ((data & 0xF0) == 0x30): - if (self.clockShift <= 24): - self.clockRegister &= ~(0x0F << self.clockShift); - self.clockRegister |= ((data & 0x0F) << self.clockShift); - self.clockShift += 4; - elif ((data & 0xF0) == 0x40): - self.updateClock(); - if ((data & 0x0F) == 0x00): - self.clockShift = 0; - elif ((data & 0x0F) == 0x03): - self.clockShift = 0; - elif ((data & 0x0F) == 0x07): - self.clockShift = 0; - elif ((data & 0xF0) == 0x50): - pass - elif ((data & 0xF0) == 0x60): - self.ramValue = 0x01; - elif (self.ramFlag >= 0x0C and self.ramFlag <= 0x0E): - pass - elif (self.ramFlag == 0x0A): - if (self.ramSize > 0): - #TODO byte conversion - self.ram[self.ramBank + (address & 0x1FFF)] = data; - - - def updateClock(self): - now = self.clock.getTime(); - elapsed = now - self.clockTime; - # years (4 bits) - while (elapsed >= 365246060): - self.clockRegister += 1 << 24; - elapsed -= 365246060; - # days (12 bits) - while (elapsed >= 246060): - self.clockRegister += 1 << 12; - elapsed -= 246060; - # minutes (12 bits) - while (elapsed >= 60): - self.clockRegister += 1; - elapsed -= 60; - - if ((self.clockRegister & 0x0000FFF) >= 2460): - self.clockRegister += (1 << 12) - 2460; - if ((self.clockRegister & 0x0FFF000) >= (365 << 12)): - self.clockRegister += (1 << 24) - (365 << 12); + clock = None; + + romBank = 0; + + ramFlag = 0; + + ramValue = 0; + + clockRegister = 0; + clockShift = 0; + clockTime = 0; + + def __init__(self, rom, ram, clock): + self.minRamBankSize = 0 + self.maxRamBankSize = 4 + self.minRomBankSize = 2 + self.maxRomBankSize = 128 + self.clock = clock; + self.setROM(rom); + self.setRAM(ram); + + + def reset(): + super.reset() + + self.ramFlag = 0; + self.ramValue = 0; + + self.clockRegister = 0; + self.clockShift = 0; + + self.clockTime = self.clock.getTime(); + + + def read(self, address): + if (address <= 0x3FFF): + # 0000-3FFF + return self.rom[address] & 0xFF; + elif (address <= 0x7FFF): + # 4000-5FFF + return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramFlag == 0x0C): + return self.ramValue; + elif (self.ramFlag == 0x0D): + return 0x01; + elif (self.ramFlag == 0x0A or self.ramFlag == 0x00): + if (self.ramSize > 0): + return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; + return 0xFF; + + + def write(self, address, data): + if (address <= 0x1FFF): + # 0000-1FFF + self.ramFlag = data; + elif (address <= 0x3FFF): + # 2000-3FFF + if ((data & 0x7F) == 0): + data = 1; + self.romBank = ((data & 0x7F) << 14) & self.romSize; + elif (address <= 0x5FFF): + # 4000-5FFF + self.ramBank = ((data & 0x0F) << 13) & self.ramSize; + elif (address >= 0xA000 and address <= 0xBFFF): + # A000-BFFF + if (self.ramFlag == 0x0B): + if ((data & 0xF0) == 0x10): + if (self.clockShift <= 24): + self.ramValue = (self.clockRegister >> self.clockShift) & 0x0F; + self.clockShift += 4; + elif ((data & 0xF0) == 0x30): + if (self.clockShift <= 24): + self.clockRegister &= ~(0x0F << self.clockShift); + self.clockRegister |= ((data & 0x0F) << self.clockShift); + self.clockShift += 4; + elif ((data & 0xF0) == 0x40): + self.updateClock(); + if ((data & 0x0F) == 0x00): + self.clockShift = 0; + elif ((data & 0x0F) == 0x03): + self.clockShift = 0; + elif ((data & 0x0F) == 0x07): + self.clockShift = 0; + elif ((data & 0xF0) == 0x50): + pass + elif ((data & 0xF0) == 0x60): + self.ramValue = 0x01; + elif (self.ramFlag >= 0x0C and self.ramFlag <= 0x0E): + pass + elif (self.ramFlag == 0x0A): + if (self.ramSize > 0): + #TODO byte conversion + self.ram[self.ramBank + (address & 0x1FFF)] = data; + + + def updateClock(self): + now = self.clock.getTime(); + elapsed = now - self.clockTime; + # years (4 bits) + while (elapsed >= 365246060): + self.clockRegister += 1 << 24; + elapsed -= 365246060; + # days (12 bits) + while (elapsed >= 246060): + self.clockRegister += 1 << 12; + elapsed -= 246060; + # minutes (12 bits) + while (elapsed >= 60): + self.clockRegister += 1; + elapsed -= 60; + + if ((self.clockRegister & 0x0000FFF) >= 2460): + self.clockRegister += (1 << 12) - 2460; + if ((self.clockRegister & 0x0FFF000) >= (365 << 12)): + self.clockRegister += (1 << 24) - (365 << 12); - self.clockTime = now - elapsed; + self.clockTime = now - elapsed; Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py Sun Mar 16 20:42:44 2008 @@ -54,7 +54,7 @@ # constants.RAM Bank Size (8KB) RAM_BANK_SIZE = 0x2000 - + # ___________________________________________________________________________ # CPU FLAGS # ___________________________________________________________________________ Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py Sun Mar 16 20:42:44 2008 @@ -8,61 +8,61 @@ class Interrupt(object): - # Registers - enable = 0; - flag = 0; + # Registers + enable = 0; + flag = 0; - def __init__(self): - self.reset(); + def __init__(self): + self.reset(); - def reset(self): - self.enable = 0; - self.flag = VBLANK; + def reset(self): + self.enable = 0; + self.flag = VBLANK; - def isPending(self): - return (self.enable & self.flag) != 0; + def isPending(self): + return (self.enable & self.flag) != 0; - def isPending(self, mask): - return (self.enable & self.flag & mask) != 0; + def isPending(self, mask): + return (self.enable & self.flag & mask) != 0; - def raiseInterrupt(self, mask): - self.flag |= mask; + def raiseInterrupt(self, mask): + self.flag |= mask; - def lower(self, mask): - self.flag &= ~mask; + def lower(self, mask): + self.flag &= ~mask; - def write(self, address, data): - if address == constants.IE: - self.setInterruptEnable(data); - elif address == constants.IF: - self.setInterruptFlag(data); + def write(self, address, data): + if address == constants.IE: + self.setInterruptEnable(data); + elif address == constants.IF: + self.setInterruptFlag(data); - def read(self, address): - if address == constants.IE: - return self.getInterruptEnable(); - elif address == constants.IF: - return self.getInterruptFlag(); - return 0xFF; + def read(self, address): + if address == constants.IE: + return self.getInterruptEnable(); + elif address == constants.IF: + return self.getInterruptFlag(); + return 0xFF; - def getInterruptEnable(self): - return self.enable; + def getInterruptEnable(self): + return self.enable; - def getInterruptFlag(self): - return 0xE0 | self.flag; + def getInterruptFlag(self): + return 0xE0 | self.flag; - def setInterruptEnable(self, data): - self.enable = data; + def setInterruptEnable(self, data): + self.enable = data; - def setInterruptFlag(self, data): - self.flag = data; + def setInterruptFlag(self, data): + self.flag = data; Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py Sun Mar 16 20:42:44 2008 @@ -6,65 +6,65 @@ class Joypad(object): - # Registers - joyp = 0; - cycles = 0; + # Registers + joyp = 0; + cycles = 0; - # Interrupt Controller - interrupt = None; + # Interrupt Controller + interrupt = None; - # Driver JoypadDriver - driver = None; + # Driver JoypadDriver + driver = None; - def __init__(self, joypadDriver, interrupt): - self.driver = joypadDriver; - self.interrupt = interrupt; - self.reset(); + def __init__(self, joypadDriver, interrupt): + self.driver = joypadDriver; + self.interrupt = interrupt; + self.reset(); - def reset(self): - self.joyp = 0xFF; - self.cycles = constants.JOYPAD_CLOCK; + def reset(self): + self.joyp = 0xFF; + self.cycles = constants.JOYPAD_CLOCK; - def cycles(self): - return self.cycles; + def cycles(self): + return self.cycles; - def emulate(self, ticks): - self.cycles -= ticks; - if (self.cycles <= 0): - if (self.driver.isRaised()): - self.update(); + def emulate(self, ticks): + self.cycles -= ticks; + if (self.cycles <= 0): + if (self.driver.isRaised()): + self.update(); - self.cycles = constants.JOYPAD_CLOCK; + self.cycles = constants.JOYPAD_CLOCK; - def write(self, address, data): - if (address == constants.JOYP): - self.joyp = (self.joyp & 0xCF) + (data & 0x30); - self.update(); + def write(self, address, data): + if (address == constants.JOYP): + self.joyp = (self.joyp & 0xCF) + (data & 0x30); + self.update(); - def read(self, address): - if (address == constants.JOYP): - return self.joyp; - return 0xFF; + def read(self, address): + if (address == constants.JOYP): + return self.joyp; + return 0xFF; - def update(self): - data = self.joyp & 0xF0; + def update(self): + data = self.joyp & 0xF0; - switch = (data & 0x30) - if switch==0x10: - data |= self.driver.getButtons(); - elif switch==0x20: - data |= self.driver.getDirections(); - elif switch==0x30: - data |= 0x0F; + switch = (data & 0x30) + if switch==0x10: + data |= self.driver.getButtons(); + elif switch==0x20: + data |= self.driver.getDirections(); + elif switch==0x30: + data |= 0x0F; - if ((self.joyp & ~data & 0x0F) != 0): - self.interrupt.raiseInterrupt(constants.JOYPAD); + if ((self.joyp & ~data & 0x0F) != 0): + self.interrupt.raiseInterrupt(constants.JOYPAD); - self.joyp = data; + self.joyp = data; Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py Sun Mar 16 20:42:44 2008 @@ -7,44 +7,44 @@ from pypy.lang.gameboy import constants class RAM(object): - - # Work RAM - wram = [] - - # High RAM - hram = [] - - def __init__(self): - self.reset(); - - def reset(self): - self.wram = range(0, constants.WRAM_SIZE) - for index in range(0, constants.WRAM_SIZE): - #TODO convert to byte - self.wram[index] = 0x00; - - self.hram = range(0, constants.HIGH_SIZE) - for index in range(0, constants.HIGH_SIZE): - #TODO convert to byte - self.hram[index] = 0x00; - - def write(self, address, data): - if (address >= 0xC000 and address <= 0xFDFF): - # C000-DFFF Work RAM (8KB) - # E000-FDFF Echo RAM - #TODO convert to byte - self.wram[address & 0x1FFF] = data; - elif (address >= 0xFF80 and address <= 0xFFFE): - # FF80-FFFE High RAM - #TODO convert to byte - self.hram[address & 0x7F] = data; - - def read(self, address): - if (address >= 0xC000 and address <= 0xFDFF): - # C000-DFFF Work RAM - # E000-FDFF Echo RAM - return self.wram[address & 0x1FFF] & 0xFF; - elif (address >= 0xFF80 and address <= 0xFFFE): - # FF80-FFFE High RAM - return self.hram[address & 0x7F] & 0xFF; - return 0xFF; + + # Work RAM + wram = [] + + # High RAM + hram = [] + + def __init__(self): + self.reset(); + + def reset(self): + self.wram = range(0, constants.WRAM_SIZE) + for index in range(0, constants.WRAM_SIZE): + #TODO convert to byte + self.wram[index] = 0x00; + + self.hram = range(0, constants.HIGH_SIZE) + for index in range(0, constants.HIGH_SIZE): + #TODO convert to byte + self.hram[index] = 0x00; + + def write(self, address, data): + if (address >= 0xC000 and address <= 0xFDFF): + # C000-DFFF Work RAM (8KB) + # E000-FDFF Echo RAM + #TODO convert to byte + self.wram[address & 0x1FFF] = data; + elif (address >= 0xFF80 and address <= 0xFFFE): + # FF80-FFFE High RAM + #TODO convert to byte + self.hram[address & 0x7F] = data; + + def read(self, address): + if (address >= 0xC000 and address <= 0xFDFF): + # C000-DFFF Work RAM + # E000-FDFF Echo RAM + return self.wram[address & 0x1FFF] & 0xFF; + elif (address >= 0xFF80 and address <= 0xFFFE): + # FF80-FFFE High RAM + return self.hram[address & 0x7F] & 0xFF; + return 0xFF; Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py Sun Mar 16 20:42:44 2008 @@ -6,50 +6,50 @@ class Serial(object): - # Registers - sb = 0 - sc = 0 - cycles = 0 + # Registers + sb = 0 + sc = 0 + cycles = 0 - # Interrupt Controller #Interrupt - interrupt = None + # Interrupt Controller #Interrupt + interrupt = None - def __init__(self, interrupt): - self.interrupt = interrupt - self.reset() + def __init__(self, interrupt): + self.interrupt = interrupt + self.reset() - def reset(self): - self.cycles = constants.SERIAL_CLOCK - self.sb = 0x00 - self.sc = 0x00 + def reset(self): + self.cycles = constants.SERIAL_CLOCK + self.sb = 0x00 + self.sc = 0x00 - def cycles(self): - return self.cycles + def cycles(self): + return self.cycles - def emulate(self, ticks): - if ((self.sc & 0x81) == 0x81): - self.cycles -= ticks + def emulate(self, ticks): + if ((self.sc & 0x81) == 0x81): + self.cycles -= ticks - if (self.cycles <= 0): - self.sb = 0xFF - self.sc &= 0x7F - self.cycles = constants.SERIAL_IDLE_CLOCK + if (self.cycles <= 0): + self.sb = 0xFF + self.sc &= 0x7F + self.cycles = constants.SERIAL_IDLE_CLOCK - self.interrupt.raiseInterrupt(constants.SERIAL) + self.interrupt.raiseInterrupt(constants.SERIAL) - def setSerialData(self, data): - self.sb = data + def setSerialData(self, data): + self.sb = data - def setSerialControl(self, data): - self.sc = data + def setSerialControl(self, data): + self.sc = data - # HACK: delay the serial interrupt (Shin Nihon Pro Wrestling) - self.cycles = constants.SERIAL_IDLE_CLOCK + constants.SERIAL_CLOCK + # HACK: delay the serial interrupt (Shin Nihon Pro Wrestling) + self.cycles = constants.SERIAL_IDLE_CLOCK + constants.SERIAL_CLOCK - def getSerialData(self): - return self.sb + def getSerialData(self): + return self.sb - def getSerialControl(self): - return self.sc + def getSerialControl(self): + return self.sc Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py Sun Mar 16 20:42:44 2008 @@ -8,738 +8,738 @@ class Sound(object): - # Audio Channel 1 int - nr10=0; - nr11=0; - nr12=0; - nr13=0; - nr14=0; - audio1Index=0; - audio1Length=0; - audio1Volume=0; - audio1EnvelopeLength=0; - audio1SweepLength=0; - audio1Frequency=0; - - - # Audio Channel 2 int - nr21=0; - nr22=0; - nr23=0; - nr24=0; - audio2Index=0; - audio2Length=0; - audio2Volume=0; - audio2EnvelopeLength=0; - audio2Frequency=0; - - - # Audio Channel 3 int - nr30=0; - nr31=0; - nr32=0; - nr33=0; - nr34=0; - audio3Index=0; - audio3Length=0; - audio3Frequency=0; - audio3WavePattern = []# = new byte[16]; - - # Audio Channel 4 int - nr41=0; - nr42=0; - nr43=0; - nr44=0; - audio4Index=0; - audio4Length=0; - audio4Volume=0; - audio4EnvelopeLength=0; - audio4Frequency=0; - - # Output Control int - nr50=0; - nr51=0; - nr52=0; - - # Sound DriverSoundDriver - #driver; - buffer = []# = new byte[512]; - #int - #frames; - #cycles; - - # Frequency Table - frequencyTable = []#= new int[2048]; - noiseFreqRatioTable = [] #= new int[8]; - - # Noise Tables - noiseStep7Table = [] #= new int[128 / 32]; - noiseStep15Table = [] #= new int[32768 / 32]; - - def __init__(self, soundDriver): - self.driver = soundDriver; - self.generateFrequencyTables(); - self.generateNoiseTables(); - self.reset(); - - - def start(self): - self.driver.start(); - - - def stop(self): - self.driver.stop(); - - - def cycles(self): - return self.cycles; - - - def emulate(self, ticks): - self.cycles -= ticks; - while (self.cycles <= 0): - self.updateAudio(); - if (self.driver.isEnabled()): - self.frames += self.driver.getSampleRate(); - length = (self.frames / constants.SOUND_CLOCK) << 1; - self.mixAudio(self.buffer, length); - self.driver.write(self.buffer, length); - self.frames %= constants.SOUND_CLOCK; - - self.cycles += constants.GAMEBOY_CLOCK / constants.SOUND_CLOCK; - - - - def reset(self): - self.cycles = constants.GAMEBOY_CLOCK / constants.SOUND_CLOCK; - self.frames = 0; - self.audio1Index = self.audio2Index = self.audio3Index = self.audio4Index = 0; - self.write(constants.NR10, 0x80); - self.write(constants.NR11, 0x3F); # 0xBF - self.write(constants.NR12, 0x00); # 0xF3 - self.write(constants.NR13, 0xFF); - self.write(constants.NR14, 0xBF); - - self.write(constants.NR21, 0x3F); - self.write(constants.NR22, 0x00); - self.write(constants.NR23, 0xFF); - self.write(constants.NR24, 0xBF); - - self.write(constants.NR30, 0x7F); - self.write(constants.NR31, 0xFF); - self.write(constants.NR32, 0x9F); - self.write(constants.NR33, 0xFF); - self.write(constants.NR34, 0xBF); - - self.write(constants.NR41, 0xFF); - self.write(constants.NR42, 0x00); - self.write(constants.NR43, 0x00); - self.write(constants.NR44, 0xBF); - - self.write(constants.NR50, 0x00); # 0x77 - self.write(constants.NR51, 0xF0); - self.write(constants.NR52, 0xFF); # 0xF0 - - for address in range(0xFF30, 0xFF3F): - write = 0xFF - if (address & 1) == 0: - write = 0x00 - self.write(address, write); - - - def read(self, address): - if address==constants.NR10: - return self.getAudio1Sweep(); - elif address == constants.NR11: - return self.getAudio1Length(); - elif address == constants.NR12: - return self.getAudio1Envelope(); - elif address == constants.NR13: - return self.getAudio1Frequency(); - elif address == constants.NR14: - return self.getAudio1Playback(); - - elif address == constants.NR21: - return self.getAudio2Length(); - elif address == constants.NR22: - return self.getAudio2Envelope(); - elif address==constants.NR23: - return self.getAudio2Frequency(); - elif address==constants.NR24: - return self.getAudio2Playback(); - - elif address==constants.NR30: - return self.getAudio3Enable(); - elif address==constants.NR31: - return self.getAudio3Length(); - elif address==constants.NR32: - return self.getAudio3Level(); - elif address==constants.NR33: - return self.getAudio4Frequency(); - elif address==constants.NR34: - return self.getAudio3Playback(); - - elif address==constants.NR41: - return self.getAudio4Length(); - elif address==constants.NR42: - return self.getAudio4Envelope(); - elif address==constants.NR43: - return self.getAudio4Polynomial(); - elif address==constants.NR44: - return self.getAudio4Playback(); - - elif address==constants.NR50: - return self.getOutputLevel(); - elif address==constants.NR51: - return self.getOutputTerminal(); - elif address==constants.NR52: - return self.getOutputEnable(); - - elif (address >= constants.AUD3WAVERAM and address <= constants.AUD3WAVERAM + 0x3F): - return self.getAudio3WavePattern(address); - - return 0xFF; - - - def write(self, address, data): - if address==constants.NR10: - self.setAudio1Sweep(data); - elif address == constants.NR11: - self.setAudio1Length(data); - elif address == constants.NR12: - self.setAudio1Envelope(data); - elif address == constants.NR13: - self.setAudio1Frequency(data); - elif address == constants.NR14: - self.setAudio1Playback(data); - - elif address == constants.NR21: - self.setAudio2Length(data); - elif address == constants.NR22: - self.setAudio2Envelope(data); - elif address == constants.NR23: - self.setAudio2Frequency(data); - elif address == constants.NR24: - self.setAudio2Playback(data); - - elif address == constants.NR30: - self.setAudio3Enable(data); - elif address == constants.NR31: - self.setAudio3Length(data); - elif address == constants.NR32: - self.setAudio3Level(data); - elif address == constants.NR33: - self.setAudio3Frequency(data); - elif address == constants.NR34: - self.setAudio3Playback(data); - - elif address == constants.NR41: - self.setAudio4Length(data); - elif address == constants.NR42: - self.setAudio4Envelope(data); - elif address == constants.NR43: - self.setAudio4Polynomial(data); - elif address == constants.NR44: - self.setAudio4Playback(data); - - elif address == constants.NR50: - self.setOutputLevel(data); - elif address == constants.NR51: - self.setOutputTerminal(data); - elif address == constants.NR52: - self.setOutputEnable(data); - - elif (address >= constants.AUD3WAVERAM and address <= constants.AUD3WAVERAM + 0x3F): - self.setAudio3WavePattern(address, data); - - - def updateAudio(self): - if ((self.nr52 & 0x80) == 0): - return - if ((self.nr52 & 0x01) != 0): - self.updateAudio1(); - if ((self.nr52 & 0x02) != 0): - self.updateAudio2(); - if ((self.nr52 & 0x04) != 0): - self.updateAudio3(); - if ((self.nr52 & 0x08) != 0): - self.updateAudio4(); - - - def mixAudio(self,buffer, length): - for index in range(0, length): - buffer[index] = 0; - if ((self.nr52 & 0x80) == 0): - return - if ((self.nr52 & 0x01) != 0): - self.mixAudio1(buffer, length); - if ((self.nr52 & 0x02) != 0): - self.mixAudio2(buffer, length); - if ((self.nr52 & 0x04) != 0): - self.mixAudio3(buffer, length); - if ((self.nr52 & 0x08) != 0): - self.mixAudio4(buffer, length); - - - # Audio Channel 1 - def getAudio1Sweep(self): - return self.nr10; - - - def getAudio1Length(self): - return self.nr11; - - - def getAudio1Envelope(self): - return self.nr12; - - - def getAudio1Frequency(self): - return self.nr13; - - - def getAudio1Playback(self): - return self.nr14; - - - def setAudio1Sweep(self, data): - self.nr10 = data; - self.audio1SweepLength = (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); - - - def setAudio1Length(self, data): - self.nr11 = data; - self.audio1Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)); - - - def setAudio1Envelope(self, data): - self.nr12 = data; - if ((self.nr14 & 0x40) != 0): - return - if ((self.nr12 >> 4) == 0): - self.audio1Volume = 0; - elif (self.audio1EnvelopeLength == 0 and (self.nr12 & 0x07) == 0): - self.audio1Volume = (self.audio1Volume + 1) & 0x0F; - else: - self.audio1Volume = (self.audio1Volume + 2) & 0x0F; - - - def setAudio1Frequency(self, data): - self.nr13 = data; - self.audio1Frequency = self.frequencyTable[self.nr13 + ((self.nr14 & 0x07) << 8)]; - - - def setAudio1Playback(self, data): - self.nr14 = data; - self.audio1Frequency = self.frequencyTable[self.nr13 - + ((self.nr14 & 0x07) << 8)]; - if ((self.nr14 & 0x80) != 0): - self.nr52 |= 0x01; - if ((self.nr14 & 0x40) != 0 and self.audio1Length == 0): - self.audio1Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)); - self.audio1SweepLength = (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); - self.audio1Volume = self.nr12 >> 4; - self.audio1EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr12 & 0x07); - - - def updateAudio1(self): - if ((self.nr14 & 0x40) != 0 and self.audio1Length > 0): - self.audio1Length-=1; - if (self.audio1Length <= 0): - self.nr52 &= ~0x01; - if (self.audio1EnvelopeLength > 0): - self.audio1EnvelopeLength-=1; - if (self.audio1EnvelopeLength <= 0): - if ((self.nr12 & 0x08) != 0): - if (self.audio1Volume < 15): - self.audio1Volume+=1; - elif (self.audio1Volume > 0): - self.audio1Volume-=1; - self.audio1EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr12 & 0x07); - if (self.audio1SweepLength > 0): - self.audio1SweepLength-=1; - if (self.audio1SweepLength <= 0): - sweepSteps = (self.nr10 & 0x07); - if (sweepSteps != 0): - frequency = ((self.nr14 & 0x07) << 8) + self.nr13; - if ((self.nr10 & 0x08) != 0): - frequency -= frequency >> sweepSteps; - else: - frequency += frequency >> sweepSteps; - if (frequency < 2048): - self.audio1Frequency = self.frequencyTable[frequency]; - self.nr13 = frequency & 0xFF; - self.nr14 = (self.nr14 & 0xF8) + ((frequency >> 8) & 0x07); - else: - self.audio1Frequency = 0; - self.nr52 &= ~0x01; - - self.audio1SweepLength += (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); - - - def mixAudio1(self, buffer, length): - wavePattern = 0x18 - if (self.nr11 & 0xC0) == 0x00: - wavePattern = 0x04 - elif (self.nr11 & 0xC0) == 0x40: - wavePattern = 0x08 - elif (self.nr11 & 0xC0) == 0x80: - wavePattern = 0x10 - wavePattern << 22; - for index in range(0, length, 3): - self.audio1Index += self.audio1Frequency; - if ((self.audio1Index & (0x1F << 22)) >= wavePattern): - if ((self.nr51 & 0x10) != 0): - buffer[index + 0] -= self.audio1Volume; - if ((self.nr51 & 0x01) != 0): - buffer[index + 1] -= self.audio1Volume; - else: - if ((self.nr51 & 0x10) != 0): - buffer[index + 0] += self.audio1Volume; - if ((self.nr51 & 0x01) != 0): - buffer[index + 1] += self.audio1Volume; - - - # Audio Channel 2 - def getAudio2Length(self): - return self.nr21; - - - def getAudio2Envelope(self): - return self.nr22; - - - def getAudio2Frequency(self): - return self.nr23; - - - def getAudio2Playback(self): - return self.nr24; - - - def setAudio2Length(self, data): - self.nr21 = data; - self.audio2Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); - - - def setAudio2Envelope(self, data): - self.nr22 = data; - if ((self.nr24 & 0x40) == 0): - if ((self.nr22 >> 4) == 0): - self.audio2Volume = 0; - elif (self.audio2EnvelopeLength == 0 and (self.nr22 & 0x07) == 0): - self.audio2Volume = (self.audio2Volume + 1) & 0x0F; - else: - self.audio2Volume = (self.audio2Volume + 2) & 0x0F; - - - def setAudio2Frequency(self, data): - self.nr23 = data; - self.audio2Frequency = self.frequencyTable[self.nr23\ - + ((self.nr24 & 0x07) << 8)]; - - - def setAudio2Playback(self, data): - self.nr24 = data; - self.audio2Frequency = self.frequencyTable[self.nr23\ - + ((self.nr24 & 0x07) << 8)]; - if ((self.nr24 & 0x80) != 0): - self.nr52 |= 0x02; - if ((self.nr24 & 0x40) != 0 and self.audio2Length == 0): - self.audio2Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); - self.audio2Volume = self.nr22 >> 4; - self.audio2EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr22 & 0x07); - - - - def updateAudio2(self): - if ((self.nr24 & 0x40) != 0 and self.audio2Length > 0): - self.audio2Length-=1; - if (self.audio2Length <= 0): - self.nr52 &= ~0x02; - if (self.audio2EnvelopeLength > 0): - self.audio2EnvelopeLength-=1; - - if (self.audio2EnvelopeLength <= 0): - if ((self.nr22 & 0x08) != 0): - if (self.audio2Volume < 15): - self.audio2Volume+=1; - elif (self.audio2Volume > 0): - self.audio2Volume-=1; - self.audio2EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr22 & 0x07); - - - def mixAudio2(self, buffer, length): - wavePattern = 0x18 - if (self.nr21 & 0xC0) == 0x00: - wavePattern = 0x04 - elif (self.nr21 & 0xC0) == 0x40: - wavePattern = 0x08 - elif (self.nr21 & 0xC0) == 0x80: - wavePattern = 0x10 - wavePattern << 22; - for index in range(0, length): - self.audio2Index += self.audio2Frequency; - if ((self.audio2Index & (0x1F << 22)) >= wavePattern): - if ((self.nr51 & 0x20) != 0): - buffer[index + 0] -= self.audio2Volume; - if ((self.nr51 & 0x02) != 0): - buffer[index + 1] -= self.audio2Volume; - else: - if ((self.nr51 & 0x20) != 0): - buffer[index + 0] += self.audio2Volume; - if ((self.nr51 & 0x02) != 0): - buffer[index + 1] += self.audio2Volume; - - - # Audio Channel 3 - def getAudio3Enable(self): - return self.nr30; - - - def getAudio3Length(self): - return self.nr31; - - - def getAudio3Level(self): - return self.nr32; - - - def getAudio4Frequency(self): - return self.nr33; - - - def getAudio3Playback(self): - return self.nr34; - - - def setAudio3Enable(self, data): - self.nr30 = data & 0x80; - if ((self.nr30 & 0x80) == 0): - self.nr52 &= ~0x04; - - - def setAudio3Length(self, data): - self.nr31 = data; - self.audio3Length = (constants.SOUND_CLOCK / 256) * (256 - self.nr31); - - - def setAudio3Level(self, data): - self.nr32 = data; - - - def setAudio3Frequency(self, data): - self.nr33 = data; - self.audio3Frequency = self.frequencyTable[((self.nr34 & 0x07) << 8) + self.nr33] >> 1; - - - def setAudio3Playback(self, data): - self.nr34 = data; - self.audio3Frequency = self.frequencyTable[((self.nr34 & 0x07) << 8) + self.nr33] >> 1; - if ((self.nr34 & 0x80) != 0 and (self.nr30 & 0x80) != 0): - self.nr52 |= 0x04; - if ((self.nr34 & 0x40) != 0 and self.audio3Length == 0): - self.audio3Length = (constants.SOUND_CLOCK / 256) * (256 - self.nr31); - - - - def setAudio3WavePattern(self, address, data): - #TODO convert to byte - self.audio3WavePattern[address & 0x0F] = data; - - - def getAudio3WavePattern(self, address): - return self.audio3WavePattern[address & 0x0F] & 0xFF; - - - def updateAudio3(self): - if ((self.nr34 & 0x40) != 0 and self.audio3Length > 0): - self.audio3Length-=1; - if (self.audio3Length <= 0): - self.nr52 &= ~0x04; - - - def mixAudio3(self, buffer, length): - wavePattern = 2 - if (self.nr32 & 0x60) == 0x00: - wavePattern = 8 - elif (self.nr32 & 0x60) == 0x40: - wavePattern = 0 - elif (self.nr32 & 0x60) == 0x80: - wavePattern = 1 - - for index in range(0, length, 2): - self.audio3Index += self.audio3Frequency; - sample = self.audio3WavePattern[(self.audio3Index >> 23) & 0x0F]; - if ((self.audio3Index & (1 << 22)) != 0): - sample = (sample >> 0) & 0x0F; - else: - sample = (sample >> 4) & 0x0F; - - sample = ((sample - 8) << 1) >> level; - - if ((self.nr51 & 0x40) != 0): - buffer[index + 0] += sample; - if ((self.nr51 & 0x04) != 0): - buffer[index + 1] += sample; - - - # Audio Channel 4 - def getAudio4Length(self): - return self.nr41; - - - def getAudio4Envelope(self): - return self.nr42; - - - def getAudio4Polynomial(self): - return self.nr43; - - - def getAudio4Playback(self): - return self.nr44; - - - def setAudio4Length(self, data): - self.nr41 = data; - self.audio4Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); - - - def setAudio4Envelope(self, data): - self.nr42 = data; - if ((self.nr44 & 0x40) == 0): - if ((self.nr42 >> 4) == 0): - self.audio4Volume = 0; - elif (self.audio4EnvelopeLength == 0 and (self.nr42 & 0x07) == 0): - self.audio4Volume = (self.audio4Volume + 1) & 0x0F; - else: - self.audio4Volume = (self.audio4Volume + 2) & 0x0F; - - - def setAudio4Polynomial(self, data): - self.nr43 = data; - if ((self.nr43 >> 4) <= 12): - self.audio4Frequency = self.noiseFreqRatioTable[self.nr43 & 0x07] >> ((self.nr43 >> 4) + 1); - else: - self.audio4Frequency = 0; - - - def setAudio4Playback(self, data): - self.nr44 = data; - if ((self.nr44 & 0x80) != 0): - self.nr52 |= 0x08; - if ((self.nr44 & 0x40) != 0 and self.audio4Length == 0): - self.audio4Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); - self.audio4Volume = self.nr42 >> 4; - self.audio4EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr42 & 0x07); - self.audio4Index = 0; - - - - def updateAudio4(self): - if ((self.nr44 & 0x40) != 0 and self.audio4Length > 0): - self.audio4Length-=1; - if (self.audio4Length <= 0): - self.nr52 &= ~0x08; - if (self.audio4EnvelopeLength > 0): - self.audio4EnvelopeLength-=1; - if (self.audio4EnvelopeLength <= 0): - if ((self.nr42 & 0x08) != 0): - if (self.audio4Volume < 15): - self.audio4Volume+=1; - elif (self.audio4Volume > 0): - self.audio4Volume-=1; - self.audio4EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr42 & 0x07); - - - def mixAudio4(self, buffer, length): - for index in range(0, length, 2): - self.audio4Index += self.audio4Frequency; - polynomial; - if ((self.nr43 & 0x08) != 0): - # 7 steps - self.audio4Index &= 0x7FFFFF; - polynomial = self.noiseStep7Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31); - else: - # 15 steps - self.audio4Index &= 0x7FFFFFFF; - polynomial = self.noiseStep15Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31); - if ((polynomial & 1) != 0): - if ((self.nr51 & 0x80) != 0): - buffer[index + 0] -= self.audio4Volume; - if ((self.nr51 & 0x08) != 0): - buffer[index + 1] -= self.audio4Volume; - else: - if ((self.nr51 & 0x80) != 0): - buffer[index + 0] += self.audio4Volume; - if ((self.nr51 & 0x08) != 0): - buffer[index + 1] += self.audio4Volume; - - - # Output Control - def getOutputLevel(self): - return self.nr50; - - - def getOutputTerminal(self): - return self.nr51; - - - def getOutputEnable(self): - return self.nr52; - - - def setOutputLevel(self, data): - self.nr50 = data; - - - def setOutputTerminal(self, data): - self.nr51 = data; - - - def setOutputEnable(self, data): - self.nr52 = (self.nr52 & 0x7F) | (data & 0x80); - if ((self.nr52 & 0x80) == 0x00): - self.nr52 &= 0xF0; - - - # Frequency Table Generation - def generateFrequencyTables(self): - sampleRate = self.driver.getSampleRate(); - # frequency = (4194304 / 32) / (2048 - period) Hz - for period in range(0, 2048): - skip = (((constants.GAMEBOY_CLOCK << 10) / sampleRate) << (22 - 8)) / (2048 - period); - if (skip >= (32 << 22)): - self.frequencyTable[period] = 0; - else: - self.frequencyTable[period] = skip; - # Polynomial Noise Frequency Ratios - # - # 4194304 Hz * 1/2^3 * 2 4194304 Hz * 1/2^3 * 1 4194304 Hz * 1/2^3 * - # 1/2 4194304 Hz * 1/2^3 * 1/3 4194304 Hz * 1/2^3 * 1/4 4194304 Hz * - # 1/2^3 * 1/5 4194304 Hz * 1/2^3 * 1/6 4194304 Hz * 1/2^3 * 1/7 - for ratio in range(0, 8): - divider = 1 - if ratio != 0: - divider = 2 * ratio - self.noiseFreqRatioTable[ratio] = (constants.GAMEBOY_CLOCK / divider) * ((1 << 16) / sampleRate); - - - - # Noise Generation - def generateNoiseTables(self): - polynomial = 0x7F - # 7 steps - for index in range(0, 0x7F): - polynomial = (((polynomial << 6) ^ (polynomial << 5)) & 0x40) | (polynomial >> 1); - if ((index & 31) == 0): - self.noiseStep7Table[index >> 5] = 0; - self.noiseStep7Table[index >> 5] |= (polynomial & 1) << (index & 31); - # 15 steps& - polynomial = 0x7FFF - for index in range(0, 0x7FFF): - polynomial = (((polynomial << 14) ^ (polynomial << 13)) & 0x4000) | (polynomial >> 1); - if ((index & 31) == 0): - self.noiseStep15Table[index >> 5] = 0; - self.noiseStep15Table[index >> 5] |= (polynomial & 1) << (index & 31); + # Audio Channel 1 int + nr10=0; + nr11=0; + nr12=0; + nr13=0; + nr14=0; + audio1Index=0; + audio1Length=0; + audio1Volume=0; + audio1EnvelopeLength=0; + audio1SweepLength=0; + audio1Frequency=0; + + + # Audio Channel 2 int + nr21=0; + nr22=0; + nr23=0; + nr24=0; + audio2Index=0; + audio2Length=0; + audio2Volume=0; + audio2EnvelopeLength=0; + audio2Frequency=0; + + + # Audio Channel 3 int + nr30=0; + nr31=0; + nr32=0; + nr33=0; + nr34=0; + audio3Index=0; + audio3Length=0; + audio3Frequency=0; + audio3WavePattern = []# = new byte[16]; + + # Audio Channel 4 int + nr41=0; + nr42=0; + nr43=0; + nr44=0; + audio4Index=0; + audio4Length=0; + audio4Volume=0; + audio4EnvelopeLength=0; + audio4Frequency=0; + + # Output Control int + nr50=0; + nr51=0; + nr52=0; + + # Sound DriverSoundDriver + #driver; + buffer = []# = new byte[512]; + #int + #frames; + #cycles; + + # Frequency Table + frequencyTable = []#= new int[2048]; + noiseFreqRatioTable = [] #= new int[8]; + + # Noise Tables + noiseStep7Table = [] #= new int[128 / 32]; + noiseStep15Table = [] #= new int[32768 / 32]; + + def __init__(self, soundDriver): + self.driver = soundDriver; + self.generateFrequencyTables(); + self.generateNoiseTables(); + self.reset(); + + + def start(self): + self.driver.start(); + + + def stop(self): + self.driver.stop(); + + + def cycles(self): + return self.cycles; + + + def emulate(self, ticks): + self.cycles -= ticks; + while (self.cycles <= 0): + self.updateAudio(); + if (self.driver.isEnabled()): + self.frames += self.driver.getSampleRate(); + length = (self.frames / constants.SOUND_CLOCK) << 1; + self.mixAudio(self.buffer, length); + self.driver.write(self.buffer, length); + self.frames %= constants.SOUND_CLOCK; + + self.cycles += constants.GAMEBOY_CLOCK / constants.SOUND_CLOCK; + + + + def reset(self): + self.cycles = constants.GAMEBOY_CLOCK / constants.SOUND_CLOCK; + self.frames = 0; + self.audio1Index = self.audio2Index = self.audio3Index = self.audio4Index = 0; + self.write(constants.NR10, 0x80); + self.write(constants.NR11, 0x3F); # 0xBF + self.write(constants.NR12, 0x00); # 0xF3 + self.write(constants.NR13, 0xFF); + self.write(constants.NR14, 0xBF); + + self.write(constants.NR21, 0x3F); + self.write(constants.NR22, 0x00); + self.write(constants.NR23, 0xFF); + self.write(constants.NR24, 0xBF); + + self.write(constants.NR30, 0x7F); + self.write(constants.NR31, 0xFF); + self.write(constants.NR32, 0x9F); + self.write(constants.NR33, 0xFF); + self.write(constants.NR34, 0xBF); + + self.write(constants.NR41, 0xFF); + self.write(constants.NR42, 0x00); + self.write(constants.NR43, 0x00); + self.write(constants.NR44, 0xBF); + + self.write(constants.NR50, 0x00); # 0x77 + self.write(constants.NR51, 0xF0); + self.write(constants.NR52, 0xFF); # 0xF0 + + for address in range(0xFF30, 0xFF3F): + write = 0xFF + if (address & 1) == 0: + write = 0x00 + self.write(address, write); + + + def read(self, address): + if address==constants.NR10: + return self.getAudio1Sweep(); + elif address == constants.NR11: + return self.getAudio1Length(); + elif address == constants.NR12: + return self.getAudio1Envelope(); + elif address == constants.NR13: + return self.getAudio1Frequency(); + elif address == constants.NR14: + return self.getAudio1Playback(); + + elif address == constants.NR21: + return self.getAudio2Length(); + elif address == constants.NR22: + return self.getAudio2Envelope(); + elif address==constants.NR23: + return self.getAudio2Frequency(); + elif address==constants.NR24: + return self.getAudio2Playback(); + + elif address==constants.NR30: + return self.getAudio3Enable(); + elif address==constants.NR31: + return self.getAudio3Length(); + elif address==constants.NR32: + return self.getAudio3Level(); + elif address==constants.NR33: + return self.getAudio4Frequency(); + elif address==constants.NR34: + return self.getAudio3Playback(); + + elif address==constants.NR41: + return self.getAudio4Length(); + elif address==constants.NR42: + return self.getAudio4Envelope(); + elif address==constants.NR43: + return self.getAudio4Polynomial(); + elif address==constants.NR44: + return self.getAudio4Playback(); + + elif address==constants.NR50: + return self.getOutputLevel(); + elif address==constants.NR51: + return self.getOutputTerminal(); + elif address==constants.NR52: + return self.getOutputEnable(); + + elif (address >= constants.AUD3WAVERAM and address <= constants.AUD3WAVERAM + 0x3F): + return self.getAudio3WavePattern(address); + + return 0xFF; + + + def write(self, address, data): + if address==constants.NR10: + self.setAudio1Sweep(data); + elif address == constants.NR11: + self.setAudio1Length(data); + elif address == constants.NR12: + self.setAudio1Envelope(data); + elif address == constants.NR13: + self.setAudio1Frequency(data); + elif address == constants.NR14: + self.setAudio1Playback(data); + + elif address == constants.NR21: + self.setAudio2Length(data); + elif address == constants.NR22: + self.setAudio2Envelope(data); + elif address == constants.NR23: + self.setAudio2Frequency(data); + elif address == constants.NR24: + self.setAudio2Playback(data); + + elif address == constants.NR30: + self.setAudio3Enable(data); + elif address == constants.NR31: + self.setAudio3Length(data); + elif address == constants.NR32: + self.setAudio3Level(data); + elif address == constants.NR33: + self.setAudio3Frequency(data); + elif address == constants.NR34: + self.setAudio3Playback(data); + + elif address == constants.NR41: + self.setAudio4Length(data); + elif address == constants.NR42: + self.setAudio4Envelope(data); + elif address == constants.NR43: + self.setAudio4Polynomial(data); + elif address == constants.NR44: + self.setAudio4Playback(data); + + elif address == constants.NR50: + self.setOutputLevel(data); + elif address == constants.NR51: + self.setOutputTerminal(data); + elif address == constants.NR52: + self.setOutputEnable(data); + + elif (address >= constants.AUD3WAVERAM and address <= constants.AUD3WAVERAM + 0x3F): + self.setAudio3WavePattern(address, data); + + + def updateAudio(self): + if ((self.nr52 & 0x80) == 0): + return + if ((self.nr52 & 0x01) != 0): + self.updateAudio1(); + if ((self.nr52 & 0x02) != 0): + self.updateAudio2(); + if ((self.nr52 & 0x04) != 0): + self.updateAudio3(); + if ((self.nr52 & 0x08) != 0): + self.updateAudio4(); + + + def mixAudio(self,buffer, length): + for index in range(0, length): + buffer[index] = 0; + if ((self.nr52 & 0x80) == 0): + return + if ((self.nr52 & 0x01) != 0): + self.mixAudio1(buffer, length); + if ((self.nr52 & 0x02) != 0): + self.mixAudio2(buffer, length); + if ((self.nr52 & 0x04) != 0): + self.mixAudio3(buffer, length); + if ((self.nr52 & 0x08) != 0): + self.mixAudio4(buffer, length); + + + # Audio Channel 1 + def getAudio1Sweep(self): + return self.nr10; + + + def getAudio1Length(self): + return self.nr11; + + + def getAudio1Envelope(self): + return self.nr12; + + + def getAudio1Frequency(self): + return self.nr13; + + + def getAudio1Playback(self): + return self.nr14; + + + def setAudio1Sweep(self, data): + self.nr10 = data; + self.audio1SweepLength = (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); + + + def setAudio1Length(self, data): + self.nr11 = data; + self.audio1Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)); + + + def setAudio1Envelope(self, data): + self.nr12 = data; + if ((self.nr14 & 0x40) != 0): + return + if ((self.nr12 >> 4) == 0): + self.audio1Volume = 0; + elif (self.audio1EnvelopeLength == 0 and (self.nr12 & 0x07) == 0): + self.audio1Volume = (self.audio1Volume + 1) & 0x0F; + else: + self.audio1Volume = (self.audio1Volume + 2) & 0x0F; + + + def setAudio1Frequency(self, data): + self.nr13 = data; + self.audio1Frequency = self.frequencyTable[self.nr13 + ((self.nr14 & 0x07) << 8)]; + + + def setAudio1Playback(self, data): + self.nr14 = data; + self.audio1Frequency = self.frequencyTable[self.nr13 + + ((self.nr14 & 0x07) << 8)]; + if ((self.nr14 & 0x80) != 0): + self.nr52 |= 0x01; + if ((self.nr14 & 0x40) != 0 and self.audio1Length == 0): + self.audio1Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)); + self.audio1SweepLength = (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); + self.audio1Volume = self.nr12 >> 4; + self.audio1EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr12 & 0x07); + + + def updateAudio1(self): + if ((self.nr14 & 0x40) != 0 and self.audio1Length > 0): + self.audio1Length-=1; + if (self.audio1Length <= 0): + self.nr52 &= ~0x01; + if (self.audio1EnvelopeLength > 0): + self.audio1EnvelopeLength-=1; + if (self.audio1EnvelopeLength <= 0): + if ((self.nr12 & 0x08) != 0): + if (self.audio1Volume < 15): + self.audio1Volume+=1; + elif (self.audio1Volume > 0): + self.audio1Volume-=1; + self.audio1EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr12 & 0x07); + if (self.audio1SweepLength > 0): + self.audio1SweepLength-=1; + if (self.audio1SweepLength <= 0): + sweepSteps = (self.nr10 & 0x07); + if (sweepSteps != 0): + frequency = ((self.nr14 & 0x07) << 8) + self.nr13; + if ((self.nr10 & 0x08) != 0): + frequency -= frequency >> sweepSteps; + else: + frequency += frequency >> sweepSteps; + if (frequency < 2048): + self.audio1Frequency = self.frequencyTable[frequency]; + self.nr13 = frequency & 0xFF; + self.nr14 = (self.nr14 & 0xF8) + ((frequency >> 8) & 0x07); + else: + self.audio1Frequency = 0; + self.nr52 &= ~0x01; + + self.audio1SweepLength += (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); + + + def mixAudio1(self, buffer, length): + wavePattern = 0x18 + if (self.nr11 & 0xC0) == 0x00: + wavePattern = 0x04 + elif (self.nr11 & 0xC0) == 0x40: + wavePattern = 0x08 + elif (self.nr11 & 0xC0) == 0x80: + wavePattern = 0x10 + wavePattern << 22; + for index in range(0, length, 3): + self.audio1Index += self.audio1Frequency; + if ((self.audio1Index & (0x1F << 22)) >= wavePattern): + if ((self.nr51 & 0x10) != 0): + buffer[index + 0] -= self.audio1Volume; + if ((self.nr51 & 0x01) != 0): + buffer[index + 1] -= self.audio1Volume; + else: + if ((self.nr51 & 0x10) != 0): + buffer[index + 0] += self.audio1Volume; + if ((self.nr51 & 0x01) != 0): + buffer[index + 1] += self.audio1Volume; + + + # Audio Channel 2 + def getAudio2Length(self): + return self.nr21; + + + def getAudio2Envelope(self): + return self.nr22; + + + def getAudio2Frequency(self): + return self.nr23; + + + def getAudio2Playback(self): + return self.nr24; + + + def setAudio2Length(self, data): + self.nr21 = data; + self.audio2Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); + + + def setAudio2Envelope(self, data): + self.nr22 = data; + if ((self.nr24 & 0x40) == 0): + if ((self.nr22 >> 4) == 0): + self.audio2Volume = 0; + elif (self.audio2EnvelopeLength == 0 and (self.nr22 & 0x07) == 0): + self.audio2Volume = (self.audio2Volume + 1) & 0x0F; + else: + self.audio2Volume = (self.audio2Volume + 2) & 0x0F; + + + def setAudio2Frequency(self, data): + self.nr23 = data; + self.audio2Frequency = self.frequencyTable[self.nr23\ + + ((self.nr24 & 0x07) << 8)]; + + + def setAudio2Playback(self, data): + self.nr24 = data; + self.audio2Frequency = self.frequencyTable[self.nr23\ + + ((self.nr24 & 0x07) << 8)]; + if ((self.nr24 & 0x80) != 0): + self.nr52 |= 0x02; + if ((self.nr24 & 0x40) != 0 and self.audio2Length == 0): + self.audio2Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); + self.audio2Volume = self.nr22 >> 4; + self.audio2EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr22 & 0x07); + + + + def updateAudio2(self): + if ((self.nr24 & 0x40) != 0 and self.audio2Length > 0): + self.audio2Length-=1; + if (self.audio2Length <= 0): + self.nr52 &= ~0x02; + if (self.audio2EnvelopeLength > 0): + self.audio2EnvelopeLength-=1; + + if (self.audio2EnvelopeLength <= 0): + if ((self.nr22 & 0x08) != 0): + if (self.audio2Volume < 15): + self.audio2Volume+=1; + elif (self.audio2Volume > 0): + self.audio2Volume-=1; + self.audio2EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr22 & 0x07); + + + def mixAudio2(self, buffer, length): + wavePattern = 0x18 + if (self.nr21 & 0xC0) == 0x00: + wavePattern = 0x04 + elif (self.nr21 & 0xC0) == 0x40: + wavePattern = 0x08 + elif (self.nr21 & 0xC0) == 0x80: + wavePattern = 0x10 + wavePattern << 22; + for index in range(0, length): + self.audio2Index += self.audio2Frequency; + if ((self.audio2Index & (0x1F << 22)) >= wavePattern): + if ((self.nr51 & 0x20) != 0): + buffer[index + 0] -= self.audio2Volume; + if ((self.nr51 & 0x02) != 0): + buffer[index + 1] -= self.audio2Volume; + else: + if ((self.nr51 & 0x20) != 0): + buffer[index + 0] += self.audio2Volume; + if ((self.nr51 & 0x02) != 0): + buffer[index + 1] += self.audio2Volume; + + + # Audio Channel 3 + def getAudio3Enable(self): + return self.nr30; + + + def getAudio3Length(self): + return self.nr31; + + + def getAudio3Level(self): + return self.nr32; + + + def getAudio4Frequency(self): + return self.nr33; + + + def getAudio3Playback(self): + return self.nr34; + + + def setAudio3Enable(self, data): + self.nr30 = data & 0x80; + if ((self.nr30 & 0x80) == 0): + self.nr52 &= ~0x04; + + + def setAudio3Length(self, data): + self.nr31 = data; + self.audio3Length = (constants.SOUND_CLOCK / 256) * (256 - self.nr31); + + + def setAudio3Level(self, data): + self.nr32 = data; + + + def setAudio3Frequency(self, data): + self.nr33 = data; + self.audio3Frequency = self.frequencyTable[((self.nr34 & 0x07) << 8) + self.nr33] >> 1; + + + def setAudio3Playback(self, data): + self.nr34 = data; + self.audio3Frequency = self.frequencyTable[((self.nr34 & 0x07) << 8) + self.nr33] >> 1; + if ((self.nr34 & 0x80) != 0 and (self.nr30 & 0x80) != 0): + self.nr52 |= 0x04; + if ((self.nr34 & 0x40) != 0 and self.audio3Length == 0): + self.audio3Length = (constants.SOUND_CLOCK / 256) * (256 - self.nr31); + + + + def setAudio3WavePattern(self, address, data): + #TODO convert to byte + self.audio3WavePattern[address & 0x0F] = data; + + + def getAudio3WavePattern(self, address): + return self.audio3WavePattern[address & 0x0F] & 0xFF; + + + def updateAudio3(self): + if ((self.nr34 & 0x40) != 0 and self.audio3Length > 0): + self.audio3Length-=1; + if (self.audio3Length <= 0): + self.nr52 &= ~0x04; + + + def mixAudio3(self, buffer, length): + wavePattern = 2 + if (self.nr32 & 0x60) == 0x00: + wavePattern = 8 + elif (self.nr32 & 0x60) == 0x40: + wavePattern = 0 + elif (self.nr32 & 0x60) == 0x80: + wavePattern = 1 + + for index in range(0, length, 2): + self.audio3Index += self.audio3Frequency; + sample = self.audio3WavePattern[(self.audio3Index >> 23) & 0x0F]; + if ((self.audio3Index & (1 << 22)) != 0): + sample = (sample >> 0) & 0x0F; + else: + sample = (sample >> 4) & 0x0F; + + sample = ((sample - 8) << 1) >> level; + + if ((self.nr51 & 0x40) != 0): + buffer[index + 0] += sample; + if ((self.nr51 & 0x04) != 0): + buffer[index + 1] += sample; + + + # Audio Channel 4 + def getAudio4Length(self): + return self.nr41; + + + def getAudio4Envelope(self): + return self.nr42; + + + def getAudio4Polynomial(self): + return self.nr43; + + + def getAudio4Playback(self): + return self.nr44; + + + def setAudio4Length(self, data): + self.nr41 = data; + self.audio4Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); + + + def setAudio4Envelope(self, data): + self.nr42 = data; + if ((self.nr44 & 0x40) == 0): + if ((self.nr42 >> 4) == 0): + self.audio4Volume = 0; + elif (self.audio4EnvelopeLength == 0 and (self.nr42 & 0x07) == 0): + self.audio4Volume = (self.audio4Volume + 1) & 0x0F; + else: + self.audio4Volume = (self.audio4Volume + 2) & 0x0F; + + + def setAudio4Polynomial(self, data): + self.nr43 = data; + if ((self.nr43 >> 4) <= 12): + self.audio4Frequency = self.noiseFreqRatioTable[self.nr43 & 0x07] >> ((self.nr43 >> 4) + 1); + else: + self.audio4Frequency = 0; + + + def setAudio4Playback(self, data): + self.nr44 = data; + if ((self.nr44 & 0x80) != 0): + self.nr52 |= 0x08; + if ((self.nr44 & 0x40) != 0 and self.audio4Length == 0): + self.audio4Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); + self.audio4Volume = self.nr42 >> 4; + self.audio4EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr42 & 0x07); + self.audio4Index = 0; + + + + def updateAudio4(self): + if ((self.nr44 & 0x40) != 0 and self.audio4Length > 0): + self.audio4Length-=1; + if (self.audio4Length <= 0): + self.nr52 &= ~0x08; + if (self.audio4EnvelopeLength > 0): + self.audio4EnvelopeLength-=1; + if (self.audio4EnvelopeLength <= 0): + if ((self.nr42 & 0x08) != 0): + if (self.audio4Volume < 15): + self.audio4Volume+=1; + elif (self.audio4Volume > 0): + self.audio4Volume-=1; + self.audio4EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr42 & 0x07); + + + def mixAudio4(self, buffer, length): + for index in range(0, length, 2): + self.audio4Index += self.audio4Frequency; + polynomial; + if ((self.nr43 & 0x08) != 0): + # 7 steps + self.audio4Index &= 0x7FFFFF; + polynomial = self.noiseStep7Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31); + else: + # 15 steps + self.audio4Index &= 0x7FFFFFFF; + polynomial = self.noiseStep15Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31); + if ((polynomial & 1) != 0): + if ((self.nr51 & 0x80) != 0): + buffer[index + 0] -= self.audio4Volume; + if ((self.nr51 & 0x08) != 0): + buffer[index + 1] -= self.audio4Volume; + else: + if ((self.nr51 & 0x80) != 0): + buffer[index + 0] += self.audio4Volume; + if ((self.nr51 & 0x08) != 0): + buffer[index + 1] += self.audio4Volume; + + + # Output Control + def getOutputLevel(self): + return self.nr50; + + + def getOutputTerminal(self): + return self.nr51; + + + def getOutputEnable(self): + return self.nr52; + + + def setOutputLevel(self, data): + self.nr50 = data; + + + def setOutputTerminal(self, data): + self.nr51 = data; + + + def setOutputEnable(self, data): + self.nr52 = (self.nr52 & 0x7F) | (data & 0x80); + if ((self.nr52 & 0x80) == 0x00): + self.nr52 &= 0xF0; + + + # Frequency Table Generation + def generateFrequencyTables(self): + sampleRate = self.driver.getSampleRate(); + # frequency = (4194304 / 32) / (2048 - period) Hz + for period in range(0, 2048): + skip = (((constants.GAMEBOY_CLOCK << 10) / sampleRate) << (22 - 8)) / (2048 - period); + if (skip >= (32 << 22)): + self.frequencyTable[period] = 0; + else: + self.frequencyTable[period] = skip; + # Polynomial Noise Frequency Ratios + # + # 4194304 Hz * 1/2^3 * 2 4194304 Hz * 1/2^3 * 1 4194304 Hz * 1/2^3 * + # 1/2 4194304 Hz * 1/2^3 * 1/3 4194304 Hz * 1/2^3 * 1/4 4194304 Hz * + # 1/2^3 * 1/5 4194304 Hz * 1/2^3 * 1/6 4194304 Hz * 1/2^3 * 1/7 + for ratio in range(0, 8): + divider = 1 + if ratio != 0: + divider = 2 * ratio + self.noiseFreqRatioTable[ratio] = (constants.GAMEBOY_CLOCK / divider) * ((1 << 16) / sampleRate); + + + + # Noise Generation + def generateNoiseTables(self): + polynomial = 0x7F + # 7 steps + for index in range(0, 0x7F): + polynomial = (((polynomial << 6) ^ (polynomial << 5)) & 0x40) | (polynomial >> 1); + if ((index & 31) == 0): + self.noiseStep7Table[index >> 5] = 0; + self.noiseStep7Table[index >> 5] |= (polynomial & 1) << (index & 31); + # 15 steps& + polynomial = 0x7FFF + for index in range(0, 0x7FFF): + polynomial = (((polynomial << 14) ^ (polynomial << 13)) & 0x4000) | (polynomial >> 1); + if ((index & 31) == 0): + self.noiseStep15Table[index >> 5] = 0; + self.noiseStep15Table[index >> 5] |= (polynomial & 1) << (index & 31); Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Sun Mar 16 20:42:44 2008 @@ -1,3 +1,4 @@ +import py from pypy.lang.gameboy.cpu import CPU, Register, DoubleRegister from pypy.lang.gameboy import constants @@ -111,17 +112,18 @@ ] def test_cycles(): + py.test.skip("opCode mapping in CPU is still missing.") cpu = get_cpu() for entry in OPCODE_CYCLES: if len(entry) == 2: - cycletest(cpu, entry[0], entry[1]) + cycle_test(cpu, entry[0], entry[1]) elif len(entry) == 4: for opCode in range(entry[0], entry[1], entry[2]): - cycletest(cpu, opCode, entry[3]) + cycle_test(cpu, opCode, entry[3]) -def cycletest(cpu, opCode, cycles): +def cycle_test(cpu, opCode, cycles): oldCycles = cpu.cycles cpu.execute(opCode) assert oldCycles - cpu.cycles == cycles Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py Sun Mar 16 20:42:44 2008 @@ -6,120 +6,120 @@ class Timer(object): - # Registers - #int - div = 0; - tima = 0; - tma = 0; - tac = 0; + # Registers + #int + div = 0; + tima = 0; + tma = 0; + tac = 0; - dividerCycles = 0; - timerCycles = 0; - timerClock = 0; + dividerCycles = 0; + timerCycles = 0; + timerClock = 0; - # Interrupt Controller Interrupt - interrupt = None; + # Interrupt Controller Interrupt + interrupt = None; - def __init__(self, interrupt): - self.interrupt = interrupt; - self.reset(); + def __init__(self, interrupt): + self.interrupt = interrupt; + self.reset(); - def reset(self): - self.div = 0; - self.dividerCycles = constants.DIV_CLOCK; - self.tima = self.tma = self.tac = 0x00; - self.timerCycles = self.timerClock = constants.TIMER_CLOCK[self.tac & 0x03]; + def reset(self): + self.div = 0; + self.dividerCycles = constants.DIV_CLOCK; + self.tima = self.tma = self.tac = 0x00; + self.timerCycles = self.timerClock = constants.TIMER_CLOCK[self.tac & 0x03]; - def write(self, address, data): - if address==constants.DIV: - self.setDivider(data); - elif address==constants.TIMA: - self.setTimerCounter(data); - elif address==constants.TMA: - self.setTimerModulo(data); - elif address==constants.TAC: - self.setTimerControl(data); - + def write(self, address, data): + if address==constants.DIV: + self.setDivider(data); + elif address==constants.TIMA: + self.setTimerCounter(data); + elif address==constants.TMA: + self.setTimerModulo(data); + elif address==constants.TAC: + self.setTimerControl(data); + - def read(self, address): - if address==constants.DIV: - return self.getDivider(); - elif address==constants.TIMA: - return self.getTimerCounter(); - elif address==constants.TMA: - return self.getTimerModulo(); - elif address==constants.TAC: - return self.getTimerControl(); - return 0xFF; + def read(self, address): + if address==constants.DIV: + return self.getDivider(); + elif address==constants.TIMA: + return self.getTimerCounter(); + elif address==constants.TMA: + return self.getTimerModulo(); + elif address==constants.TAC: + return self.getTimerControl(); + return 0xFF; - def setDivider(self, data): - #DIV register resets on write - self.div = 0; + def setDivider(self, data): + #DIV register resets on write + self.div = 0; - def setTimerCounter(self, data): - self.tima = data; + def setTimerCounter(self, data): + self.tima = data; - def setTimerModulo(self, data): - self.tma = data; + def setTimerModulo(self, data): + self.tma = data; - def setTimerControl(self, data): - if ((self.tac & 0x03) != (data & 0x03)): - self.timerCycles = self.timerClock = constants.TIMER_CLOCK[data & 0x03]; - self.tac = data; + def setTimerControl(self, data): + if ((self.tac & 0x03) != (data & 0x03)): + self.timerCycles = self.timerClock = constants.TIMER_CLOCK[data & 0x03]; + self.tac = data; - def getDivider(self): - return self.div; + def getDivider(self): + return self.div; - def getTimerCounter(self): - return self.tima; + def getTimerCounter(self): + return self.tima; - def getTimerModulo(self): - return self.tma; + def getTimerModulo(self): + return self.tma; - def getTimerControl(self): - return 0xF8 | self.tac; + def getTimerControl(self): + return 0xF8 | self.tac; - def cycles(self): - if ((self.tac & 0x04) != 0 and self.timerCycles < self.dividerCycles): - return self.timerCycles; - return self.dividerCycles; + def cycles(self): + if ((self.tac & 0x04) != 0 and self.timerCycles < self.dividerCycles): + return self.timerCycles; + return self.dividerCycles; - def emulate(self, ticks): - self.emulateDivider(ticks); - self.emulateTimer(ticks); + def emulate(self, ticks): + self.emulateDivider(ticks); + self.emulateTimer(ticks); - def emulateDivider(self, ticks): - self.dividerCycles -= ticks; - while (self.dividerCycles <= 0): - self.div = (self.div + 1) & 0xFF; - self.dividerCycles += constants.DIV_CLOCK; - + def emulateDivider(self, ticks): + self.dividerCycles -= ticks; + while (self.dividerCycles <= 0): + self.div = (self.div + 1) & 0xFF; + self.dividerCycles += constants.DIV_CLOCK; + - def emulateTimer(self, ticks): - if ((self.tac & 0x04) != 0): - self.timerCycles -= ticks; + def emulateTimer(self, ticks): + if ((self.tac & 0x04) != 0): + self.timerCycles -= ticks; - while (self.timerCycles <= 0): - self.tima = (self.tima + 1) & 0xFF; - self.timerCycles += self.timerClock; + while (self.timerCycles <= 0): + self.tima = (self.tima + 1) & 0xFF; + self.timerCycles += self.timerClock; - if (self.tima == 0x00): - self.tima = self.tma; - self.interrupt.raiseInterrupt(constants.TIMER); - + if (self.tima == 0x00): + self.tima = self.tma; + self.interrupt.raiseInterrupt(constants.TIMER); + Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Sun Mar 16 20:42:44 2008 @@ -7,709 +7,709 @@ class Video(object): - # constants.OAM Registers - oam = [] #= new byte[OAM_SIZE] + # constants.OAM Registers + oam = [] #= new byte[OAM_SIZE] - # Video constants.RAM - vram = []#= new byte[VRAM_SIZE] + # Video constants.RAM + vram = []#= new byte[VRAM_SIZE] - # constants.LCD Registers int - lcdc = 0 - stat = 0 - scy = 0 - scx = 0 - ly = 0 - lyc = 0 - dma = 0 - bgp = 0 - obp0 = 0 - obp1 = 0 - wy = 0 - wx = 0 - wly = 0 - - cycles = 0 - - frames = 0 - frameSkip = 0 - - #boolean - transfer = False - display = False - vblank = False - dirty = False - - # Line Buffer, constants.OAM Cache and Color Palette - line = []#= new int[8 + 160 + 8] - objects = []#= new int[OBJECTS_PER_LINE] - palette = []#= new int[1024] - - # Video Driver VideoDriver - driver = None - - # Interrupt Controller Interrupt - interrupt = None - - # Memory Interface Memory - memory = None - - - def __init__(self, videDriver, interrupt, memory): - self.driver = videoDriver - self.interrupt = interrupt - self.memory = memory - self.reset() - - - def getFrameSkip(self): - return self.frameSkip - - - def setFrameSkip(self, frameSkip): - self.frameSkip = frameSkip - - - def reset(self): - self.cycles = constants.MODE_2_TICKS - - self.lcdc = 0x91 - self.stat = 2 - self.ly = 0 - self.lyc = 0 - self.dma = 0xFF - self.scy = 0 - self.scx = 0 - self.wy = self.wly = 0 - self.wx = 0 - self.bgp = 0xFC - self.obp0 = self.obp1 = 0xFF - - self.transfer = True - self.display = True - self.vblank = True - self.dirty = True - - for index in range(0, constants.VRAM_SIZE): - self.vram[index] = 0x00 - - for index in range(0, constants.OAM_SIZE): - self.oam[index] = 0x00 - - - def write(self, address, data): - # assert data >= 0x00 and data <= 0xFF - if address == constants.LCDC : - self.setControl(data) - elif address == constants.STAT: - self.setStatus(data) - elif address == constants.SCY: - self.setScrollY(data) - elif address == constants.SCX: - self.setScrollX(data) - elif address == constants.LY: - # Read Only - pass - elif address == constants.LYC: - self.setLYCompare(data) - elif address == constants.DMA: - self.setDMA(data) - elif address == constants.BGP: - self.setBackgroundPalette(data) - elif address == constants.OBP0: - self.setObjectPalette0(data) - elif address == constants.OBP1: - self.setObjectPalette1(data) - elif address == constants.WY: - self.setWindowY(data) - elif address == constants.WX: - self.setWindowX(data) - else: - if (address >= constants.OAM_ADDR and address < constants.OAM_ADDR + constants.OAM_SIZE): - #TODO convert to byte - self.oam[address - constants.OAM_ADDR] = data - elif (address >= constants.VRAM_ADDR and address < constants.VRAM_ADDR + constants.VRAM_SIZE): - #TODO convert to byte - self.vram[address - constants.VRAM_ADDR] =data - - - def read(self, address): - if address == constants.LCDC: - return self.getControl() - elif address == constants.STAT: - return self.getStatus() - elif address == constants.SCY: - return self.getScrollY() - elif address == constants.SCX: - return self.getScrollX() - elif address == constants.LY: - return self.getLineY() - elif address == constants.LYC: - return self.getLineYCompare() - elif address == constants.DMA: - return self.getDMA() - elif address == constants.BGP: - return self.getBackgroundPalette() - elif address == constants.OBP0: - return self.getObjectPalette0() - elif address == constants.OBP1: - return self.getObjectPalette1() - elif address == constants.WY: - return self.getWindowY() - elif address == constants.WX: - return self.getWindowX() - else: - if (address >= constants.OAM_ADDR and address < constants.OAM_ADDR + constants.OAM_SIZE): - return self.oam[address - constants.OAM_ADDR] & 0xFF - elif (address >= constants.VRAM_ADDR and address < constants.VRAM_ADDR + constants.VRAM_SIZE): - return self.vram[address - constants.VRAM_ADDR] & 0xFF - return 0xFF - - - def cycles(self): - return self.cycles - - - def emulate(self, ticks): - if ((self.lcdc & 0x80) != 0): - self.cycles -= ticks - while (self.cycles <= 0): - switch = self.stat & 0x03 - if switch == 0: - self.emulateHBlank() - elif switch == 1: - self.emulateVBlank() - elif switch == 2: - self.emulateOAM() - elif switch == 3: - self.emulateTransfer() - - - def getControl(self): - return self.lcdc - - - def getStatus(self): - return 0x80 | self.stat - - - def getScrollY(self): - return self.scy - - - def getScrollX(self): - return self.scx - - - def getLineY(self): - return self.ly - - - def getLineYCompare(self): - return self.lyc - - - def getDMA(self): - return self.dma - - - def getBackgroundPalette(self): - return self.bgp - - - def getObjectPalette0(self): - return self.obp0 - - - def getObjectPalette1(self): - return self.obp1 - - - def getWindowY(self): - return self.wy - - - def getWindowX(self): - return self.wx - - - def setControl(self, data): - if ((self.lcdc & 0x80) != (data & 0x80)): - # constants.NOTE: do not reset constants.LY=LYC flag (bit 2) of the constants.STAT register (Mr. - # Do!) - if ((data & 0x80) != 0): - self.stat = (self.stat & 0xFC) | 0x02 - self.cycles = constants.MODE_2_TICKS - self.ly = 0 - self.display = False - else: - self.stat = (self.stat & 0xFC) | 0x00 - self.cycles = constants.MODE_1_TICKS - self.ly = 0 - - self.clearFrame() - # don't draw window if it was not enabled and not being drawn before - if ((self.lcdc & 0x20) == 0 and (data & 0x20) != 0 and self.wly == 0 and self.ly > self.wy): - self.wly = 144 - self.lcdc = data - - - def setStatus(self, data): - self.stat = (self.stat & 0x87) | (data & 0x78) - # Gameboy Bug - if ((self.lcdc & 0x80) != 0 and (self.stat & 0x03) == 0x01 and (self.stat & 0x44) != 0x44): - self.interrupt.raiseInterrupt(constants.LCD) - - - def setScrollY(self, data): - self.scy = data - - - def setScrollX(self, data): - self.scx = data - - - def setLYCompare(self, data): - self.lyc = data - if ((self.lcdc & 0x80) != 0): - if (self.ly == self.lyc): - # constants.NOTE: raise interrupt once per line (Prehistorik Man, The - # Jetsons, Muhammad Ali) - if ((self.stat & 0x04) == 0): - # constants.LYC=LY interrupt - self.stat |= 0x04 - if ((self.stat & 0x40) != 0): - self.interrupt.raiseInterrupt(constants.LCD) - else: - self.stat &= 0xFB - - - def setDMA(self, data): - self.dma = data - for index in range(0, constants.OAM_SIZE): - #TODO convert to byte - self.oam[index] = self.memory.read((self.dma << 8) + index) - - - def setBackgroundPalette(self, data): - if (self.bgp != data): - self.bgp = data - self.dirty = True - - - def setObjectPalette0(self, data): - if (self.obp0 != data): - self.obp0 = data - self.dirty = True - - - def setObjectPalette1(self, data): - if (self.obp1 != data): - self.obp1 = data - self.dirty = True - - - def setWindowY(self, data): - self.wy = data - - - def setWindowX(self, data): - self.wx = data - - - def emulateOAM(self): - self.stat = (self.stat & 0xFC) | 0x03 - self.cycles += constants.MODE_3_BEGIN_TICKS - self.transfer = True - - - def emulateTransfer(self): - if (self.transfer): - if (self.display): - self.drawLine() - self.stat = (self.stat & 0xFC) | 0x03 - self.cycles += constants.MODE_3_END_TICKS - self.transfer = False - else: - self.stat = (self.stat & 0xFC) | 0x00 - self.cycles += constants.MODE_0_TICKS - # H-Blank interrupt - if ((self.stat & 0x08) != 0 and (self.stat & 0x44) != 0x44): - self.interrupt.raiseInterrupt(constants.LCD) - - - def emulateHBlank(self): - self.ly+=1 - if (self.ly == self.lyc): - # constants.LYC=LY interrupt - self.stat |= 0x04 - if ((self.stat & 0x40) != 0): - self.interrupt.raiseInterrupt(constants.LCD) - else: - self.stat &= 0xFB - if (self.ly < 144): - self.stat = (self.stat & 0xFC) | 0x02 - self.cycles += constants.MODE_2_TICKS - # constants.OAM interrupt - if ((self.stat & 0x20) != 0 and (self.stat & 0x44) != 0x44): - self.interrupt.raiseInterrupt(constants.LCD) - else: - if (self.display): - self.drawFrame() - self.frames += 1 - if (self.frames >= self.frameSkip): - self.display = True - self.frames = 0 - else: - self.display = False - - self.stat = (self.stat & 0xFC) | 0x01 - self.cycles += constants.MODE_1_BEGIN_TICKS - self.vblank = True - - - def emulateVBlank(self): - if (self.vblank): - self.vblank = False - self.stat = (self.stat & 0xFC) | 0x01 - self.cycles += constants.MODE_1_TICKS - constants.MODE_1_BEGIN_TICKS - # V-Blank interrupt - if ((self.stat & 0x10) != 0): - self.interrupt.raiseInterrupt(constants.LCD) - # V-Blank interrupt - self.interrupt.raiseInterrupt(constants.VBLANK) - elif (self.ly == 0): - self.stat = (self.stat & 0xFC) | 0x02 - self.cycles += constants.MODE_2_TICKS - # constants.OAM interrupt - if ((self.stat & 0x20) != 0 and (self.stat & 0x44) != 0x44): - self.interrupt.raiseInterrupt(constants.LCD) - else: - if (self.ly < 153): - self.ly+=1 - self.stat = (self.stat & 0xFC) | 0x01 - if (self.ly == 153): - self.cycles += constants.MODE_1_END_TICKS - else: - self.cycles += constants.MODE_1_TICKS - else: - self.ly = self.wly = 0 - self.stat = (self.stat & 0xFC) | 0x01 - self.cycles += constants.MODE_1_TICKS - constants.MODE_1_END_TICKS - if (self.ly == self.lyc): - # constants.LYC=LY interrupt - self.stat |= 0x04 - if ((self.stat & 0x40) != 0): - self.interrupt.raiseInterrupt(constants.LCD) - else: - self.stat &= 0xFB - - - def drawFrame(self): - self.driver.display() - - - def clearFrame(self): - self.clearPixels() - self.driver.display() - - - def drawLine(self): - if ((self.lcdc & 0x01) != 0): - self.drawBackground() - else: - self.drawCleanBackground() - if ((self.lcdc & 0x20) != 0): - self.drawWindow() - if ((self.lcdc & 0x02) != 0): - self.drawObjects() - self.drawPixels() - - - def drawCleanBackground(self): - for x in range(0, 8+160+8): - self.line[x] = 0x00 - - - def drawBackground(self): - y = (self.scy + self.ly) & 0xFF - x = self.scx & 0xFF - tileMap = constants.VRAM_MAP_A - if (self.lcdc & 0x08) != 0: - tileMap = constants.VRAM_MAP_B - tileData = constants.VRAM_DATA_B - if (self.lcdc & 0x10) != 0: - tileData = constants.VRAM_DATA_A - tileMap += ((y >> 3) << 5) + (x >> 3) - tileData += (y & 7) << 1 - self.drawTiles(8 - (x & 7), tileMap, tileData) - - - def drawWindow(self): - if (self.ly >= self.wy and self.wx < 167 and self.wly < 144): - tileMap = constants.VRAM_MAP_A - if (self.lcdc & 0x40) != 0: - tileMap = constants.VRAM_MAP_B - tileData = constants.VRAM_DATA_B - if (self.lcdc & 0x10) != 0: - tileData = constants.VRAM_DATA_A - tileMap += (self.wly >> 3) << 5 - tileData += (self.wly & 7) << 1 - self.drawTiles(self.wx + 1, tileMap, tileData) - self.wly+=1 - - - def drawObjects(self): - count = self.scanObjects() - lastx = 176 - for index in range(176, count): - data = self.objects[index] - x = (data >> 24) & 0xFF - flags = (data >> 12) & 0xFF - address = data & 0xFFF - if (x + 8 <= lastx): - self.drawObjectTile(x, address, flags) - else: - self.drawOverlappedObjectTile(x, address, flags) - lastx = x - - - def scanObjects(self): - count = 0 - # search active objects - for offset in range(0, 4*40, 4): - y = self.oam[offset + 0] & 0xFF - x = self.oam[offset + 1] & 0xFF - if (y <= 0 or y >= 144 + 16 or x <= 0 or x >= 168): - continue - tile = self.oam[offset + 2] & 0xFF - flags = self.oam[offset + 3] & 0xFF - - y = self.ly - y + 16 - - if ((self.lcdc & 0x04) != 0): - # 8x16 tile size - if (y < 0 or y > 15): - continue - # Y flip - if ((flags & 0x40) != 0): - y = 15 - y - tile &= 0xFE - else: - # 8x8 tile size - if (y < 0 or y > 7): - continue - # Y flip - if ((flags & 0x40) != 0): - y = 7 - y - self.objects[count] = (x << 24) + (count << 20) + (flags << 12) + ((tile << 4) + (y << 1)) - if (++count >= constants.OBJECTS_PER_LINE): - break - self.sortScanObject(count) - return count - - def sortScanObject(self, count): - # sort objects from lower to higher priority - for index in range(0, count): - rightmost = index - for number in range(index+1, count): - if ((self.objects[number] >> 20) > (self.objects[rightmost] >> 20)): - rightmost = number - if (rightmost != index): - data = self.objects[index] - self.objects[index] = self.objects[rightmost] - self.objects[rightmost] = data - - - def drawTiles(self, x, tileMap, tileData): - if ((self.lcdc & 0x10) != 0): - while (x < 168): - tile = self.vram[tileMap] & 0xFF - self.drawTile(x, tileData + (tile << 4)) - tileMap = (tileMap & 0x1FE0) + ((tileMap + 1) & 0x001F) - x += 8 - else: - while (x < 168): - tile = (self.vram[tileMap] ^ 0x80) & 0xFF - self.drawTile(x, tileData + (tile << 4)) - tileMap = (tileMap & 0x1FE0) + ((tileMap + 1) & 0x001F) - x += 8 - - - def drawTile(self, x, address): - pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8) - self.line[x + 0] = (pattern >> 7) & 0x0101 - self.line[x + 1] = (pattern >> 6) & 0x0101 - self.line[x + 2] = (pattern >> 5) & 0x0101 - self.line[x + 3] = (pattern >> 4) & 0x0101 - self.line[x + 4] = (pattern >> 3) & 0x0101 - self.line[x + 5] = (pattern >> 2) & 0x0101 - self.line[x + 6] = (pattern >> 1) & 0x0101 - self.line[x + 7] = (pattern >> 0) & 0x0101 - - - def drawObjectTile(self, x, address, flags): - pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8) - mask = 0 - # priority - if (flags & 0x80) != 0: - mask |= 0x0008 - # palette - if (flags & 0x10) != 0: - mask |= 0x0004 - # X flip - if (flags & 0x20) != 0: - color = (pattern << 1) - if ((color & 0x0202) != 0): - self.line[x + 0] |= color | mask - color = (pattern >> 0) - if ((color & 0x0202) != 0): - self.line[x + 1] |= color | mask - color = (pattern >> 1) - if ((color & 0x0202) != 0): - self.line[x + 2] |= color | mask - color = (pattern >> 2) - if ((color & 0x0202) != 0): - self.line[x + 3] |= color | mask - color = (pattern >> 3) - if ((color & 0x0202) != 0): - self.line[x + 4] |= color | mask - color = (pattern >> 4) - if ((color & 0x0202) != 0): - self.line[x + 5] |= color | mask - color = (pattern >> 5) - if ((color & 0x0202) != 0): - self.line[x + 6] |= color | mask - color = (pattern >> 6) - if ((color & 0x0202) != 0): - self.line[x + 7] |= color | mask - else: - color = (pattern >> 6) - if ((color & 0x0202) != 0): - self.line[x + 0] |= color | mask - color = (pattern >> 5) - if ((color & 0x0202) != 0): - self.line[x + 1] |= color | mask - color = (pattern >> 4) - if ((color & 0x0202) != 0): - self.line[x + 2] |= color | mask - color = (pattern >> 3) - if ((color & 0x0202) != 0): - self.line[x + 3] |= color | mask - color = (pattern >> 2) - if ((color & 0x0202) != 0): - self.line[x + 4] |= color | mask - color = (pattern >> 1) - if ((color & 0x0202) != 0): - self.line[x + 5] |= color | mask - color = (pattern >> 0) - if ((color & 0x0202) != 0): - self.line[x + 6] |= color | mask - color = (pattern << 1) - if ((color & 0x0202) != 0): - self.line[x + 7] |= color | mask - - - def drawOverlappedObjectTile(self, x, address, flags): - pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8) - mask = 0 - # priority - if ((flags & 0x80) != 0): - mask |= 0x0008 - # palette - if ((flags & 0x10) != 0): - mask |= 0x0004 - # X flip - if ((flags & 0x20) != 0): - color = (pattern << 1) - if ((color & 0x0202) != 0): - self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask - color = (pattern >> 0) - if ((color & 0x0202) != 0): - self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask - color = (pattern >> 1) - if ((color & 0x0202) != 0): - self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask - color = (pattern >> 2) - if ((color & 0x0202) != 0): - self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask - color = (pattern >> 3) - if ((color & 0x0202) != 0): - self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask - color = (pattern >> 4) - if ((color & 0x0202) != 0): - self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask - color = (pattern >> 6) - if ((color & 0x0202) != 0): - self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask - color = (pattern >> 5) - if ((color & 0x0202) != 0): - self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask - else: - color = (pattern >> 6) - if ((color & 0x0202) != 0): - self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask - color = (pattern >> 5) - if ((color & 0x0202) != 0): - self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask - color = (pattern >> 4) - if ((color & 0x0202) != 0): - self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask - color = (pattern >> 3) - if ((color & 0x0202) != 0): - self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask - color = (pattern >> 2) - if ((color & 0x0202) != 0): - self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask - color = (pattern >> 1) - if ((color & 0x0202) != 0): - self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask - color = (pattern >> 0) - if ((color & 0x0202) != 0): - self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask - color = (pattern << 1) - if ((color & 0x0202) != 0): - self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask - - - def drawPixels(self): - self.updatePalette() - pixels = self.driver.getPixels() - offset = self.ly * self.driver.getWidth() - for x in range(8, 168, 4): - pattern0 = self.line[x + 0] - pattern1 = self.line[x + 1] - pattern2 = self.line[x + 2] - pattern3 = self.line[x + 3] - pixels[offset + 0] = self.palette[pattern0] - pixels[offset + 1] = self.palette[pattern1] - pixels[offset + 2] = self.palette[pattern2] - pixels[offset + 3] = self.palette[pattern3] - offset += 4 - - - def clearPixels(self): - pixels = self.driver.getPixels() - length = self.driver.getWidth() * self.driver.getHeight() - for offset in range(0, length): - pixels[offset] = constants.COLOR_MAP[0] - - - def updatePalette(self): - if (not self.dirty): - return - # bit 4/0 = constants.BG color, bit 5/1 = constants.OBJ color, bit 2 = constants.OBJ palette, bit - # 3 = constants.OBJ priority - for pattern in range(0, 64): - #color - if ((pattern & 0x22) == 0 or ((pattern & 0x08) != 0 and (pattern & 0x11) != 0)): - # constants.OBJ behind constants.BG color 1-3 - color = (self.bgp >> ((((pattern >> 3) & 0x02) + (pattern & 0x01)) << 1)) & 0x03 - # constants.OBJ above constants.BG - elif ((pattern & 0x04) == 0): - color = (self.obp0 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03 - else: - color = (self.obp1 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03 + # constants.LCD Registers int + lcdc = 0 + stat = 0 + scy = 0 + scx = 0 + ly = 0 + lyc = 0 + dma = 0 + bgp = 0 + obp0 = 0 + obp1 = 0 + wy = 0 + wx = 0 + wly = 0 + + cycles = 0 + + frames = 0 + frameSkip = 0 + + #boolean + transfer = False + display = False + vblank = False + dirty = False + + # Line Buffer, constants.OAM Cache and Color Palette + line = []#= new int[8 + 160 + 8] + objects = []#= new int[OBJECTS_PER_LINE] + palette = []#= new int[1024] + + # Video Driver VideoDriver + driver = None + + # Interrupt Controller Interrupt + interrupt = None + + # Memory Interface Memory + memory = None + + + def __init__(self, videDriver, interrupt, memory): + self.driver = videoDriver + self.interrupt = interrupt + self.memory = memory + self.reset() + + + def getFrameSkip(self): + return self.frameSkip + + + def setFrameSkip(self, frameSkip): + self.frameSkip = frameSkip + + + def reset(self): + self.cycles = constants.MODE_2_TICKS + + self.lcdc = 0x91 + self.stat = 2 + self.ly = 0 + self.lyc = 0 + self.dma = 0xFF + self.scy = 0 + self.scx = 0 + self.wy = self.wly = 0 + self.wx = 0 + self.bgp = 0xFC + self.obp0 = self.obp1 = 0xFF + + self.transfer = True + self.display = True + self.vblank = True + self.dirty = True + + for index in range(0, constants.VRAM_SIZE): + self.vram[index] = 0x00 + + for index in range(0, constants.OAM_SIZE): + self.oam[index] = 0x00 + + + def write(self, address, data): + # assert data >= 0x00 and data <= 0xFF + if address == constants.LCDC : + self.setControl(data) + elif address == constants.STAT: + self.setStatus(data) + elif address == constants.SCY: + self.setScrollY(data) + elif address == constants.SCX: + self.setScrollX(data) + elif address == constants.LY: + # Read Only + pass + elif address == constants.LYC: + self.setLYCompare(data) + elif address == constants.DMA: + self.setDMA(data) + elif address == constants.BGP: + self.setBackgroundPalette(data) + elif address == constants.OBP0: + self.setObjectPalette0(data) + elif address == constants.OBP1: + self.setObjectPalette1(data) + elif address == constants.WY: + self.setWindowY(data) + elif address == constants.WX: + self.setWindowX(data) + else: + if (address >= constants.OAM_ADDR and address < constants.OAM_ADDR + constants.OAM_SIZE): + #TODO convert to byte + self.oam[address - constants.OAM_ADDR] = data + elif (address >= constants.VRAM_ADDR and address < constants.VRAM_ADDR + constants.VRAM_SIZE): + #TODO convert to byte + self.vram[address - constants.VRAM_ADDR] =data + + + def read(self, address): + if address == constants.LCDC: + return self.getControl() + elif address == constants.STAT: + return self.getStatus() + elif address == constants.SCY: + return self.getScrollY() + elif address == constants.SCX: + return self.getScrollX() + elif address == constants.LY: + return self.getLineY() + elif address == constants.LYC: + return self.getLineYCompare() + elif address == constants.DMA: + return self.getDMA() + elif address == constants.BGP: + return self.getBackgroundPalette() + elif address == constants.OBP0: + return self.getObjectPalette0() + elif address == constants.OBP1: + return self.getObjectPalette1() + elif address == constants.WY: + return self.getWindowY() + elif address == constants.WX: + return self.getWindowX() + else: + if (address >= constants.OAM_ADDR and address < constants.OAM_ADDR + constants.OAM_SIZE): + return self.oam[address - constants.OAM_ADDR] & 0xFF + elif (address >= constants.VRAM_ADDR and address < constants.VRAM_ADDR + constants.VRAM_SIZE): + return self.vram[address - constants.VRAM_ADDR] & 0xFF + return 0xFF + + + def cycles(self): + return self.cycles + + + def emulate(self, ticks): + if ((self.lcdc & 0x80) != 0): + self.cycles -= ticks + while (self.cycles <= 0): + switch = self.stat & 0x03 + if switch == 0: + self.emulateHBlank() + elif switch == 1: + self.emulateVBlank() + elif switch == 2: + self.emulateOAM() + elif switch == 3: + self.emulateTransfer() + + + def getControl(self): + return self.lcdc + + + def getStatus(self): + return 0x80 | self.stat + + + def getScrollY(self): + return self.scy + + + def getScrollX(self): + return self.scx + + + def getLineY(self): + return self.ly + + + def getLineYCompare(self): + return self.lyc + + + def getDMA(self): + return self.dma + + + def getBackgroundPalette(self): + return self.bgp + + + def getObjectPalette0(self): + return self.obp0 + + + def getObjectPalette1(self): + return self.obp1 + + + def getWindowY(self): + return self.wy + + + def getWindowX(self): + return self.wx + + + def setControl(self, data): + if ((self.lcdc & 0x80) != (data & 0x80)): + # constants.NOTE: do not reset constants.LY=LYC flag (bit 2) of the constants.STAT register (Mr. + # Do!) + if ((data & 0x80) != 0): + self.stat = (self.stat & 0xFC) | 0x02 + self.cycles = constants.MODE_2_TICKS + self.ly = 0 + self.display = False + else: + self.stat = (self.stat & 0xFC) | 0x00 + self.cycles = constants.MODE_1_TICKS + self.ly = 0 + + self.clearFrame() + # don't draw window if it was not enabled and not being drawn before + if ((self.lcdc & 0x20) == 0 and (data & 0x20) != 0 and self.wly == 0 and self.ly > self.wy): + self.wly = 144 + self.lcdc = data + + + def setStatus(self, data): + self.stat = (self.stat & 0x87) | (data & 0x78) + # Gameboy Bug + if ((self.lcdc & 0x80) != 0 and (self.stat & 0x03) == 0x01 and (self.stat & 0x44) != 0x44): + self.interrupt.raiseInterrupt(constants.LCD) + + + def setScrollY(self, data): + self.scy = data + + + def setScrollX(self, data): + self.scx = data + + + def setLYCompare(self, data): + self.lyc = data + if ((self.lcdc & 0x80) != 0): + if (self.ly == self.lyc): + # constants.NOTE: raise interrupt once per line (Prehistorik Man, The + # Jetsons, Muhammad Ali) + if ((self.stat & 0x04) == 0): + # constants.LYC=LY interrupt + self.stat |= 0x04 + if ((self.stat & 0x40) != 0): + self.interrupt.raiseInterrupt(constants.LCD) + else: + self.stat &= 0xFB + + + def setDMA(self, data): + self.dma = data + for index in range(0, constants.OAM_SIZE): + #TODO convert to byte + self.oam[index] = self.memory.read((self.dma << 8) + index) + + + def setBackgroundPalette(self, data): + if (self.bgp != data): + self.bgp = data + self.dirty = True + + + def setObjectPalette0(self, data): + if (self.obp0 != data): + self.obp0 = data + self.dirty = True + + + def setObjectPalette1(self, data): + if (self.obp1 != data): + self.obp1 = data + self.dirty = True + + + def setWindowY(self, data): + self.wy = data + + + def setWindowX(self, data): + self.wx = data + + + def emulateOAM(self): + self.stat = (self.stat & 0xFC) | 0x03 + self.cycles += constants.MODE_3_BEGIN_TICKS + self.transfer = True + + + def emulateTransfer(self): + if (self.transfer): + if (self.display): + self.drawLine() + self.stat = (self.stat & 0xFC) | 0x03 + self.cycles += constants.MODE_3_END_TICKS + self.transfer = False + else: + self.stat = (self.stat & 0xFC) | 0x00 + self.cycles += constants.MODE_0_TICKS + # H-Blank interrupt + if ((self.stat & 0x08) != 0 and (self.stat & 0x44) != 0x44): + self.interrupt.raiseInterrupt(constants.LCD) + + + def emulateHBlank(self): + self.ly+=1 + if (self.ly == self.lyc): + # constants.LYC=LY interrupt + self.stat |= 0x04 + if ((self.stat & 0x40) != 0): + self.interrupt.raiseInterrupt(constants.LCD) + else: + self.stat &= 0xFB + if (self.ly < 144): + self.stat = (self.stat & 0xFC) | 0x02 + self.cycles += constants.MODE_2_TICKS + # constants.OAM interrupt + if ((self.stat & 0x20) != 0 and (self.stat & 0x44) != 0x44): + self.interrupt.raiseInterrupt(constants.LCD) + else: + if (self.display): + self.drawFrame() + self.frames += 1 + if (self.frames >= self.frameSkip): + self.display = True + self.frames = 0 + else: + self.display = False + + self.stat = (self.stat & 0xFC) | 0x01 + self.cycles += constants.MODE_1_BEGIN_TICKS + self.vblank = True + + + def emulateVBlank(self): + if (self.vblank): + self.vblank = False + self.stat = (self.stat & 0xFC) | 0x01 + self.cycles += constants.MODE_1_TICKS - constants.MODE_1_BEGIN_TICKS + # V-Blank interrupt + if ((self.stat & 0x10) != 0): + self.interrupt.raiseInterrupt(constants.LCD) + # V-Blank interrupt + self.interrupt.raiseInterrupt(constants.VBLANK) + elif (self.ly == 0): + self.stat = (self.stat & 0xFC) | 0x02 + self.cycles += constants.MODE_2_TICKS + # constants.OAM interrupt + if ((self.stat & 0x20) != 0 and (self.stat & 0x44) != 0x44): + self.interrupt.raiseInterrupt(constants.LCD) + else: + if (self.ly < 153): + self.ly+=1 + self.stat = (self.stat & 0xFC) | 0x01 + if (self.ly == 153): + self.cycles += constants.MODE_1_END_TICKS + else: + self.cycles += constants.MODE_1_TICKS + else: + self.ly = self.wly = 0 + self.stat = (self.stat & 0xFC) | 0x01 + self.cycles += constants.MODE_1_TICKS - constants.MODE_1_END_TICKS + if (self.ly == self.lyc): + # constants.LYC=LY interrupt + self.stat |= 0x04 + if ((self.stat & 0x40) != 0): + self.interrupt.raiseInterrupt(constants.LCD) + else: + self.stat &= 0xFB + + + def drawFrame(self): + self.driver.display() + + + def clearFrame(self): + self.clearPixels() + self.driver.display() + + + def drawLine(self): + if ((self.lcdc & 0x01) != 0): + self.drawBackground() + else: + self.drawCleanBackground() + if ((self.lcdc & 0x20) != 0): + self.drawWindow() + if ((self.lcdc & 0x02) != 0): + self.drawObjects() + self.drawPixels() + + + def drawCleanBackground(self): + for x in range(0, 8+160+8): + self.line[x] = 0x00 + + + def drawBackground(self): + y = (self.scy + self.ly) & 0xFF + x = self.scx & 0xFF + tileMap = constants.VRAM_MAP_A + if (self.lcdc & 0x08) != 0: + tileMap = constants.VRAM_MAP_B + tileData = constants.VRAM_DATA_B + if (self.lcdc & 0x10) != 0: + tileData = constants.VRAM_DATA_A + tileMap += ((y >> 3) << 5) + (x >> 3) + tileData += (y & 7) << 1 + self.drawTiles(8 - (x & 7), tileMap, tileData) + + + def drawWindow(self): + if (self.ly >= self.wy and self.wx < 167 and self.wly < 144): + tileMap = constants.VRAM_MAP_A + if (self.lcdc & 0x40) != 0: + tileMap = constants.VRAM_MAP_B + tileData = constants.VRAM_DATA_B + if (self.lcdc & 0x10) != 0: + tileData = constants.VRAM_DATA_A + tileMap += (self.wly >> 3) << 5 + tileData += (self.wly & 7) << 1 + self.drawTiles(self.wx + 1, tileMap, tileData) + self.wly+=1 + + + def drawObjects(self): + count = self.scanObjects() + lastx = 176 + for index in range(176, count): + data = self.objects[index] + x = (data >> 24) & 0xFF + flags = (data >> 12) & 0xFF + address = data & 0xFFF + if (x + 8 <= lastx): + self.drawObjectTile(x, address, flags) + else: + self.drawOverlappedObjectTile(x, address, flags) + lastx = x + + + def scanObjects(self): + count = 0 + # search active objects + for offset in range(0, 4*40, 4): + y = self.oam[offset + 0] & 0xFF + x = self.oam[offset + 1] & 0xFF + if (y <= 0 or y >= 144 + 16 or x <= 0 or x >= 168): + continue + tile = self.oam[offset + 2] & 0xFF + flags = self.oam[offset + 3] & 0xFF + + y = self.ly - y + 16 + + if ((self.lcdc & 0x04) != 0): + # 8x16 tile size + if (y < 0 or y > 15): + continue + # Y flip + if ((flags & 0x40) != 0): + y = 15 - y + tile &= 0xFE + else: + # 8x8 tile size + if (y < 0 or y > 7): + continue + # Y flip + if ((flags & 0x40) != 0): + y = 7 - y + self.objects[count] = (x << 24) + (count << 20) + (flags << 12) + ((tile << 4) + (y << 1)) + if (++count >= constants.OBJECTS_PER_LINE): + break + self.sortScanObject(count) + return count + + def sortScanObject(self, count): + # sort objects from lower to higher priority + for index in range(0, count): + rightmost = index + for number in range(index+1, count): + if ((self.objects[number] >> 20) > (self.objects[rightmost] >> 20)): + rightmost = number + if (rightmost != index): + data = self.objects[index] + self.objects[index] = self.objects[rightmost] + self.objects[rightmost] = data + + + def drawTiles(self, x, tileMap, tileData): + if ((self.lcdc & 0x10) != 0): + while (x < 168): + tile = self.vram[tileMap] & 0xFF + self.drawTile(x, tileData + (tile << 4)) + tileMap = (tileMap & 0x1FE0) + ((tileMap + 1) & 0x001F) + x += 8 + else: + while (x < 168): + tile = (self.vram[tileMap] ^ 0x80) & 0xFF + self.drawTile(x, tileData + (tile << 4)) + tileMap = (tileMap & 0x1FE0) + ((tileMap + 1) & 0x001F) + x += 8 + + + def drawTile(self, x, address): + pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8) + self.line[x + 0] = (pattern >> 7) & 0x0101 + self.line[x + 1] = (pattern >> 6) & 0x0101 + self.line[x + 2] = (pattern >> 5) & 0x0101 + self.line[x + 3] = (pattern >> 4) & 0x0101 + self.line[x + 4] = (pattern >> 3) & 0x0101 + self.line[x + 5] = (pattern >> 2) & 0x0101 + self.line[x + 6] = (pattern >> 1) & 0x0101 + self.line[x + 7] = (pattern >> 0) & 0x0101 + + + def drawObjectTile(self, x, address, flags): + pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8) + mask = 0 + # priority + if (flags & 0x80) != 0: + mask |= 0x0008 + # palette + if (flags & 0x10) != 0: + mask |= 0x0004 + # X flip + if (flags & 0x20) != 0: + color = (pattern << 1) + if ((color & 0x0202) != 0): + self.line[x + 0] |= color | mask + color = (pattern >> 0) + if ((color & 0x0202) != 0): + self.line[x + 1] |= color | mask + color = (pattern >> 1) + if ((color & 0x0202) != 0): + self.line[x + 2] |= color | mask + color = (pattern >> 2) + if ((color & 0x0202) != 0): + self.line[x + 3] |= color | mask + color = (pattern >> 3) + if ((color & 0x0202) != 0): + self.line[x + 4] |= color | mask + color = (pattern >> 4) + if ((color & 0x0202) != 0): + self.line[x + 5] |= color | mask + color = (pattern >> 5) + if ((color & 0x0202) != 0): + self.line[x + 6] |= color | mask + color = (pattern >> 6) + if ((color & 0x0202) != 0): + self.line[x + 7] |= color | mask + else: + color = (pattern >> 6) + if ((color & 0x0202) != 0): + self.line[x + 0] |= color | mask + color = (pattern >> 5) + if ((color & 0x0202) != 0): + self.line[x + 1] |= color | mask + color = (pattern >> 4) + if ((color & 0x0202) != 0): + self.line[x + 2] |= color | mask + color = (pattern >> 3) + if ((color & 0x0202) != 0): + self.line[x + 3] |= color | mask + color = (pattern >> 2) + if ((color & 0x0202) != 0): + self.line[x + 4] |= color | mask + color = (pattern >> 1) + if ((color & 0x0202) != 0): + self.line[x + 5] |= color | mask + color = (pattern >> 0) + if ((color & 0x0202) != 0): + self.line[x + 6] |= color | mask + color = (pattern << 1) + if ((color & 0x0202) != 0): + self.line[x + 7] |= color | mask + + + def drawOverlappedObjectTile(self, x, address, flags): + pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8) + mask = 0 + # priority + if ((flags & 0x80) != 0): + mask |= 0x0008 + # palette + if ((flags & 0x10) != 0): + mask |= 0x0004 + # X flip + if ((flags & 0x20) != 0): + color = (pattern << 1) + if ((color & 0x0202) != 0): + self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask + color = (pattern >> 0) + if ((color & 0x0202) != 0): + self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask + color = (pattern >> 1) + if ((color & 0x0202) != 0): + self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask + color = (pattern >> 2) + if ((color & 0x0202) != 0): + self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask + color = (pattern >> 3) + if ((color & 0x0202) != 0): + self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask + color = (pattern >> 4) + if ((color & 0x0202) != 0): + self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask + color = (pattern >> 6) + if ((color & 0x0202) != 0): + self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask + color = (pattern >> 5) + if ((color & 0x0202) != 0): + self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask + else: + color = (pattern >> 6) + if ((color & 0x0202) != 0): + self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask + color = (pattern >> 5) + if ((color & 0x0202) != 0): + self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask + color = (pattern >> 4) + if ((color & 0x0202) != 0): + self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask + color = (pattern >> 3) + if ((color & 0x0202) != 0): + self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask + color = (pattern >> 2) + if ((color & 0x0202) != 0): + self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask + color = (pattern >> 1) + if ((color & 0x0202) != 0): + self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask + color = (pattern >> 0) + if ((color & 0x0202) != 0): + self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask + color = (pattern << 1) + if ((color & 0x0202) != 0): + self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask + + + def drawPixels(self): + self.updatePalette() + pixels = self.driver.getPixels() + offset = self.ly * self.driver.getWidth() + for x in range(8, 168, 4): + pattern0 = self.line[x + 0] + pattern1 = self.line[x + 1] + pattern2 = self.line[x + 2] + pattern3 = self.line[x + 3] + pixels[offset + 0] = self.palette[pattern0] + pixels[offset + 1] = self.palette[pattern1] + pixels[offset + 2] = self.palette[pattern2] + pixels[offset + 3] = self.palette[pattern3] + offset += 4 + + + def clearPixels(self): + pixels = self.driver.getPixels() + length = self.driver.getWidth() * self.driver.getHeight() + for offset in range(0, length): + pixels[offset] = constants.COLOR_MAP[0] + + + def updatePalette(self): + if (not self.dirty): + return + # bit 4/0 = constants.BG color, bit 5/1 = constants.OBJ color, bit 2 = constants.OBJ palette, bit + # 3 = constants.OBJ priority + for pattern in range(0, 64): + #color + if ((pattern & 0x22) == 0 or ((pattern & 0x08) != 0 and (pattern & 0x11) != 0)): + # constants.OBJ behind constants.BG color 1-3 + color = (self.bgp >> ((((pattern >> 3) & 0x02) + (pattern & 0x01)) << 1)) & 0x03 + # constants.OBJ above constants.BG + elif ((pattern & 0x04) == 0): + color = (self.obp0 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03 + else: + color = (self.obp1 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03 - self.palette[((pattern & 0x30) << 4) + (pattern & 0x0F)] = constants.COLOR_MAP[color] - self.dirty = False + self.palette[((pattern & 0x30) << 4) + (pattern & 0x0F)] = constants.COLOR_MAP[color] + self.dirty = False From cami at codespeak.net Sun Mar 16 21:00:44 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sun, 16 Mar 2008 21:00:44 +0100 (CET) Subject: [pypy-svn] r52622 - pypy/branch/gameboy-emulator/pypy/lang/gameboy/test Message-ID: <20080316200044.3455516A011@codespeak.net> Author: cami Date: Sun Mar 16 21:00:42 2008 New Revision: 52622 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Log: added more cpu cycles Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Sun Mar 16 21:00:42 2008 @@ -108,7 +108,13 @@ (0x08, 5), (0x10, 0), (0x18, 3), - (0x01, 0x31, 0x10, 3) + (0x20, 0x38, 0x08, [2,3]), + (0x01, 0x31, 0x10, 3), + (0x09, 0x39, 0x10, 2), + (0x02, 0x3A, 0x08, 2), + (0x03, 0x33, 0x10, 2), + (0x0B, 0x3B, 0x10, 2), + (0x04, 0x2C, 0x01, 1), (0x34, 3), (0x3C, 1) #CPU.java line 331 ] def test_cycles(): From arigo at codespeak.net Sun Mar 16 21:04:35 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 16 Mar 2008 21:04:35 +0100 (CET) Subject: [pypy-svn] r52623 - in pypy/branch/loops-for-gcc/pypy/translator/backendopt: . test Message-ID: <20080316200435.9C1B916A011@codespeak.net> Author: arigo Date: Sun Mar 16 21:04:35 2008 New Revision: 52623 Added: pypy/branch/loops-for-gcc/pypy/translator/backendopt/innerloop.py (contents, props changed) pypy/branch/loops-for-gcc/pypy/translator/backendopt/test/test_innerloop.py (contents, props changed) Log: A cleaner heuristic, with tests. Thanks stakkars Added: pypy/branch/loops-for-gcc/pypy/translator/backendopt/innerloop.py ============================================================================== --- (empty file) +++ pypy/branch/loops-for-gcc/pypy/translator/backendopt/innerloop.py Sun Mar 16 21:04:35 2008 @@ -0,0 +1,120 @@ +""" +This is optional support code for backends: it finds which cycles +in a graph are likely to correspond to source-level 'inner loops'. +""" +from pypy.tool.algo import graphlib +from pypy.objspace.flow.model import Variable +from pypy.translator.backendopt.ssa import DataFlowFamilyBuilder + + +class Loop: + def __init__(self, headblock, links): + self.headblock = headblock + self.links = links # list of Links making the cycle, + # starting from one of the exits of headblock + + +def find_inner_loops(graph, check_exitswitch_type=None): + """Enumerate what look like the innermost loops of the graph. + Returns a list of non-overlapping Loop() instances. + """ + # Heuristic (thanks Stakkars for the idea): + # to find the "best" cycle to pick, + # + # * look for variables that don't change over the whole cycle + # + # * cycles with _more_ of them are _inside_ cycles with less of them, + # because any variable that doesn't change over an outer loop will + # not change over an inner loop either, and on the other hand the + # outer loop is likely to use and modify variables that remain + # constant over the inner loop. + # + # * if the numbers are the same, fall back to a more arbitrary + # measure: loops involving less blocks may be more important + # to optimize + # + # * in a cycle, which block is the head of the loop? Somewhat + # arbitrarily we pick the first Bool-switching block that has + # two exits. The "first" means the one closest to the + # startblock of the graph. + # + startdistance = {} # {block: distance-from-startblock} + pending = [graph.startblock] + edge_list = [] + dist = 0 + while pending: + newblocks = [] + for block in pending: + if block not in startdistance: + startdistance[block] = dist + for link in block.exits: + newblocks.append(link.target) + edge = graphlib.Edge(block, link.target) + edge.link = link + edge_list.append(edge) + dist += 1 + pending = newblocks + + vertices = startdistance + edges = graphlib.make_edge_dict(edge_list) + cycles = graphlib.all_cycles(graph.startblock, vertices, edges) + loops = [] + variable_families = None + + for cycle in cycles: + # find the headblock + candidates = [] + for i in range(len(cycle)): + block = cycle[i].source + v = block.exitswitch + if isinstance(v, Variable) and len(block.exits) == 2: + if getattr(v, 'concretetype', None) is check_exitswitch_type: + dist = startdistance[block] + candidates.append((dist, i)) + if not candidates: + continue + _, i = min(candidates) + links = [edge.link for edge in cycle[i:] + cycle[:i]] + loop = Loop(cycle[i].source, links) + + # count the variables that remain constant across the cycle, + # detected as having its SSA family present across all blocks. + if variable_families is None: + dffb = DataFlowFamilyBuilder(graph) + variable_families = dffb.get_variable_families() + + num_loop_constants = 0 + for v in loop.headblock.inputargs: + v = variable_families.find_rep(v) + for link in loop.links: + block1 = link.target + for v1 in block1.inputargs: + v1 = variable_families.find_rep(v1) + if v1 is v: + break # ok, found in this block + else: + break # not found in this block, fail + else: + # found in all blocks, this variable is a loop constant + num_loop_constants += 1 + + # smaller keys are "better" + key = (-num_loop_constants, # maximize num_loop_constants + len(cycle)) # minimize len(cycle) + loops.append((key, loop)) + + loops.sort() + + # returns 'loops' without overlapping blocks + result = [] + blocks_seen = {} + for key, loop in loops: + for link in loop.links: + if link.target in blocks_seen: + break # overlapping + else: + # non-overlapping + result.append(loop) + for link in loop.links: + blocks_seen[link.target] = True + return result Added: pypy/branch/loops-for-gcc/pypy/translator/backendopt/test/test_innerloop.py ============================================================================== --- (empty file) +++ pypy/branch/loops-for-gcc/pypy/translator/backendopt/test/test_innerloop.py Sun Mar 16 21:04:35 2008 @@ -0,0 +1,63 @@ +from pypy.translator.translator import TranslationContext +from pypy.translator.backendopt.innerloop import find_inner_loops +from pypy.conftest import option + +def test_simple_loop(): + def snippet_fn(x, y): + while y > 0: + y -= x + return y + t = TranslationContext() + graph = t.buildflowgraph(snippet_fn) + if option.view: + t.view() + loops = find_inner_loops(graph) + assert len(loops) == 1 + loop = loops[0] + assert loop.headblock.operations[0].opname == 'gt' + assert len(loop.links) == 2 + assert loop.links[0] in loop.headblock.exits + assert loop.links[1] in loop.links[0].target.exits + assert loop.links[1].target is loop.headblock + +def test_two_loops(): + def snippet_fn(x, y): + while y > 0: + y -= x + while y < 0: + y += x + return y + t = TranslationContext() + graph = t.buildflowgraph(snippet_fn) + if option.view: + t.view() + loops = find_inner_loops(graph) + assert len(loops) == 2 + assert loops[0].headblock is not loops[1].headblock + for loop in loops: + assert loop.headblock.operations[0].opname in ('gt', 'lt') + assert len(loop.links) == 2 + assert loop.links[0] in loop.headblock.exits + assert loop.links[1] in loop.links[0].target.exits + assert loop.links[1].target is loop.headblock + +def test_nested_loops(): + def snippet_fn(x, z): + y = 0 + while y <= 10: + while z < y: + z += y + y += 1 + return z + t = TranslationContext() + graph = t.buildflowgraph(snippet_fn) + if option.view: + t.view() + loops = find_inner_loops(graph) + assert len(loops) == 1 + loop = loops[0] + assert loop.headblock.operations[0].opname == 'lt' + assert len(loop.links) == 2 + assert loop.links[0] in loop.headblock.exits + assert loop.links[1] in loop.links[0].target.exits + assert loop.links[1].target is loop.headblock From antocuni at codespeak.net Mon Mar 17 09:56:30 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Mon, 17 Mar 2008 09:56:30 +0100 (CET) Subject: [pypy-svn] r52628 - in pypy/dist/pypy/translator/cli: . test Message-ID: <20080317085630.5BEE1169F98@codespeak.net> Author: antocuni Date: Mon Mar 17 09:56:28 2008 New Revision: 52628 Modified: pypy/dist/pypy/translator/cli/constant.py pypy/dist/pypy/translator/cli/dotnet.py pypy/dist/pypy/translator/cli/test/test_dotnet.py Log: now it should really be possible to mix all record instances with System.Object instances Modified: pypy/dist/pypy/translator/cli/constant.py ============================================================================== --- pypy/dist/pypy/translator/cli/constant.py (original) +++ pypy/dist/pypy/translator/cli/constant.py Mon Mar 17 09:56:28 2008 @@ -83,20 +83,20 @@ def downcast_constant(self, gen, const, EXPECTED_TYPE): type = self.cts.lltype_to_cts(EXPECTED_TYPE) gen.ilasm.opcode('castclass', type) - + def _get_key_for_const(self, value): - from pypy.translator.cli.dotnet import _record_view - if isinstance(value, _record_view): - return value._record + if isinstance(value, ootype._view) and isinstance(value._inst, ootype._record): + return value._inst return BaseConstantGenerator._get_key_for_const(self, value) def _create_complex_const(self, value): - from pypy.translator.cli.dotnet import _fieldinfo, _record_view + from pypy.translator.cli.dotnet import _fieldinfo + if isinstance(value, _fieldinfo): uniq = self.db.unique() return CLIFieldInfoConst(self.db, value.llvalue, uniq) - elif isinstance(value, _record_view): - return self.record_const(value._record) + elif isinstance(value, ootype._view) and isinstance(value._inst, ootype._record): + return self.record_const(value._inst) else: return BaseConstantGenerator._create_complex_const(self, value) Modified: pypy/dist/pypy/translator/cli/dotnet.py ============================================================================== --- pypy/dist/pypy/translator/cli/dotnet.py (original) +++ pypy/dist/pypy/translator/cli/dotnet.py Mon Mar 17 09:56:28 2008 @@ -633,37 +633,16 @@ v_inst = hop.inputarg(hop.args_r[0], arg=0) return hop.genop('oodowncast', [v_inst], resulttype = hop.r_result.lowleveltype) -class _record_view(object): - - def __init__(self, record): - self._record = record - self._TYPE = CLR.System.Object._INSTANCE - - def __ne__(self, other): - return not (self == other) - - def __eq__(self, other): - if isinstance(other, ootype._record): - return self._record == other - assert isinstance(other, _record_view) - return self._record == other._record - - def __hash__(self): - return hash(self._record) - - def __nonzero__(self): - return bool(self._record) - - def cast_record_to_object(record): T = ootype.typeOf(record) assert isinstance(T, ootype.Record) - return _record_view(record) + return ootype._view(CLR.System.Object._INSTANCE, record) def cast_object_to_record(T, obj): assert isinstance(T, ootype.Record) - assert isinstance(obj, _record_view) - record = obj._record + assert isinstance(obj, ootype._view) + assert isinstance(obj._inst, ootype._record) + record = obj._inst assert ootype.typeOf(record) == T return record Modified: pypy/dist/pypy/translator/cli/test/test_dotnet.py ============================================================================== --- pypy/dist/pypy/translator/cli/test/test_dotnet.py (original) +++ pypy/dist/pypy/translator/cli/test/test_dotnet.py Mon Mar 17 09:56:28 2008 @@ -641,7 +641,7 @@ res = self.interpret(fn, [True]) assert res == 'Int32' - def test_mix_record_and_object(self): + def test_cast_record(self): T = ootype.Record({'x': ootype.Signed}) record = ootype.new(T) def fn(flag): @@ -665,6 +665,14 @@ res = self.interpret(fn, []) assert res + def test_cast_record_mix_object(self): + T = ootype.Record({'x': ootype.Signed}) + NULL = ootype.null(System.Object._INSTANCE) + record = cast_record_to_object(ootype.new(T)) + assert record != NULL + assert NULL != record + + class TestPythonnet(TestDotnetRtyping): # don't interpreter functions but execute them directly through pythonnet def interpret(self, f, args, backendopt='ignored'): From arigo at codespeak.net Mon Mar 17 10:12:40 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 17 Mar 2008 10:12:40 +0100 (CET) Subject: [pypy-svn] r52629 - pypy/branch/loops-for-gcc/pypy/translator/c Message-ID: <20080317091240.F3FAA169FA0@codespeak.net> Author: arigo Date: Mon Mar 17 10:12:40 2008 New Revision: 52629 Modified: pypy/branch/loops-for-gcc/pypy/translator/c/funcgen.py Log: Use find_inner_loops() in funcgen. Modified: pypy/branch/loops-for-gcc/pypy/translator/c/funcgen.py ============================================================================== --- pypy/branch/loops-for-gcc/pypy/translator/c/funcgen.py (original) +++ pypy/branch/loops-for-gcc/pypy/translator/c/funcgen.py Mon Mar 17 10:12:40 2008 @@ -13,6 +13,7 @@ from pypy.rpython.lltypesystem.lltype import ForwardReference, FuncType from pypy.rpython.lltypesystem.llmemory import Address from pypy.translator.backendopt.ssa import SSI_to_SSA +from pypy.translator.backendopt.innerloop import find_inner_loops PyObjPtr = Ptr(PyObject) LOCALVAR = 'l_%s' @@ -32,9 +33,8 @@ vars lltypes functionname - currentblock blocknum - backlinks + innerloops oldgraph""".split() def __init__(self, graph, db, exception_policy=None, functionname=None): @@ -113,58 +113,14 @@ self.db.gctransformer.inline_helpers(graph) return graph - def order_blocks(self): - from pypy.tool.algo import graphlib - self.blocknum = {} - self.backlinks = {} - vertices = {} - edge_list = [] - for index, block in enumerate(self.graph.iterblocks()): - self.blocknum[block] = index - vertices[block] = True - for link in block.exits: - edge_list.append(graphlib.Edge(block, link.target)) - edges = graphlib.make_edge_dict(edge_list) - cycles = graphlib.all_cycles(self.graph.startblock, vertices, edges) - cycles.sort(key=len) - for cycle in cycles: - for edge in cycle: - if edge.source not in vertices: - break # cycle overlaps already-seen blocks - else: - # make this cycle a C-level loop - def edge2link(edge): - for link in edge.source.exits: - if link.target is edge.target: - return link - raise AssertionError("an edge's link has gone missing") - - edges = [] - for i, edge in enumerate(cycle): - v = edge.source.exitswitch - if isinstance(v, Variable) and len(edge.source.exits) == 2: - TYPE = self.lltypemap(v) - if TYPE in (Bool, PyObjPtr): - edges.append((self.blocknum[edge.source], i)) - if not edges: - continue - _, i = min(edges) - backedge = cycle[i-1] - forwardedge = cycle[i] - headblock = backedge.target - assert headblock is forwardedge.source - self.backlinks[edge2link(backedge)] = None - exitcase = edge2link(forwardedge).exitcase - assert exitcase in (False, True) - self.backlinks[headblock] = exitcase - for edge in cycle: - del vertices[edge.target] - def implementation_begin(self): self.oldgraph = self.graph self.graph = self.patch_graph(copy_graph=True) SSI_to_SSA(self.graph) self.collect_var_and_types() + self.blocknum = {} + for block in self.graph.iterblocks(): + self.blocknum[block] = len(self.blocknum) db = self.db lltypes = {} for v in self.vars: @@ -172,7 +128,9 @@ typename = db.gettype(T) lltypes[id(v)] = T, typename self.lltypes = lltypes - self.order_blocks() + self.innerloops = {} # maps the loop's header block to a Loop() + for loop in find_inner_loops(self.graph, Bool): + self.innerloops[loop.headblock] = loop def graphs_to_patch(self): yield self.graph @@ -181,8 +139,7 @@ self.lltypes = None self.vars = None self.blocknum = None - self.backlinks = None - self.currentblock = None + self.innerloops = None self.graph = self.oldgraph del self.oldgraph @@ -251,10 +208,8 @@ graph = self.graph # generate the body of each block - allblocks = [(num, block) for (block, num) in self.blocknum.items()] - allblocks.sort() - for myblocknum, block in allblocks: - self.currentblock = block + for block in graph.iterblocks(): + myblocknum = self.blocknum[block] yield '' yield 'block%d:' % myblocknum for i, op in enumerate(block.operations): @@ -279,25 +234,9 @@ assert len(block.exits) == 1 for op in self.gen_link(block.exits[0]): yield op - elif block in self.backlinks: - looplink, exitlink = block.exits - if looplink.exitcase != self.backlinks[block]: - looplink, exitlink = exitlink, looplink - assert looplink.exitcase == self.backlinks[block] - assert exitlink.exitcase == (not self.backlinks[block]) - expr = self.expr(block.exitswitch) - if not looplink.exitcase: - expr = '!' + expr - yield 'while (%s) {' % expr - for op in self.gen_link(looplink): - yield '\t' + op - yield '\t block%d_back:' % myblocknum - for i, op in enumerate(block.operations): - for line in self.gen_op(op): - yield '\t' + line - yield '}' - for op in self.gen_link(exitlink): - yield op + elif block in self.innerloops: + for line in self.gen_while_loop_hack(block): + yield line else: assert block.exitswitch != c_last_exception # block ending in a switch on a value @@ -371,8 +310,10 @@ for line in gen_assignments(assignments): yield line label = 'block%d' % self.blocknum[link.target] - if link in self.backlinks: - label += '_back' + if link.target in self.innerloops: + loop = self.innerloops[link.target] + if link is loop.links[-1]: # link that ends a loop + label += '_back' yield 'goto %s;' % label def gen_op(self, op): @@ -395,6 +336,52 @@ for line in line.splitlines(): yield line + def gen_while_loop_hack(self, headblock): + # a GCC optimization hack: generate 'while' statement in the + # source to convince the C compiler that it is really dealing + # with loops. For the head of a loop (i.e. the block where the + # decision is) we produce code like this: + # + # headblock: + # ...headblock operations... + # while (cond) { + # goto firstbodyblock; + # headblock_back: + # ...headblock operations... + # } + # + # The real body of the loop is not syntactically within the + # scope of { }, but apparently this doesn't matter to GCC as + # long as it is within the { } via the chain of goto's starting + # at firstbodyblock: and ending at headblock_back:. We need to + # duplicate the operations of headblock, though, because the + # chain of gotos entering the loop must arrive outside the + # while() at the headblock: label and the chain of goto's that + # close the loop must arrive inside the while() at the + # headblock_back: label. + + looplinks = self.innerloops[headblock].links + enterlink = looplinks[0] + assert len(headblock.exits) == 2 + assert isinstance(headblock.exits[0].exitcase, bool) + assert isinstance(headblock.exits[1].exitcase, bool) + i = list(headblock.exits).index(enterlink) + exitlink = headblock.exits[1 - i] + + expr = self.expr(headblock.exitswitch) + if enterlink.exitcase == False: + expr = '!' + expr + yield 'while (%s) {' % expr + for op in self.gen_link(enterlink): + yield '\t' + op + yield '\t block%d_back:' % self.blocknum[headblock] + for i, op in enumerate(headblock.operations): + for line in self.gen_op(op): + yield '\t' + line + yield '}' + for op in self.gen_link(exitlink): + yield op + # ____________________________________________________________ # the C preprocessor cannot handle operations taking a variable number From arigo at codespeak.net Mon Mar 17 10:25:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 17 Mar 2008 10:25:09 +0100 (CET) Subject: [pypy-svn] r52630 - pypy/dist/pypy/objspace/flow/test Message-ID: <20080317092509.16C08169FAE@codespeak.net> Author: arigo Date: Mon Mar 17 10:25:08 2008 New Revision: 52630 Modified: pypy/dist/pypy/objspace/flow/test/test_objspace.py Log: Fix two tests that now require builtins_can_raise_exceptions. Modified: pypy/dist/pypy/objspace/flow/test/test_objspace.py ============================================================================== --- pypy/dist/pypy/objspace/flow/test/test_objspace.py (original) +++ pypy/dist/pypy/objspace/flow/test/test_objspace.py Mon Mar 17 10:25:08 2008 @@ -297,45 +297,6 @@ assert d == {None: True, OSError: True, Exception: True} #__________________________________________________________ - def reraiseAttributeError(v): - try: - x = getattr(v, "y") - except AttributeError: - raise - - def test_reraiseAttributeError(self): - x = self.codetest(self.reraiseAttributeError) - simplify_graph(x) - self.show(x) - found_AttributeError = [] - def only_raise_AttributeError(link): - if isinstance(link, Link): - if link.target is x.exceptblock: - assert link.args[0] == Constant(AttributeError) - found_AttributeError.append(link) - traverse(only_raise_AttributeError, x) - assert found_AttributeError - - def reraiseTypeError(dic): - try: - x = dic[5] - except TypeError: - raise - - def test_reraiseTypeError(self): - x = self.codetest(self.reraiseTypeError) - simplify_graph(x) - self.show(x) - found = [] - def can_reach_exceptblock(link): - if isinstance(link, Link): - if link.target is x.exceptblock: - found.append(link) - traverse(can_reach_exceptblock, x) - assert found - - - #__________________________________________________________ def reraiseAnythingDicCase(dic): try: dic[5] @@ -867,6 +828,56 @@ g = self.codetest(f) +class TestGenInterpStyle(Base): + def setup_class(cls): + cls.space = FlowObjSpace() + cls.space.config.translation.builtins_can_raise_exceptions = True + + def reraiseAttributeError(v): + try: + x = getattr(v, "y") + except AttributeError: + raise + + def test_reraiseAttributeError(self): + x = self.codetest(self.reraiseAttributeError) + simplify_graph(x) + self.show(x) + excfound = [] + def check(link): + if isinstance(link, Link): + if link.target is x.exceptblock: + excfound.append(link.exitcase) + traverse(check, x) + assert len(excfound) == 2 + excfound.sort() + expected = [Exception, AttributeError] + expected.sort() + assert excfound == expected + + def reraiseTypeError(dic): + try: + x = dic[5] + except TypeError: + raise + + def test_reraiseTypeError(self): + x = self.codetest(self.reraiseTypeError) + simplify_graph(x) + self.show(x) + excfound = [] + def check(link): + if isinstance(link, Link): + if link.target is x.exceptblock: + excfound.append(link.exitcase) + traverse(check, x) + assert len(excfound) == 2 + excfound.sort() + expected = [Exception, TypeError] + expected.sort() + assert excfound == expected + + DATA = {'x': 5, 'y': 6} From cfbolz at codespeak.net Mon Mar 17 11:04:30 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 17 Mar 2008 11:04:30 +0100 (CET) Subject: [pypy-svn] r52631 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080317100430.EB6F9169F8A@codespeak.net> Author: cfbolz Date: Mon Mar 17 11:04:29 2008 New Revision: 52631 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: typo Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Mon Mar 17 11:04:29 2008 @@ -514,8 +514,8 @@ if is_array: # array substruct index = indexes_gv[i].revealconst(lltype.Signed) i += 1 - if 0 <= i < len(ptr): - ptr = ptr[i] + if 0 <= index < len(ptr): + ptr = ptr[index] else: raise SegfaultException # index out of bounds else: From arigo at codespeak.net Mon Mar 17 11:27:58 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 17 Mar 2008 11:27:58 +0100 (CET) Subject: [pypy-svn] r52632 - in pypy/dist/pypy/translator: backendopt backendopt/test c goal Message-ID: <20080317102758.AA310169EA9@codespeak.net> Author: arigo Date: Mon Mar 17 11:27:58 2008 New Revision: 52632 Added: pypy/dist/pypy/translator/backendopt/innerloop.py - copied unchanged from r52630, pypy/branch/loops-for-gcc/pypy/translator/backendopt/innerloop.py pypy/dist/pypy/translator/backendopt/test/test_innerloop.py - copied unchanged from r52630, pypy/branch/loops-for-gcc/pypy/translator/backendopt/test/test_innerloop.py Modified: pypy/dist/pypy/translator/c/funcgen.py pypy/dist/pypy/translator/goal/ann_override.py Log: Merge the loops-for-gcc branch: produce 'while' statements in the generated C code to make GCC happier. Slightly obscure. Thanks stakkars for the idea on the heuristic for finding the inner loops of a graph. Modified: pypy/dist/pypy/translator/c/funcgen.py ============================================================================== --- pypy/dist/pypy/translator/c/funcgen.py (original) +++ pypy/dist/pypy/translator/c/funcgen.py Mon Mar 17 11:27:58 2008 @@ -13,6 +13,7 @@ from pypy.rpython.lltypesystem.lltype import ForwardReference, FuncType from pypy.rpython.lltypesystem.llmemory import Address from pypy.translator.backendopt.ssa import SSI_to_SSA +from pypy.translator.backendopt.innerloop import find_inner_loops PyObjPtr = Ptr(PyObject) LOCALVAR = 'l_%s' @@ -32,8 +33,8 @@ vars lltypes functionname - currentblock blocknum + innerloops oldgraph""".split() def __init__(self, graph, db, exception_policy=None, functionname=None): @@ -127,6 +128,9 @@ typename = db.gettype(T) lltypes[id(v)] = T, typename self.lltypes = lltypes + self.innerloops = {} # maps the loop's header block to a Loop() + for loop in find_inner_loops(self.graph, Bool): + self.innerloops[loop.headblock] = loop def graphs_to_patch(self): yield self.graph @@ -135,7 +139,7 @@ self.lltypes = None self.vars = None self.blocknum = None - self.currentblock = None + self.innerloops = None self.graph = self.oldgraph del self.oldgraph @@ -205,7 +209,6 @@ # generate the body of each block for block in graph.iterblocks(): - self.currentblock = block myblocknum = self.blocknum[block] yield '' yield 'block%d:' % myblocknum @@ -231,6 +234,9 @@ assert len(block.exits) == 1 for op in self.gen_link(block.exits[0]): yield op + elif block in self.innerloops: + for line in self.gen_while_loop_hack(block): + yield line else: assert block.exitswitch != c_last_exception # block ending in a switch on a value @@ -303,7 +309,12 @@ assignments.append((a2typename, dest, src)) for line in gen_assignments(assignments): yield line - yield 'goto block%d;' % self.blocknum[link.target] + label = 'block%d' % self.blocknum[link.target] + if link.target in self.innerloops: + loop = self.innerloops[link.target] + if link is loop.links[-1]: # link that ends a loop + label += '_back' + yield 'goto %s;' % label def gen_op(self, op): macro = 'OP_%s' % op.opname.upper() @@ -325,6 +336,52 @@ for line in line.splitlines(): yield line + def gen_while_loop_hack(self, headblock): + # a GCC optimization hack: generate 'while' statement in the + # source to convince the C compiler that it is really dealing + # with loops. For the head of a loop (i.e. the block where the + # decision is) we produce code like this: + # + # headblock: + # ...headblock operations... + # while (cond) { + # goto firstbodyblock; + # headblock_back: + # ...headblock operations... + # } + # + # The real body of the loop is not syntactically within the + # scope of { }, but apparently this doesn't matter to GCC as + # long as it is within the { } via the chain of goto's starting + # at firstbodyblock: and ending at headblock_back:. We need to + # duplicate the operations of headblock, though, because the + # chain of gotos entering the loop must arrive outside the + # while() at the headblock: label and the chain of goto's that + # close the loop must arrive inside the while() at the + # headblock_back: label. + + looplinks = self.innerloops[headblock].links + enterlink = looplinks[0] + assert len(headblock.exits) == 2 + assert isinstance(headblock.exits[0].exitcase, bool) + assert isinstance(headblock.exits[1].exitcase, bool) + i = list(headblock.exits).index(enterlink) + exitlink = headblock.exits[1 - i] + + expr = self.expr(headblock.exitswitch) + if enterlink.exitcase == False: + expr = '!' + expr + yield 'while (%s) {' % expr + for op in self.gen_link(enterlink): + yield '\t' + op + yield '\t block%d_back:' % self.blocknum[headblock] + for i, op in enumerate(headblock.operations): + for line in self.gen_op(op): + yield '\t' + line + yield '}' + for op in self.gen_link(exitlink): + yield op + # ____________________________________________________________ # the C preprocessor cannot handle operations taking a variable number Modified: pypy/dist/pypy/translator/goal/ann_override.py ============================================================================== --- pypy/dist/pypy/translator/goal/ann_override.py (original) +++ pypy/dist/pypy/translator/goal/ann_override.py Mon Mar 17 11:27:58 2008 @@ -55,6 +55,7 @@ assert typ != tuple, "space.wrap(tuple) forbidden; use newtuple()" assert typ != list, "space.wrap(list) forbidden; use newlist()" assert typ != dict, "space.wrap(dict) forbidden; use newdict()" + assert typ != object, "degenerated space.wrap(object)" if args_s[0].is_constant() and args_s[1].is_constant(): if typ in (str, bool, int, float): space = args_s[0].const From antocuni at codespeak.net Mon Mar 17 11:46:36 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Mon, 17 Mar 2008 11:46:36 +0100 (CET) Subject: [pypy-svn] r52633 - pypy/dist/pypy/translator/cli Message-ID: <20080317104636.AC233169E8F@codespeak.net> Author: antocuni Date: Mon Mar 17 11:46:36 2008 New Revision: 52633 Modified: pypy/dist/pypy/translator/cli/dotnet.py Log: (arigo, antocuni) for the series "how can it ever worked", we need to test for ootype.String *before* testing for ootype.OOType. Modified: pypy/dist/pypy/translator/cli/dotnet.py ============================================================================== --- pypy/dist/pypy/translator/cli/dotnet.py (original) +++ pypy/dist/pypy/translator/cli/dotnet.py Mon Mar 17 11:46:36 2008 @@ -446,13 +446,15 @@ # can_be_None == True because it can always return None, if it fails classdef = self.bookkeeper.getuniqueclassdef(TYPE) return SomeInstance(classdef, can_be_None=True) + elif TYPE in BOXABLE_TYPES: + return OverloadingResolver.lltype_to_annotation(TYPE) elif isinstance(TYPE, ootype.StaticMethod): return SomeOOStaticMeth(TYPE) elif isinstance(TYPE, ootype.OOType): return SomeOOInstance(TYPE) else: - assert TYPE in BOXABLE_TYPES - return OverloadingResolver.lltype_to_annotation(TYPE) + assert False + def specialize_call(self, hop): assert hop.args_s[1].is_constant() From cfbolz at codespeak.net Mon Mar 17 11:51:27 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 17 Mar 2008 11:51:27 +0100 (CET) Subject: [pypy-svn] r52634 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080317105127.750EE169E8F@codespeak.net> Author: cfbolz Date: Mon Mar 17 11:51:27 2008 New Revision: 52634 Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py - copied, changed from r52630, pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_vlist.py Log: confused I am From arigo at codespeak.net Mon Mar 17 11:59:46 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 17 Mar 2008 11:59:46 +0100 (CET) Subject: [pypy-svn] r52635 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080317105946.9016F169E8F@codespeak.net> Author: arigo Date: Mon Mar 17 11:59:45 2008 New Revision: 52635 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: Move these lines to the base class to avoid confusion. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Mon Mar 17 11:59:45 2008 @@ -56,6 +56,12 @@ class HotPathTest(test_interpreter.InterpretationTest): type_system = 'lltype' + + def interpret(self, main, ll_values, opt_consts=[], **kwds): + py.test.skip("old-style test, port me") + def interpret_raises(self, Exception, main, ll_values, opt_consts=[]): + py.test.skip("old-style test, port me") + def run(self, main, main_args, threshold, policy=P_HOTPATH, small=False): # xxx caching of tests doesn't work - do we care? policy = make_hot_policy(policy) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Mon Mar 17 11:59:45 2008 @@ -30,11 +30,6 @@ class TestHotInterpreter(test_hotpath.HotPathTest): - def interpret(self, main, ll_values, opt_consts=[], **kwds): - py.test.skip("fix this test") - def interpret_raises(self, Exception, main, ll_values, opt_consts=[]): - py.test.skip("fix this test") - def test_loop_convert_const_to_redbox(self): class MyJitDriver(JitDriver): greens = ['x'] From cfbolz at codespeak.net Mon Mar 17 12:13:44 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 17 Mar 2008 12:13:44 +0100 (CET) Subject: [pypy-svn] r52636 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080317111344.16AD8169E9C@codespeak.net> Author: cfbolz Date: Mon Mar 17 12:13:43 2008 New Revision: 52636 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py Log: port first test Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py Mon Mar 17 12:13:43 2008 @@ -2,10 +2,11 @@ from pypy.jit.hintannotator.policy import HintAnnotatorPolicy from pypy.jit.rainbow.test.test_interpreter import InterpretationTest, P_OOPSPEC from pypy.rlib.jit import JitDriver, hint, JitHintError +from pypy.jit.rainbow.test import test_hotpath -class TestVList(InterpretationTest): +class TestVList(test_hotpath.HotPathTest): type_system = "lltype" def test_vlist(self): @@ -17,15 +18,15 @@ i = 1024 while i > 0: i >>= 1 - MyJitDriver.jit_merge_point(i=i, tot=tot) - MyJitDriver.can_enter_jit(i=i, tot=tot) lst = [] lst.append(12) tot += lst[0] + MyJitDriver.jit_merge_point(tot=tot, i=i) + MyJitDriver.can_enter_jit(tot=tot, i=i) return tot - res = self.interpret(ll_function, [], [], policy=P_OOPSPEC) + res = self.run(ll_function, [], threshold=2) assert res == ll_function() - self.check_insns({}) + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1}) def test_enter_block(self): py.test.skip("port me") From cami at codespeak.net Mon Mar 17 13:22:33 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Mon, 17 Mar 2008 13:22:33 +0100 (CET) Subject: [pypy-svn] r52637 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080317122233.727F3169E35@codespeak.net> Author: cami Date: Mon Mar 17 13:22:31 2008 New Revision: 52637 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Log: going towards working test. changed doubleRegisters to 2 coupled Registers. adapted tests to the new registers. some opcodes already working Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Mon Mar 17 13:22:31 2008 @@ -12,59 +12,69 @@ self.cpu = cpu self.set(value) - def set(self, value): + def set(self, value, useCycles=True): self.value = value & 0xFF - self.cpu.cycles -= 1 + if (useCycles): + self.cpu.cycles -= 1 - def get(self): + def get(self, useCycles=True): return self.value + def add(self, value, useCycles=False): + self.set(self.get()+1, useCycles) + # ___________________________________________________________________________ class DoubleRegister(Register): cpu = None - def __init__(self, cpu, hi=0, lo=None): + def __init__(self, cpu, hi=None, lo=None): self.cpu = cpu - self.set(hi, lo); + if hi==None: + self.hi = Register(self.cpu) + else: + self.hi = hi + if lo==None: + self.lo = Register(self.cpu) + else: + self.lo = lo def set(self, hi=0, lo=None): if (lo is None): - self.value = (hi & 0xFFFF) - self.cpu.cycles -= 1 + self.setHi(hi >> 8) + self.setLo(hi & 0xFF) + self.cpu.cycles += 1 else: - self.value = ((hi & 0xFF) << 8) + (lo & 0xFF) - self.cpu.cycles -= 2 + self.setHi(hi) + self.setLo(lo) - def setHi(self, hi=0): - self.set(hi, self.getLo()) - self.cpu.cycles += 1 - - def setLo(self, lo=0): - self.set(self.getHi(), lo) - self.cpu.cycles += 1 + def setHi(self, hi=0, useCycles=True): + self.hi.set(hi, useCycles) + + def setLo(self, lo=0, useCycles=True): + self.lo.set(lo, useCycles) def get(self): - return self.value + return (self.hi.get()<<8) + self.lo.get() def getHi(self): - return (self.value >> 8) & 0xFF + return self.hi.get() def getLo(self): - return self.value & 0xFF + return self.lo.get() def inc(self): - self.value = (self.value +1) & 0xFFFF - self.cpu.cycles -= 2 + self.set(self.get() +1) + self.cpu.cycles -= 1 def dec(self): - self.value = (self.value - 1) & 0xFFFF - self.cpu.cycles -= 2 + self.set(self.get() - 1) + self.cpu.cycles -= 1 def add(self, n=2): - self.value = (self.value + n) & 0xFFFF - self.cpu.cycles -= 3 + self.set(self.get() + n) + self.cpu.cycles -= 2 # ___________________________________________________________________________ @@ -102,24 +112,23 @@ self.hl = DoubleRegister(self) self.pc = DoubleRegister(self) self.sp = DoubleRegister(self) + self.a = Register(self) + self.f = Register(self) + self.af = DoubleRegister(self, self.a, self.f) self.reset() def reset(self): - self.a = 0x01 - self.f = 0x80 - self.bc.set(0x0013) - self.de.set(0x00D8) - self.hl.set(0x014D) - self.sp.set(0xFFFE) - self.pc.set(0x0100) - + self.a.set(constants.RESET_A) + self.f.set(constants.RESET_F) + self.bc.set(constants.RESET_BC) + self.de.set(constants.RESET_DE) + self.hl.set(constants.RESET_HL) + self.sp.set(constants.RESET_SP) + self.pc.set(constants.RESET_PC) self.ime = False self.halted = False - self.cycles = 0 - - def getAF(self): - return (self.a << 8) + self.f + def getIF(self): val = 0x00 @@ -128,14 +137,13 @@ if self.halted: val += 0x80 return val - + def getA(self): - return self.a - + return self.a.get() + def setA(self, value): - self.a = value - self.cycles -= 1 - + return self.a.set(value) + def getB(self): return self.bc.getHi() @@ -158,15 +166,14 @@ return self.de.getLo() def setE(self, value): - self.de.setLo(value) - - def setF(self, value): - self.f = value - self.cycles -= 1 + self.de.setLo(value) def getF(self): - return self.f - + return self.f.get() + + def setF(self, value): + return self.f.set(value) + def getH(self): return self.hl.getHi() @@ -192,15 +199,15 @@ def zFlagAdd(self, s, resetF=False): if (resetF): - self.f = 0 + self.f.set(0, False) if s == 0: - self.f = constants.Z_FLAG + self.f.add(constants.Z_FLAG, False) def cFlagAdd(self, s, compareAnd=0x01, resetF=False): if (resetF): - self.f = 0 + self.f.set(0, False) if (s & compareAnd) != 0: - self.f += constants.C_FLAG + self.f.add(constants.C_FLAG, False) def emulate(self, ticks): self.cycles += ticks @@ -240,28 +247,30 @@ # Execution def fetchExecute(self): - global FETCHEXEC_OP_CODES - FETCHEXEC_OP_CODES[self.fetch()](self) + global FETCH_EXECUTE_OP_CODES + FETCH_EXECUTE_OP_CODES[self.fetch()](self) def execute(self, opCode): global OP_CODES OP_CODES[opCode](self) + + def reverseArgumentsDoubleRegister(self, register, getter): + pass + # memory Access, 1 cycle - def read(self, address): + def read(self, hi, lo=None): + address = hi + if lo != None: + address(hi << 8) + lo self.cycles -= 1 return self.memory.read(address) - - def read(self, hi, lo): - return self.read((hi << 8) + lo) # 2 cycles def write(self, address, data): self.memory.write(address, data) self.cycles -= 2 - def write(self, hi, lo, data): - self.write((hi << 8) + lo, data) # Fetching 1 cycle def fetch(self): @@ -277,6 +286,11 @@ def push(self, data): self.sp.dec() # 2 cycles self.memory.write(self.sp.get(), data) + + # PUSH rr 4 cycles + def pushDoubleRegister(self, register): + self.push(register.getHi()) # 2 cycles + self.push(register.getLo()) # 2 cycles # 1 cycle def pop(self): @@ -284,93 +298,104 @@ self.sp.inc() # 2 cycles self.cycles += 1 return data - + + # 3 cycles + def popDoubleRegister(self, register, getter): + b = getter() # 1 cycle + a = getter() # 1 cycle + register.set(a, b) # 2 cycles + self.cycles += 1 + # 4 cycles def call(self, address): self.push(self.pc.getHi()) # 2 cycles self.push(self.pc.getLo()) # 2 cycles self.pc.set(address) # 1 cycle self.cycles += 1 + + # 1 cycle + def ld(self, getter, setter): + setter(getter()) # 1 cycle # ALU, 1 cycle def addA(self, data): - s = (self.a + data) & 0xFF + s = (self.a.get() + data) & 0xFF self.zFlagAdd(s, resetF=True) - if s < self.a: - self.f += constants.C_FLAG - if (s & 0x0F) < (self.a & 0x0F): - self.f += constants.H_FLAG - self.setA(s) # 1 cycle + if s < self.a.get(): + self.f.add(constants.C_FLAG, False) + if (s & 0x0F) < (self.a.get() & 0x0F): + self.f.add(constants.H_FLAG, False) + self.a.set(s) # 1 cycle # 2 cycles def addHL(self, register): s = (self.hl.get() + register.get()) & 0xFFFF - self.f = (self.f & constants.Z_FLAG) + self.f.set((self.f & constants.Z_FLAG), False) if ((s >> 8) & 0x0F) < (self.hl.getHi() & 0x0F): - self.f += constants.H_FLAG + self.f.add(constants.H_FLAG, False) if s < self.hl.get(): - self.f += constants.C_FLAG + self.f.add(constants.C_FLAG, False) self.cycles -= 1 self.hl.set(s); # 1 cycle # 1 cycle def adc(self, getter): s = self.a + getter() + ((self.f & constants.C_FLAG) >> 4) - self.f = 0 + self.f.set(0, False) if (s & 0xFF) == 0: - self.f += constants.Z_FLAG + self.f.add(constants.Z_FLAG , False) if s >= 0x100: - self.f += constants.C_FLAG + self.f.add(constants.C_FLAG, False) if ((s ^ self.a ^ getter()) & 0x10) != 0: - self.f += constants.H_FLAG - self.setA(s & 0xFF) # 1 cycle + self.f.add(constants.H_FLAG, False) + self.a.set(s & 0xFF) # 1 cycle # 1 cycle def sbc(self, getter): s = self.a - getter() - ((self.f & constants.C_FLAG) >> 4) - self.f = constants.N_FLAG + self.f.set(constants.N_FLAG, False) if (s & 0xFF) == 0: - self.f += constants.Z_FLAG + self.f.add(constants.Z_FLAG , False) if (s & 0xFF00) != 0: - self.f += constants.C_FLAG + self.f.add(constants.C_FLAG, False) if ((s ^ self.a ^ getter()) & 0x10) != 0: - self.f += constants.H_FLAG - self.setA(s & 0xFF) # 1 cycle + self.f.add(constants.H_FLAG, False) + self.a.set(s & 0xFF) # 1 cycle # 1 cycle def sub(self, getter): s = (self.a - getter()) & 0xFF - self.f = constants.N_FLAG + self.f.set(constants.N_FLAG, False) self.zFlagAdd(s) if s > self.a: - self.f += constants.C_FLAG + self.f.add(constants.C_FLAG, False) if (s & 0x0F) > (self.a & 0x0F): - self.f += constants.H_FLAG - self.setA(s) # 1 cycle + self.f.add(constants.H_FLAG, False) + self.a.set(s) # 1 cycle # 1 cycle def cpA(self, getter): s = (self.a - getter()) & 0xFF - self.setF(constants.N_FLAG) # 1 cycle + self.f.set(constants.N_FLAG) # 1 cycle self.zFlagAdd(self.a) if s > self.a: - self.f += constants.C_FLAG + self.f.add(constants.C_FLAG, False) if (s & 0x0F) > (self.a & 0x0F): - self.f += constants.H_FLAG + self.f.add(constants.H_FLAG, False) # 1 cycle def AND(self, getter): - self.setA(self.a & getter()) # 1 cycle + self.a.set(self.a & getter()) # 1 cycle self.zFlagAdd(self.a, resetF=True) # 1 cycle def XOR(self, getter): - self.setA( self.a ^ getter()) # 1 cycle + self.a.set( self.a ^ getter()) # 1 cycle self.zFlagAdd(self.a, resetF=True) # 1 cycle def OR(self, getter): - self.setA(self.a | getter()) # 1 cycle + self.a.set(self.a | getter()) # 1 cycle self.zFlagAdd(self.a, resetF=True) # 1 cycle @@ -382,14 +407,14 @@ def dec(self, getter, setter): data = (getter() - 1) & 0xFF self.decIncFlagFinish(data) - self.f += constants.N_FLAG + self.f.add(constants.N_FLAG, False) def decIncFlagFinish(data): - self.setF(0) # 1 cycle + self.f.set(0) # 1 cycle self.zFlagAdd(data) if (data & 0x0F) == 0x0F: - self.f += constants.H_FLAG - self.f += (self.f & constants.C_FLAG) + self.f.add(constants.H_FLAG, False) + self.f.add((self.f & constants.C_FLAG), False) setter(data) # 1 cycle @@ -431,7 +456,7 @@ # 1 cycle def flagsAndSetterFinish(self, s, setter, compareAnd=0x01): - self.setF(0) # 1 cycle + self.f.set(0) # 1 cycle self.zFlagAdd(s) self.cFlagAdd(getter(), compareAnd) setter(s) @@ -439,21 +464,21 @@ # 1 cycle def swap(self, getter, setter): s = ((getter() << 4) & 0xF0) + ((getter() >> 4) & 0x0F) - self.setF(0) # 1 cycle + self.f.set(0) # 1 cycle self.zFlagAdd(s) setter(s) # 2 cycles def bit(self, getter, setter, n): - self.f = (self.f & constants.C_FLAG) + constants.H_FLAG + self.f.set((self.f & constants.C_FLAG) + constants.H_FLAG, False) if (getter() & (1 << n)) == 0: - self.f += constants.Z_FLAG + self.f.add(constants.Z_FLAG, False) self.cycles -= 2 # RLCA 1 cycle def rlca(self): self.cFlagAdd(self.a, 0x80, resetF=True) - self.setA(((self.a & 0x7F) << 1) + ((self.a & 0x80) >> 7)) + self.a.set(((self.a & 0x7F) << 1) + ((self.a & 0x80) >> 7)) # RLA 1 cycle def rla(self): @@ -461,12 +486,12 @@ if (self.f & constants.C_FLAG) != 0: s += 0x01 self.cFlagAdd(self.a, 0x80, resetF=True) - self.setA(s) # 1 cycle + self.a.set(s) # 1 cycle # RRCA 1 cycle def rrca(self): self.cFlagAdd(self.a, resetF=True) - self.setA(((self.a >> 1) & 0x7F) + ((self.a << 7) & 0x80)) #1 cycle + self.a.set(((self.a >> 1) & 0x7F) + ((self.a << 7) & 0x80)) #1 cycle # RRA 1 cycle def rra(self): @@ -474,7 +499,7 @@ if (self.f & constants.C_FLAG) != 0: s += 0x80 self.cFlagAdd(self.a, resetF=True) - self.setA(s) # 1 cycle + self.a.set(s) # 1 cycle # 2 cycles def set(self, getter, setter, n): @@ -485,34 +510,29 @@ def res(self, getter, setter, n): setter(getter() & (~(1 << n))) # 1 cycle - # 1 cycle - def ld(self, getter, setter): - setter(getter()) # 1 cycle # LD A,(nnnn), 4 cycles def ld_A_mem(self): lo = self.fetch() # 1 cycle hi = self.fetch() # 1 cycle - self.setA(self.read(hi, lo)) # 1+1 cycles + self.a.set(self.read(hi, lo)) # 1+1 cycles + # 2 cycles def ld_BCi_A(self): - self.write(self.bc.get(), self.a); - self.cycles -= 2; - + self.write(self.bc.get(), self.a.get()); + def ld_DEi_A(self): - self.write(self.de.get(), self.a); + self.write(self.de.get(), self.a.get()); def ld_A_BCi(self): - self.a = self.read(self.b, self.c); - self.cycles -= 2; + self.a.set(self.read(self.bc.get())) def load_A_DEi(self): - self.a = self.read(self.d, self.e); - self.cycles -= 2; + self.a.set(self.read(self.de.get())) # LD (rr),A 2 cycles def ld_dbRegisteri_A(self, register): - self.write(register.get(), self.a) # 2 cycles + self.write(register.get(), self.a.get()) # 2 cycles # LD (nnnn),SP 5 cycles def load_mem_SP(self): @@ -522,47 +542,44 @@ self.write(address, self.sp.getLo()) # 2 cycles self.write((address + 1) & 0xFFFF, self.sp.getHi()) # 2 cycles self.cycles += 1 - - # LD (nnnn),A 4 cycles def ld_mem_A(self): lo = self.fetch() # 1 cycle hi = self.fetch() # 1 cycle - self.write(hi, lo, self.a) # 2 cycles + self.write(hi, lo, self.a.get()) # 2 cycles # LDH A,(nn) 3 cycles def ldh_A_mem(self): - self.setA(self.read(0xFF00 + self.fetch())) # 1+1+1 cycles + self.a.set(self.read(0xFF00 + self.fetch())) # 1+1+1 cycles # LDH A,(C) 2 cycles def ldh_A_Ci(self): - self.setA(self.read(0xFF00 + self.bc.getLo())) # 1+2 cycles + self.a.set(self.read(0xFF00 + self.bc.getLo())) # 1+2 cycles # LDI A,(HL) 2 cycles def ldi_A_HLi(self): - self.a = self.read(self.hl.get()) # 1 cycle + self.a.set(self.read(self.hl.get())) # 1 cycle self.hl.inc()# 2 cycles self.cycles += 1 # LDD A,(HL) 2 cycles def ldd_A_HLi(self): - self.a = self.read(self.hl.get()) # 1 cycle + self.a.set(self.read(self.hl.get())) # 1 cycle self.hl.dec() # 2 cycles self.cycles += 1 # LDH (nn),A 3 cycles def ldh_mem_A(self): - self.write(0xFF00 + self.fetch(), self.a) # 2 + 1 cycles + self.write(0xFF00 + self.fetch(), self.a.get()) # 2 + 1 cycles # LDH (C),A 2 cycles def ldh_Ci_A(self): - self.write(0xFF00 + self.bc.getLo(), self.a) # 2 cycles + self.write(0xFF00 + self.bc.getLo(), self.a.get()) # 2 cycles - # LDI (HL),A 2 cycles def ldi_HLi_A(self): - self.write(self.hl.get(), self.a) # 2 cycles + self.write(self.hl.get(), self.a.get()) # 2 cycles self.hl.inc() # 2 cycles self.cycles += 2 @@ -577,49 +594,27 @@ self.sp.set(self.hl.get()) # 1 cycle self.cycles -= 1 - # PUSH rr 4 cycles - def push_dbRegister(self, register): - self.push(register.getHi()) # 2 cycles - self.push(register.getLo()) # 2 cycles - - # 4 cycles - def push_AF(self): - self.push(self.a) # 2 cycles - self.push(self.f) # 2 cycles - - # 3 cycles - def pop_dbRegister(self, register, getter): - b = getter() # 1 cycle - a = getter() # 1 cycle - register.set(a, b) # 2 cycles - self.cycles += 1 - - # 3 cycles - def pop_AF(self): - self.f = self.pop() # 1 cycle - self.setA(self.pop()) # 1+1 cycle - def cpl(self): - self.a ^= 0xFF - self.f |= constants.N_FLAG + constants.H_FLAG + self.a.set(self.a.get() ^ 0xFF, False) + self.f.set(self.f.get() | (constants.N_FLAG + constants.H_FLAG)) # DAA 1 cycle def daa(self): delta = 0 - if ((self.f & constants.H_FLAG) != 0 or (self.a & 0x0F) > 0x09): + if ((self.f.get() & constants.H_FLAG) != 0 or (self.a.get() & 0x0F) > 0x09): delta |= 0x06 - if ((self.f & constants.C_FLAG) != 0 or (self.a & 0xF0) > 0x90): + if ((self.f.get() & constants.C_FLAG) != 0 or (self.a.get() & 0xF0) > 0x90): delta |= 0x60 - if ((self.a & 0xF0) > 0x80 and (self.a & 0x0F) > 0x09): + if ((self.a.get() & 0xF0) > 0x80 and (self.a.get() & 0x0F) > 0x09): delta |= 0x60 - if ((self.f & constants.N_FLAG) == 0): - self.setA((self.a + delta) & 0xFF) # 1 cycle + if ((self.f.get() & constants.N_FLAG) == 0): + self.a.set((self.a.get() + delta) & 0xFF) # 1 cycle else: - self.setA((self.a - delta) & 0xFF) # 1 cycle - self.f = (self.f & constants.N_FLAG) + self.a.set((self.a.get() - delta) & 0xFF) # 1 cycle + self.f.set((self.f.get() & constants.N_FLAG), False) if delta >= 0x60: - self.f += constants.C_FLAG - self.zFlagAdd(self.a) + self.f.add(constants.C_FLAG, False) + self.zFlagAdd(self.a.get()) # INC rr def incDoubleRegister(self, register): @@ -631,45 +626,42 @@ # ADD SP,nn 4 cycles def add_SP_nn(self): - self.sp.set(sel.SP_nn()) # 1+1 cycle + self.sp.set(self.SP_nn()) # 1+1 cycle self.cycles -= 2 # LD HL,SP+nn 3 cycles def ld_HL_SP_nn(self): - self.hl.set(sel.SP_nn()) # 1+1 cycle + self.hl.set(self.SP_nn()) # 1+1 cycle self.cycles -= 1 # 1 cycle def SP_nn(self): offset = self.fetch() # 1 cycle s = (self.sp.get() + offset) & 0xFFFF - self.f = 0 + self.f.set(0, False) if (offset >= 0): if s < self.sp.get(): - self.f += constants.C_FLAG + self.f.add(constants.C_FLAG, False) if (s & 0x0F00) < (self.sp.get() & 0x0F00): - self.f += constants.H_FLAG + self.f.add(constants.H_FLAG, False) else: if s > self.sp.get(): - self.f += constants.C_FLAG + self.f.add(constants.C_FLAG, False) if (s & 0x0F00) > (self.sp.get() & 0x0F00): - self.f += constants.H_FLAG + self.f.add(constants.H_FLAG, False) # CCF/SCF def ccf(self): - self.f = (self.f & (constants.Z_FLAG | constants.C_FLAG)) ^ constants.C_FLAG - + self.f.set((self.f & (constants.Z_FLAG | constants.C_FLAG)) ^ constants.C_FLAG, False) def scf(self): - self.f = (self.f & constants.Z_FLAG) | constants.C_FLAG + self.f.set((self.f & constants.Z_FLAG) | constants.C_FLAG, False) # NOP 1 cycle def nop(self): self.cycles -= 1 # LD PC,HL, 1 cycle - def ld_PC_HL(self): - self.pc.set(self.hl.get()) # 1 cycle # JP nnnn, 4 cycles def jp_nnnn(self): @@ -775,12 +767,14 @@ # check pending interrupts self.interrupt() + # 0 cycles def stop(self): + self.cycles += 1 self.fetch() -SINGLE_OP_CODES = [ +FIRST_ORDER_OP_CODES = [ (0x00, CPU.nop), (0x08, CPU.load_mem_SP), (0x10, CPU.stop), @@ -801,6 +795,7 @@ (0x2F, CPU.cpl), (0x37, CPU.scf), (0x3F, CPU.ccf), + (0x76, CPU.halt), (0xF3, CPU.di), (0xFB, CPU.ei), (0xE2, CPU.ldh_Ci_A), @@ -810,7 +805,7 @@ (0xC3, CPU.jp_nnnn), (0xC9, CPU.ret), (0xD9, CPU.reti), - (0xE9, CPU.ld_PC_HL), + (0xE9, lambda s: CPU.ld(s, CPU.hl, CPU.pc)), (0xF9, CPU.ld_SP_HL), (0xE0, CPU.ldh_mem_A), (0xE8, CPU.add_SP_nn), @@ -834,10 +829,8 @@ (0xEF, lambda s: CPU.rst(s, 0x28)), (0xF7, lambda s: CPU.rst(s, 0x30)), (0xFF, lambda s: CPU.rst(s, 0x38)), - (0x76, CPU.halt) ] - REGISTER_GROUP_OP_CODES = [ (0x04, 0x08, CPU.inc), (0x05, 0x08, CPU.dec), @@ -849,6 +842,26 @@ (0xA8, 0x01, CPU.XOR), (0xB0, 0x01, CPU.OR), (0xB8, 0x01, CPU.cpA), + #(0x06, 0x08, CPU.ld_nn), + (0x40, 0x01, CPU.res, range(0, 8)) +] + +REGISTER_OP_CODES = [ + (0x01, 0x10, lambda s: CPU.pop_dbRegister(s, CPU.fetch), [CPU.bc, CPU.de, CPU.hl, CPU.sp]), + (0x09, 0x10, CPU.addHL, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), + (0x03, 0x10, CPU.inc, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), + (0x0B, 0x10, CPU.dec, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), + + #(0xC0, 0x08, CPU.ret, [NZ, Z, NC, C]), + #(0xC2, 0x08, CPU.jp_nnnn, [NZ, Z, NC, C]), + #(0xC4, 0x08, CPU.call_nnnn, [NZ, Z, NC, C]), + #(0x20, 0x08, CPU.jr_nn, [NZ, Z, NC, C]),""" + + (0xC1, 0x10, CPU.pop, [CPU.bc, CPU.de, CPU.hl, CPU.af]), + (0xC5, 0x10, CPU.push, [CPU.bc, CPU.de, CPU.hl, CPU.af]) +] + +SECOND_ORDER_REGISTER_OP_CODES = [ (0x00, 0x01, CPU.rlc), (0x08, 0x01, CPU.rrc), (0x10, 0x01, CPU.rl), @@ -859,17 +872,16 @@ (0x38, 0x01, CPU.srl), (0x40, 0x01, CPU.bit, range(0, 8)), (0xC0, 0x01, CPU.set, range(0, 8)), - (0x80, 0x01, CPU.res, range(0, 8)), - #(0x06, 0x08, CPU.ld_nn), - (0x40, 0x01, CPU.res, range(0, 8)) + (0x80, 0x01, CPU.res, range(0, 8)) ] + GROUP_CODES_GETTERS = (CPU.getB, CPU.getC, CPU.getD, CPU.getE, CPU.getH, CPU.getL, CPU.getHLi, CPU.getA) GROUP_CODES_SETTERS = (CPU.setB, CPU.setC, CPU.setD, CPU.setE, CPU.setH, CPU.setL, CPU.setHLi, CPU.setA) -def create_group_op_codes(): +def create_group_op_codes(table): opCodes = [None] * 0xFF; - for entry in REGISTER_GROUP_OP_CODES: + for entry in table: startCode = entry[0] step = entry[1] method = entry[2] @@ -877,30 +889,16 @@ if len(entry) == 4: for i in range(0, 8): for n in entry[3]: - opCodes[startCode+step*i] = lambda me: method(me, GROUP_CODES_GETTERS[i], GROUP_CODES_SETTERS[i], n) + index = startCode+step*i + opCodes[index] = (index, lambda me: method(me, GROUP_CODES_GETTERS[i], GROUP_CODES_SETTERS[i], n)) else: for i in range(0, 8): - opCodes[startCode+step*i] = lambda me: method(me, GROUP_CODES_GETTERS[i], GROUP_CODES_SETTERS[i]) + index = startCode+step*i + opCodes[index] = (index, lambda me: method(me, GROUP_CODES_GETTERS[i], GROUP_CODES_SETTERS[i])) return opCodes -SINGLE_OP_CODES.extend(create_group_op_codes()) - - - -REGISTER_OP_CODES = [ - (0x01, 0x10, lambda s: CPU.pop_dbRegister(s, CPU.fetch), [CPU.bc, CPU.de, CPU.hl, CPU.sp]), - (0x09, 0x10, CPU.addHL, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), - (0x03, 0x10, CPU.inc, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), - (0x0B, 0x10, CPU.dec, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), - - #(0xC0, 0x08, CPU.ret, [NZ, Z, NC, C]), - #(0xC2, 0x08, CPU.jp_nnnn, [NZ, Z, NC, C]), - #(0xC4, 0x08, CPU.call_nnnn, [NZ, Z, NC, C]), - #(0x20, 0x08, CPU.jr_nn, [NZ, Z, NC, C]),""" - - (0xC1, 0x10, CPU.pop, [CPU.bc, CPU.de, CPU.hl, CPU.af]), - (0xC5, 0x10, CPU.push, [CPU.bc, CPU.de, CPU.hl, CPU.af]) -] +FIRST_ORDER_OP_CODES.extend(create_group_op_codes(REGISTER_GROUP_OP_CODES)) +SECOND_ORDER_OP_CODES = create_group_op_codes(SECOND_ORDER_REGISTER_OP_CODES) def create_register_op_codes(): opCodes = []; @@ -911,13 +909,13 @@ changing = entry[3] return opCodes -SINGLE_OP_CODES.extend(create_register_op_codes()) +FIRST_ORDER_OP_CODES.extend(create_register_op_codes()) def initialize_op_code_table(table): result = [None] * 256 - for entry in table: - if entry is not tuple: + for entry in table: + if entry is None: continue if len(entry) == 2: positions = [entry[0]] @@ -927,5 +925,5 @@ result[pos] = entry[-1] return result -OP_CODES = initialize_op_code_table(SINGLE_OP_CODES) - +OP_CODES = initialize_op_code_table(FIRST_ORDER_OP_CODES) +FETCH_EXECUTE_OP_CODES = initialize_op_code_table(SECOND_ORDER_OP_CODES) Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py Mon Mar 17 13:22:31 2008 @@ -18,15 +18,8 @@ self.reset(); def reset(self): - self.wram = range(0, constants.WRAM_SIZE) - for index in range(0, constants.WRAM_SIZE): - #TODO convert to byte - self.wram[index] = 0x00; - - self.hram = range(0, constants.HIGH_SIZE) - for index in range(0, constants.HIGH_SIZE): - #TODO convert to byte - self.hram[index] = 0x00; + self.wram = [0x00]*8192; + self.hram = [0x00]*128; def write(self, address, data): if (address >= 0xC000 and address <= 0xFDFF): Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Mon Mar 17 13:22:31 2008 @@ -1,9 +1,12 @@ import py from pypy.lang.gameboy.cpu import CPU, Register, DoubleRegister +from pypy.lang.gameboy.ram import RAM from pypy.lang.gameboy import constants def get_cpu(): - return CPU([None]*256, None) + cpu = CPU(None, RAM()) + cpu.setROM([0]*0xFFFF); + return cpu # ------------------------------------------------------------ # TEST REGISTER @@ -22,17 +25,31 @@ assert register.get() == value assert oldCycles-register.cpu.cycles == 1 +def test_register_bounds(): + register = Register(get_cpu()) + value = 0x1234FF + register.set(value) + assert register.get() == 0xFF + # ------------------------------------------------------------ # TEST DOUBLE REGISTER def test_double_register_constructor(): - register = DoubleRegister(get_cpu()) + cpu = get_cpu() + register = DoubleRegister(cpu) assert register.get() == 0 assert register.getHi() == 0 assert register.getLo() == 0 value = 0x1234 - register = DoubleRegister(get_cpu(), value) - assert register.get() == value + reg1 = Register(cpu) + reg1.set(0x12) + reg2 = Register(cpu) + reg2.set(0x34) + register = DoubleRegister(cpu, reg1, reg2) + assert register.hi == reg1 + assert register.lo == reg2 + assert register.getHi() == reg1.get() + assert register.getLo() == reg2.get() def test_double_register(): register = DoubleRegister(get_cpu()) @@ -42,6 +59,12 @@ assert oldCycles-register.cpu.cycles == 1 assert register.get() == value +def test_double_register_bounds(): + register = DoubleRegister(get_cpu()) + value = 0xFFFF1234 + register.set(value) + assert register.get() == 0x1234 + def test_double_register_hilo(): register = DoubleRegister(get_cpu()) value = 0x1234 @@ -71,7 +94,8 @@ def test_double_register_methods(): value = 0x1234 - register = DoubleRegister(get_cpu(), value) + register = DoubleRegister(get_cpu()) + register.set(value) oldCycles = register.cpu.cycles register.inc() From cfbolz at codespeak.net Mon Mar 17 13:25:28 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 17 Mar 2008 13:25:28 +0100 (CET) Subject: [pypy-svn] r52638 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080317122528.1521B169E3E@codespeak.net> Author: cfbolz Date: Mon Mar 17 13:25:27 2008 New Revision: 52638 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Log: some comments I had when reading commits Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Mon Mar 17 13:25:27 2008 @@ -216,6 +216,11 @@ self.execute() # Interrupts + # XXX this doesn't work, you cannot have two methods with the same name + # and different numbers of parameters + # another problem is that the attribute self.parameter cannot have the + # same name as a method or you will confuse yourself in major ways (Python + # is lookup-based, not send-based) def interrupt(self): if (self.halted): if (self.interrupt.isPending()): @@ -247,6 +252,7 @@ # Execution def fetchExecute(self): + # these global statements have no effect global FETCH_EXECUTE_OP_CODES FETCH_EXECUTE_OP_CODES[self.fetch()](self) @@ -458,6 +464,7 @@ def flagsAndSetterFinish(self, s, setter, compareAnd=0x01): self.f.set(0) # 1 cycle self.zFlagAdd(s) + # XXX where does "getter" come from here? should be "setter"? self.cFlagAdd(getter(), compareAnd) setter(s) @@ -901,6 +908,7 @@ SECOND_ORDER_OP_CODES = create_group_op_codes(SECOND_ORDER_REGISTER_OP_CODES) def create_register_op_codes(): + # not necessary to build a list, you can nicely use a generator here opCodes = []; for entry in REGISTER_OP_CODES: startCode = entry[0] From arigo at codespeak.net Mon Mar 17 13:38:13 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 17 Mar 2008 13:38:13 +0100 (CET) Subject: [pypy-svn] r52639 - pypy/dist/pypy/translator/c/src Message-ID: <20080317123813.4B26A169E47@codespeak.net> Author: arigo Date: Mon Mar 17 13:38:12 2008 New Revision: 52639 Modified: pypy/dist/pypy/translator/c/src/signals.h Log: This may have been a race condition with threads and signals (not sure, probably depends on the details of the platform). Modified: pypy/dist/pypy/translator/c/src/signals.h ============================================================================== --- pypy/dist/pypy/translator/c/src/signals.h (original) +++ pypy/dist/pypy/translator/c/src/signals.h Mon Mar 17 13:38:12 2008 @@ -87,9 +87,9 @@ static void signal_setflag_handler(int signum) { - pypysig_occurred = 1; if (0 <= signum && signum < NSIG) pypysig_flags[signum] = 1; + pypysig_occurred = 1; } void pypysig_setflag(int signum) From cfbolz at codespeak.net Mon Mar 17 13:58:10 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 17 Mar 2008 13:58:10 +0100 (CET) Subject: [pypy-svn] r52641 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080317125810.6B1C3169E2F@codespeak.net> Author: cfbolz Date: Mon Mar 17 13:58:08 2008 New Revision: 52641 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py Log: port some tests Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py Mon Mar 17 13:58:08 2008 @@ -29,37 +29,59 @@ self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1}) def test_enter_block(self): - py.test.skip("port me") + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'flag'] def ll_function(flag): - lst = [] - lst.append(flag) - lst.append(131) - if flag: - return lst[0] - else: - return lst[1] - res = self.interpret(ll_function, [6], [], policy=P_OOPSPEC) - assert res == 6 - self.check_insns({'int_is_true': 1}) - res = self.interpret(ll_function, [0], [], policy=P_OOPSPEC) - assert res == 131 - self.check_insns({'int_is_true': 1}) + tot = 0 + i = 1024 + while i > 0: + i >>= 1 + lst = [] + lst.append(flag) + lst.append(131) + if flag: + tot += lst[0] + else: + tot += lst[1] + MyJitDriver.jit_merge_point(tot=tot, i=i, flag=flag) + MyJitDriver.can_enter_jit(tot=tot, i=i, flag=flag) + return tot + res = self.run(ll_function, [6], threshold=2) + assert res == ll_function(6) + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1, + 'int_is_true': 1}) + res = self.run(ll_function, [0], threshold=2) + assert res == ll_function(0) + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1, + 'int_is_true': 1}) def test_merge(self): - py.test.skip("port me") + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'flag'] def ll_function(flag): - lst = [] - if flag: - lst.append(flag) - else: - lst.append(131) - return lst[-1] - res = self.interpret(ll_function, [6], [], policy=P_OOPSPEC) - assert res == 6 - self.check_insns({'int_is_true': 1}) - res = self.interpret(ll_function, [0], [], policy=P_OOPSPEC) - assert res == 131 - self.check_insns({'int_is_true': 1}) + tot = 0 + i = 1024 + while i > 0: + i >>= 1 + lst = [] + if flag: + lst.append(flag) + else: + lst.append(131) + tot += lst[-1] + MyJitDriver.jit_merge_point(tot=tot, i=i, flag=flag) + MyJitDriver.can_enter_jit(tot=tot, i=i, flag=flag) + return tot + res = self.run(ll_function, [6], threshold=2, policy=P_OOPSPEC) + assert res == ll_function(6) + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1, + 'int_is_true': 1}) + res = self.run(ll_function, [0], threshold=2, policy=P_OOPSPEC) + assert res == ll_function(0) + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1, + 'int_is_true': 1}) def test_replace(self): py.test.skip("port me") @@ -78,56 +100,85 @@ self.check_insns({'int_is_true': 1}) def test_force(self): - py.test.skip("port me") - def ll_function(n): - lst = [] - lst.append(n) - if n: - lst.append(12) - return lst[-1] - res = self.interpret(ll_function, [6], [], policy=P_OOPSPEC) - assert res == 12 - res = self.interpret(ll_function, [0], [], policy=P_OOPSPEC) - assert res == 0 + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'flag'] + def ll_function(flag): + i = 1024 + tot = 0 + while i: + i >>= 1 + lst = [] + lst.append(flag) + if flag: + lst.append(12) + tot += lst[-1] + MyJitDriver.jit_merge_point(tot=tot, i=i, flag=flag) + MyJitDriver.can_enter_jit(tot=tot, i=i, flag=flag) + return tot + res = self.run(ll_function, [6], 2, policy=P_OOPSPEC) + assert res == ll_function(6) + res = self.run(ll_function, [0], 2, policy=P_OOPSPEC) + assert res == ll_function(0) def test_oop_vlist(self): - py.test.skip("port me") + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot'] def ll_function(): - lst = [3, 5] - five = lst.pop() # [3] - lst.append(len(lst)) # [3, 1] - lst2 = list(lst) - three = lst.pop(0) # [1] - lst.insert(0, 8) # [8, 1] - lst.insert(2, 7) # [8, 1, 7] - lst.append(not lst) # [8, 1, 7, 0] - lst.reverse() # [0, 7, 1, 8] - lst3 = lst2 + lst # [3, 1, 0, 7, 1, 8] - del lst3[1] # [3, 0, 7, 1, 8] - seven = lst3.pop(2) # [3, 0, 1, 8] - lst3[0] = 9 # [9, 0, 1, 8] - nine = lst3.pop(-4) # [0, 1, 8] - return (len(lst3) * 10000000 + - lst3[0] * 1000000 + - lst3[1] * 100000 + - lst3[-1] * 10000 + - five * 1000 + - three * 100 + - seven * 10 + - nine * 1) - assert ll_function() == 30185379 - res = self.interpret(ll_function, [], [], policy=P_OOPSPEC) - assert res == 30185379 - self.check_insns({}) + i = 1024 + tot = 0 + while i: + i >>= 1 + lst = [3, 5] + five = lst.pop() # [3] + lst.append(len(lst)) # [3, 1] + lst2 = list(lst) + three = lst.pop(0) # [1] + lst.insert(0, 8) # [8, 1] + lst.insert(2, 7) # [8, 1, 7] + lst.append(not lst) # [8, 1, 7, 0] + lst.reverse() # [0, 7, 1, 8] + lst3 = lst2 + lst # [3, 1, 0, 7, 1, 8] + del lst3[1] # [3, 0, 7, 1, 8] + seven = lst3.pop(2) # [3, 0, 1, 8] + lst3[0] = 9 # [9, 0, 1, 8] + nine = lst3.pop(-4) # [0, 1, 8] + tot += (len(lst3) * 10000000 + + lst3[0] * 1000000 + + lst3[1] * 100000 + + lst3[-1] * 10000 + + five * 1000 + + three * 100 + + seven * 10 + + nine * 1) + MyJitDriver.jit_merge_point(tot=tot, i=i) + MyJitDriver.can_enter_jit(tot=tot, i=i) + return tot + assert ll_function() == 30185379 * 11 + res = self.run(ll_function, [], 2, policy=P_OOPSPEC) + assert res == 30185379 * 11 + self.check_insns_in_loops({'int_rshift': 1, 'int_add': 1, + 'int_is_true': 1}) def test_alloc_and_set(self): - py.test.skip("port me") + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot'] def ll_function(): - lst = [0] * 9 - return len(lst) - res = self.interpret(ll_function, [], [], policy=P_OOPSPEC) - assert res == 9 - self.check_insns({}) + i = 1024 + tot = 0 + while i: + i >>= 1 + lst = [0] * 9 + tot += len(lst) + MyJitDriver.jit_merge_point(tot=tot, i=i) + MyJitDriver.can_enter_jit(tot=tot, i=i) + return tot + res = self.run(ll_function, [], 2, policy=P_OOPSPEC) + assert res == 9 * 11 + self.check_insns_in_loops({'int_rshift': 1, 'int_add': 1, + 'int_is_true': 1}) def test_lists_deepfreeze(self): py.test.skip("port me") @@ -150,33 +201,55 @@ self.check_insns({}) def test_frozen_list(self): - py.test.skip("port me") lst = [5, 7, 9] + class MyJitDriver(JitDriver): + greens = ['x'] + reds = ['i', 'tot'] def ll_function(x): - mylist = hint(lst, deepfreeze=True) - z = mylist[x] - hint(z, concrete=True) - return z - - res = self.interpret(ll_function, [1], policy=P_OOPSPEC) - assert res == 7 - self.check_insns({}) + i = 1024 + tot = 0 + while i: + i >>= 1 + mylist = hint(lst, deepfreeze=True) + z = mylist[x] + hint(z, concrete=True) + tot += z + MyJitDriver.jit_merge_point(x=x, tot=tot, i=i) + MyJitDriver.can_enter_jit(x=x, tot=tot, i=i) + return tot + + res = self.run(ll_function, [1], 2, policy=P_OOPSPEC) + assert res == 7 * 11 + self.check_insns_in_loops({'int_rshift': 1, 'int_add': 1, + 'int_is_true': 1}) def test_frozen_list_indexerror(self): - py.test.skip("port me") + py.test.skip("fix me") lst = [5, 7, 9] + class MyJitDriver(JitDriver): + greens = ['x'] + reds = ['i', 'tot'] def ll_function(x): - mylist = hint(lst, deepfreeze=True) - try: - z = mylist[x] - except IndexError: - return -42 - hint(z, concrete=True) - return z - - res = self.interpret(ll_function, [4], policy=P_OOPSPEC) - assert res == -42 - self.check_insns({}) + i = 1024 + tot = 0 + while i: + i >>= 1 + mylist = hint(lst, deepfreeze=True) + try: + z = mylist[x] + except IndexError: + tot += -42 + else: + hint(z, concrete=True) + tot += z + MyJitDriver.jit_merge_point(x=x, tot=tot, i=i) + MyJitDriver.can_enter_jit(x=x, tot=tot, i=i) + return tot + + res = self.run(ll_function, [4], threshold=2, policy=P_OOPSPEC) + assert res == -42 * 11 + self.check_insns_in_loops({'int_rshift': 1, 'int_add': 1, + 'int_is_true': 1}) def test_bogus_index_while_compiling(self): py.test.skip("implement me") From cfbolz at codespeak.net Mon Mar 17 14:50:48 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 17 Mar 2008 14:50:48 +0100 (CET) Subject: [pypy-svn] r52642 - pypy/branch/loops-for-gcc Message-ID: <20080317135048.DF308169E2C@codespeak.net> Author: cfbolz Date: Mon Mar 17 14:50:47 2008 New Revision: 52642 Removed: pypy/branch/loops-for-gcc/ Log: kill merged branch From arigo at codespeak.net Mon Mar 17 15:51:35 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 17 Mar 2008 15:51:35 +0100 (CET) Subject: [pypy-svn] r52643 - in pypy/dist/pypy/objspace/std: . test Message-ID: <20080317145135.E95D9169E09@codespeak.net> Author: arigo Date: Mon Mar 17 15:51:34 2008 New Revision: 52643 Modified: pypy/dist/pypy/objspace/std/rangeobject.py pypy/dist/pypy/objspace/std/test/test_rangeobject.py Log: Test and fix for iter(range(10))__reduce__(). Modified: pypy/dist/pypy/objspace/std/rangeobject.py ============================================================================== --- pypy/dist/pypy/objspace/std/rangeobject.py (original) +++ pypy/dist/pypy/objspace/std/rangeobject.py Mon Mar 17 15:51:34 2008 @@ -4,6 +4,7 @@ from pypy.objspace.std.sliceobject import W_SliceObject from pypy.objspace.std.listobject import W_ListObject from pypy.objspace.std import listtype +from pypy.objspace.std import iterobject from pypy.objspace.std import slicetype from pypy.interpreter import gateway, baseobjspace @@ -100,7 +101,6 @@ return W_RangeListObject(rangestart, rangestep, slicelength) def iter__RangeList(space, w_rangelist): - from pypy.objspace.std import iterobject return W_RangeIterObject(w_rangelist) def repr__RangeList(space, w_rangelist): @@ -163,25 +163,24 @@ w_rangelist.step = -w_rangelist.step return space.w_None -class W_RangeIterObject(W_Object): - from pypy.objspace.std.itertype import iter_typedef as typedef - def __init__(w_self, w_rangelist, index=0): - w_self.w_rangelist = w_rangelist - w_self.index = index +class W_RangeIterObject(iterobject.W_AbstractSeqIterObject): + pass def iter__RangeIter(space, w_rangeiter): return w_rangeiter def next__RangeIter(space, w_rangeiter): - if w_rangeiter.w_rangelist is None: + w_rangelist = w_rangeiter.w_seq + if w_rangelist is None: raise OperationError(space.w_StopIteration, space.w_None) - if w_rangeiter.w_rangelist.w_list is not None: + assert isinstance(w_rangelist, W_RangeListObject) + if w_rangelist.w_list is not None: try: - w_item = space.getitem(w_rangeiter.w_rangelist.w_list, + w_item = space.getitem(w_rangelist.w_list, wrapint(space, w_rangeiter.index)) except OperationError, e: - w_rangeiter.w_rangelist = None + w_rangeiter.w_seq = None if not e.match(space, space.w_IndexError): raise raise OperationError(space.w_StopIteration, space.w_None) @@ -189,18 +188,18 @@ try: w_item = wrapint( space, - w_rangeiter.w_rangelist.getitem(w_rangeiter.index)) + w_rangelist.getitem(w_rangeiter.index)) except IndexError: - w_rangeiter.w_rangelist = None + w_rangeiter.w_seq = None raise OperationError(space.w_StopIteration, space.w_None) w_rangeiter.index += 1 return w_item def len__RangeIter(space, w_rangeiter): - if w_rangeiter.w_rangelist is None: + if w_rangeiter.w_seq is None: return wrapint(space, 0) index = w_rangeiter.index - w_length = space.len(w_rangeiter.w_rangelist) + w_length = space.len(w_rangeiter.w_seq) w_len = space.sub(w_length, wrapint(space, index)) if space.is_true(space.lt(w_len, wrapint(space, 0))): w_len = wrapint(space, 0) Modified: pypy/dist/pypy/objspace/std/test/test_rangeobject.py ============================================================================== --- pypy/dist/pypy/objspace/std/test/test_rangeobject.py (original) +++ pypy/dist/pypy/objspace/std/test/test_rangeobject.py Mon Mar 17 15:51:34 2008 @@ -105,3 +105,18 @@ assert not self.not_forced(r) assert r == [1, 2, 5, 6, 7] + def test_reduce(self): + it = iter(range(10)) + assert it.next() == 0 + assert it.next() == 1 + assert it.next() == 2 + assert it.next() == 3 + seqiter_new, args = it.__reduce__() + assert it.next() == 4 + assert it.next() == 5 + it2 = seqiter_new(*args) + assert it2.next() == 4 + assert it2.next() == 5 + it3 = seqiter_new(*args) + assert it3.next() == 4 + assert it3.next() == 5 From cfbolz at codespeak.net Mon Mar 17 15:59:54 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 17 Mar 2008 15:59:54 +0100 (CET) Subject: [pypy-svn] r52644 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080317145954.6B5F7169E23@codespeak.net> Author: cfbolz Date: Mon Mar 17 15:59:52 2008 New Revision: 52644 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py Log: support for green calls that raise Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Mon Mar 17 15:59:52 2008 @@ -22,11 +22,12 @@ # since we have a normal exception instance here # we need to turn it into a low level one assert not we_are_translated() - bk = rtyper.annotator.bookkeeper - exc_classdef = bk.getuniqueclassdef(e.__class__) - ll_exc = rtyper.exceptiondata.get_standard_ll_exc_instance( - rtyper, exc_classdef) - jitstate.residual_ll_exception(ll_exc) + from pypy.rpython.llinterp import LLException + if not isinstance(e, LLException): + raise # don't know how to capture it, and it + # probably shows a bug anyway + llexctype, llvalue = e.args + jitstate.residual_ll_exception(llvalue) class CallDesc: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Mon Mar 17 15:59:52 2008 @@ -312,7 +312,11 @@ @arguments("green", "calldesc", "green_varargs") def opimpl_green_call(self, gv_fnptr, calldesc, greenargs): - gv_res = calldesc.perform_call(self.rgenop, gv_fnptr, greenargs) + try: + gv_res = calldesc.perform_call(self.rgenop, gv_fnptr, greenargs) + except Exception, e: + self.capture_exception(e) + gv_res = calldesc.gv_whatever_return_value self.green_result(gv_res) @arguments("oopspec", "bool", returns="red") Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py Mon Mar 17 15:59:52 2008 @@ -224,7 +224,6 @@ 'int_is_true': 1}) def test_frozen_list_indexerror(self): - py.test.skip("fix me") lst = [5, 7, 9] class MyJitDriver(JitDriver): greens = ['x'] From fijal at codespeak.net Mon Mar 17 17:03:28 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 17 Mar 2008 17:03:28 +0100 (CET) Subject: [pypy-svn] r52645 - in pypy/dist/ctypes_configure: . test Message-ID: <20080317160328.4949D169E14@codespeak.net> Author: fijal Date: Mon Mar 17 17:03:25 2008 New Revision: 52645 Added: pypy/dist/ctypes_configure/ pypy/dist/ctypes_configure/__init__.py (contents, props changed) pypy/dist/ctypes_configure/configure.py (contents, props changed) pypy/dist/ctypes_configure/test/ pypy/dist/ctypes_configure/test/__init__.py (contents, props changed) pypy/dist/ctypes_configure/test/test_configure.py (contents, props changed) Log: Try to separate (as far as possible) ctypes platform from pypy. Fished from svn history. Added: pypy/dist/ctypes_configure/__init__.py ============================================================================== Added: pypy/dist/ctypes_configure/configure.py ============================================================================== --- (empty file) +++ pypy/dist/ctypes_configure/configure.py Mon Mar 17 17:03:25 2008 @@ -0,0 +1,648 @@ +#! /usr/bin/env python + +import os, py, sys +import ctypes +from pypy.translator.tool.cbuild import build_executable +from pypy.translator.tool.cbuild import ExternalCompilationInfo +from pypy.tool.udir import udir +from pypy.tool.gcc_cache import build_executable_cache, try_compile_cache +import distutils + +# ____________________________________________________________ +# +# Helpers for simple cases + +def eci_from_header(c_header_source): + return ExternalCompilationInfo( + pre_include_lines=c_header_source.split("\n") + ) + + +def getstruct(name, c_header_source, interesting_fields): + class CConfig: + _compilation_info_ = eci_from_header(c_header_source) + STRUCT = Struct(name, interesting_fields) + return configure(CConfig)['STRUCT'] + +def getsimpletype(name, c_header_source, ctype_hint=ctypes.c_int): + class CConfig: + _compilation_info_ = eci_from_header(c_header_source) + TYPE = SimpleType(name, ctype_hint) + return configure(CConfig)['TYPE'] + +def getconstantinteger(name, c_header_source): + class CConfig: + _compilation_info_ = eci_from_header(c_header_source) + CONST = ConstantInteger(name) + return configure(CConfig)['CONST'] + +def getdefined(macro, c_header_source): + class CConfig: + _compilation_info_ = eci_from_header(c_header_source) + DEFINED = Defined(macro) + return configure(CConfig)['DEFINED'] + +def has(name, c_header_source): + class CConfig: + _compilation_info_ = eci_from_header(c_header_source) + HAS = Has(name) + return configure(CConfig)['HAS'] + +def check_eci(eci): + """Check if a given ExternalCompilationInfo compiles and links.""" + class CConfig: + _compilation_info_ = eci + WORKS = Works() + return configure(CConfig)['WORKS'] + +def sizeof(name, eci, **kwds): + class CConfig: + _compilation_info_ = eci + SIZE = SizeOf(name) + for k, v in kwds.items(): + setattr(CConfig, k, v) + return configure(CConfig)['SIZE'] + +def memory_alignment(): + """Return the alignment (in bytes) of memory allocations. + This is enough to make sure a structure with pointers and 'double' + fields is properly aligned.""" + global _memory_alignment + if _memory_alignment is None: + S = getstruct('struct memory_alignment_test', """ + struct memory_alignment_test { + double d; + void* p; + }; + """, []) + result = ctypes.alignment(S) + assert result & (result-1) == 0, "not a power of two??" + _memory_alignment = result + return _memory_alignment +_memory_alignment = None + +# ____________________________________________________________ +# +# General interface + +class ConfigResult: + def __init__(self, CConfig, info, entries): + self.CConfig = CConfig + self.result = {} + self.info = info + self.entries = entries + + def get_entry_result(self, entry): + try: + return self.result[entry] + except KeyError: + pass + name = self.entries[entry] + info = self.info[name] + self.result[entry] = entry.build_result(info, self) + + def get_result(self): + return dict([(name, self.result[entry]) + for entry, name in self.entries.iteritems()]) + + +class _CWriter(object): + """ A simple class which aggregates config parts + """ + def __init__(self, CConfig): + self.path = uniquefilepath() + self.f = self.path.open("w") + self.config = CConfig + + def write_header(self): + f = self.f + CConfig = self.config + CConfig._compilation_info_.write_c_header(f) + print >> f, C_HEADER + print >> f + + def write_entry(self, key, entry): + f = self.f + print >> f, 'void dump_section_%s(void) {' % (key,) + for line in entry.prepare_code(): + if line and line[0] != '#': + line = '\t' + line + print >> f, line + print >> f, '}' + print >> f + + def write_entry_main(self, key): + print >> self.f, '\tprintf("-+- %s\\n");' % (key,) + print >> self.f, '\tdump_section_%s();' % (key,) + print >> self.f, '\tprintf("---\\n");' + + def start_main(self): + print >> self.f, 'int main(int argc, char *argv[]) {' + + def close(self): + f = self.f + print >> f, '\treturn 0;' + print >> f, '}' + f.close() + + def ask_gcc(self, question): + self.start_main() + self.f.write(question + "\n") + self.close() + eci = self.config._compilation_info_ + return try_compile_cache([self.path], eci) + + +def configure(CConfig): + """Examine the local system by running the C compiler. + The CConfig class contains CConfigEntry attribues that describe + what should be inspected; configure() returns a dict mapping + names to the results. + """ + for attr in ['_includes_', '_libraries_', '_sources_', '_library_dirs_', + '_include_dirs_', '_header_']: + assert not hasattr(CConfig, attr), "Found legacy attribut %s on CConfig" % (attr,) + entries = [] + for key in dir(CConfig): + value = getattr(CConfig, key) + if isinstance(value, CConfigEntry): + entries.append((key, value)) + + if entries: # can be empty if there are only CConfigSingleEntries + writer = _CWriter(CConfig) + writer.write_header() + for key, entry in entries: + writer.write_entry(key, entry) + + f = writer.f + writer.start_main() + for key, entry in entries: + writer.write_entry_main(key) + writer.close() + + eci = CConfig._compilation_info_ + infolist = list(run_example_code(writer.path, eci)) + assert len(infolist) == len(entries) + + resultinfo = {} + resultentries = {} + for info, (key, entry) in zip(infolist, entries): + resultinfo[key] = info + resultentries[entry] = key + + result = ConfigResult(CConfig, resultinfo, resultentries) + for name, entry in entries: + result.get_entry_result(entry) + res = result.get_result() + else: + res = {} + + for key in dir(CConfig): + value = getattr(CConfig, key) + if isinstance(value, CConfigSingleEntry): + writer = _CWriter(CConfig) + writer.write_header() + res[key] = value.question(writer.ask_gcc) + + return res + +# ____________________________________________________________ + + +class CConfigEntry(object): + "Abstract base class." + + +class Struct(CConfigEntry): + """An entry in a CConfig class that stands for an externally + defined structure. + """ + def __init__(self, name, interesting_fields, ifdef=None): + self.name = name + self.interesting_fields = interesting_fields + self.ifdef = ifdef + + def prepare_code(self): + if self.ifdef is not None: + yield '#ifdef %s' % (self.ifdef,) + yield 'typedef %s ctypesplatcheck_t;' % (self.name,) + yield 'typedef struct {' + yield ' char c;' + yield ' ctypesplatcheck_t s;' + yield '} ctypesplatcheck2_t;' + yield '' + yield 'ctypesplatcheck_t s;' + if self.ifdef is not None: + yield 'dump("defined", 1);' + yield 'dump("align", offsetof(ctypesplatcheck2_t, s));' + yield 'dump("size", sizeof(ctypesplatcheck_t));' + for fieldname, fieldtype in self.interesting_fields: + yield 'dump("fldofs %s", offsetof(ctypesplatcheck_t, %s));'%( + fieldname, fieldname) + yield 'dump("fldsize %s", sizeof(s.%s));' % ( + fieldname, fieldname) + if fieldtype in integer_class: + yield 's.%s = 0; s.%s = ~s.%s;' % (fieldname, + fieldname, + fieldname) + yield 'dump("fldunsigned %s", s.%s > 0);' % (fieldname, + fieldname) + if self.ifdef is not None: + yield '#else' + yield 'dump("defined", 0);' + yield '#endif' + + def build_result(self, info, config_result): + if self.ifdef is not None: + if not info['defined']: + return None + alignment = 1 + layout = [None] * info['size'] + for fieldname, fieldtype in self.interesting_fields: + if isinstance(fieldtype, Struct): + offset = info['fldofs ' + fieldname] + size = info['fldsize ' + fieldname] + c_fieldtype = config_result.get_entry_result(fieldtype) + layout_addfield(layout, offset, c_fieldtype, fieldname) + alignment = max(alignment, ctype_alignment(c_fieldtype)) + else: + offset = info['fldofs ' + fieldname] + size = info['fldsize ' + fieldname] + sign = info.get('fldunsigned ' + fieldname, False) + if (size, sign) != size_and_sign(fieldtype): + fieldtype = fixup_ctype(fieldtype, fieldname, (size, sign)) + layout_addfield(layout, offset, fieldtype, fieldname) + alignment = max(alignment, ctype_alignment(fieldtype)) + + # try to enforce the same alignment as the one of the original + # structure + if alignment < info['align']: + choices = [ctype for ctype in alignment_types + if ctype_alignment(ctype) == info['align']] + assert choices, "unsupported alignment %d" % (info['align'],) + choices = [(ctypes.sizeof(ctype), i, ctype) + for i, ctype in enumerate(choices)] + csize, _, ctype = min(choices) + for i in range(0, info['size'] - csize + 1, info['align']): + if layout[i:i+csize] == [None] * csize: + layout_addfield(layout, i, ctype, '_alignment') + break + else: + raise AssertionError("unenforceable alignment %d" % ( + info['align'],)) + + n = 0 + for i, cell in enumerate(layout): + if cell is not None: + continue + layout_addfield(layout, i, ctypes.c_char, '_pad%d' % (n,)) + n += 1 + + # build the ctypes Structure + seen = {} + fields = [] + for cell in layout: + if cell in seen: + continue + fields.append((cell.name, cell.ctype)) + seen[cell] = True + + class S(ctypes.Structure): + _fields_ = fields + name = self.name + if name.startswith('struct '): + name = name[7:] + S.__name__ = name + return S + + +class SimpleType(CConfigEntry): + """An entry in a CConfig class that stands for an externally + defined simple numeric type. + """ + def __init__(self, name, ctype_hint=ctypes.c_int, ifdef=None): + self.name = name + self.ctype_hint = ctype_hint + self.ifdef = ifdef + + def prepare_code(self): + if self.ifdef is not None: + yield '#ifdef %s' % (self.ifdef,) + yield 'typedef %s ctypesplatcheck_t;' % (self.name,) + yield '' + yield 'ctypesplatcheck_t x;' + if self.ifdef is not None: + yield 'dump("defined", 1);' + yield 'dump("size", sizeof(ctypesplatcheck_t));' + if self.ctype_hint in integer_class: + yield 'x = 0; x = ~x;' + yield 'dump("unsigned", x > 0);' + if self.ifdef is not None: + yield '#else' + yield 'dump("defined", 0);' + yield '#endif' + + def build_result(self, info, config_result): + if self.ifdef is not None and not info['defined']: + return None + size = info['size'] + sign = info.get('unsigned', False) + ctype = self.ctype_hint + if (size, sign) != size_and_sign(ctype): + ctype = fixup_ctype(ctype, self.name, (size, sign)) + return ctype + + +class ConstantInteger(CConfigEntry): + """An entry in a CConfig class that stands for an externally + defined integer constant. + """ + def __init__(self, name): + self.name = name + + def prepare_code(self): + yield 'if ((%s) < 0) {' % (self.name,) + yield ' long long x = (long long)(%s);' % (self.name,) + yield ' printf("value: %lld\\n", x);' + yield '} else {' + yield ' unsigned long long x = (unsigned long long)(%s);' % ( + self.name,) + yield ' printf("value: %llu\\n", x);' + yield '}' + + def build_result(self, info, config_result): + return info['value'] + +class DefinedConstantInteger(CConfigEntry): + """An entry in a CConfig class that stands for an externally + defined integer constant. If not #defined the value will be None. + """ + def __init__(self, macro): + self.name = self.macro = macro + + def prepare_code(self): + yield '#ifdef %s' % self.macro + yield 'dump("defined", 1);' + yield 'if ((%s) < 0) {' % (self.macro,) + yield ' long long x = (long long)(%s);' % (self.macro,) + yield ' printf("value: %lld\\n", x);' + yield '} else {' + yield ' unsigned long long x = (unsigned long long)(%s);' % ( + self.macro,) + yield ' printf("value: %llu\\n", x);' + yield '}' + yield '#else' + yield 'dump("defined", 0);' + yield '#endif' + + def build_result(self, info, config_result): + if info["defined"]: + return info['value'] + return None + + +class DefinedConstantString(CConfigEntry): + """ + """ + def __init__(self, macro): + self.macro = macro + self.name = macro + + def prepare_code(self): + yield '#ifdef %s' % self.macro + yield 'int i;' + yield 'char *p = %s;' % self.macro + yield 'dump("defined", 1);' + yield 'for (i = 0; p[i] != 0; i++ ) {' + yield ' printf("value_%d: %d\\n", i, (int)(unsigned char)p[i]);' + yield '}' + yield '#else' + yield 'dump("defined", 0);' + yield '#endif' + + def build_result(self, info, config_result): + if info["defined"]: + string = '' + d = 0 + while info.has_key('value_%d' % d): + string += chr(info['value_%d' % d]) + d += 1 + return string + return None + + +class Defined(CConfigEntry): + """A boolean, corresponding to an #ifdef. + """ + def __init__(self, macro): + self.macro = macro + self.name = macro + + def prepare_code(self): + yield '#ifdef %s' % (self.macro,) + yield 'dump("defined", 1);' + yield '#else' + yield 'dump("defined", 0);' + yield '#endif' + + def build_result(self, info, config_result): + return bool(info['defined']) + +class CConfigSingleEntry(object): + """ An abstract class of type which requires + gcc succeeding/failing instead of only asking + """ + pass + +class Has(CConfigSingleEntry): + def __init__(self, name): + self.name = name + + def question(self, ask_gcc): + return ask_gcc(self.name + ';') + +class Works(CConfigSingleEntry): + def question(self, ask_gcc): + return ask_gcc("") + +class SizeOf(CConfigEntry): + """An entry in a CConfig class that stands for + some external opaque type + """ + def __init__(self, name): + self.name = name + + def prepare_code(self): + yield 'dump("size", sizeof(%s));' % self.name + + def build_result(self, info, config_result): + return info['size'] + +class Library(CConfigEntry): + """The loaded CTypes library object. + """ + def __init__(self, name): + self.name = name + + def prepare_code(self): + # XXX should check that we can link against the lib + return [] + + def build_result(self, info, config_result): + from pypy.rpython.rctypes.tool import util + path = util.find_library(self.name) + mylib = ctypes.cdll.LoadLibrary(path) + + class _FuncPtr(ctypes._CFuncPtr): + _flags_ = ctypes._FUNCFLAG_CDECL + _restype_ = ctypes.c_int # default, can be overridden in instances + includes = tuple(config_result.CConfig._includes_) + libraries = (self.name,) + + mylib._FuncPtr = _FuncPtr + return mylib + +# ____________________________________________________________ +# +# internal helpers + +def ctype_alignment(c_type): + if issubclass(c_type, ctypes.Structure): + return max([ctype_alignment(fld_type) + for fld_name, fld_type in c_type._fields_]) + + return ctypes.alignment(c_type) + +def uniquefilepath(LAST=[0]): + i = LAST[0] + LAST[0] += 1 + return udir.join('ctypesplatcheck_%d.c' % i) + +alignment_types = [ + ctypes.c_short, + ctypes.c_int, + ctypes.c_long, + ctypes.c_float, + ctypes.c_double, + ctypes.c_char_p, + ctypes.c_void_p, + ctypes.c_longlong, + ctypes.c_wchar, + ctypes.c_wchar_p, + ] + +integer_class = [ctypes.c_byte, ctypes.c_ubyte, + ctypes.c_short, ctypes.c_ushort, + ctypes.c_int, ctypes.c_uint, + ctypes.c_long, ctypes.c_ulong, + ctypes.c_longlong, ctypes.c_ulonglong, + ] +float_class = [ctypes.c_float, ctypes.c_double] + +class Field(object): + def __init__(self, name, ctype): + self.name = name + self.ctype = ctype + def __repr__(self): + return '' % (self.name, self.ctype) + +def layout_addfield(layout, offset, ctype, prefix): + size = ctypes.sizeof(ctype) + name = prefix + i = 0 + while name in layout: + i += 1 + name = '%s_%d' % (prefix, i) + field = Field(name, ctype) + for i in range(offset, offset+size): + assert layout[i] is None, "%s overlaps %r" % (fieldname, layout[i]) + layout[i] = field + return field + +def size_and_sign(ctype): + return (ctypes.sizeof(ctype), + ctype in integer_class and ctype(-1).value > 0) + +def fixup_ctype(fieldtype, fieldname, expected_size_and_sign): + for typeclass in [integer_class, float_class]: + if fieldtype in typeclass: + for ctype in typeclass: + if size_and_sign(ctype) == expected_size_and_sign: + return ctype + if (hasattr(fieldtype, '_length_') + and getattr(fieldtype, '_type_', None) == ctypes.c_char): + # for now, assume it is an array of chars; otherwise we'd also + # have to check the exact integer type of the elements of the array + size, sign = expected_size_and_sign + return ctypes.c_char * size + if (hasattr(fieldtype, '_length_') + and getattr(fieldtype, '_type_', None) == ctypes.c_ubyte): + # grumble, fields of type 'c_char array' have automatic cast-to- + # Python-string behavior in ctypes, which may not be what you + # want, so here is the same with c_ubytes instead... + size, sign = expected_size_and_sign + return ctypes.c_ubyte * size + raise TypeError("conflicting field type %r for %r" % (fieldtype, + fieldname)) + + +C_HEADER = """ +#include +#include /* for offsetof() */ + +void dump(char* key, int value) { + printf("%s: %d\\n", key, value); +} +""" + +def run_example_code(filepath, eci): + executable = build_executable([filepath], eci) + output = py.process.cmdexec(executable) + section = None + for line in output.splitlines(): + line = line.strip() + if line.startswith('-+- '): # start of a new section + section = {} + elif line == '---': # section end + assert section is not None + yield section + section = None + elif line: + assert section is not None + key, value = line.split(': ') + section[key] = int(value) + +# ____________________________________________________________ + +def get_python_include_dir(): + from distutils import sysconfig + gcv = sysconfig.get_config_vars() + return gcv['INCLUDEPY'] + +if __name__ == '__main__': + doc = """Example: + + ctypes_platform.py -h sys/types.h -h netinet/in.h + 'struct sockaddr_in' + sin_port c_int + """ + import sys, getopt + opts, args = getopt.gnu_getopt(sys.argv[1:], 'h:') + if not args: + print >> sys.stderr, doc + else: + assert len(args) % 2 == 1 + headers = [] + for opt, value in opts: + if opt == '-h': + headers.append('#include <%s>' % (value,)) + name = args[0] + fields = [] + for i in range(1, len(args), 2): + ctype = getattr(ctypes, args[i+1]) + fields.append((args[i], ctype)) + + S = getstruct(name, '\n'.join(headers), fields) + + for key, value in S._fields_: + print key, value Added: pypy/dist/ctypes_configure/test/__init__.py ============================================================================== Added: pypy/dist/ctypes_configure/test/test_configure.py ============================================================================== --- (empty file) +++ pypy/dist/ctypes_configure/test/test_configure.py Mon Mar 17 17:03:25 2008 @@ -0,0 +1,213 @@ +import py, sys, struct +from ctypes_configure import configure +from pypy.translator.tool.cbuild import ExternalCompilationInfo +from pypy.tool.udir import udir +import ctypes + + +def test_dirent(): + dirent = configure.getstruct("struct dirent", + """ + struct dirent /* for this example only, not the exact dirent */ + { + long d_ino; + int d_off; + unsigned short d_reclen; + char d_name[32]; + }; + """, + [("d_reclen", ctypes.c_ushort)]) + assert issubclass(dirent, ctypes.Structure) + ssize = (ctypes.sizeof(ctypes.c_long) + + ctypes.sizeof(ctypes.c_int) + + ctypes.sizeof(ctypes.c_ushort) + + 32) + extra_padding = (-ssize) % ctypes.alignment(ctypes.c_long) + + assert dirent._fields_ == [('_alignment', ctypes.c_long), + ('_pad0', ctypes.c_char), + ('_pad1', ctypes.c_char), + ('_pad2', ctypes.c_char), + ('_pad3', ctypes.c_char), + ('d_reclen', ctypes.c_ushort), + ] + [ + ('_pad%d' % n, ctypes.c_char) + for n in range(4, 4+32+extra_padding)] + assert ctypes.sizeof(dirent) == ssize + extra_padding + assert ctypes.alignment(dirent) == ctypes.alignment(ctypes.c_long) + +def test_fit_type(): + S = configure.getstruct("struct S", + """ + struct S { + signed char c; + unsigned char uc; + short s; + unsigned short us; + int i; + unsigned int ui; + long l; + unsigned long ul; + long long ll; + unsigned long long ull; + float f; + double d; + }; + """, + [("c", ctypes.c_int), + ("uc", ctypes.c_int), + ("s", ctypes.c_uint), + ("us", ctypes.c_int), + ("i", ctypes.c_int), + ("ui", ctypes.c_int), + ("l", ctypes.c_int), + ("ul", ctypes.c_int), + ("ll", ctypes.c_int), + ("ull", ctypes.c_int), + ("f", ctypes.c_double), + ("d", ctypes.c_float)]) + assert issubclass(S, ctypes.Structure) + fields = dict(S._fields_) + assert fields["c"] == ctypes.c_byte + assert fields["uc"] == ctypes.c_ubyte + assert fields["s"] == ctypes.c_short + assert fields["us"] == ctypes.c_ushort + assert fields["i"] == ctypes.c_int + assert fields["ui"] == ctypes.c_uint + assert fields["l"] == ctypes.c_long + assert fields["ul"] == ctypes.c_ulong + assert fields["ll"] == ctypes.c_longlong + assert fields["ull"] == ctypes.c_ulonglong + assert fields["f"] == ctypes.c_float + assert fields["d"] == ctypes.c_double + +def test_simple_type(): + ctype = configure.getsimpletype('test_t', + 'typedef unsigned short test_t;', + ctypes.c_int) + assert ctype == ctypes.c_ushort + +def test_constant_integer(): + value = configure.getconstantinteger('BLAH', + '#define BLAH (6*7)') + assert value == 42 + value = configure.getconstantinteger('BLAH', + '#define BLAH (-2147483648LL)') + assert value == -2147483648 + value = configure.getconstantinteger('BLAH', + '#define BLAH (3333333333ULL)') + assert value == 3333333333 + +def test_defined(): + res = configure.getdefined('ALFKJLKJFLKJFKLEJDLKEWMECEE', '') + assert not res + res = configure.getdefined('ALFKJLKJFLKJFKLEJDLKEWMECEE', + '#define ALFKJLKJFLKJFKLEJDLKEWMECEE') + assert res + +def test_configure(): + test_h = udir.join('test_ctypes_platform.h') + test_h.write('#define XYZZY 42\n') + + class CConfig: + _compilation_info_ = ExternalCompilationInfo( + pre_include_lines = ["/* a C comment */", + "#include ", + "#include "], + include_dirs = [str(udir)] + ) + + FILE = configure.Struct('FILE', []) + ushort = configure.SimpleType('unsigned short') + XYZZY = configure.ConstantInteger('XYZZY') + + res = configure.configure(CConfig) + assert issubclass(res['FILE'], ctypes.Structure) + assert res == {'FILE': res['FILE'], + 'ushort': ctypes.c_ushort, + 'XYZZY': 42} + +def test_ifdef(): + class CConfig: + _compilation_info_ = ExternalCompilationInfo( + post_include_lines = ['/* a C comment */', + '#define XYZZY 42', + 'typedef int foo;', + 'struct s {', + 'int i;', + 'double f;' + '};']) + + + s = configure.Struct('struct s', [('i', ctypes.c_int)], + ifdef='XYZZY') + z = configure.Struct('struct z', [('i', ctypes.c_int)], + ifdef='FOOBAR') + + foo = configure.SimpleType('foo', ifdef='XYZZY') + bar = configure.SimpleType('bar', ifdef='FOOBAR') + + res = configure.configure(CConfig) + assert res['s'] is not None + assert res['z'] is None + assert res['foo'] is not None + assert res['bar'] is None + +def test_nested_structs(): + class CConfig: + _compilation_info_ = ExternalCompilationInfo( + post_include_lines=""" + struct x { + int foo; + unsigned long bar; + }; + struct y { + char c; + struct x x; + }; + """.split("\n")) + + x = configure.Struct("struct x", [("bar", ctypes.c_short)]) + y = configure.Struct("struct y", [("x", x)]) + + res = configure.configure(CConfig) + c_x = res["x"] + c_y = res["y"] + c_y_fields = dict(c_y._fields_) + assert issubclass(c_x , ctypes.Structure) + assert issubclass(c_y, ctypes.Structure) + assert c_y_fields["x"] is c_x + +def test_array(): + dirent = configure.getstruct("struct dirent", + """ + struct dirent /* for this example only, not the exact dirent */ + { + long d_ino; + int d_off; + unsigned short d_reclen; + char d_name[32]; + }; + """, + [("d_name", ctypes.c_char * 0)]) + assert dirent.d_name.size == 32 + +def test_has(): + assert configure.has("x", "int x = 3;") + assert not configure.has("x", "") + # has() should also not crash if it is given an invalid #include + assert not configure.has("x", "#include ") + +def test_check_eci(): + eci = ExternalCompilationInfo() + assert configure.check_eci(eci) + eci = ExternalCompilationInfo(libraries=['some_name_that_doesnt_exist_']) + assert not configure.check_eci(eci) + +def test_sizeof(): + assert configure.sizeof("char", ExternalCompilationInfo()) == 1 + +def test_memory_alignment(): + a = configure.memory_alignment() + print a + assert a % struct.calcsize("P") == 0 From fijal at codespeak.net Mon Mar 17 17:25:38 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 17 Mar 2008 17:25:38 +0100 (CET) Subject: [pypy-svn] r52648 - in pypy/dist/ctypes_configure: . test Message-ID: <20080317162538.AD193169E24@codespeak.net> Author: fijal Date: Mon Mar 17 17:25:37 2008 New Revision: 52648 Added: pypy/dist/ctypes_configure/cbuild.py - copied, changed from r52641, pypy/dist/pypy/translator/tool/cbuild.py pypy/dist/ctypes_configure/gcc_cache.py - copied, changed from r52641, pypy/dist/pypy/tool/gcc_cache.py pypy/dist/ctypes_configure/stdoutcapture.py - copied unchanged from r52641, pypy/dist/pypy/translator/tool/stdoutcapture.py Modified: pypy/dist/ctypes_configure/ (props changed) pypy/dist/ctypes_configure/configure.py pypy/dist/ctypes_configure/test/ (props changed) pypy/dist/ctypes_configure/test/test_configure.py Log: Steal from pypy svn few files, a bit of simplify them. Modified: pypy/dist/ctypes_configure/configure.py ============================================================================== --- pypy/dist/ctypes_configure/configure.py (original) +++ pypy/dist/ctypes_configure/configure.py Mon Mar 17 17:25:37 2008 @@ -2,10 +2,9 @@ import os, py, sys import ctypes -from pypy.translator.tool.cbuild import build_executable -from pypy.translator.tool.cbuild import ExternalCompilationInfo -from pypy.tool.udir import udir -from pypy.tool.gcc_cache import build_executable_cache, try_compile_cache +from ctypes_configure.cbuild import build_executable, configdir +from ctypes_configure.cbuild import ExternalCompilationInfo +from ctypes_configure.gcc_cache import build_executable_cache, try_compile_cache import distutils # ____________________________________________________________ @@ -478,30 +477,6 @@ def build_result(self, info, config_result): return info['size'] -class Library(CConfigEntry): - """The loaded CTypes library object. - """ - def __init__(self, name): - self.name = name - - def prepare_code(self): - # XXX should check that we can link against the lib - return [] - - def build_result(self, info, config_result): - from pypy.rpython.rctypes.tool import util - path = util.find_library(self.name) - mylib = ctypes.cdll.LoadLibrary(path) - - class _FuncPtr(ctypes._CFuncPtr): - _flags_ = ctypes._FUNCFLAG_CDECL - _restype_ = ctypes.c_int # default, can be overridden in instances - includes = tuple(config_result.CConfig._includes_) - libraries = (self.name,) - - mylib._FuncPtr = _FuncPtr - return mylib - # ____________________________________________________________ # # internal helpers @@ -516,7 +491,7 @@ def uniquefilepath(LAST=[0]): i = LAST[0] LAST[0] += 1 - return udir.join('ctypesplatcheck_%d.c' % i) + return configdir.join('ctypesplatcheck_%d.c' % i) alignment_types = [ ctypes.c_short, Modified: pypy/dist/ctypes_configure/test/test_configure.py ============================================================================== --- pypy/dist/ctypes_configure/test/test_configure.py (original) +++ pypy/dist/ctypes_configure/test/test_configure.py Mon Mar 17 17:25:37 2008 @@ -1,10 +1,8 @@ import py, sys, struct from ctypes_configure import configure -from pypy.translator.tool.cbuild import ExternalCompilationInfo -from pypy.tool.udir import udir +from ctypes_configure.cbuild import ExternalCompilationInfo import ctypes - def test_dirent(): dirent = configure.getstruct("struct dirent", """ @@ -106,7 +104,8 @@ assert res def test_configure(): - test_h = udir.join('test_ctypes_platform.h') + configdir = configure.configdir + test_h = configdir.join('test_ctypes_platform.h') test_h.write('#define XYZZY 42\n') class CConfig: @@ -114,7 +113,7 @@ pre_include_lines = ["/* a C comment */", "#include ", "#include "], - include_dirs = [str(udir)] + include_dirs = [str(configdir)] ) FILE = configure.Struct('FILE', []) From fijal at codespeak.net Mon Mar 17 18:07:52 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 17 Mar 2008 18:07:52 +0100 (CET) Subject: [pypy-svn] r52649 - pypy/dist/ctypes_configure/doc Message-ID: <20080317170752.D4696169E26@codespeak.net> Author: fijal Date: Mon Mar 17 18:07:50 2008 New Revision: 52649 Added: pypy/dist/ctypes_configure/doc/ pypy/dist/ctypes_configure/doc/sample.py (contents, props changed) Log: Sample python program to demonstrate ctypes_platform. Added: pypy/dist/ctypes_configure/doc/sample.py ============================================================================== --- (empty file) +++ pypy/dist/ctypes_configure/doc/sample.py Mon Mar 17 18:07:50 2008 @@ -0,0 +1,72 @@ + +from ctypes_configure import configure +import ctypes + +class CConfigure: + _compilation_info_ = configure.ExternalCompilationInfo( + + # all lines landing in C header before includes + pre_include_lines = [], + + # list of .h files to include + includes = ['time.h', 'sys/time.h', 'unistd.h'], + + # list of directories to search for include files + include_dirs = [], + + # all lines landing in C header after includes + post_include_lines = [], + + # libraries to link with + libraries = [], + + # library directories + library_dirs = [], + + # additional C sources to compile with (that go to + # created .c files) + separate_module_sources = [], + + # additional existing C source file names + separate_module_files = [], + ) + + # get real int type out of hint and name + size_t = configure.SimpleType('size_t', ctypes.c_int) + + # grab value of numerical #define + NULL = configure.ConstantInteger('NULL') + + # grab #define, whether it's defined or not + EXISTANT = configure.Defined('NULL') + NOT_EXISTANT = configure.Defined('XXXNOTNULL') + + # check for existance of C functions + has_write = configure.Has('write') + no_xxxwrite = configure.Has('xxxwrite') + + # check for size of type + sizeof_size_t = configure.SizeOf('size_t') + + # structure, with given hints for interesting fields, + # types does not need to be too specific. + # all interesting fields would end up with right offset + # size and order + struct_timeval = configure.Struct('struct timeval',[ + ('tv_sec', ctypes.c_int), + ('tv_usec', ctypes.c_int)]) + +info = configure.configure(CConfigure) + +assert info['has_write'] +assert not info['no_xxxwrite'] +assert info['NULL'] == 0 +size_t = info['size_t'] +print "size_t in ctypes is ", size_t +assert ctypes.sizeof(size_t) == info['sizeof_size_t'] +assert info['EXISTANT'] +assert not info['NOT_EXISTANT'] +print +print "fields of struct timeval are " +for name, value in info['struct_timeval']._fields_: + print " ", name, " ", value From fijal at codespeak.net Mon Mar 17 18:30:08 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 17 Mar 2008 18:30:08 +0100 (CET) Subject: [pypy-svn] r52650 - pypy/dist/ctypes_configure/doc Message-ID: <20080317173008.516D2169E11@codespeak.net> Author: fijal Date: Mon Mar 17 18:30:07 2008 New Revision: 52650 Added: pypy/dist/ctypes_configure/doc/configure.html pypy/dist/ctypes_configure/doc/configure.txt (contents, props changed) Log: a bit of documentation. Added: pypy/dist/ctypes_configure/doc/configure.html ============================================================================== --- (empty file) +++ pypy/dist/ctypes_configure/doc/configure.html Mon Mar 17 18:30:07 2008 @@ -0,0 +1,313 @@ + + + + + + +ctypes configure + + + +
+

ctypes configure

+
+

idea

+

One of ctypes problems is that ctypes programs are usually not very +platform-independent. We created ctypes_configure, which invokes gcc +(and caches results) for various platform-dependent details like +exact sizes of types (for example size_t), #defines, exact outline +of structures etc. It replaces in this regard code generator (h2py).

+
+
+

installation

+

easy_install ctypes_platform

+
+
+

usage

+

sample.py explains in details how to use it.

+
+
+ + Added: pypy/dist/ctypes_configure/doc/configure.txt ============================================================================== --- (empty file) +++ pypy/dist/ctypes_configure/doc/configure.txt Mon Mar 17 18:30:07 2008 @@ -0,0 +1,22 @@ +================= +ctypes configure +================= + +idea +==== + +One of ctypes problems is that ctypes programs are usually not very +platform-independent. We created ctypes_configure, which invokes gcc +(and caches results) for various platform-dependent details like +exact sizes of types (for example size_t), #defines, exact outline +of structures etc. It replaces in this regard code generator (h2py). + +installation +============ + +``easy_install ctypes_platform`` + +usage +===== + +sample.py explains in details how to use it. From fijal at codespeak.net Mon Mar 17 18:33:34 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 17 Mar 2008 18:33:34 +0100 (CET) Subject: [pypy-svn] r52651 - pypy/dist/ctypes_configure/doc Message-ID: <20080317173334.2405A169E11@codespeak.net> Author: fijal Date: Mon Mar 17 18:33:33 2008 New Revision: 52651 Modified: pypy/dist/ctypes_configure/doc/configure.html pypy/dist/ctypes_configure/doc/configure.txt Log: update. Modified: pypy/dist/ctypes_configure/doc/configure.html ============================================================================== --- pypy/dist/ctypes_configure/doc/configure.html (original) +++ pypy/dist/ctypes_configure/doc/configure.html Mon Mar 17 18:33:33 2008 @@ -302,11 +302,11 @@

installation

-

easy_install ctypes_platform

+

easy_install ctypes_configure

usage

-

sample.py explains in details how to use it.

+

sample.py explains in details how to use it.

Modified: pypy/dist/ctypes_configure/doc/configure.txt ============================================================================== --- pypy/dist/ctypes_configure/doc/configure.txt (original) +++ pypy/dist/ctypes_configure/doc/configure.txt Mon Mar 17 18:33:33 2008 @@ -14,9 +14,11 @@ installation ============ -``easy_install ctypes_platform`` +``easy_install ctypes_configure`` usage ===== -sample.py explains in details how to use it. +`sample.py`_ explains in details how to use it. + +.. _`sample.py`: http://codespeak.net/svn/pypy/dist/ctypes_configure/doc/sample.py From cfbolz at codespeak.net Mon Mar 17 18:35:26 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 17 Mar 2008 18:35:26 +0100 (CET) Subject: [pypy-svn] r52652 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080317173526.05FEF168457@codespeak.net> Author: cfbolz Date: Mon Mar 17 18:35:26 2008 New Revision: 52652 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Log: fix a regression caused by my last commit Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Mon Mar 17 18:35:26 2008 @@ -23,11 +23,15 @@ # we need to turn it into a low level one assert not we_are_translated() from pypy.rpython.llinterp import LLException - if not isinstance(e, LLException): - raise # don't know how to capture it, and it - # probably shows a bug anyway - llexctype, llvalue = e.args - jitstate.residual_ll_exception(llvalue) + if isinstance(e, LLException): + llexctype, llvalue = e.args + jitstate.residual_ll_exception(llvalue) + else: + bk = rtyper.annotator.bookkeeper + exc_classdef = bk.getuniqueclassdef(e.__class__) + ll_exc = rtyper.exceptiondata.get_standard_ll_exc_instance( + rtyper, exc_classdef) + jitstate.residual_ll_exception(ll_exc) class CallDesc: From cfbolz at codespeak.net Mon Mar 17 18:37:57 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 17 Mar 2008 18:37:57 +0100 (CET) Subject: [pypy-svn] r52653 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080317173757.2AA8A168574@codespeak.net> Author: cfbolz Date: Mon Mar 17 18:37:56 2008 New Revision: 52653 Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py - copied unchanged from r52635, pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_vdict.py Log: start porting the vdict tests to the hotpath policy From cfbolz at codespeak.net Mon Mar 17 18:48:17 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 17 Mar 2008 18:48:17 +0100 (CET) Subject: [pypy-svn] r52654 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080317174817.D145916857B@codespeak.net> Author: cfbolz Date: Mon Mar 17 18:48:17 2008 New Revision: 52654 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py Log: port over most vdict tests Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py Mon Mar 17 18:48:17 2008 @@ -1,47 +1,79 @@ import py from pypy.jit.hintannotator.policy import HintAnnotatorPolicy from pypy.jit.rainbow.test.test_interpreter import InterpretationTest, P_OOPSPEC -from pypy.rlib.jit import hint +from pypy.rlib.jit import JitDriver, hint, JitHintError +from pypy.jit.rainbow.test import test_hotpath -class TestVDict(InterpretationTest): +class TestVDict(test_hotpath.HotPathTest): type_system = "lltype" def test_vdict(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot'] def ll_function(): - dic = {} - dic[12] = 34 - dic[13] = 35 - return dic[12] - res = self.interpret(ll_function, [], [], policy=P_OOPSPEC) - assert res == 34 - self.check_insns({}) + tot = 0 + i = 1024 + while i > 0: + i >>= 1 + dic = {} + dic[12] = 34 + dic[13] = 35 + tot += dic[12] + MyJitDriver.jit_merge_point(tot=tot, i=i) + MyJitDriver.can_enter_jit(tot=tot, i=i) + return tot + res = self.run(ll_function, [], 2, policy=P_OOPSPEC) + assert res == 34 * 11 + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1}) def test_vdict_and_vlist(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot'] def ll_function(): - dic = {} - lst = [12] - dic[12] = 34 - dic[13] = 35 - return dic[lst.pop()] - res = self.interpret(ll_function, [], [], policy=P_OOPSPEC) - assert res == 34 - self.check_insns({}) + tot = 0 + i = 1024 + while i > 0: + i >>= 1 + dic = {} + lst = [12] + dic[12] = 34 + dic[13] = 35 + tot += dic[lst.pop()] + MyJitDriver.jit_merge_point(tot=tot, i=i) + MyJitDriver.can_enter_jit(tot=tot, i=i) + return tot + res = self.run(ll_function, [], 2, policy=P_OOPSPEC) + assert res == 34 * 11 + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1}) def test_multiple_vdicts(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot'] def ll_function(): - d1 = {} - d1[12] = 34 - l1 = [12] - l2 = ['foo'] - d2 = {} - d2['foo'] = 'hello' - return d1[l1.pop()] + len(d2[l2.pop()]) - res = self.interpret(ll_function, [], [], policy=P_OOPSPEC) - assert res == 39 - self.check_insns({}) + tot = 0 + i = 1024 + while i > 0: + i >>= 1 + d1 = {} + d1[12] = 34 + l1 = [12] + l2 = ['foo'] + d2 = {} + d2['foo'] = 'hello' + tot += d1[l1.pop()] + len(d2[l2.pop()]) + MyJitDriver.jit_merge_point(tot=tot, i=i) + MyJitDriver.can_enter_jit(tot=tot, i=i) + return tot + res = self.run(ll_function, [], 2, policy=P_OOPSPEC) + assert res == 39 * 11 + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1}) def test_dicts_deepfreeze(self): + py.test.skip("how do you generate constant arguments?") d1 = {1: 123, 2: 54, 3:84} d2 = {1: 831, 2: 32, 3:81} def getdict(n): @@ -49,13 +81,21 @@ return d1 else: return d2 - def ll_function(n, i): - d = getdict(n) - d = hint(d, deepfreeze=True) - res = d[i] - res = hint(res, variable=True) - return res - - res = self.interpret(ll_function, [3, 2], [0, 1], policy=P_OOPSPEC) - assert res == 54 - self.check_insns({}) + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'n', 'x'] + def ll_function(n, x): + tot = 0 + i = 1024 + while i > 0: + i >>= 1 + d = getdict(n) + d = hint(d, deepfreeze=True) + res = d[i] + res = hint(res, variable=True) + tot += res + MyJitDriver.jit_merge_point(tot=tot, i=i, n=n, x=x) + MyJitDriver.can_enter_jit(tot=tot, i=i, n=n, x=x) + return tot + res = self.run(ll_function, [3, 2], 2, policy=P_OOPSPEC) + assert res == 54 * 11 From pedronis at codespeak.net Mon Mar 17 19:06:18 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Mon, 17 Mar 2008 19:06:18 +0100 (CET) Subject: [pypy-svn] r52655 - pypy/dist/pypy/doc/discussion Message-ID: <20080317180618.F3CF0169E22@codespeak.net> Author: pedronis Date: Mon Mar 17 19:06:17 2008 New Revision: 52655 Modified: pypy/dist/pypy/doc/discussion/ctypes_todo.txt Log: forgot to update this on friday Modified: pypy/dist/pypy/doc/discussion/ctypes_todo.txt ============================================================================== --- pypy/dist/pypy/doc/discussion/ctypes_todo.txt (original) +++ pypy/dist/pypy/doc/discussion/ctypes_todo.txt Mon Mar 17 19:06:17 2008 @@ -15,8 +15,7 @@ - there are features, which we don't support like buffer() and array() protocols. - - no tests for passing a union by value, missing tests about nesting unions - and keep-alive logic for unions + - are the _CData_value return lifetime/gc sematics correct? - for some ABIs we will need completely filled ffitypes to do the right thing for passing structures by value, we are now passing enough From cfbolz at codespeak.net Mon Mar 17 19:33:58 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 17 Mar 2008 19:33:58 +0100 (CET) Subject: [pypy-svn] r52656 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080317183358.15F43169E16@codespeak.net> Author: cfbolz Date: Mon Mar 17 19:33:57 2008 New Revision: 52656 Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py - copied unchanged from r52635, pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_virtualizable.py Log: try to start porting virtualizable tests to the hotpath policy From cami at codespeak.net Mon Mar 17 19:49:08 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Mon, 17 Mar 2008 19:49:08 +0100 (CET) Subject: [pypy-svn] r52658 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080317184908.36654169E0A@codespeak.net> Author: cami Date: Mon Mar 17 19:49:07 2008 New Revision: 52658 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_ram.py Log: added some more tests. fixde bug for the CPU.fetch function Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py Mon Mar 17 19:49:07 2008 @@ -62,6 +62,7 @@ Z_FLAG = 0x80 N_FLAG = 0x40 H_FLAG = 0x20 +C_FLAG = 0x10 RESET_A = 0x01 RESET_F = 0x80 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Mon Mar 17 19:49:07 2008 @@ -216,12 +216,11 @@ self.execute() # Interrupts - # XXX this doesn't work, you cannot have two methods with the same name - # and different numbers of parameters - # another problem is that the attribute self.parameter cannot have the - # same name as a method or you will confuse yourself in major ways (Python - # is lookup-based, not send-based) - def interrupt(self): + def interrupt(self, address=None): + if address is not None: + self.ime = False + self.call(address) + return if (self.halted): if (self.interrupt.isPending()): self.halted = False @@ -246,21 +245,13 @@ self.interrupt(0x60) self.interrupt.lower(constants.JOYPAD) - def interrupt(self, address): - self.ime = False - self.call(address) - # Execution def fetchExecute(self): - # these global statements have no effect - global FETCH_EXECUTE_OP_CODES FETCH_EXECUTE_OP_CODES[self.fetch()](self) def execute(self, opCode): - global OP_CODES OP_CODES[opCode](self) - def reverseArgumentsDoubleRegister(self, register, getter): pass @@ -277,14 +268,13 @@ self.memory.write(address, data) self.cycles -= 2 - # Fetching 1 cycle def fetch(self): self.cycles += 1 if (self.pc.get() <= 0x3FFF): - self.pc.inc() # 2 cycles - return self.rom[self.pc.get()] & 0xFF - data = self.memory.read(self.pc.get()) + data = self.rom[self.pc.get()] + else: + data = self.memory.read(self.pc.get()) self.pc.inc() # 2 cycles return data @@ -677,7 +667,7 @@ self.pc.set(hi,lo) # 2 cycles # JP cc,nnnn 3,4 cycles - def jp_cc_nnnn(cc): + def jp_cc_nnnn(self, cc): if (cc): self.jp_nnnn() # 4 cycles else: @@ -689,9 +679,9 @@ self.cycles += 1 # JR cc,+nn, 2,3 cycles - def jr_cc_nn(cc): + def jr_cc_nn(self, cc): if (cc): - self.pc.add(self.fetch()) # 3 cycles + self.jr_nn() # 3 cycles else: self.pc.inc() # 2 cycles @@ -702,7 +692,7 @@ self.call((hi << 8) + lo) # 4 cycles # CALL cc,nnnn, 3,6 cycles - def call_cc_nnnn(cc): + def call_cc_nnnn(self, cc): if (cc): self.call_nnnn() # 6 cycles else: @@ -854,20 +844,34 @@ ] REGISTER_OP_CODES = [ - (0x01, 0x10, lambda s: CPU.pop_dbRegister(s, CPU.fetch), [CPU.bc, CPU.de, CPU.hl, CPU.sp]), + (0x01, 0x10, lambda s, register: CPU.popDoubleRegister(s, register=register, getter=CPU.fetch), [CPU.bc, CPU.de, CPU.hl, CPU.sp]), (0x09, 0x10, CPU.addHL, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), (0x03, 0x10, CPU.inc, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), (0x0B, 0x10, CPU.dec, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), - #(0xC0, 0x08, CPU.ret, [NZ, Z, NC, C]), - #(0xC2, 0x08, CPU.jp_nnnn, [NZ, Z, NC, C]), - #(0xC4, 0x08, CPU.call_nnnn, [NZ, Z, NC, C]), - #(0x20, 0x08, CPU.jr_nn, [NZ, Z, NC, C]),""" + (0xC0, 0x08, CPU.ret, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), + (0xC2, 0x08, CPU.jp_nnnn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), + (0xC4, 0x08, CPU.call_nnnn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), + (0x20, 0x08, CPU.jr_nn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), (0xC1, 0x10, CPU.pop, [CPU.bc, CPU.de, CPU.hl, CPU.af]), (0xC5, 0x10, CPU.push, [CPU.bc, CPU.de, CPU.hl, CPU.af]) ] +def create_register_op_codes(table): + opCodes = [None] * 0xFF + for entry in table: + opCode = entry[0] + step = entry[1] + function = entry[2] + for getter in entry[3]: + opCodes[opCode] = (opCode, lambda s: function(s, getter)) + opCode += step + return opCodes + + +FIRST_ORDER_OP_CODES.extend(create_register_op_codes(REGISTER_OP_CODES)) + SECOND_ORDER_REGISTER_OP_CODES = [ (0x00, 0x01, CPU.rlc), (0x08, 0x01, CPU.rrc), @@ -887,7 +891,7 @@ GROUP_CODES_SETTERS = (CPU.setB, CPU.setC, CPU.setD, CPU.setE, CPU.setH, CPU.setL, CPU.setHLi, CPU.setA) def create_group_op_codes(table): - opCodes = [None] * 0xFF; + opCodes = [None] * 0xFF for entry in table: startCode = entry[0] step = entry[1] Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Mon Mar 17 19:49:07 2008 @@ -126,36 +126,188 @@ assert cpu.pc.get() == constants.RESET_PC assert cpu.sp.get() == constants.RESET_SP + +def test_fetch(): + cpu = get_cpu() + address = 0x3FFF + value = 0x12 + # in rom + cpu.pc.set(address) + cpu.rom[address] = value + startCycles = cpu.cycles + assert cpu.fetch() == value + assert startCycles-cpu.cycles == 1 + # in the memory + value = 0x13 + address = 0xC000 + cpu.pc.set(address) + cpu.memory.write(address, value) + assert cpu.fetch() == value + + +def test_read_write(): + cpu = get_cpu() + address = 0xC000 + value = 0x12 + startCycles = cpu.cycles + cpu.write(address, value) + assert startCycles-cpu.cycles == 2 + startCycles = cpu.cycles + assert cpu.read(address) == value + assert startCycles-cpu.cycles == 1 + + address +=1 + value += 1 + cpu.write(address, value) + assert cpu.read(address) == value -OPCODE_CYCLES = [ - (0x00, 1), - (0x08, 5), - (0x10, 0), - (0x18, 3), - (0x20, 0x38, 0x08, [2,3]), - (0x01, 0x31, 0x10, 3), - (0x09, 0x39, 0x10, 2), - (0x02, 0x3A, 0x08, 2), - (0x03, 0x33, 0x10, 2), - (0x0B, 0x3B, 0x10, 2), - (0x04, 0x2C, 0x01, 1), (0x34, 3), (0x3C, 1) #CPU.java line 331 -] -def test_cycles(): - py.test.skip("opCode mapping in CPU is still missing.") +def test_jr_cc_nn(): cpu = get_cpu() - for entry in OPCODE_CYCLES: - if len(entry) == 2: - cycle_test(cpu, entry[0], entry[1]) - elif len(entry) == 4: - for opCode in range(entry[0], entry[1], entry[2]): - cycle_test(cpu, opCode, entry[3]) - + pc = cpu.pc.get() + value = 0x12 + cpu.rom[constants.RESET_PC] = value + # test jr_nn + startCycles = cpu.cycles + cpu.jr_cc_nn(True) + assert startCycles-cpu.cycles == 3 + assert_registers(cpu, pc=pc+value+1) + # test pc.inc + startCycles = cpu.cycles + pc = cpu.pc.get() + cpu.jr_cc_nn(False) + assert startCycles-cpu.cycles == 2 + assert cpu.pc.get() == pc+1 + + +def cycle_test(cpu, opCode, cycles=0): + startCycles = cpu.cycles + cpu.execute(opCode) + cpuUsedCycles = startCycles-cpu.cycles + assert cpuUsedCycles == cycles,\ + "Cycles for opCode %s should be %i not %i" %\ + (hex(opCode), cycles, cpuUsedCycles) + + # HELPERS + +def assert_reset_registers(cpu): + return assert_registers(cpu, \ + constants.RESET_A, constants.RESET_BC,\ + constants.RESET_DE, constants.RESET_F,\ + constants.RESET_HL, constants.RESET_SP,\ + constants.RESET_PC) + +def assert_registers(cpu, a=None, bc=None, de=None, f=None, hl=None, sp=None, pc=None): + if a is not None: + assert cpu.a.get() == a, "Register a is %s but should be %s" % (hex(cpu.a.get()), hex(a)) + if bc is not None: + assert cpu.bc.get() == bc, "Register bc is %s but should be %s" % (hex(cpu.bc.get(), hex(bc))) + if de is not None: + assert cpu.de.get() == de, "Register de is %s but should be %s" % (hex(cpu.de.get()),hex(de)) + if f is not None: + assert cpu.f.get() == f, "Register f is %s but should be %s" % (hex(cpu.f.get()),hex(f)) + if hl is not None: + assert cpu.hl.get() == hl, "Register hl is %s but should be %s" % (hex(cpu.hl.get()), hex(hl)) + if sp is not None: + assert cpu.sp.get() == sp, "Register sp is %s but should be %s" % (hex(cpu.sp.get()), hex(sp)) + if pc is not None: + assert cpu.pc.get() == pc, "Register pc is %s but should be %s" % (hex(cpu.pc.get()), hex(pc)) +def prepare_for_fetch(cpu, value, valueLo=None): + cpu.rom[cpu.pc.get()] = value & 0xFF + if valueLo is not None: + cpu.rom[cpu.pc.get()+1] = value & 0xFF -def cycle_test(cpu, opCode, cycles): - oldCycles = cpu.cycles - cpu.execute(opCode) - assert oldCycles - cpu.cycles == cycles - + +# ------------------------------------------------------------ +# opCode Testing +#nop +def test_0x00(): + cpu = get_cpu() + cycle_test(cpu, 0x00, 1) + assert_reset_registers(cpu) + +#load_mem_SP +def test_0x08(): + cpu = get_cpu() + assert_reset_registers(cpu) + startPC = cpu.pc.get() + cpu.sp.set(0x1234) + cpu.rom[startPC] = 0xD0 + cpu.rom[startPC+1] = 0xC0 + cycle_test(cpu, 0x08, 5) + assert_registers(cpu, pc=startPC+2) + assert cpu.memory.read(0xC0D0) == cpu.sp.getLo() + assert cpu.memory.read(0xC0D0+1) == cpu.sp.getHi() + +# stop +def test_0x10(): + cpu = get_cpu() + pc = cpu.pc.get() + cycle_test(cpu, 0x10, 0) + # fetches 1 cycle + assert_registers(cpu, pc=pc+1) + +# jr_nn +def test_0x18(): + cpu = get_cpu(); + pc = cpu.pc.get() + value = 0x12 + cpu.rom[constants.RESET_PC] = value + assert_reset_registers(cpu) + cycle_test(cpu, 0x18, 3) + assert_registers(cpu, pc=pc+value+1) + +# jr_NZ_nn see test_jr_cc_nn +def test_0x20_0x28_0x30(): + py.test.skip("Op Code Mapping not fully implemented") + cpu = get_cpu() + flags = [~constants.Z_FLAG, constants.Z_FLAG, ~constants.C_FLAG, constants.C_FLAG] + opCode = 0x20 + value = 0x12 + for i in range(0, 4): + prepare_for_fetch(cpu, value) + pc = cpu.pc.get() + cpu.f.set(flags[i]) + cycle_test(cpu, opCode, 3) + assert cpu.pc.get() == pc+value + + pc = cpu.pc.get() + cpu.f.set(~flags[i]) + cycle_test(cpu, opCode, 2) + assert cpu.pc.ge() == pc+1 + value += 2 + + +# ld_BC_nnnn to ld_SP_nnnn +def test_0x01_0x11_0x21_0x31(): + py.test.skip("Op Code Mapping not fully implemented") + cpu = get_cpu() + registers= [cpu.bc, cpu.de, cpu.hl, cpu.sp] + value = 0x12 + for index in range(0, 8): + prepare_for_fetch(cpu, value, value+1) + cycle_test(cpu, 0x01+index*0x10, 3) + assert registers[index].getHi() == value + assert registers[index].getlo() == value+1 + value += 2 + +# add_HL_BC to add_HL_SP +def test_0x09_0x19_0x29_0x39(): + py.test.skip("Op Code Mapping not fully implemented") + cpu = get_cpu() + registers= [cpu.bc, cpu.de, cpu.hl, cpu.sp] + value = 0x1234 + for i in range(0, 8): + cpu.hl.set(0x00) + registers[i].set(value) + assert registers[i].get() == value + cycle_test(cpu, 0x09+i*0x10, 2) + assert cpu.hl.get() == value + value += 1 + + + + + \ No newline at end of file Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_ram.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_ram.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_ram.py Mon Mar 17 19:49:07 2008 @@ -0,0 +1,51 @@ +from pypy.lang.gameboy import constants +from pypy.lang.gameboy.ram import RAM + + +def get_ram(): + return RAM() + + +def test_ram_read_write(): + ram = get_ram() + address = 0x00 + value = 0x12 + ram.write(address, value) + assert ram.read(address) == 0xFF + assert value not in ram.wram + assert value not in ram.hram + + address = 0xC000 + ram.write(address, value) + assert ram.read(address) == value + assert value in ram.wram + assert value not in ram.hram + + address = 0xFDFF + value += 1 + ram.write(address, value) + assert ram.read(address) == value + assert value in ram.wram + assert value not in ram.hram + + + address = 0xFF80 + value += 1 + ram.write(address, value) + assert ram.read(address) == value + assert value in ram.hram + assert value not in ram.wram + + address = 0xFFFE + value += 1 + ram.write(address, value) + assert ram.read(address) == value + assert value in ram.hram + assert value not in ram.wram + + address += 1 + value += 1 + ram.write(address, value) + assert ram.read(address) == 0xFF + assert value not in ram.hram + assert value not in ram.wram \ No newline at end of file From fijal at codespeak.net Mon Mar 17 20:13:26 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 17 Mar 2008 20:13:26 +0100 (CET) Subject: [pypy-svn] r52662 - pypy/dist/ctypes_configure Message-ID: <20080317191326.CCFFB169E21@codespeak.net> Author: fijal Date: Mon Mar 17 20:13:26 2008 New Revision: 52662 Removed: pypy/dist/ctypes_configure/gcc_cache.py Modified: pypy/dist/ctypes_configure/cbuild.py pypy/dist/ctypes_configure/configure.py Log: Remove caching. Modified: pypy/dist/ctypes_configure/cbuild.py ============================================================================== --- pypy/dist/ctypes_configure/cbuild.py (original) +++ pypy/dist/ctypes_configure/cbuild.py Mon Mar 17 20:13:26 2008 @@ -1,6 +1,7 @@ import os, sys, inspect, re, imp, py from ctypes_configure import stdoutcapture +import distutils debug = 0 @@ -183,6 +184,16 @@ opt += '/Op' gcv['OPT'] = opt + +def try_compile(c_files, eci): + try: + build_executable(c_files, eci) + result = True + except (distutils.errors.CompileError, + distutils.errors.LinkError): + result = False + return result + def compile_c_module(cfiles, modbasename, eci, tmpdir=None): #try: # from distutils.log import set_threshold @@ -315,7 +326,8 @@ def log_spawned_cmd(spawn): def spawn_and_log(cmd, *args, **kwds): - log.execute(' '.join(cmd)) + if debug: + log.execute(' '.join(cmd)) return spawn(cmd, *args, **kwds) return spawn_and_log Modified: pypy/dist/ctypes_configure/configure.py ============================================================================== --- pypy/dist/ctypes_configure/configure.py (original) +++ pypy/dist/ctypes_configure/configure.py Mon Mar 17 20:13:26 2008 @@ -2,9 +2,8 @@ import os, py, sys import ctypes -from ctypes_configure.cbuild import build_executable, configdir +from ctypes_configure.cbuild import build_executable, configdir, try_compile from ctypes_configure.cbuild import ExternalCompilationInfo -from ctypes_configure.gcc_cache import build_executable_cache, try_compile_cache import distutils # ____________________________________________________________ @@ -149,7 +148,7 @@ self.f.write(question + "\n") self.close() eci = self.config._compilation_info_ - return try_compile_cache([self.path], eci) + return try_compile([self.path], eci) def configure(CConfig): From fijal at codespeak.net Mon Mar 17 20:17:39 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 17 Mar 2008 20:17:39 +0100 (CET) Subject: [pypy-svn] r52663 - pypy/dist/ctypes_configure/doc Message-ID: <20080317191739.97ECC169E16@codespeak.net> Author: fijal Date: Mon Mar 17 20:17:39 2008 New Revision: 52663 Modified: pypy/dist/ctypes_configure/doc/configure.html pypy/dist/ctypes_configure/doc/configure.txt Log: update docs. Modified: pypy/dist/ctypes_configure/doc/configure.html ============================================================================== --- pypy/dist/ctypes_configure/doc/configure.html (original) +++ pypy/dist/ctypes_configure/doc/configure.html Mon Mar 17 20:17:39 2008 @@ -1,293 +1,10 @@ - + - + ctypes configure -
@@ -296,7 +13,7 @@

idea

One of ctypes problems is that ctypes programs are usually not very platform-independent. We created ctypes_configure, which invokes gcc -(and caches results) for various platform-dependent details like +for various platform-dependent details like exact sizes of types (for example size_t), #defines, exact outline of structures etc. It replaces in this regard code generator (h2py).

Modified: pypy/dist/ctypes_configure/doc/configure.txt ============================================================================== --- pypy/dist/ctypes_configure/doc/configure.txt (original) +++ pypy/dist/ctypes_configure/doc/configure.txt Mon Mar 17 20:17:39 2008 @@ -7,8 +7,8 @@ One of ctypes problems is that ctypes programs are usually not very platform-independent. We created ctypes_configure, which invokes gcc -(and caches results) for various platform-dependent details like -exact sizes of types (for example size_t), #defines, exact outline +for various platform-dependent details like +exact sizes of types (for example size\_t), #defines, exact outline of structures etc. It replaces in this regard code generator (h2py). installation From fijal at codespeak.net Mon Mar 17 22:21:33 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 17 Mar 2008 22:21:33 +0100 (CET) Subject: [pypy-svn] r52670 - in pypy/branch/jit-refactoring/pypy/lang/js: . doc test Message-ID: <20080317212133.D5525169E7D@codespeak.net> Author: fijal Date: Mon Mar 17 22:21:33 2008 New Revision: 52670 Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt pypy/branch/jit-refactoring/pypy/lang/js/execution.py pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py pypy/branch/jit-refactoring/pypy/lang/js/jscode.py pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Log: Some progress. Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py Mon Mar 17 22:21:33 2008 @@ -283,17 +283,17 @@ if isinstance(left, Identifier): return operations.SimpleAssignment(pos, left, right, atype) elif isinstance(left, Member): - return operations.MemberAssignment(pos, left.left, left.right, + return operations.MemberAssignment(pos, left.left, left.expr, right, atype) elif isinstance(left, MemberDot): return operations.MemberDotAssignment(pos, left.left, left.name, right, atype) else: - raise ParseError(left.pos, "Invalid lefthand expression") + raise ParseError(pos, None) visit_assignmentexpressionnoin = visit_assignmentexpression def visit_emptystatement(self, node): - return operations.astundef + pass def visit_newexpression(self, node): if len(node.children) == 1: @@ -376,7 +376,7 @@ if len(node.children) > 0: value = self.dispatch(node.children[0]) else: - value = operations.astundef + value = None return operations.Return(pos, value) def visit_conditionalexpression(self, node): Modified: pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt Mon Mar 17 22:21:33 2008 @@ -30,7 +30,7 @@ object creation: -LOAD_OBJECT +LOAD_OBJECT Takes one element per one parameter from the stack and initializes object this way. @@ -44,6 +44,15 @@ loads function object (declared earlier) to a stack. used for function expressions. +LOAD_MEMBER + +Load a member name from the last element on a stack. + +LOAD_ELEMENT + +Take element and left side from the stack and load element +from the left side onto the stack + Arithmetic binary operations: (all pops two values and pushes on stack the result) Modified: pypy/branch/jit-refactoring/pypy/lang/js/execution.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/execution.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/execution.py Mon Mar 17 22:21:33 2008 @@ -9,11 +9,15 @@ self.message = message self.exception_object = exception_object # JS Exception Object -class ExecutionReturned(JsBaseExcept): - def __init__(self, type='normal', value=None, identifier=None): - self.type = type +class ReturnException(Exception): + def __init__(self, value): self.value = value - self.identifier = identifier + +#class ExecutionReturned(JsBaseExcept): +# def __init__(self, type='normal', value=None, identifier=None): +# self.type = type +# self.value = value +# self.identifier = identifier class ThrowException(JsBaseExcept): def __init__(self, exception): Modified: pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py Mon Mar 17 22:21:33 2008 @@ -259,7 +259,11 @@ functioncode = "function () {}" #remove program and sourcelements node funcnode = parse(functioncode).children[0].children[0] - return ASTBUILDER.dispatch(funcnode).execute(ctx) + ast = ASTBUILDER.dispatch(funcnode) + bytecode = JsCode() + ast.emit(bytecode) + bytecode.run(ctx, check_stack=False) + return bytecode.stack[-1] def Construct(self, ctx, args=[]): return self.Call(ctx, args, this=None) Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jscode.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jscode.py Mon Mar 17 22:21:33 2008 @@ -1,8 +1,8 @@ from pypy.lang.js.jsobj import W_IntNumber, W_FloatNumber, W_String,\ W_Array, W_PrimitiveObject, W_Reference, ActivationObject,\ - create_object -from pypy.lang.js.execution import JsTypeError + create_object, W_Object, w_Undefined +from pypy.lang.js.execution import JsTypeError, ReturnException from pypy.rlib.unroll import unrolling_iterable from pypy.lang.js.baseop import plus, sub @@ -81,6 +81,13 @@ self.params = params self.code = code + def run(self, ctx): + try: + self.code.run(ctx) + except ReturnException, e: + return e.value + return w_Undefined + class Opcode(object): def eval(self, ctx, stack): """ Execute in context ctx @@ -160,6 +167,10 @@ def __repr__(self): return 'LOAD_STRINGCONSTANT "%s"' % (self.w_stringvalue.strval,) +class LOAD_UNDEFINED(Opcode): + def eval(self, ctx, stack): + stack.append(w_Undefined) + class LOAD_VARIABLE(Opcode): def __init__(self, identifier): self.identifier = identifier @@ -188,6 +199,16 @@ def __init__(self, funcobj): self.funcobj = funcobj + def eval(self, ctx, stack): + proto = ctx.get_global().Get('Function').Get('prototype') + w_func = W_Object(ctx=ctx, Prototype=proto, Class='Function', + callfunc=self.funcobj) + w_func.Put('length', W_IntNumber(len(self.funcobj.params))) + w_obj = create_object(ctx, 'Object') + w_obj.Put('constructor', w_func, de=True) + w_func.Put('prototype', w_obj) + stack.append(w_func) + def __repr__(self): return 'LOAD_FUNCTION' # XXX @@ -208,18 +229,19 @@ return 'STORE "%s"' % self.name class LOAD_OBJECT(Opcode): - def __init__(self, listofnames): - self.listofnames = reversed(listofnames) - + def __init__(self, counter): + self.counter = counter + def eval(self, ctx, stack): w_obj = create_object(ctx, 'Object') - for name in self.listofnames: + for _ in range(self.counter): + name = stack.pop().GetValue().ToString() w_elem = stack.pop().GetValue() w_obj.Put(name, w_elem) stack.append(w_obj) def __repr__(self): - return 'LOAD_OBJECT %r' % (self.listofnames,) + return 'LOAD_OBJECT %d' % (self.counter,) class LOAD_MEMBER(Opcode): def __init__(self, name): @@ -232,6 +254,12 @@ def __repr__(self): return 'LOAD_MEMBER "%s"' % (self.name,) +class LOAD_ELEMENT(Opcode): + def eval(self, ctx, stack): + name = stack.pop().GetValue().ToString(ctx) + w_obj = stack.pop().GetValue().ToObject(ctx) + stack.append(W_Reference(name, w_obj)) + class SUB(BaseBinaryOperation): def operation(self, ctx, left, right): return sub(ctx, left, right) @@ -306,6 +334,16 @@ def __init__(self, funcobj): self.funcobj = funcobj + def eval(self, ctx, stack): + # function declaration actyally don't run anything + proto = ctx.get_global().Get('Function').Get('prototype') + w_func = W_Object(ctx=ctx, Prototype=proto, Class='Function', callfunc=self.funcobj) + w_func.Put('length', W_IntNumber(len(self.funcobj.params))) + w_obj = create_object(ctx, 'Object') + w_obj.Put('constructor', w_func, de=True) + w_func.Put('prototype', w_obj) + ctx.put(self.funcobj.name, w_func) + def __repr__(self): funcobj = self.funcobj if funcobj.name is None: @@ -319,11 +357,15 @@ def __init__(self, name): self.name = name + def eval(self, ctx, stack): + ctx.put(self.name, w_Undefined) + def __repr__(self): return 'DECLARE_VAR "%s"' % (self.name,) class RETURN(Opcode): - pass + def eval(self, ctx, stack): + raise ReturnException(stack.pop()) class POP(Opcode): def eval(self, ctx, stack): Modified: pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py Mon Mar 17 22:21:33 2008 @@ -2,7 +2,7 @@ from pypy.rlib.rarithmetic import r_uint, intmask, isnan, isinf,\ ovfcheck_float_to_int from pypy.lang.js.execution import ThrowException, JsTypeError,\ - ExecutionReturned, RangeError + RangeError class SeePage(NotImplementedError): pass @@ -145,7 +145,7 @@ w_Arguments = W_Arguments(self, args) act.Put('arguments', w_Arguments) newctx = function_context(self.Scope, act, this) - val = self.callfunc.body.execute(ctx=newctx) + val = self.callfunc.run(ctx=newctx) return val def Construct(self, ctx, args=[]): @@ -517,7 +517,10 @@ obj.Put(name, value) return # if not, we need to put this thing in current scope - self.scope[0].Put(name, value) + self.variable.Put(name, value) + + def put(self, name, value): + self.variable.Put(name, value) def get_global(self): return self.scope[-1] Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Mon Mar 17 22:21:33 2008 @@ -9,8 +9,7 @@ W_PrimitiveObject, W_Reference, ActivationObject, W_Array, W_Boolean,\ w_Null, W_BaseNumber, isnull_or_undefined from pypy.rlib.parsing.ebnfparse import Symbol, Nonterminal -from pypy.lang.js.execution import ExecutionReturned, JsTypeError,\ - ThrowException +from pypy.lang.js.execution import JsTypeError, ThrowException from pypy.lang.js.jscode import JsCode, JsFunction from constants import unescapedict, SLASH @@ -87,13 +86,17 @@ bytecode.emit('LOAD_UNDEFINED') class PropertyInit(Expression): - def __init__(self, pos, identifier, expr): + def __init__(self, pos, lefthand, expr): self.pos = pos - self.identifier = identifier.name + self.lefthand = lefthand self.expr = expr def emit(self, bytecode): self.expr.emit(bytecode) + if isinstance(self.lefthand, Identifier): + bytecode.emit('LOAD_STRINGCONSTANT', self.lefthand.name) + else: + self.lefthand.emit(bytecode) class Array(ListOp): def emit(self, bytecode): @@ -290,13 +293,17 @@ return self.falsepart.eval(ctx).GetValue() -class Member(BinaryOp): +class Member(Expression): "this is for object[name]" - def eval(self, ctx): - w_obj = self.left.eval(ctx).GetValue().ToObject(ctx) - name = self.right.eval(ctx).GetValue().ToString(ctx) - return W_Reference(name, w_obj) - + def __init__(self, pos, left, expr): + self.pos = pos + self.left = left + self.expr = expr + + def emit(self, bytecode): + self.left.emit(bytecode) + self.expr.emit(bytecode) + bytecode.emit('LOAD_ELEMENT') class MemberDot(BinaryOp): "this is for object.name" @@ -308,13 +315,7 @@ def emit(self, bytecode): self.left.emit(bytecode) - bytecode.emit('LOAD_MEMBER', self.name) - - def eval(self, ctx): - w_obj = self.left.eval(ctx).GetValue().ToObject(ctx) - name = self.right.get_literal() - return W_Reference(name, w_obj) - + bytecode.emit('LOAD_MEMBER', self.name) class FunctionStatement(Statement): def __init__(self, pos, name, params, body): @@ -329,25 +330,16 @@ def emit(self, bytecode): code = JsCode() - self.body.emit(code) + if self.body is not None: + self.body.emit(code) funcobj = JsFunction(self.name, self.params, code) bytecode.emit('DECLARE_FUNCTION', funcobj) if self.name is None: - # XXX looks awful bytecode.emit('LOAD_FUNCTION', funcobj) - - def eval(self, ctx): - proto = ctx.get_global().Get('Function').Get('prototype') - w_func = W_Object(ctx=ctx, Prototype=proto, Class='Function', callfunc=self) - w_func.Put('length', W_IntNumber(len(self.params))) - w_obj = create_object(ctx, 'Object') - w_obj.Put('constructor', w_func, de=True) - w_func.Put('prototype', w_obj) - return w_func - - def execute(self, ctx): - return self.eval(ctx) - + #else: + # bytecode.emit('LOAD_FUNCTION', funcobj) + # bytecode.emit('STORE', self.name) + # bytecode.emit('POP') class Identifier(Expression): def __init__(self, pos, name): @@ -869,11 +861,9 @@ class ObjectInit(ListOp): def emit(self, bytecode): - names = [] for prop in self.nodes: prop.emit(bytecode) - names.append(prop.identifier) - bytecode.emit('LOAD_OBJECT', names) + bytecode.emit('LOAD_OBJECT', len(self.nodes)) class SourceElements(Statement): """ @@ -934,15 +924,11 @@ self.expr = expr def emit(self, bytecode): - self.expr.emit(bytecode) - bytecode.emit('RETURN') - - def execute(self, ctx): - if isinstance(self.expr, Undefined): - raise ExecutionReturned('return', None, None) + if self.expr is None: + bytecode.emit('LOAD_UNDEFINED') else: - raise ExecutionReturned('return', self.expr.eval(ctx), None) - + self.expr.emit(bytecode) + bytecode.emit('RETURN') class Throw(Statement): def __init__(self, pos, exp): @@ -999,7 +985,10 @@ self.expr = expr def emit(self, bytecode): - self.expr.emit(bytecode) + if self.expr is not None: + self.expr.emit(bytecode) + else: + bytecode.emit('LOAD_UNDEFINED') bytecode.emit('STORE', self.identifier) def eval(self, ctx): Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py Mon Mar 17 22:21:33 2008 @@ -110,7 +110,8 @@ function x () { var p; p = 1; - y = 3; return y + z; + y = 3; + return y + z; }; var z = 2; print(x(), y, p); Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Mon Mar 17 22:21:33 2008 @@ -331,9 +331,10 @@ self.check('x = 3', [ 'LOAD_INTCONSTANT 3', 'STORE "x"']) - self.check('{x:1}', [ + self.check('{"x":1}', [ 'LOAD_INTCONSTANT 1', - "LOAD_OBJECT ['x']"]) + 'LOAD_STRINGCONSTANT "x"', + "LOAD_OBJECT 1"]) def test_raising(self): py.test.raises(ParseError, self.check, '1=2', []) @@ -367,6 +368,12 @@ 'LOAD_STRINGCONSTANT "world"', 'ADD']) + def test_member(self): + self.check('a["b"]', + ['LOAD_VARIABLE "a"', + 'LOAD_STRINGCONSTANT "b"', + 'LOAD_ELEMENT']) + class TestToAstStatement(BaseTestToAST): def setup_class(cls): cls.parse = parse_func('statement') From fijal at codespeak.net Tue Mar 18 03:24:14 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 18 Mar 2008 03:24:14 +0100 (CET) Subject: [pypy-svn] r52672 - in pypy/branch/jit-refactoring/pypy/lang/js: . bench doc test Message-ID: <20080318022414.0D713169E37@codespeak.net> Author: fijal Date: Tue Mar 18 03:24:13 2008 New Revision: 52672 Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py pypy/branch/jit-refactoring/pypy/lang/js/baseop.py pypy/branch/jit-refactoring/pypy/lang/js/bench/f1.js pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py pypy/branch/jit-refactoring/pypy/lang/js/jscode.py pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py pypy/branch/jit-refactoring/pypy/lang/js/operations.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Log: Some general progress. Implement few things, speed up other. Still a lot of work to do. Modified: pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/astbuilder.py Tue Mar 18 03:24:13 2008 @@ -2,6 +2,11 @@ from pypy.lang.js import operations from pypy.rlib.parsing.parsing import ParseError +class FakeParseError(Exception): + def __init__(self, pos, msg): + self.pos = pos + self.msg = msg + class ASTBuilder(RPythonVisitor): BINOP_TO_CLS = { '+': operations.Plus, @@ -9,8 +14,8 @@ '*': operations.Mult, '/': operations.Division, '%': operations.Mod, - '^': operations.BitwiseXor, - '|': operations.BitwiseOr, + #'^': operations.BitwiseXor, + #'|': operations.BitwiseOr, '&': operations.BitwiseAnd, '&&': operations.And, '||': operations.Or, @@ -22,24 +27,28 @@ '>=': operations.Ge, '<': operations.Lt, '<=': operations.Le, - '>>': operations.Rsh, - '>>>': operations.Ursh, - '<<': operations.Lsh, + #'>>': operations.Rsh, + #'>>>': operations.Ursh, + #'<<': operations.Lsh, '.': operations.MemberDot, '[': operations.Member, ',': operations.Comma, - 'in': operations.In, + #'in': operations.In, } UNOP_TO_CLS = { - '~': operations.BitwiseNot, - '!': operations.Not, + #'~': operations.BitwiseNot, + #'!': operations.Not, '+': operations.UPlus, '-': operations.UMinus, - '++': operations.Increment, - '--': operations.Decrement, - 'typeof': operations.Typeof, - 'void': operations.Void, - 'delete': operations.Delete, + '++': operations.PreIncrement, + '--': operations.PreDecrement, + #'typeof': operations.Typeof, + #'void': operations.Void, + #'delete': operations.Delete, + } + POSTFIX_TO_CLS = { + '++': operations.PostIncrement, + '--': operations.PostDecrement, } LISTOP_TO_CLS = { '[': operations.Array, @@ -127,6 +136,7 @@ def visit_memberexpression(self, node): if isinstance(node.children[0], Symbol) and \ node.children[0].additional_info == 'new': # XXX could be a identifier? + raise NotImplementedError pos = self.get_pos(node) left = self.dispatch(node.children[1]) right = self.dispatch(node.children[2]) @@ -157,7 +167,7 @@ op = node.children[1] pos = self.get_pos(op) child = self.dispatch(node.children[0]) - return self.UNOP_TO_CLS[op.additional_info](pos, child, postfix=True) + return self.POSTFIX_TO_CLS[op.additional_info](pos, child) def listop(self, node): @@ -195,10 +205,26 @@ left = self.dispatch(node.children[0]) right = self.dispatch(node.children[1]) return operations.PropertyInit(pos,left,right) + + def _search_identifier(self, name): + lenall = len(self.varlists) + for i in range(lenall): + num = lenall - i - 1 + vardecl = self.varlists[num] + if name in vardecl: + return i, vardecl + raise ValueError("xxx") def visit_IDENTIFIERNAME(self, node): pos = self.get_pos(node) name = node.additional_info + try: + t = self._search_identifier(name) + except ValueError: + pass + else: + i, vardecl = t + return operations.VariableIdentifier(pos, i, name) return operations.Identifier(pos, name) def visit_program(self, node): @@ -263,7 +289,8 @@ visit_variabledeclarationnoin = visit_variabledeclaration def visit_expressionstatement(self, node): - return self.dispatch(node.children[0]) + pos = self.get_pos(node) + return operations.ExprStatement(pos, self.dispatch(node.children[0])) def visit_callexpression(self, node): pos = self.get_pos(node) @@ -275,13 +302,16 @@ return left def visit_assignmentexpression(self, node): - from pypy.lang.js.operations import Identifier, Member, MemberDot + from pypy.lang.js.operations import Identifier, Member, MemberDot,\ + VariableIdentifier pos = self.get_pos(node) left = self.dispatch(node.children[0]) atype = node.children[1].additional_info right = self.dispatch(node.children[2]) if isinstance(left, Identifier): return operations.SimpleAssignment(pos, left, right, atype) + elif isinstance(left, VariableIdentifier): + return operations.VariableAssignment(pos, left, right, atype) elif isinstance(left, Member): return operations.MemberAssignment(pos, left.left, left.expr, right, atype) @@ -289,7 +319,7 @@ return operations.MemberDotAssignment(pos, left.left, left.name, right, atype) else: - raise ParseError(pos, None) + raise FakeParseError(pos, "invalid lefthand expression") visit_assignmentexpressionnoin = visit_assignmentexpression def visit_emptystatement(self, node): @@ -299,6 +329,7 @@ if len(node.children) == 1: return self.dispatch(node.children[0]) else: + raise NotImplementedError pos = self.get_pos(node) val = self.dispatch(node.children[1]) return operations.New(pos, val) Modified: pypy/branch/jit-refactoring/pypy/lang/js/baseop.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/baseop.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/baseop.py Tue Mar 18 03:24:13 2008 @@ -13,8 +13,8 @@ return W_String(sleft + sright) # hot path if isinstance(nleft, W_IntNumber) and isinstance(nright, W_IntNumber): - ileft = nleft.ToInt32() - iright = nright.ToInt32() + ileft = nleft.intval + iright = nright.intval try: return W_IntNumber(ovfcheck(ileft + iright)) except OverflowError: @@ -35,3 +35,161 @@ fleft = nleft.ToNumber() fright = nright.ToNumber() return W_FloatNumber(fleft - fright) + +def mult(ctx, nleft, nright): + if isinstance(nleft, W_IntNumber) and isinstance(nright, W_IntNumber): + ileft = nleft.ToInt32() + iright = nright.ToInt32() + try: + return W_IntNumber(ovfcheck(ileft * iright)) + except OverflowError: + return W_FloatNumber(float(ileft) * float(iright)) + fleft = nleft.ToNumber() + fright = nright.ToNumber() + return W_FloatNumber(fleft * fright) + +def mod(ctx, nleft, nright): # XXX this one is really not following spec + ileft = nleft.ToInt32() + iright = nright.ToInt32() + return W_IntNumber(ileft % iright) + +def division(ctx, nleft, nright): + fleft = nleft.ToNumber() + fright = nright.ToNumber() + if fright == 0: + if fleft < 0: + val = -INFINITY + elif fleft == 0: + val = NAN + else: + val = INFINITY + else: + val = fleft / fright + return W_FloatNumber(val) + +def compare(ctx, x, y): + if isinstance(x, W_IntNumber) and isinstance(y, W_IntNumber): + return x.intval > y.intval + if isinstance(x, W_FloatNumber) and isinstance(y, W_FloatNumber): + if isnan(x.floatval) or isnan(y.floatval): + return -1 + return x.floatval > y.floatval + s1 = x.ToPrimitive(ctx, 'Number') + s2 = y.ToPrimitive(ctx, 'Number') + if not (isinstance(s1, W_String) and isinstance(s2, W_String)): + s4 = s1.ToNumber() + s5 = s2.ToNumber() + if isnan(s4) or isnan(s5): + return False + return s4 > s5 + else: + s4 = s1.ToString(ctx) + s5 = s2.ToString(ctx) + return s4 > s5 + +def compare_e(ctx, x, y): + if isinstance(x, W_IntNumber) and isinstance(y, W_IntNumber): + return x.intval >= y.intval + if isinstance(x, W_FloatNumber) and isinstance(y, W_FloatNumber): + if isnan(x.floatval) or isnan(y.floatval): + return -1 + return x.floatval >= y.floatval + s1 = x.ToPrimitive(ctx, 'Number') + s2 = y.ToPrimitive(ctx, 'Number') + if not (isinstance(s1, W_String) and isinstance(s2, W_String)): + s4 = s1.ToNumber() + s5 = s2.ToNumber() + if isnan(s4) or isnan(s5): + return False + return s4 >= s5 + else: + s4 = s1.ToString(ctx) + s5 = s2.ToString(ctx) + return s4 >= s5 + +def AbstractEC(ctx, x, y): + """ + Implements the Abstract Equality Comparison x == y + trying to be fully to the spec + """ + if isinstance(x, W_IntNumber) and isinstance(y, W_IntNumber): + return x.intval == y.intval + if isinstance(x, W_FloatNumber) and isinstance(y, W_FloatNumber): + if isnan(x.floatval) or isnan(y.floatval): + return False + return x.floatval == y.floatval + type1 = x.type() + type2 = y.type() + if type1 == type2: + if type1 == "undefined" or type1 == "null": + return True + if type1 == "number": + n1 = x.ToNumber() + n2 = y.ToNumber() + if isnan(n1) or isnan(n2): + return False + if n1 == n2: + return True + return False + elif type1 == "string": + return x.ToString(ctx) == y.ToString(ctx) + elif type1 == "boolean": + return x.ToBoolean() == x.ToBoolean() + return x == y + else: + #step 14 + if (type1 == "undefined" and type2 == "null") or \ + (type1 == "null" and type2 == "undefined"): + return True + if type1 == "number" and type2 == "string": + return AbstractEC(ctx, x, W_FloatNumber(y.ToNumber())) + if type1 == "string" and type2 == "number": + return AbstractEC(ctx, W_FloatNumber(x.ToNumber()), y) + if type1 == "boolean": + return AbstractEC(ctx, W_FloatNumber(x.ToNumber()), y) + if type2 == "boolean": + return AbstractEC(ctx, x, W_FloatNumber(y.ToNumber())) + if (type1 == "string" or type1 == "number") and \ + type2 == "object": + return AbstractEC(ctx, x, y.ToPrimitive(ctx)) + if (type2 == "string" or type2 == "number") and \ + type1 == "object": + return AbstractEC(ctx, x.ToPrimitive(ctx), y) + return False + + + objtype = x.GetValue().type() + if objtype == y.GetValue().type(): + if objtype == "undefined" or objtype == "null": + return True + + if isinstance(x, W_String) and isinstance(y, W_String): + r = x.ToString(ctx) == y.ToString(ctx) + else: + r = x.ToNumber() == y.ToNumber() + return r + +def StrictEC(ctx, x, y): + """ + Implements the Strict Equality Comparison x === y + trying to be fully to the spec + """ + type1 = x.type() + type2 = y.type() + if type1 != type2: + return False + if type1 == "undefined" or type1 == "null": + return True + if type1 == "number": + n1 = x.ToNumber() + n2 = y.ToNumber() + if isnan(n1) or isnan(n2): + return False + if n1 == n2: + return True + return False + if type1 == "string": + return x.ToString(ctx) == y.ToString(ctx) + if type1 == "boolean": + return x.ToBoolean() == x.ToBoolean() + return x == y Modified: pypy/branch/jit-refactoring/pypy/lang/js/bench/f1.js ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/bench/f1.js (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/bench/f1.js Tue Mar 18 03:24:13 2008 @@ -7,16 +7,16 @@ while (i < n) { var j = 0; while (j <= i) { - j++; + j = j + 1; x = x + (i&j); } - i++; + i = i +1; } return x; } -a = new Date(); -f1(2117); -b = new Date(); -print(b - a); +//a = new Date(); +print(f1(2117)); +//b = new Date(); +//print(b - a); Modified: pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/doc/bytecode.txt Tue Mar 18 03:24:13 2008 @@ -58,7 +58,7 @@ ADD, SUB, MUL, DIV, MOD BITXOR, BITOR, BITAND -AND, OR, EQ, NE, IS, ISNOT, GT, GE, LT, LE, +EQ, NE, IS, ISNOT, GT, GE, LT, LE, RSHIT, URSHIFT, LSHIFT Unary arithmetic operations: Modified: pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/interpreter.py Tue Mar 18 03:24:13 2008 @@ -100,6 +100,7 @@ TEST = False def evaljs(ctx, args, this): + raise NotImplementedError if len(args) >= 1: if isinstance(args[0], W_String): code = args[0] @@ -262,6 +263,10 @@ ast = ASTBUILDER.dispatch(funcnode) bytecode = JsCode() ast.emit(bytecode) + # XXX awful hack + from pypy.lang.js.jscode import POP + assert isinstance(bytecode.opcodes[-1], POP) + bytecode.opcodes.pop() bytecode.run(ctx, check_stack=False) return bytecode.stack[-1] @@ -547,7 +552,7 @@ w_Global.Put('this', w_Global) # DEBUGGING - if 1: + if 0: w_Global.Put('pypy_repr', W_Builtin(pypy_repr)) self.global_context = ctx Modified: pypy/branch/jit-refactoring/pypy/lang/js/jscode.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jscode.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jscode.py Tue Mar 18 03:24:13 2008 @@ -1,14 +1,34 @@ from pypy.lang.js.jsobj import W_IntNumber, W_FloatNumber, W_String,\ W_Array, W_PrimitiveObject, W_Reference, ActivationObject,\ - create_object, W_Object, w_Undefined -from pypy.lang.js.execution import JsTypeError, ReturnException + create_object, W_Object, w_Undefined, W_Boolean, newbool,\ + w_True, w_False +from pypy.lang.js.execution import JsTypeError, ReturnException, ThrowException from pypy.rlib.unroll import unrolling_iterable -from pypy.lang.js.baseop import plus, sub +from pypy.lang.js.baseop import plus, sub, compare, AbstractEC, StrictEC,\ + compare_e +from pypy.rlib.jit import hint class AlreadyRun(Exception): pass +def run_bytecode(opcodes, ctx, stack, check_stack=True): + i = 0 + while i < len(opcodes): + for name, op in opcode_unrolling: + opcode = opcodes[i] + opcode = hint(opcode, deepfreeze=True) + if isinstance(opcode, op): + opcode.eval(ctx, stack) + break + if isinstance(opcode, BaseJump): + i = opcode.do_jump(stack, i) + else: + i += 1 + if check_stack: + assert not stack + + class JsCode(object): """ That object stands for code of a single javascript function """ @@ -29,24 +49,19 @@ return num def emit(self, operation, *args): - try: - opcode = OpcodeMap[operation](*args) - self.opcodes.append(opcode) - return opcode - except KeyError: - raise ValueError("Unknown opcode %s" % (operation,)) + opcode = None + for name, opcodeclass in opcode_unrolling: + if operation == name: + opcode = opcodeclass(*args) + self.opcodes.append(opcode) + return opcode + raise ValueError("Unknown opcode %s" % (operation,)) emit._annspecialcase_ = 'specialize:arg(1)' def run(self, ctx, check_stack=True): - i = 0 - while i < len(self.opcodes): - for name, op in opcode_unrolling: - opcode = self.opcodes[i] - if isinstance(opcode, op): - opcode.eval(ctx, self.stack) - i += 1 - if check_stack: - assert not self.stack + if self.has_labels: + self.remove_labels() + run_bytecode(self.opcodes, ctx, self.stack, check_stack) def remove_labels(self): """ Basic optimization to remove all labels and change @@ -56,7 +71,8 @@ raise AlreadyRun("Already has labels") labels = {} counter = 0 - for i, op in enumerate(self.opcodes): + for i in range(len(self.opcodes)): + op = self.opcodes[i] if isinstance(op, LABEL): labels[op.num] = counter else: @@ -89,6 +105,9 @@ return w_Undefined class Opcode(object): + def __init__(self): + pass + def eval(self, ctx, stack): """ Execute in context ctx """ @@ -101,38 +120,35 @@ return self.__class__.__name__ class BaseBinaryComparison(Opcode): - def eval(self, ctx): - s2 = self.left.eval(ctx).GetValue() - s4 = self.right.eval(ctx).GetValue() - return self.decision(ctx, s2, s4) + def eval(self, ctx, stack): + s4 = stack.pop()#.GetValue() + s2 = stack.pop()#.GetValue() + stack.append(self.decision(ctx, s2, s4)) def decision(self, ctx, op1, op2): raise NotImplementedError class BaseBinaryBitwiseOp(Opcode): - def eval(self, ctx): - s5 = self.left.eval(ctx).GetValue().ToInt32() - s6 = self.right.eval(ctx).GetValue().ToInt32() - return self.decision(ctx, s5, s6) + def eval(self, ctx, stack): + s5 = stack.pop().ToInt32()#.GetValue().ToInt32() + s6 = stack.pop().ToInt32()#.GetValue().ToInt32() + stack.append(self.operation(ctx, s5, s6)) - def decision(self, ctx, op1, op2): + def operation(self, ctx, op1, op2): raise NotImplementedError class BaseBinaryOperation(Opcode): def eval(self, ctx, stack): - right = stack.pop().GetValue() - left = stack.pop().GetValue() + right = stack.pop()#.GetValue() + left = stack.pop()#.GetValue() stack.append(self.operation(ctx, left, right)) class BaseUnaryOperation(Opcode): pass class Undefined(Opcode): - def eval(self, ctx): - return w_Undefined - - def execute(self, ctx): - return w_Undefined + def eval(self, ctx, stack): + stack.append(w_Undefined) class LOAD_INTCONSTANT(Opcode): def __init__(self, value): @@ -161,8 +177,8 @@ def eval(self, ctx, stack): stack.append(self.w_stringvalue) - def get_literal(self): - return W_String(self.strval).ToString() + #def get_literal(self, ctx): + # return W_String(self.strval).ToString(ctx) def __repr__(self): return 'LOAD_STRINGCONSTANT "%s"' % (self.w_stringvalue.strval,) @@ -176,7 +192,20 @@ self.identifier = identifier def eval(self, ctx, stack): - stack.append(ctx.resolve_identifier(self.identifier).GetValue()) + stack.append(ctx.resolve_identifier(self.identifier)) + + def __repr__(self): + return 'LOAD_VARIABLE "%s"' % (self.identifier,) + +class LOAD_REALVAR(Opcode): + def __init__(self, depth, identifier): + self.depth = depth + self.identifier = identifier + + def eval(self, ctx, stack): + scope = ctx.scope[self.depth] + stack.append(scope.Get(self.identifier)) + #stack.append(W_Reference(self.identifier, scope)) def __repr__(self): return 'LOAD_VARIABLE "%s"' % (self.identifier,) @@ -189,7 +218,7 @@ proto = ctx.get_global().Get('Array').Get('prototype') array = W_Array(ctx, Prototype=proto, Class = proto.Class) for i in range(self.counter): - array.Put(str(self.counter - i - 1), stack.pop().GetValue()) + array.Put(str(self.counter - i - 1), stack.pop())#.GetValue()) stack.append(array) def __repr__(self): @@ -213,17 +242,29 @@ return 'LOAD_FUNCTION' # XXX class STORE_MEMBER(Opcode): - def eval(self, ctx): - XXX + pass + #def eval(self, ctx, ): + # XXX class STORE(Opcode): def __init__(self, name): self.name = name def eval(self, ctx, stack): - value = stack.pop().GetValue() + value = stack[-1] ctx.assign(self.name, value) - stack.append(value) + + def __repr__(self): + return 'STORE "%s"' % self.name + +class STORE_VAR(Opcode): + def __init__(self, depth, name): + self.name = name + self.depth = depth + + def eval(self, ctx, stack): + value = stack[-1] + ctx.scope[self.depth].Put(self.name, value) def __repr__(self): return 'STORE "%s"' % self.name @@ -235,8 +276,8 @@ def eval(self, ctx, stack): w_obj = create_object(ctx, 'Object') for _ in range(self.counter): - name = stack.pop().GetValue().ToString() - w_elem = stack.pop().GetValue() + name = stack.pop().ToString(ctx)#.GetValue().ToString(ctx) + w_elem = stack.pop()#.GetValue() w_obj.Put(name, w_elem) stack.append(w_obj) @@ -248,17 +289,26 @@ self.name = name def eval(self, ctx, stack): - w_obj = stack.pop().GetValue().ToObject(ctx) - stack.append(W_Reference(self.name, w_obj)) + w_obj = stack.pop().ToObject(ctx)#GetValue().ToObject(ctx) + stack.append(w_obj.Get(self.name)) + #stack.append(W_Reference(self.name, w_obj)) def __repr__(self): return 'LOAD_MEMBER "%s"' % (self.name,) class LOAD_ELEMENT(Opcode): def eval(self, ctx, stack): - name = stack.pop().GetValue().ToString(ctx) - w_obj = stack.pop().GetValue().ToObject(ctx) - stack.append(W_Reference(name, w_obj)) + name = stack.pop().ToString(ctx)#GetValue().ToString(ctx) + w_obj = stack.pop().ToObject(ctx)#GetValue().ToObject(ctx) + stack.append(w_obj.Get(name)) + #stack.append(W_Reference(name, w_obj)) + +class COMMA(BaseUnaryOperation): + def eval(self, ctx, stack): + one = stack.pop() + stack.pop() + stack.append(one) + # XXX class SUB(BaseBinaryOperation): def operation(self, ctx, left, right): @@ -268,6 +318,11 @@ def operation(self, ctx, left, right): return plus(ctx, left, right) +class BITAND(BaseBinaryBitwiseOp): + def operation(self, ctx, op1, op2): + return W_IntNumber(op1&op2) + + class MUL(BaseBinaryOperation): pass @@ -283,29 +338,49 @@ class UMINUS(BaseUnaryOperation): pass -class PREINCR(BaseUnaryOperation): - pass +#class PREINCR(BaseUnaryOperation): +# pass -class POSTINCR(BaseUnaryOperation): - pass +#class POSTINCR(BaseUnaryOperation): +# pass + +#class PREDECR(BaseUnaryOperation): +# pass -class PREDECR(BaseUnaryOperation): - pass - -class POSTDECR(BaseUnaryOperation): - pass +#class POSTDECR(BaseUnaryOperation): +# pass class GT(BaseBinaryComparison): - pass + def decision(self, ctx, op1, op2): + return newbool(compare(ctx, op1, op2)) class GE(BaseBinaryComparison): - pass + def decision(self, ctx, op1, op2): + return newbool(compare_e(ctx, op1, op2)) class LT(BaseBinaryComparison): - pass + def decision(self, ctx, op1, op2): + return newbool(compare(ctx, op2, op1)) class LE(BaseBinaryComparison): - pass + def decision(self, ctx, op1, op2): + return newbool(compare_e(ctx, op2, op1)) + +class EQ(BaseBinaryComparison): + def decision(self, ctx, op1, op2): + return newbool(AbstractEC(ctx, op1, op2)) + +class NE(BaseBinaryComparison): + def decision(self, ctx, op1, op2): + return newbool(not AbstractEC(ctx, op1, op2)) + +class IS(BaseBinaryComparison): + def decision(self, ctx, op1, op2): + return newbool(StrictEC(ctx, op1, op2)) + +class ISNOT(BaseBinaryComparison): + def decision(self, ctx, op1, op2): + return newbool(not StrictEC(ctx, op1, op2)) class LABEL(Opcode): def __init__(self, num): @@ -317,18 +392,56 @@ class BaseJump(Opcode): def __init__(self, where): self.where = where + self.decision = False + + def do_jump(self, stack, pos): + return 0 def __repr__(self): return '%s %d' % (self.__class__.__name__, self.where) class JUMP(BaseJump): - pass + def eval(self, ctx, stack): + pass -class JUMP_IF_FALSE(BaseJump): - pass + def do_jump(self, stack, pos): + return self.where -class JUMP_IF_TRUE(BaseJump): - pass +class BaseIfJump(BaseJump): + def eval(self, ctx, stack): + value = stack.pop() + self.decision = value.ToBoolean() + +class BaseIfNopopJump(BaseJump): + def eval(self, ctx, stack): + value = stack[-1] + self.decision = value.ToBoolean() + +class JUMP_IF_FALSE(BaseIfJump): + def do_jump(self, stack, pos): + if self.decision: + return pos + 1 + return self.where + +class JUMP_IF_FALSE_NOPOP(BaseIfNopopJump): + def do_jump(self, stack, pos): + if self.decision: + stack.pop() + return pos + 1 + return self.where + +class JUMP_IF_TRUE(BaseIfNopopJump): + def do_jump(self, stack, pos): + if self.decision: + return self.where + return pos + 1 + +class JUMP_IF_TRUE_NOPOP(BaseIfNopopJump): + def do_jump(self, stack, pos): + if self.decision: + return self.where + stack.pop() + return pos + 1 class DECLARE_FUNCTION(Opcode): def __init__(self, funcobj): @@ -342,7 +455,8 @@ w_obj = create_object(ctx, 'Object') w_obj.Put('constructor', w_func, de=True) w_func.Put('prototype', w_obj) - ctx.put(self.funcobj.name, w_func) + if self.funcobj.name is not None: + ctx.put(self.funcobj.name, w_func) def __repr__(self): funcobj = self.funcobj @@ -375,7 +489,7 @@ def eval(self, ctx, stack): r1 = stack.pop() args = stack.pop() - r3 = r1.GetValue() + r3 = r1#.GetValue() if not isinstance(r3, W_PrimitiveObject): raise ThrowException(W_String("it is not a callable")) @@ -393,6 +507,10 @@ raise ThrowException(W_String('it is not a function')) stack.append(res) +class DUP(Opcode): + def eval(self, ctx, stack): + stack.append(stack[-1]) + OpcodeMap = {} for name, value in locals().items(): Modified: pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py Tue Mar 18 03:24:13 2008 @@ -460,7 +460,7 @@ def ToNumber(self): return self.floatval - + def ToInt32(self): if isnan(self.floatval) or isinf(self.floatval): return 0 @@ -511,6 +511,7 @@ return ""%(self.scope, self.variable) def assign(self, name, value): + assert name is not None for obj in self.scope: assert isinstance(obj, W_PrimitiveObject) if obj.HasProperty(name): @@ -520,6 +521,7 @@ self.variable.Put(name, value) def put(self, name, value): + assert name is not None self.variable.Put(name, value) def get_global(self): @@ -540,9 +542,10 @@ for obj in self.scope: assert isinstance(obj, W_PrimitiveObject) if obj.HasProperty(identifier): - return W_Reference(identifier, obj) - - return W_Reference(identifier) + return obj.Get(identifier) + #return W_Reference(identifier, obj) + raise Exception("stuff") + #return W_Reference(identifier) def global_context(w_global): assert isinstance(w_global, W_PrimitiveObject) @@ -586,22 +589,22 @@ exception = "ReferenceError: %s is not defined"%(self.property_name,) raise ThrowException(W_String(exception)) - def GetValue(self): - self.check_empty() - return self.base.Get(self.property_name) - - def PutValue(self, w, ctx): - base = self.base - if base is None: - base = ctx.scope[-1] - base.Put(self.property_name, w) - return w + #def GetValue(self): + # self.check_empty() + # return self.base.Get(self.property_name) + + #def PutValue(self, w, ctx): + # base = self.base + # if base is None: + # base = ctx.scope[-1] + # base.Put(self.property_name, w) + # return w - def GetBase(self): - return self.base + #def GetBase(self): + # return self.base - def GetPropertyName(self): - return self.property_name + #def GetPropertyName(self): + # return self.property_name def __str__(self): return "<" + str(self.base) + " -> " + str(self.property_name) + ">" @@ -616,3 +619,11 @@ if obj is w_Null or obj is w_Undefined: return True return False + +w_True = W_Boolean(True) +w_False = W_Boolean(False) + +def newbool(val): + if val: + return w_True + return w_False Modified: pypy/branch/jit-refactoring/pypy/lang/js/operations.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/operations.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/operations.py Tue Mar 18 03:24:13 2008 @@ -12,6 +12,7 @@ from pypy.lang.js.execution import JsTypeError, ThrowException from pypy.lang.js.jscode import JsCode, JsFunction from constants import unescapedict, SLASH +from pypy.rlib.unroll import unrolling_iterable import sys import os @@ -51,6 +52,15 @@ def __init__(self, pos): self.pos = pos +class ExprStatement(Node): + def __init__(self, pos, expr): + self.pos = pos + self.expr = expr + + def emit(self, bytecode): + self.expr.emit(bytecode) + bytecode.emit('POP') + class Expression(Statement): def execute(self, ctx): return self.eval(ctx) @@ -59,27 +69,33 @@ def __init__(self, pos, nodes): self.pos = pos self.nodes = nodes - -class UnaryOp(Expression): - def __init__(self, pos, expr, postfix=False): - self.pos = pos - self.expr = expr - self.postfix = postfix - def emit(self, bytecode): - self.expr.emit(bytecode) - bytecode.emit(self.operation_name) +def create_unary_op(name): + class UnaryOp(Expression): + def __init__(self, pos, expr, postfix=False): + self.pos = pos + self.expr = expr + self.postfix = postfix -class BinaryOp(Expression): - def __init__(self, pos, left, right): - self.pos = pos - self.left = left - self.right = right - - def emit(self, bytecode): - self.left.emit(bytecode) - self.right.emit(bytecode) - bytecode.emit(self.operation_name) + def emit(self, bytecode): + self.expr.emit(bytecode) + bytecode.emit(name) + UnaryOp.__name__ = name + return UnaryOp + +def create_binary_op(name): + class BinaryOp(Expression): + def __init__(self, pos, left, right): + self.pos = pos + self.left = left + self.right = right + + def emit(self, bytecode): + self.left.emit(bytecode) + self.right.emit(bytecode) + bytecode.emit(name) + BinaryOp.__name__ = name + return BinaryOp class Undefined(Statement): def emit(self, bytecode): @@ -109,8 +125,7 @@ class SimpleAssignment(Assignment): def __init__(self, pos, left, right, operand): - assert isinstance(left, Identifier) - self.identifier = left.name + self.identifier = left.get_literal() self.right = right self.pos = pos self.operand = operand @@ -119,6 +134,18 @@ self.right.emit(bytecode) bytecode.emit('STORE', self.identifier) +class VariableAssignment(Assignment): + def __init__(self, pos, left, right, operand): + self.identifier = left.identifier + self.right = right + self.pos = pos + self.operand = operand + self.depth = left.depth + + def emit(self, bytecode): + self.right.emit(bytecode) + bytecode.emit('STORE_VAR', self.depth, self.identifier) + class MemberAssignment(Assignment): def __init__(self, pos, what, item, right, operand): # XXX we can optimise here what happens if what is identifier, @@ -209,7 +236,6 @@ def emit(self, bytecode): for node in self.nodes: node.emit(bytecode) - bytecode.emit('POP') def execute(self, ctx): try: @@ -223,27 +249,23 @@ else: raise e +BitwiseAnd = create_binary_op('BITAND') -class BitwiseAnd(BinaryOp): - def decision(self, ctx, op1, op2): - return W_IntNumber(op1&op2) - - -class BitwiseNot(UnaryOp): - def eval(self, ctx): - op1 = self.expr.eval(ctx).GetValue().ToInt32() - return W_IntNumber(~op1) +#class BitwiseNot(UnaryOp): +# def eval(self, ctx): +# op1 = self.expr.eval(ctx).GetValue().ToInt32() +# return W_IntNumber(~op1) -class BitwiseOr(BinaryOp): - def decision(self, ctx, op1, op2): - return W_IntNumber(op1|op2) +# class BitwiseOr(BinaryOp): +# def decision(self, ctx, op1, op2): +# return W_IntNumber(op1|op2) -class BitwiseXor(BinaryOp): - def decision(self, ctx, op1, op2): - return W_IntNumber(op1^op2) +# class BitwiseXor(BinaryOp): +# def decision(self, ctx, op1, op2): +# return W_IntNumber(op1^op2) class Unconditional(Statement): @@ -273,11 +295,7 @@ self.left.emit(bytecode) bytecode.emit('CALL') -class Comma(BinaryOp): - def eval(self, ctx): - self.left.eval(ctx) - return self.right.eval(ctx) - +Comma = create_binary_op('COMMA') class Conditional(Expression): def __init__(self, pos, condition, truepart, falsepart): @@ -305,11 +323,10 @@ self.expr.emit(bytecode) bytecode.emit('LOAD_ELEMENT') -class MemberDot(BinaryOp): +class MemberDot(Expression): "this is for object.name" def __init__(self, pos, left, name): - assert isinstance(name, Identifier) - self.name = name.name + self.name = name.get_literal() self.left = left self.pos = pos @@ -323,8 +340,7 @@ if name is None: self.name = None else: - assert isinstance(name, Identifier) - self.name = name.name + self.name = name.get_literal() self.body = body self.params = params @@ -385,9 +401,9 @@ else: return self.elsePart.execute(ctx) -class Group(UnaryOp): - def eval(self, ctx): - return self.expr.eval(ctx) +#class Group(UnaryOp): +# def eval(self, ctx): +# return self.expr.eval(ctx) ############################################################################## # @@ -395,89 +411,36 @@ # ############################################################################## -def ARC(ctx, x, y): - """ - Implements the Abstract Relational Comparison x < y - Still not fully to the spec - """ - # XXX fast path when numbers only - s1 = x.ToPrimitive(ctx, 'Number') - s2 = y.ToPrimitive(ctx, 'Number') - if not (isinstance(s1, W_String) and isinstance(s2, W_String)): - s4 = s1.ToNumber() - s5 = s2.ToNumber() - if isnan(s4) or isnan(s5): - return -1 - if s4 < s5: - return 1 - else: - return 0 - else: - s4 = s1.ToString(ctx) - s5 = s2.ToString(ctx) - if s4 < s5: - return 1 - if s4 == s5: - return 0 - return -1 - -class Or(BinaryOp): - def eval(self, ctx): - s2 = self.left.eval(ctx).GetValue() - if s2.ToBoolean(): - return s2 - s4 = self.right.eval(ctx).GetValue() - return s4 - - -class And(BinaryOp): - def eval(self, ctx): - s2 = self.left.eval(ctx).GetValue() - if not s2.ToBoolean(): - return s2 - s4 = self.right.eval(ctx).GetValue() - return s4 - - -class Ge(BinaryOp): - operation_name = 'GE' - def decision(self, ctx, op1, op2): - s5 = ARC(ctx, op1, op2) - if s5 in (-1, 1): - return W_Boolean(False) - else: - return W_Boolean(True) - - -class Gt(BinaryOp): - operation_name = 'GT' - def decision(self, ctx, op1, op2): - s5 = ARC(ctx, op2, op1) - if s5 == -1: - return W_Boolean(False) - else: - return W_Boolean(s5) +class And(Expression): + def __init__(self, pos, left, right): + self.pos = pos + self.left = left + self.right = right + def emit(self, bytecode): + self.left.emit(bytecode) + one = bytecode.prealocate_label() + bytecode.emit('JUMP_IF_FALSE_NOPOP', one) + self.right.emit(bytecode) + bytecode.emit('LABEL', one) -class Le(BinaryOp): - operation_name = 'LE' - def decision(self, ctx, op1, op2): - s5 = ARC(ctx, op2, op1) - if s5 in (-1, 1): - return W_Boolean(False) - else: - return W_Boolean(True) - +class Or(Expression): + def __init__(self, pos, left, right): + self.pos = pos + self.left = left + self.right = right -class Lt(BinaryOp): - operation_name = 'LT' - def decision(self, ctx, op1, op2): - s5 = ARC(ctx, op1, op2) - if s5 == -1: - return W_Boolean(False) - else: - return W_Boolean(s5) - + def emit(self, bytecode): + self.left.emit(bytecode) + one = bytecode.prealocate_label() + bytecode.emit('JUMP_IF_TRUE_NOPOP', one) + self.right.emit(bytecode) + bytecode.emit('LABEL', one) + +Ge = create_binary_op('GE') +Gt = create_binary_op('GT') +Le = create_binary_op('LE') +Lt = create_binary_op('LT') ############################################################################## # @@ -485,23 +448,23 @@ # ############################################################################## -class Ursh(BinaryOp): - def decision(self, ctx, op1, op2): - a = op1.ToUInt32() - b = op2.ToUInt32() - return W_IntNumber(a >> (b & 0x1F)) - -class Rsh(BinaryOp): - def decision(self, ctx, op1, op2): - a = op1.ToInt32() - b = op2.ToUInt32() - return W_IntNumber(a >> intmask(b & 0x1F)) - -class Lsh(BinaryOp): - def decision(self, ctx, op1, op2): - a = op1.ToInt32() - b = op2.ToUInt32() - return W_IntNumber(a << intmask(b & 0x1F)) +# class Ursh(BinaryOp): +# def decision(self, ctx, op1, op2): +# a = op1.ToUInt32() +# b = op2.ToUInt32() +# return W_IntNumber(a >> (b & 0x1F)) + +# class Rsh(BinaryOp): +# def decision(self, ctx, op1, op2): +# a = op1.ToInt32() +# b = op2.ToUInt32() +# return W_IntNumber(a >> intmask(b & 0x1F)) + +# class Lsh(BinaryOp): +# def decision(self, ctx, op1, op2): +# a = op1.ToInt32() +# b = op2.ToUInt32() +# return W_IntNumber(a << intmask(b & 0x1F)) ############################################################################## # @@ -509,72 +472,8 @@ # ############################################################################## - -def AEC(ctx, x, y): - """ - Implements the Abstract Equality Comparison x == y - trying to be fully to the spec - """ - # XXX think about fast paths here and there - type1 = x.type() - type2 = y.type() - if type1 == type2: - if type1 == "undefined" or type1 == "null": - return True - if type1 == "number": - n1 = x.ToNumber() - n2 = y.ToNumber() - if isnan(n1) or isnan(n2): - return False - if n1 == n2: - return True - return False - elif type1 == "string": - return x.ToString(ctx) == y.ToString(ctx) - elif type1 == "boolean": - return x.ToBoolean() == x.ToBoolean() - return x == y - else: - #step 14 - if (type1 == "undefined" and type2 == "null") or \ - (type1 == "null" and type2 == "undefined"): - return True - if type1 == "number" and type2 == "string": - return AEC(ctx, x, W_FloatNumber(y.ToNumber())) - if type1 == "string" and type2 == "number": - return AEC(ctx, W_FloatNumber(x.ToNumber()), y) - if type1 == "boolean": - return AEC(ctx, W_FloatNumber(x.ToNumber()), y) - if type2 == "boolean": - return AEC(ctx, x, W_FloatNumber(y.ToNumber())) - if (type1 == "string" or type1 == "number") and \ - type2 == "object": - return AEC(ctx, x, y.ToPrimitive(ctx)) - if (type2 == "string" or type2 == "number") and \ - type1 == "object": - return AEC(ctx, x.ToPrimitive(ctx), y) - return False - - - objtype = x.GetValue().type() - if objtype == y.GetValue().type(): - if objtype == "undefined" or objtype == "null": - return True - - if isinstance(x, W_String) and isinstance(y, W_String): - r = x.ToString(ctx) == y.ToString(ctx) - else: - r = x.ToNumber() == y.ToNumber() - return r - -class Eq(BinaryOp): - def decision(self, ctx, op1, op2): - return W_Boolean(AEC(ctx, op1, op2)) - -class Ne(BinaryOp): - def decision(self, ctx, op1, op2): - return W_Boolean(not AEC(ctx, op1, op2)) - +Eq = create_binary_op('EQ') +Ne = create_binary_op('NE') ############################################################################## # @@ -583,118 +482,43 @@ # ############################################################################## -def SEC(ctx, x, y): - """ - Implements the Strict Equality Comparison x === y - trying to be fully to the spec - """ - type1 = x.type() - type2 = y.type() - if type1 != type2: - return False - if type1 == "undefined" or type1 == "null": - return True - if type1 == "number": - n1 = x.ToNumber() - n2 = y.ToNumber() - if isnan(n1) or isnan(n2): - return False - if n1 == n2: - return True - return False - if type1 == "string": - return x.ToString(ctx) == y.ToString(ctx) - if type1 == "boolean": - return x.ToBoolean() == x.ToBoolean() - return x == y - -class StrictEq(BinaryOp): - def decision(self, ctx, op1, op2): - return W_Boolean(SEC(ctx, op1, op2)) - -class StrictNe(BinaryOp): - def decision(self, ctx, op1, op2): - return W_Boolean(not SEC(ctx, op1, op2)) - - -class In(BinaryOp): - """ - The in operator, eg: "property in object" - """ - def decision(self, ctx, op1, op2): - if not isinstance(op2, W_Object): - raise ThrowException(W_String("TypeError")) - name = op1.ToString(ctx) - return W_Boolean(op2.HasProperty(name)) - -class Delete(UnaryOp): - """ - the delete op, erases properties from objects - """ - def eval(self, ctx): - r1 = self.expr.eval(ctx) - if not isinstance(r1, W_Reference): - return W_Boolean(True) - r3 = r1.GetBase() - r4 = r1.GetPropertyName() - return W_Boolean(r3.Delete(r4)) - -class BaseIncrementDecrement(UnaryOp): - def emit(self, bytecode): - self.expr.emit(bytecode) - if self.postfix: - bytecode.emit('POST' + self.operation_name) - else: - bytecode.emit('PRE' + self.operation_name) - -class Increment(BaseIncrementDecrement): - """ - ++value (prefix) and value++ (postfix) - """ - operation_name = 'INCR' - - def eval(self, ctx): - # XXX write down fast version - thing = self.expr.eval(ctx) - val = thing.GetValue() - x = val.ToNumber() - resl = plus(ctx, W_FloatNumber(x), W_IntNumber(1)) - thing.PutValue(resl, ctx) - if self.postfix: - return val - else: - return resl - - -class Decrement(BaseIncrementDecrement): - """ - same as increment --value and value -- - """ - operation_name = 'DECR' - - def eval(self, ctx): - # XXX write down hot path - thing = self.expr.eval(ctx) - val = thing.GetValue() - x = val.ToNumber() - resl = sub(ctx, W_FloatNumber(x), W_IntNumber(1)) - thing.PutValue(resl, ctx) - if self.postfix: - return val - else: - return resl +StrictEq = create_binary_op('IS') +StrictNe = create_binary_op('ISNOT') - -class Index(BinaryOp): - def eval(self, ctx): - w_obj = self.left.eval(ctx).GetValue().ToObject(ctx) - name= self.right.eval(ctx).GetValue().ToString(ctx) - return W_Reference(name, w_obj) +# class In(BinaryOp): +# """ +# The in operator, eg: "property in object" +# """ +# def decision(self, ctx, op1, op2): +# if not isinstance(op2, W_Object): +# raise ThrowException(W_String("TypeError")) +# name = op1.ToString(ctx) +# return W_Boolean(op2.HasProperty(name)) + +# class Delete(UnaryOp): +# """ +# the delete op, erases properties from objects +# """ +# def eval(self, ctx): +# r1 = self.expr.eval(ctx) +# if not isinstance(r1, W_Reference): +# return W_Boolean(True) +# r3 = r1.GetBase() +# r4 = r1.GetPropertyName() +# return W_Boolean(r3.Delete(r4)) + +PreIncrement = create_unary_op('PREINCR') +PostIncrement = create_unary_op('POSTINCR') +PreDecrement = create_unary_op('PREDECRE') +PostDecrement = create_unary_op('POSTDECR') + +#class Index(BinaryOp): +# def eval(self, ctx): +# w_obj = self.left.eval(ctx).GetValue().ToObject(ctx) +# name= self.right.eval(ctx).GetValue().ToString(ctx) +# return W_Reference(name, w_obj) class ArgumentList(ListOp): - def eval(self, ctx): - return W_List([node.eval(ctx).GetValue() for node in self.nodes]) - def emit(self, bytecode): for node in self.nodes: node.emit(bytecode) @@ -706,72 +530,11 @@ # ############################################################################## -class BinaryNumberOp(BinaryOp): - def eval(self, ctx): - nleft = self.left.eval(ctx).GetValue().ToPrimitive(ctx, 'Number') - nright = self.right.eval(ctx).GetValue().ToPrimitive(ctx, 'Number') - result = self.mathop(ctx, nleft, nright) - return result - - def mathop(self, ctx, n1, n2): - raise NotImplementedError - -def mult(ctx, nleft, nright): - if isinstance(nleft, W_IntNumber) and isinstance(nright, W_IntNumber): - ileft = nleft.ToInt32() - iright = nright.ToInt32() - try: - return W_IntNumber(ovfcheck(ileft * iright)) - except OverflowError: - return W_FloatNumber(float(ileft) * float(iright)) - fleft = nleft.ToNumber() - fright = nright.ToNumber() - return W_FloatNumber(fleft * fright) - -def mod(ctx, nleft, nright): # XXX this one is really not following spec - ileft = nleft.ToInt32() - iright = nright.ToInt32() - return W_IntNumber(ileft % iright) - -def division(ctx, nleft, nright): - fleft = nleft.ToNumber() - fright = nright.ToNumber() - if fright == 0: - if fleft < 0: - val = -INFINITY - elif fleft == 0: - val = NAN - else: - val = INFINITY - else: - val = fleft / fright - return W_FloatNumber(val) - -class Plus(BinaryNumberOp): - operation_name = 'ADD' - -class Mult(BinaryNumberOp): - operation_name = 'MUL' - def mathop(self, ctx, n1, n2): - return mult(ctx, n1, n2) - - -class Mod(BinaryNumberOp): - operation_name = 'MOD' - def mathop(self, ctx, n1, n2): - return mod(ctx, n1, n2) - -class Division(BinaryNumberOp): - def mathop(self, ctx, n1, n2): - return division(ctx, n1, n2) - - -class Sub(BinaryNumberOp): - operation_name = 'SUB' - - def mathop(self, ctx, n1, n2): - return sub(ctx, n1, n2) - +Plus = create_binary_op('ADD') +Mult = create_binary_op('MUL') +Mod = create_binary_op('MOD') +Division = create_binary_op('DIV') +Sub = create_binary_op('SUB') class Null(Expression): def eval(self, ctx): @@ -793,17 +556,17 @@ raise ThrowException(W_String('it is not a constructor')) return res -class New(UnaryOp): - def eval(self, ctx): - x = self.expr.eval(ctx).GetValue() - return commonnew(ctx, x, []) +#class New(UnaryOp): +# def eval(self, ctx): +# x = self.expr.eval(ctx).GetValue() +# return commonnew(ctx, x, []) -class NewWithArgs(BinaryOp): - def eval(self, ctx): - x = self.left.eval(ctx).GetValue() - args = self.right.eval(ctx).get_args() - return commonnew(ctx, x, args) +# class NewWithArgs(BinaryOp): +# def eval(self, ctx): +# x = self.left.eval(ctx).GetValue() +# args = self.right.eval(ctx).get_args() +# return commonnew(ctx, x, args) class BaseNumber(Expression): pass @@ -886,8 +649,6 @@ node.emit(bytecode) # we don't need to pop after certain instructions, let's # list them - if not isinstance(node, Return): - bytecode.emit('POP') def execute(self, ctx): for varname in self.var_decl: @@ -970,18 +731,17 @@ return tryresult -class Typeof(UnaryOp): - def eval(self, ctx): - val = self.expr.eval(ctx) - if isinstance(val, W_Reference) and val.GetBase() is None: - return W_String("undefined") - return W_String(val.GetValue().type()) +#class Typeof(UnaryOp): +# def eval(self, ctx): +# val = self.expr.eval(ctx) +# if isinstance(val, W_Reference) and val.GetBase() is None: +# return W_String("undefined") +# return W_String(val.GetValue().type()) class VariableDeclaration(Expression): def __init__(self, pos, identifier, expr=None): self.pos = pos - assert isinstance(identifier, Identifier) - self.identifier = identifier.name + self.identifier = identifier.get_literal() self.expr = expr def emit(self, bytecode): @@ -998,7 +758,18 @@ else: ctx.variable.Put(name, self.expr.eval(ctx).GetValue(), dd=True) return self.identifier.eval(ctx) - + +class VariableIdentifier(Expression): + def __init__(self, pos, depth, identifier): + self.pos = pos + self.depth = depth + self.identifier = identifier + + def emit(self, bytecode): + bytecode.emit('LOAD_REALVAR', self.depth, self.identifier) + + def get_literal(self): + return self.identifier class VariableDeclList(Expression): def __init__(self, pos, nodes): @@ -1021,14 +792,15 @@ def emit(self, bytecode): self.body.emit(bytecode) + bytecode.emit('POP') def execute(self, ctx): return self.body.eval(ctx) -class Void(UnaryOp): - def eval(self, ctx): - self.expr.eval(ctx) - return w_Undefined +#class Void(UnaryOp): +# def eval(self, ctx): +# self.expr.eval(ctx) +# return w_Undefined class With(Statement): @@ -1179,28 +951,11 @@ return W_Boolean(self.bool) -class Not(UnaryOp): - def eval(self, ctx): - return W_Boolean(not self.expr.eval(ctx).GetValue().ToBoolean()) - +#class Not(UnaryOp): +# def eval(self, ctx): +# return W_Boolean(not self.expr.eval(ctx).GetValue().ToBoolean()) -class UMinus(UnaryOp): - operation_name = 'UMINUS' - - def eval(self, ctx): - res = self.expr.eval(ctx) - if isinstance(res, W_IntNumber): - return W_IntNumber(-res.intval) - elif isinstance(res, W_FloatNumber): - return W_FloatNumber(-res.floatval) - return W_FloatNumber(-self.expr.eval(ctx).GetValue().ToNumber()) +UMinus = create_unary_op('UMINUS') +UPlus = create_unary_op('UPLUS') -class UPlus(UnaryOp): - operation_name = 'UPLUS' - - def eval(self, ctx): - res = self.expr.eval(ctx) - if isinstance(res, W_BaseNumber): - return res - return W_FloatNumber(self.expr.eval(ctx).GetValue().ToNumber()) - +unrolling_classes = unrolling_iterable((If, Return, Block, While)) Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_interp.py Tue Mar 18 03:24:13 2008 @@ -1,7 +1,7 @@ import py from pypy.lang.js import interpreter -from pypy.lang.js.operations import AEC, IntNumber, FloatNumber, Position, Plus +from pypy.lang.js.operations import IntNumber, FloatNumber, Position, Plus from pypy.lang.js.jsobj import W_Object, ExecutionContext, W_Root, w_Null from pypy.lang.js.execution import ThrowException from pypy.lang.js.jscode import JsCode, POP @@ -175,6 +175,7 @@ """, ['', '0']) def test_throw(): + py.test.skip("Not implemented") assertp("throw(3);", "uncaught exception: 3") def test_group(): @@ -184,10 +185,11 @@ assertv("(500,3);", 3) def test_block(): - yield assertv, "{5;}", 5 - yield assertv, "{3; 5;}", 5 + yield assertp, "{print(5);}", '5' + yield assertp, "{3; print(5);}", '5' def test_try_catch_finally(): + py.test.skip("Not implemented") yield assertp, """ try { throw(3); @@ -250,7 +252,7 @@ yield assertv, "'aaa' < 'a';", False yield assertv, "'a' > 'a';", False -def test_binary_op(): +def test_binary_opb(): yield assertp, "print(0||0); print(1||0);", ["0", "1"] yield assertp, "print(0&&1); print(1&&1);", ["0", "1"] @@ -259,7 +261,7 @@ i = 0; while (i<3) { print(i); - i = i+1; + i++; } print(i); """, ["0","1","2","3"]) Modified: pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/test/test_parser.py Tue Mar 18 03:24:13 2008 @@ -2,7 +2,8 @@ import py from pypy.rlib.parsing.ebnfparse import parse_ebnf, make_parse_function -from pypy.rlib.parsing.parsing import ParseError, Rule +from pypy.rlib.parsing.parsing import Rule +from pypy.lang.js.astbuilder import FakeParseError from pypy.rlib.parsing.tree import RPythonVisitor from pypy.lang.js.jsobj import W_Object, global_context, ThrowException, empty_context from pypy.lang.js.astbuilder import ASTBuilder @@ -337,7 +338,7 @@ "LOAD_OBJECT 1"]) def test_raising(self): - py.test.raises(ParseError, self.check, '1=2', []) + py.test.raises(FakeParseError, self.check, '1=2', []) def test_expression(self): self.check('1 - 1 - 1', [ From fijal at codespeak.net Tue Mar 18 04:23:55 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 18 Mar 2008 04:23:55 +0100 (CET) Subject: [pypy-svn] r52673 - in pypy/branch/jit-refactoring/pypy/lang/js: . bench Message-ID: <20080318032355.83ECB169E48@codespeak.net> Author: fijal Date: Tue Mar 18 04:23:51 2008 New Revision: 52673 Added: pypy/branch/jit-refactoring/pypy/lang/js/bench/f2.js Modified: pypy/branch/jit-refactoring/pypy/lang/js/bench/f1.js pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py Log: Some minor fixes + additional benchmark. Modified: pypy/branch/jit-refactoring/pypy/lang/js/bench/f1.js ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/bench/f1.js (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/bench/f1.js Tue Mar 18 04:23:51 2008 @@ -1,5 +1,5 @@ -// some simple number-crunching benchmarks +// some simple number-crunching benchmark function f1(n) { var i = 0; @@ -10,7 +10,7 @@ j = j + 1; x = x + (i&j); } - i = i +1; + i = i + 1; } return x; } Added: pypy/branch/jit-refactoring/pypy/lang/js/bench/f2.js ============================================================================== --- (empty file) +++ pypy/branch/jit-refactoring/pypy/lang/js/bench/f2.js Tue Mar 18 04:23:51 2008 @@ -0,0 +1,8 @@ + +function fib(n) { + if ((n == 0) || (n == 1)) + return(0); + return fib(n-1)+fib(n-2); +} + +fib(28); Modified: pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py ============================================================================== --- pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py (original) +++ pypy/branch/jit-refactoring/pypy/lang/js/jsobj.py Tue Mar 18 04:23:51 2008 @@ -164,8 +164,11 @@ def Get(self, P): - if P in self.propdict: return self.propdict[P].value - if self.Prototype is None: return w_Undefined + try: + return self.propdict[P].value + except KeyError: + if self.Prototype is None: + return w_Undefined return self.Prototype.Get(P) # go down the prototype chain def CanPut(self, P): @@ -177,13 +180,14 @@ def Put(self, P, V, dd=False, ro=False, de=False, it=False): - if not self.CanPut(P): - return - if P in self.propdict: - self.propdict[P].value = V - else: + try: + P = self.propdict[P] + if P.ro: + return + P.value = V + except KeyError: self.propdict[P] = Property(P, V, - dd = dd, ro = ro, it = it) + dd = dd, ro = ro, it = it) def HasProperty(self, P): if P in self.propdict: return True @@ -514,9 +518,14 @@ assert name is not None for obj in self.scope: assert isinstance(obj, W_PrimitiveObject) - if obj.HasProperty(name): - obj.Put(name, value) + try: + P = obj.propdict[name] + if P.ro: + return + P.value = value return + except KeyError: + pass # if not, we need to put this thing in current scope self.variable.Put(name, value) @@ -541,9 +550,10 @@ def resolve_identifier(self, identifier): for obj in self.scope: assert isinstance(obj, W_PrimitiveObject) - if obj.HasProperty(identifier): - return obj.Get(identifier) - #return W_Reference(identifier, obj) + try: + return obj.propdict[identifier].value + except KeyError: + pass raise Exception("stuff") #return W_Reference(identifier) From antocuni at codespeak.net Tue Mar 18 10:07:35 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Tue, 18 Mar 2008 10:07:35 +0100 (CET) Subject: [pypy-svn] r52674 - pypy/dist/pypy/rpython/ootypesystem Message-ID: <20080318090735.97D05169EBF@codespeak.net> Author: antocuni Date: Tue Mar 18 10:07:34 2008 New Revision: 52674 Modified: pypy/dist/pypy/rpython/ootypesystem/ootype.py Log: oups, I forgot to check this is togheter with r52628. Modified: pypy/dist/pypy/rpython/ootypesystem/ootype.py ============================================================================== --- pypy/dist/pypy/rpython/ootypesystem/ootype.py (original) +++ pypy/dist/pypy/rpython/ootypesystem/ootype.py Tue Mar 18 10:07:34 2008 @@ -813,8 +813,8 @@ def __init__(self, INSTANCE, inst): self.__dict__['_TYPE'] = INSTANCE - assert isinstance(inst, _instance) - assert isSubclass(inst._TYPE, INSTANCE) + assert isinstance(inst, (_instance, _record)) + assert isinstance(inst._TYPE, Record) or isSubclass(inst._TYPE, INSTANCE) self.__dict__['_inst'] = inst def __repr__(self): @@ -828,7 +828,9 @@ def __eq__(self, other): assert isinstance(other, _view) - return self._inst == other._inst + a = self._inst + b = other._inst + return a.__class__ == b.__class__ and a == b def __hash__(self): return hash(self._inst) From antocuni at codespeak.net Tue Mar 18 10:08:23 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Tue, 18 Mar 2008 10:08:23 +0100 (CET) Subject: [pypy-svn] r52675 - in pypy/dist/pypy: annotation rpython/ootypesystem translator/cli/test Message-ID: <20080318090823.AF88B169EC5@codespeak.net> Author: antocuni Date: Tue Mar 18 10:08:22 2008 New Revision: 52675 Modified: pypy/dist/pypy/annotation/unaryop.py pypy/dist/pypy/rpython/ootypesystem/rootype.py pypy/dist/pypy/translator/cli/test/test_dotnet.py Log: add support to call_args on low level static methods Modified: pypy/dist/pypy/annotation/unaryop.py ============================================================================== --- pypy/dist/pypy/annotation/unaryop.py (original) +++ pypy/dist/pypy/annotation/unaryop.py Tue Mar 18 10:08:22 2008 @@ -731,12 +731,17 @@ return lltype_to_annotation(METH.RESULT) class __extend__(SomeOOStaticMeth): - def simple_call(m, *args_s): - llargs = [annotation_to_lltype(arg_s)._example() for arg_s in args_s] - smeth = m.method._example() - v = smeth(*llargs) + + def call(m, args): + args_s, kwds_s = args.unpack() + if kwds_s: + raise Exception("keyword arguments to call to a low-level static method") + info = 'argument to ll static method call' + llargs = [annotation_to_lltype(s_arg, info)._defl() for s_arg in args_s] + v = m.method._example()(*llargs) return ll_to_annotation(v) + #_________________________________________ # weakrefs Modified: pypy/dist/pypy/rpython/ootypesystem/rootype.py ============================================================================== --- pypy/dist/pypy/rpython/ootypesystem/rootype.py (original) +++ pypy/dist/pypy/rpython/ootypesystem/rootype.py Tue Mar 18 10:08:22 2008 @@ -111,6 +111,13 @@ vlist.append(cgraphs) return hop.genop("indirect_call", vlist, resulttype = hop.r_result.lowleveltype) + def rtype_call_args(self, hop): + from pypy.rpython.rbuiltin import call_args_expand + hop, _ = call_args_expand(hop, takes_kwds=False) + hop.swap_fst_snd_args() + hop.r_s_popfirstarg() + return self.rtype_simple_call(hop) + class __extend__(pairtype(OOInstanceRepr, OOBoundMethRepr)): Modified: pypy/dist/pypy/translator/cli/test/test_dotnet.py ============================================================================== --- pypy/dist/pypy/translator/cli/test/test_dotnet.py (original) +++ pypy/dist/pypy/translator/cli/test/test_dotnet.py Tue Mar 18 10:08:22 2008 @@ -536,11 +536,14 @@ il.Emit(OpCodes.Ret) myfunc = meth.CreateDelegate(typeof(FUNCTYPE)) return myfunc - - def fn(): + + def fn(x, y): myfunc = unbox(build_fn(), FUNCTYPE) - return myfunc(30, 12) - res = self.interpret(fn, []) + a = myfunc(x, y) + mytuple = (x, y) + b = myfunc(*mytuple) + return a+b + res = self.interpret(fn, [10, 11]) assert res == 42 def test_bound_delegate(self): From arigo at codespeak.net Tue Mar 18 10:37:07 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 10:37:07 +0100 (CET) Subject: [pypy-svn] r52676 - in pypy/dist/pypy/module/zlib: . test Message-ID: <20080318093707.44957169ED1@codespeak.net> Author: arigo Date: Tue Mar 18 10:37:05 2008 New Revision: 52676 Modified: pypy/dist/pypy/module/zlib/interp_zlib.py pypy/dist/pypy/module/zlib/test/test_zlib.py Log: zlib.crc32() and zlib.adler32() on 64-bit platforms: follow the newly fixed behavior of CPython 2.6 instead of the bogus one of previous versions. Modified: pypy/dist/pypy/module/zlib/interp_zlib.py ============================================================================== --- pypy/dist/pypy/module/zlib/interp_zlib.py (original) +++ pypy/dist/pypy/module/zlib/interp_zlib.py Tue Mar 18 10:37:05 2008 @@ -9,6 +9,17 @@ from pypy.rlib import rzlib +if intmask(2**31) == -2**31: + # 32-bit platforms + unsigned_to_signed_32bit = intmask +else: + # 64-bit platforms + def unsigned_to_signed_32bit(x): + # assumes that 'x' is in range(0, 2**32) to start with + SIGN_EXTEND2 = 1 << 31 + return intmask((x ^ SIGN_EXTEND2) - SIGN_EXTEND2) + + def crc32(space, string, start = rzlib.CRC32_DEFAULT_START): """ crc32(string[, start]) -- Compute a CRC-32 checksum of string. @@ -20,9 +31,10 @@ # This is, perhaps, a little stupid. zlib returns the checksum unsigned. # CPython exposes it as a signed value, though. -exarkun - # The value *is* unsigned on 64-bit platforms in CPython... bah. - # For now let's do the same as CPython and boldly cast to a C long. -arigo - checksum = intmask(checksum) + # Note that in CPython < 2.6 on 64-bit platforms the result is + # actually unsigned, but it was considered to be a bug so we stick to + # the 2.6 behavior and always return a number in range(-2**31, 2**31). + checksum = unsigned_to_signed_32bit(checksum) return space.wrap(checksum) crc32.unwrap_spec = [ObjSpace, 'bufferstr', int] @@ -36,12 +48,8 @@ an integer. """ checksum = rzlib.adler32(string, start) - - # This is, perhaps, a little stupid. zlib returns the checksum unsigned. - # CPython exposes it as a signed value, though. -exarkun - # The value *is* unsigned on 64-bit platforms in CPython... bah. - # For now let's do the same as CPython and boldly cast to a C long. -arigo - checksum = intmask(checksum) + # See comments in crc32() for the following line + checksum = unsigned_to_signed_32bit(checksum) return space.wrap(checksum) adler32.unwrap_spec = [ObjSpace, 'bufferstr', int] Modified: pypy/dist/pypy/module/zlib/test/test_zlib.py ============================================================================== --- pypy/dist/pypy/module/zlib/test/test_zlib.py (original) +++ pypy/dist/pypy/module/zlib/test/test_zlib.py Tue Mar 18 10:37:05 2008 @@ -8,8 +8,15 @@ except ImportError: import py; py.test.skip("no zlib module on this host Python") +from pypy.module.zlib import interp_zlib from pypy.conftest import gettestobjspace +def test_unsigned_to_signed_32bit(): + assert interp_zlib.unsigned_to_signed_32bit(123) == 123 + assert interp_zlib.unsigned_to_signed_32bit(2**31) == -2**31 + assert interp_zlib.unsigned_to_signed_32bit(2**32-1) == -1 + + class AppTestZlib(object): def setup_class(cls): """ @@ -38,7 +45,8 @@ def test_crc32(self): """ When called with a string, zlib.crc32 should compute its CRC32 and - return it as a signed 32 bit integer. + return it as a signed 32 bit integer. On 64-bit machines too + (it is a bug in CPython < 2.6 to return unsigned values in this case). """ assert self.zlib.crc32('') == 0 assert self.zlib.crc32('\0') == -771559539 @@ -64,6 +72,8 @@ """ When called with a string, zlib.crc32 should compute its adler 32 checksum and return it as a signed 32 bit integer. + On 64-bit machines too + (it is a bug in CPython < 2.6 to return unsigned values in this case). """ assert self.zlib.adler32('') == 1 assert self.zlib.adler32('\0') == 65537 From arigo at codespeak.net Tue Mar 18 11:18:19 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 11:18:19 +0100 (CET) Subject: [pypy-svn] r52677 - in pypy/dist/pypy/doc: . discussion Message-ID: <20080318101819.55999169EDE@codespeak.net> Author: arigo Date: Tue Mar 18 11:18:17 2008 New Revision: 52677 Added: pypy/dist/pypy/doc/discussion/standalone-howto.txt - copied unchanged from r52632, pypy/dist/pypy/doc/standalone-howto.txt Removed: pypy/dist/pypy/doc/standalone-howto.txt Log: Move this to discussion/ because I think it is misleading. Also the part about using _annspecialcase_ to specialize on the type of list items looks wrong to me. From arigo at codespeak.net Tue Mar 18 11:23:29 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 11:23:29 +0100 (CET) Subject: [pypy-svn] r52678 - pypy/dist/pypy/doc/discussion Message-ID: <20080318102329.401B0169EDE@codespeak.net> Author: arigo Date: Tue Mar 18 11:23:29 2008 New Revision: 52678 Modified: pypy/dist/pypy/doc/discussion/standalone-howto.txt Log: Fix links. Modified: pypy/dist/pypy/doc/discussion/standalone-howto.txt ============================================================================== --- pypy/dist/pypy/doc/discussion/standalone-howto.txt (original) +++ pypy/dist/pypy/doc/discussion/standalone-howto.txt Tue Mar 18 11:23:29 2008 @@ -100,8 +100,8 @@ ``sum([1,2,3])`` and ``sum([1.0,2.0,3.0])``. -.. _`FAQ Entries`: faq.html#pypy-translation-tool-chain -.. _`RPython`: coding-guide.html#restricted-python -.. _`Annotator`: dynamic-language-translation.html#annotator -.. _`RTyper`: dynamic-language-translation.html#rtyper +.. _`FAQ Entries`: ../faq.html#pypy-translation-tool-chain +.. _`RPython`: ../coding-guide.html#restricted-python +.. _`Annotator`: ../dynamic-language-translation.html#annotator +.. _`RTyper`: ../dynamic-language-translation.html#rtyper From arigo at codespeak.net Tue Mar 18 11:23:48 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 11:23:48 +0100 (CET) Subject: [pypy-svn] r52679 - pypy/dist/pypy/doc Message-ID: <20080318102348.504EC169EDE@codespeak.net> Author: arigo Date: Tue Mar 18 11:23:45 2008 New Revision: 52679 Modified: pypy/dist/pypy/doc/__pypy__-module.txt Log: Mention __pypy__.bytebuffer(). Modified: pypy/dist/pypy/doc/__pypy__-module.txt ============================================================================== --- pypy/dist/pypy/doc/__pypy__-module.txt (original) +++ pypy/dist/pypy/doc/__pypy__-module.txt Tue Mar 18 11:23:45 2008 @@ -14,6 +14,9 @@ - ``internal_repr(obj)``: return the interpreter-level representation of an object. + - ``bytebuffer(length)``: return a new read-write buffer of the given length. + It works like a simplified array of characters (actually, depending on the + configuration the ``array`` module internally uses this). Thunk Object Space Functionality ================================ From arigo at codespeak.net Tue Mar 18 12:13:39 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 12:13:39 +0100 (CET) Subject: [pypy-svn] r52680 - pypy/dist/pypy/objspace/std Message-ID: <20080318111339.84E86169EC5@codespeak.net> Author: arigo Date: Tue Mar 18 12:13:37 2008 New Revision: 52680 Modified: pypy/dist/pypy/objspace/std/ropeobject.py Log: This assert ends up in the translation and forces additional_info to be computed for all rope nodes... Bad Modified: pypy/dist/pypy/objspace/std/ropeobject.py ============================================================================== --- pypy/dist/pypy/objspace/std/ropeobject.py (original) +++ pypy/dist/pypy/objspace/std/ropeobject.py Tue Mar 18 12:13:37 2008 @@ -18,7 +18,8 @@ from pypy.objspace.std.stringtype import str_typedef as typedef def __init__(w_self, node): - assert node.is_bytestring() + if not we_are_translated(): + assert node.is_bytestring() w_self._node = node def __repr__(w_self): From arigo at codespeak.net Tue Mar 18 12:15:43 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 12:15:43 +0100 (CET) Subject: [pypy-svn] r52681 - in pypy/dist/pypy/rlib: . test Message-ID: <20080318111543.E78B1169EC5@codespeak.net> Author: arigo Date: Tue Mar 18 12:15:43 2008 New Revision: 52681 Modified: pypy/dist/pypy/rlib/rope.py pypy/dist/pypy/rlib/test/test_rope.py Log: Replace masked_power() with masked_mul_by_1000003_pow(). As we know that we only do powers of 1000003, we can write a simpler algo that only needs half as many multiplications. Modified: pypy/dist/pypy/rlib/rope.py ============================================================================== --- pypy/dist/pypy/rlib/rope.py (original) +++ pypy/dist/pypy/rlib/rope.py Tue Mar 18 12:15:43 2008 @@ -1,6 +1,7 @@ import py import sys from pypy.rlib.rarithmetic import intmask, _hash_string, ovfcheck +from pypy.rlib.rarithmetic import r_uint, LONG_BIT from pypy.rlib.objectmodel import we_are_translated import math @@ -25,30 +26,19 @@ a, b = b, a + b i += 1 -def masked_power(a, b): - if b == 0: - return 1 - if b == 1: - return a - if a == 0: - return 0 - if a == 1: - return 1 - num_bits = 2 - mask = b >> 2 - while mask: - num_bits += 1 - mask >>= 1 - result = a - mask = 1 << (num_bits - 2) - #import pdb; pdb.set_trace() - for i in range(num_bits - 1): - if mask & b: - result = intmask(result * result * a) - else: - result = intmask(result * result) - mask >>= 1 - return result +mul_by_1000003_pow_table = [intmask(pow(1000003, 2**_i, 2**LONG_BIT)) + for _i in range(LONG_BIT)] + +def masked_mul_by_1000003_pow(a, b): + """Computes intmask(a * (1000003**b)).""" + index = 0 + b = r_uint(b) + while b: + if b & 1: + a = intmask(a * mul_by_1000003_pow_table[index]) + b >>= 1 + index += 1 + return a class GlobalRopeInfo(object): @@ -65,7 +55,7 @@ result.charbitmask = self.charbitmask | other.charbitmask h1 = self.hash h2 = other.hash - x = intmask(h2 + h1 * (masked_power(1000003, rightlength))) + x = intmask(h2 + masked_mul_by_1000003_pow(h1, rightlength)) x |= HIGHEST_BIT_SET result.hash = x result.is_ascii = self.is_ascii and other.is_ascii Modified: pypy/dist/pypy/rlib/test/test_rope.py ============================================================================== --- pypy/dist/pypy/rlib/test/test_rope.py (original) +++ pypy/dist/pypy/rlib/test/test_rope.py Tue Mar 18 12:15:43 2008 @@ -686,7 +686,7 @@ for i in range(0, 60, 13): print i for j in range(1, 10000, 7): - assert intmask(i ** j) == masked_power(i, j) + assert intmask(i * (1000003**j)) == masked_mul_by_1000003_pow(i, j) def test_seekable_bug(): From arigo at codespeak.net Tue Mar 18 13:50:24 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 13:50:24 +0100 (CET) Subject: [pypy-svn] r52682 - in pypy/dist/pypy/doc: . discussion jit Message-ID: <20080318125024.8245D169EC0@codespeak.net> Author: arigo Date: Tue Mar 18 13:50:23 2008 New Revision: 52682 Added: pypy/dist/pypy/doc/jit/ (props changed) pypy/dist/pypy/doc/jit/backend.txt (contents, props changed) pypy/dist/pypy/doc/jit/howto.txt - copied, changed from r52681, pypy/dist/pypy/doc/jit.txt pypy/dist/pypy/doc/jit/index.txt (contents, props changed) pypy/dist/pypy/doc/jit/overview.txt (contents, props changed) pypy/dist/pypy/doc/jit/rainbow.txt - copied, changed from r52681, pypy/dist/pypy/doc/discussion/jit-refactoring-plan.txt pypy/dist/pypy/doc/jit/status.txt - copied, changed from r52681, pypy/dist/pypy/doc/jit.txt pypy/dist/pypy/doc/jit/theory.txt - copied, changed from r52681, pypy/dist/pypy/doc/discussion/jit-draft.txt Removed: pypy/dist/pypy/doc/discussion/jit-draft.txt pypy/dist/pypy/doc/discussion/jit-refactoring-plan.txt pypy/dist/pypy/doc/jit.txt Modified: pypy/dist/pypy/doc/faq.txt pypy/dist/pypy/doc/glossary.txt pypy/dist/pypy/doc/index.txt pypy/dist/pypy/doc/redirections pypy/dist/pypy/doc/style.css Log: Create a pypy/doc/jit/ directory and shuffle files around. No new content at this point. Modified: pypy/dist/pypy/doc/faq.txt ============================================================================== --- pypy/dist/pypy/doc/faq.txt (original) +++ pypy/dist/pypy/doc/faq.txt Tue Mar 18 13:50:23 2008 @@ -151,7 +151,7 @@ i.e. within 20% of recoding the function in C and compiling with ``gcc`` without optimizations). -.. _`manually enabled`: jit.html +.. _`manually enabled`: jit/status.html .. _`prolog and javascript`: Modified: pypy/dist/pypy/doc/glossary.txt ============================================================================== --- pypy/dist/pypy/doc/glossary.txt (original) +++ pypy/dist/pypy/doc/glossary.txt Tue Mar 18 13:50:23 2008 @@ -218,8 +218,8 @@ .. _applevel: coding-guide.html#application-level .. _`target language`: getting-started.html#trying-out-the-translator -.. _`just in time compiler`: jit.html -.. _`the jit docs`: jit.html +.. _`just in time compiler`: jit/index.html +.. _`the jit docs`: jit/index.html .. _`type inference article on Wikipedia`: http://en.wikipedia.org/wiki/Type_inference .. _`annotator pass`: translation.html#the-annotation-pass .. _`The RPython Typer`: translation.html#the-rpython-typer Modified: pypy/dist/pypy/doc/index.txt ============================================================================== --- pypy/dist/pypy/doc/index.txt (original) +++ pypy/dist/pypy/doc/index.txt Tue Mar 18 13:50:23 2008 @@ -337,12 +337,12 @@ .. _`CLI backend`: cli-backend.html .. _`py.py`: getting-started.html#main-entry-point .. _`translatorshell.py`: getting-started.html#try-out-the-translator -.. _JIT: jit.html -.. _`JIT Generation in PyPy`: jit.html -.. _`just-in-time compiler generator`: jit.html -.. _`jit backends`: discussion/jit-draft.html#backends -.. _`hint-annotator`: discussion/jit-draft.html#hint-annotator -.. _`timeshifter`: discussion/jit-draft.html#timeshifter +.. _JIT: jit/index.html +.. _`JIT Generation in PyPy`: jit/index.html +.. _`just-in-time compiler generator`: jit/index.html +.. _`jit backends`: jit/backend.html +.. _`hint-annotator`: jit/theory.html#hint-annotator +.. _`timeshifter`: jit/theory.html#timeshifter .. _rtyper: rtyper.html .. _`low-level type system`: rtyper.html#low-level-type .. _`object-oriented type system`: rtyper.html#oo-type Added: pypy/dist/pypy/doc/jit/backend.txt ============================================================================== --- (empty file) +++ pypy/dist/pypy/doc/jit/backend.txt Tue Mar 18 13:50:23 2008 @@ -0,0 +1,6 @@ +in-progress +============================================================ + +.. raw:: html + +
JIT index
Added: pypy/dist/pypy/doc/jit/index.txt ============================================================================== --- (empty file) +++ pypy/dist/pypy/doc/jit/index.txt Tue Mar 18 13:50:23 2008 @@ -0,0 +1,41 @@ +======================================================================== + JIT Compiler Generation +======================================================================== + +:abstract: + + When PyPy is translated into an executable like ``pypy-c``, the + executable contains a full virtual machine that can optionally + include a Just-In-Time compiler. This JIT compiler is **generated + automatically from the interpreter** that we wrote in RPython. + + This JIT Compiler Generator can be applied on interpreters for any + language, as long as the interpreter itself is written in RPython + and contains a few hints to guide the JIT Compiler Generator. + + +Content +------------------------------------------------------------ + +- Motivation_: introduction and rough overview + +- Status_: using a pypy-c with a JIT + +- `How-to`_: make your own JIT compilers, with examples for tiny languages + +- Theory_: partial evaluation + +- How it all works: the Rainbow_ interpreter + +- Machine code Backends_ + +*(work and documentation in progress!)* + +------------------------------------------------------------ + +.. _Motivation: overview.html +.. _Status: status.html +.. _`How-to`: howto.html +.. _Theory: theory.html +.. _Rainbow: rainbow.html +.. _Backends: backend.html Added: pypy/dist/pypy/doc/jit/overview.txt ============================================================================== --- (empty file) +++ pypy/dist/pypy/doc/jit/overview.txt Tue Mar 18 13:50:23 2008 @@ -0,0 +1,7 @@ +------------------------------------------------------------------------ +in-progress +------------------------------------------------------------------------ + +.. raw:: html + +
JIT index
Modified: pypy/dist/pypy/doc/redirections ============================================================================== --- pypy/dist/pypy/doc/redirections (original) +++ pypy/dist/pypy/doc/redirections Tue Mar 18 13:50:23 2008 @@ -3,5 +3,6 @@ 'proxy.html': 'objspace-proxies.html#tproxy', 'news.html': 'home.html', 'contact.html': 'home.html', + 'jit.html': 'jit/index.html', } Modified: pypy/dist/pypy/doc/style.css ============================================================================== --- pypy/dist/pypy/doc/style.css (original) +++ pypy/dist/pypy/doc/style.css Tue Mar 18 13:50:23 2008 @@ -1089,3 +1089,7 @@ div.abstract p.topic-title { font-weight: bold ; text-align: center } + +div.innermenu { + font: 109% Verdana, Helvetica, Arial, sans-serif; + float: right } From antocuni at codespeak.net Tue Mar 18 13:53:27 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Tue, 18 Mar 2008 13:53:27 +0100 (CET) Subject: [pypy-svn] r52683 - in pypy/dist/pypy: jit/codegen/cli jit/codegen/cli/test jit/codegen/i386/test jit/codegen/test jit/timeshifter jit/timeshifter/test rpython/ootypesystem translator/cli Message-ID: <20080318125327.D2B38169EC9@codespeak.net> Author: antocuni Date: Tue Mar 18 13:53:27 2008 New Revision: 52683 Added: pypy/dist/pypy/jit/codegen/cli/test/test_gencli_ts.py (contents, props changed) Modified: pypy/dist/pypy/jit/codegen/cli/operation.py pypy/dist/pypy/jit/codegen/cli/rgenop.py pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py pypy/dist/pypy/jit/codegen/test/rgenop_tests.py pypy/dist/pypy/jit/timeshifter/exception.py pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py pypy/dist/pypy/rpython/ootypesystem/rootype.py pypy/dist/pypy/translator/cli/constant.py Log: whack here and there until we can run the first timeshifted tests with gencli Modified: pypy/dist/pypy/jit/codegen/cli/operation.py ============================================================================== --- pypy/dist/pypy/jit/codegen/cli/operation.py (original) +++ pypy/dist/pypy/jit/codegen/cli/operation.py Tue Mar 18 13:53:27 2008 @@ -154,7 +154,14 @@ self.builder.il.EmitCall(OpCodes.Callvirt, meth_invoke, None) self.storeResult() - + +class GetField(Operation): + + def __init__(self, builder, gv_obj, fieldname): + self.builder = builder + self.gv_obj = gv_obj + self.fieldname = fieldname + def opcode2attrname(opcode): if opcode == 'ldc.r8 0': Modified: pypy/dist/pypy/jit/codegen/cli/rgenop.py ============================================================================== --- pypy/dist/pypy/jit/codegen/cli/rgenop.py (original) +++ pypy/dist/pypy/jit/codegen/cli/rgenop.py Tue Mar 18 13:53:27 2008 @@ -1,11 +1,13 @@ from pypy.tool.pairtype import extendabletype from pypy.rpython.ootypesystem import ootype +from pypy.rpython.lltypesystem import lltype, llmemory from pypy.rlib.objectmodel import specialize from pypy.jit.codegen.model import AbstractRGenOp, GenBuilder, GenLabel from pypy.jit.codegen.model import GenVarOrConst, GenVar, GenConst, CodeGenSwitch from pypy.jit.codegen.cli import operation as ops from pypy.jit.codegen.cli.dumpgenerator import DumpGenerator from pypy.translator.cli.dotnet import CLR, typeof, new_array, box, unbox, clidowncast, classof +from pypy.translator.cli.dotnet import cast_record_to_object, cast_object_to_record System = CLR.System Utils = CLR.pypy.runtime.Utils DelegateHolder = CLR.pypy.runtime.DelegateHolder @@ -133,15 +135,24 @@ def load(self, builder): index = self._get_index(builder) - t = self.obj.GetType() + if self.obj is None: + t = typeof(System.Object) + else: + t = self.obj.GetType() self._load_from_array(builder, index, t) @specialize.arg(1) def revealconst(self, T): - assert isinstance(T, ootype.OOType) - return unbox(self.obj, T) + if T is llmemory.Address: + return unbox(self.obj, ootype.ROOT) # XXX + elif isinstance(T, ootype.Record): + return cast_object_to_record(T, self.obj) + else: + assert isinstance(T, ootype.OOType) + return unbox(self.obj, T) +OBJECT = System.Object._INSTANCE class FunctionConst(BaseConst): def __init__(self, delegatetype): @@ -149,7 +160,8 @@ self.delegatetype = delegatetype def getobj(self): - return self.holder + # XXX: should the conversion be done automatically? + return ootype.ooupcast(OBJECT, self.holder) def load(self, builder): holdertype = box(self.holder).GetType() @@ -185,8 +197,15 @@ return IntConst(llvalue) elif T is ootype.Bool: return IntConst(int(llvalue)) + elif T is llmemory.Address: + assert llvalue is llmemory.NULL + return zero_const + elif isinstance(T, ootype.Record): + obj = cast_record_to_object(llvalue) + return ObjectConst(obj) elif isinstance(T, ootype.OOType): - return ObjectConst(box(llvalue)) + obj = box(llvalue) + return ObjectConst(obj) else: assert False, "XXX not implemented" @@ -220,6 +239,15 @@ else: assert False + @staticmethod + @specialize.memo() + def fieldToken(T, name): + _, FIELD = T._lookup_field(name) + return name #, RCliGenOp.kindToken(FIELD) + + def check_no_open_mc(self): + pass + def newgraph(self, sigtoken, name): argsclass = sigtoken.args args = new_array(System.Type, len(argsclass)+1) @@ -295,7 +323,13 @@ op = ops.SameAs(self, gv_x) self.emit(op) return op.gv_res() - + + def genop_getfield(self, fieldtoken, gv_ptr): + pass + + def genop_setfield(self, fieldtoken, gv_ptr, gv_value): + pass + def emit(self, op): op.emit() @@ -406,4 +440,5 @@ global_rgenop = RCliGenOp() RCliGenOp.constPrebuiltGlobal = global_rgenop.genconst -zero_const = ObjectConst(ootype.null(ootype.ROOT)) +NULL = ootype.null(System.Object._INSTANCE) +zero_const = ObjectConst(NULL) Added: pypy/dist/pypy/jit/codegen/cli/test/test_gencli_ts.py ============================================================================== --- (empty file) +++ pypy/dist/pypy/jit/codegen/cli/test/test_gencli_ts.py Tue Mar 18 13:53:27 2008 @@ -0,0 +1,52 @@ +import py +from pypy.tool.udir import udir +from pypy.translator.cli.entrypoint import StandaloneEntryPoint +from pypy.translator.cli.gencli import GenCli +from pypy.translator.cli.sdk import SDK +from pypy.jit.codegen.i386.test.test_genc_ts import I386TimeshiftingTestMixin +from pypy.jit.timeshifter.test import test_timeshift +from pypy.jit.codegen.cli.rgenop import RCliGenOp + +class CliTimeshiftingTestMixin(I386TimeshiftingTestMixin): + RGenOp = RCliGenOp + + def getgraph(self, fn): + bk = self.rtyper.annotator.bookkeeper + return bk.getdesc(fn).getuniquegraph() + + def compile(self, ll_main): + graph = self.getgraph(ll_main) + entrypoint = StandaloneEntryPoint(graph) + gen = GenCli(udir, self.rtyper.annotator.translator, entrypoint) + gen.generate_source() + self.executable_name = gen.build_exe() + + def cmdexec(self, args=''): + assert self.executable_name + mono = ''.join(SDK.runtime()) + return py.process.cmdexec('%s "%s" %s' % (mono, self.executable_name, args)) + + +class TestTimeshiftCli(CliTimeshiftingTestMixin, + test_timeshift.TestOOType): + + passing_ootype_tests = set([ + 'test_very_simple', + 'test_convert_const_to_redbox', + 'test_simple_opt_const_propagation1', + 'test_simple_opt_const_propagation2', + 'test_loop_folding', +# 'test_loop_merging', +# 'test_two_loops_merging', + 'test_convert_greenvar_to_redvar', +# 'test_green_across_split', +# 'test_merge_const_before_return', +# 'test_merge_3_redconsts_before_return', + 'test_merge_const_at_return', +# 'test_arith_plus_minus', + ]) + + # for the individual tests see + # ====> ../../../timeshifter/test/test_timeshift.py + + pass Modified: pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py ============================================================================== --- pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py (original) +++ pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py Tue Mar 18 13:53:27 2008 @@ -13,7 +13,7 @@ RGenOp = RI386GenOp SEPLINE = 'running residual graph...\n' - + def annotate_interface_functions(self): annhelper = self.hrtyper.annhelper RGenOp = self.RGenOp @@ -95,12 +95,18 @@ annhelper.getgraph(ll_main, [s_list_of_strings], annmodel.SomeInteger()) annhelper.finish() + self.compile(ll_main) + + def compile(self, ll_main): t = self.rtyper.annotator.translator t.config.translation.gc = 'boehm' cbuilder = CStandaloneBuilder(t, ll_main, config=t.config) cbuilder.generate_source() cbuilder.compile() self.main_cbuilder= cbuilder + + def cmdexec(self, args): + return self.main_cbuilder.cmdexec(args) def timeshift(self, ll_function, values, opt_consts=[], *args, **kwds): self.ll_function = ll_function @@ -119,7 +125,7 @@ mainargs = ' '.join([str(arg) for arg in mainargs]) - output = self.main_cbuilder.cmdexec(mainargs) + output = self.cmdexec(mainargs) lines = output.splitlines() assert lines[0] == self.SEPLINE[:-1] if (lines[1].startswith('{') and Modified: pypy/dist/pypy/jit/codegen/test/rgenop_tests.py ============================================================================== --- pypy/dist/pypy/jit/codegen/test/rgenop_tests.py (original) +++ pypy/dist/pypy/jit/codegen/test/rgenop_tests.py Tue Mar 18 13:53:27 2008 @@ -1979,9 +1979,12 @@ RGenOp = self.RGenOp gv = RGenOp.genzeroconst(RGenOp.kindToken(lltype.Signed)) assert gv.revealconst(lltype.Signed) == 0 - P = self.T.Ptr(lltype.Struct('S')) + P = self.T.Ptr(self.T.Struct('S')) gv = RGenOp.genzeroconst(RGenOp.kindToken(P)) - assert gv.revealconst(llmemory.Address) == llmemory.NULL + if self.T.__name__ == 'LLType': + assert gv.revealconst(llmemory.Address) == llmemory.NULL + else: + assert gv.revealconst(ootype.ROOT) == ootype.null(ootype.ROOT) def test_ovfcheck_adder_direct(self): rgenop = self.RGenOp() Modified: pypy/dist/pypy/jit/timeshifter/exception.py ============================================================================== --- pypy/dist/pypy/jit/timeshifter/exception.py (original) +++ pypy/dist/pypy/jit/timeshifter/exception.py Tue Mar 18 13:53:27 2008 @@ -33,7 +33,7 @@ # XXX: think more about exceptions self.null_exc_type_box = rvalue.PtrRedBox(self.exc_type_kind, RGenOp.constPrebuiltGlobal(llmemory.NULL)) - self.null_exc_value_box = rvalue.IntRedBox(self.exc_value_kind, + self.null_exc_value_box = rvalue.PtrRedBox(self.exc_value_kind, RGenOp.constPrebuiltGlobal(llmemory.NULL)) self.lazy_exception_path = lazy_exception_path @@ -70,6 +70,9 @@ builder = jitstate.curbuilder etypebox = jitstate.exc_type_box if etypebox.is_constant(): + # we should really use LL_EXC_TYPE instead of Address, but at the moment it crashes with ootype + #LL_EXC_TYPE = self.etrafo.lltype_of_exception_type + #ll_etype = rvalue.ll_getvalue(etypebox, LL_EXC_TYPE) ll_etype = rvalue.ll_getvalue(etypebox, llmemory.Address) if not ll_etype: return # we know there is no exception set Modified: pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py ============================================================================== --- pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py (original) +++ pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py Tue Mar 18 13:53:27 2008 @@ -1799,29 +1799,30 @@ class TestLLType(BaseTestTimeshift): type_system = 'lltype' -passing_ootype_tests = set([ - 'test_very_simple', - 'test_convert_const_to_redbox', - 'test_simple_opt_const_propagation1', - 'test_simple_opt_const_propagation2', - 'test_loop_folding', - 'test_loop_merging', - 'test_two_loops_merging', - 'test_convert_greenvar_to_redvar', - 'test_green_across_split', - 'test_merge_const_before_return', - 'test_merge_3_redconsts_before_return', - 'test_merge_const_at_return', - 'test_arith_plus_minus', - ]) class TestOOType(BaseTestTimeshift): type_system = 'ootype' + passing_ootype_tests = set([ + 'test_very_simple', + 'test_convert_const_to_redbox', + 'test_simple_opt_const_propagation1', + 'test_simple_opt_const_propagation2', + 'test_loop_folding', + 'test_loop_merging', + 'test_two_loops_merging', + 'test_convert_greenvar_to_redvar', + 'test_green_across_split', + 'test_merge_const_before_return', + 'test_merge_3_redconsts_before_return', + 'test_merge_const_at_return', + 'test_arith_plus_minus', + ]) + def Ptr(self, T): return T def __getattribute__(self, name): - if name.startswith('test_') and name not in passing_ootype_tests: + if name.startswith('test_') and name not in self.passing_ootype_tests: def fn(): py.test.skip("doesn't work yet") return fn Modified: pypy/dist/pypy/rpython/ootypesystem/rootype.py ============================================================================== --- pypy/dist/pypy/rpython/ootypesystem/rootype.py (original) +++ pypy/dist/pypy/rpython/ootypesystem/rootype.py Tue Mar 18 13:53:27 2008 @@ -109,6 +109,7 @@ vlist = hop.inputargs(*hop.args_r) cgraphs = hop.inputconst(ootype.Void, None) vlist.append(cgraphs) + hop.exception_is_here() return hop.genop("indirect_call", vlist, resulttype = hop.r_result.lowleveltype) def rtype_call_args(self, hop): Modified: pypy/dist/pypy/translator/cli/constant.py ============================================================================== --- pypy/dist/pypy/translator/cli/constant.py (original) +++ pypy/dist/pypy/translator/cli/constant.py Tue Mar 18 13:53:27 2008 @@ -96,6 +96,7 @@ uniq = self.db.unique() return CLIFieldInfoConst(self.db, value.llvalue, uniq) elif isinstance(value, ootype._view) and isinstance(value._inst, ootype._record): + self.db.cts.lltype_to_cts(value._inst._TYPE) # record the type of the record return self.record_const(value._inst) else: return BaseConstantGenerator._create_complex_const(self, value) From cfbolz at codespeak.net Tue Mar 18 13:55:20 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 18 Mar 2008 13:55:20 +0100 (CET) Subject: [pypy-svn] r52684 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080318125520.63F66169EC2@codespeak.net> Author: cfbolz Date: Tue Mar 18 13:55:18 2008 New Revision: 52684 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/portal.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: first virtualizable test is passing Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 18 13:55:18 2008 @@ -14,6 +14,7 @@ from pypy.jit.timeshifter.greenkey import GreenKey, newgreendict from pypy.jit.rainbow import rhotpath from pypy.jit.rainbow.fallback import FallbackInterpreter +from pypy.jit.rainbow.portal import getjitenterargdesc class HotRunnerDesc: @@ -59,10 +60,11 @@ self.green_args_spec.append(TYPE) assert len(self.red_args_spec) == 0, "bogus order of colors" else: - RESARGS.append(TYPE) - kind = self.RGenOp.kindToken(TYPE) - boxcls = rvalue.ll_redboxcls(TYPE) - self.red_args_spec.append((kind, boxcls)) + argdesc = getjitenterargdesc(TYPE, self.RGenOp) + arg_spec = (argdesc.residual_args_collector(), + argdesc.arg_redbox_maker(), TYPE) + self.red_args_spec.append(arg_spec) + RESARGS.extend(argdesc.residual_argtypes()) self.JIT_ENTER_FUNCTYPE = lltype.FuncType(ALLARGS, lltype.Void) self.RESIDUAL_FUNCTYPE = lltype.FuncType(RESARGS, lltype.Void) @@ -90,7 +92,8 @@ interpreter.debug_trace("run_machine_code", *args) mc = state.machine_codes[key] run = maybe_on_top_of_llinterp(exceptiondesc, mc) - run(*args[num_green_args:]) + residualargs = state.make_residualargs(*args[num_green_args:]) + run(*residualargs) HotEnterState.compile.im_func._dont_inline_ = True maybe_enter_jit._always_inline_ = True @@ -327,20 +330,20 @@ hotrunnerdesc.sigtoken, "residual") greenargs = list(greenkey.values) + + jitstate = interp.fresh_jitstate(builder) redargs = () red_i = 0 - for kind, boxcls in red_args_spec: + for _, make_arg_redbox, _ in red_args_spec: gv_arg = inputargs_gv[red_i] - red_i += 1 - box = boxcls(kind, gv_arg) + box = make_arg_redbox(jitstate, inputargs_gv, red_i) redargs += (box,) + red_i += 1 redargs = list(redargs) - jitstate = interp.fresh_jitstate(builder) rhotpath.setup_jitstate(interp, jitstate, greenargs, redargs, hotrunnerdesc.entryjitcode, hotrunnerdesc.sigtoken) - builder = jitstate.curbuilder builder.start_writing() rhotpath.compile(interp) builder.end() @@ -353,4 +356,12 @@ if not we_are_translated(): hotrunnerdesc.residual_graph = generated._obj.graph #for tests + def make_residualargs(self, *redargs): + residualargs = () + i = 0 + for collect_residual_args, _, _ in red_args_spec: + residualargs = residualargs + collect_residual_args(redargs[i]) + i += 1 + return residualargs + return HotEnterState Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/portal.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/portal.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/portal.py Tue Mar 18 13:55:18 2008 @@ -45,7 +45,7 @@ if binding.is_green(): arg_spec = "green", None, None, concretetype else: - argdesc = self.getportalargdesc(concretetype) + argdesc = getjitenterargdesc(concretetype, self.RGenOp) arg_spec = ("red", argdesc.residual_args_collector(), argdesc.arg_redbox_maker(), concretetype) ARGS.extend(argdesc.residual_argtypes()) @@ -110,16 +110,6 @@ block.recloseblock( flowmodel.Link([result], self.origportalgraph.returnblock)) - def getportalargdesc(self, lowleveltype): - assert not isinstance(lowleveltype, lltype.ContainerType) - redportargdesccls = RedPortalArgDesc - if isinstance(lowleveltype, lltype.Ptr): - if isinstance(lowleveltype.TO, lltype.Struct): - if lowleveltype.TO._hints.get('virtualizable', False): - redportargdesccls = RedVirtualizableStructPortalArgDesc - else: - redportargdesccls = RedPortalArgDesc - return redportargdesccls(lowleveltype, self.RGenOp) def get_residual_graph(self, llinterp): # debugging helper @@ -319,7 +309,16 @@ return PortalState -class RedPortalArgDesc: +def getjitenterargdesc(lowleveltype, RGenOp): + assert not isinstance(lowleveltype, lltype.ContainerType) + redportargdesccls = RedJitEnterArgDesc + if isinstance(lowleveltype, lltype.Ptr): + if isinstance(lowleveltype.TO, lltype.Struct): + if lowleveltype.TO._hints.get('virtualizable', False): + redportargdesccls = RedVirtualizableStructJitEnterArgDesc + return redportargdesccls(lowleveltype, RGenOp) + +class RedJitEnterArgDesc: __metaclass__ = cachedtype def __init__(self, original_concretetype, RGenOp): @@ -355,7 +354,7 @@ return self.make_arg_redbox -class RedVirtualizableStructPortalArgDesc(RedPortalArgDesc): +class RedVirtualizableStructJitEnterArgDesc(RedJitEnterArgDesc): typedesc = None _s_c_typedesc = None Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Tue Mar 18 13:55:18 2008 @@ -1,9 +1,12 @@ +import py from pypy.jit.rainbow.test.test_portal import PortalTest, P_OOPSPEC from pypy.jit.rainbow.test.test_interpreter import StopAtXPolicy from pypy.rpython.lltypesystem import lltype, llmemory from pypy.rpython.lltypesystem.rvirtualizable import VABLERTIPTR from pypy.rlib.jit import hint -import py +from pypy.rlib.jit import JitDriver, hint, JitHintError +from pypy.jit.rainbow.test import test_hotpath + S = lltype.GcStruct('s', ('a', lltype.Signed), ('b', lltype.Signed)) PS = lltype.Ptr(S) @@ -114,26 +117,38 @@ -class TestVirtualizableExplicit(PortalTest): +class TestVirtualizableExplicit(test_hotpath.HotPathTest): + def timeshift_from_portal(self, *args, **kwargs): + py.test.skip("port me") + type_system = "lltype" def test_simple(self): - - def f(xy): - x = xy_get_x(xy) - y = xy_get_y(xy) - return x+y + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'xy'] def main(x, y): xy = lltype.malloc(XY) xy.vable_access = lltype.nullptr(XY_ACCESS) xy.x = x xy.y = y - return f(xy) - - res = self.timeshift_from_portal(main, f, [20, 22], policy=P_OOPSPEC) - assert res == 42 - self.check_insns(getfield=0) + tot = 0 + i = 1024 + while i: + i >>= 1 + x = xy_get_x(xy) + y = xy_get_y(xy) + tot += x+y + MyJitDriver.jit_merge_point(tot=tot, i=i, xy=xy) + MyJitDriver.can_enter_jit(tot=tot, i=i, xy=xy) + return tot + + res = self.run(main, [20, 22], 2, policy=P_OOPSPEC) + assert res == 42 * 11 + self.check_insns_in_loops(getfield=0) + return + # XXX port the rest if self.on_llgraph: residual_graph = self.get_residual_graph() inputargs = residual_graph.startblock.inputargs @@ -738,9 +753,12 @@ assert res == 42 -class TestVirtualizableImplicit(PortalTest): +class TestVirtualizableImplicit(test_hotpath.HotPathTest): type_system = "lltype" + def timeshift_from_portal(self, *args, **kwargs): + py.test.skip("port me") + def test_simple(self): class XY(object): From arigo at codespeak.net Tue Mar 18 14:37:32 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 14:37:32 +0100 (CET) Subject: [pypy-svn] r52685 - in pypy/dist/pypy/doc: . jit Message-ID: <20080318133732.1F982169EB8@codespeak.net> Author: arigo Date: Tue Mar 18 14:37:31 2008 New Revision: 52685 Added: pypy/dist/pypy/doc/jit/confrest.py (contents, props changed) Modified: pypy/dist/pypy/doc/jit/ (props changed) pypy/dist/pypy/doc/jit/backend.txt pypy/dist/pypy/doc/jit/howto.txt pypy/dist/pypy/doc/jit/index.txt pypy/dist/pypy/doc/jit/overview.txt pypy/dist/pypy/doc/jit/rainbow.txt pypy/dist/pypy/doc/jit/status.txt pypy/dist/pypy/doc/jit/theory.txt pypy/dist/pypy/doc/style.css Log: Use a confrest to get the style right. Use a custom menu bar too. Modified: pypy/dist/pypy/doc/jit/backend.txt ============================================================================== --- pypy/dist/pypy/doc/jit/backend.txt (original) +++ pypy/dist/pypy/doc/jit/backend.txt Tue Mar 18 14:37:31 2008 @@ -1,6 +1,2 @@ in-progress ============================================================ - -.. raw:: html - -
JIT index
Added: pypy/dist/pypy/doc/jit/confrest.py ============================================================================== --- (empty file) +++ pypy/dist/pypy/doc/jit/confrest.py Tue Mar 18 14:37:31 2008 @@ -0,0 +1,17 @@ +from pypy.doc.confrest import * + +class PyPyPage(PyPyPage): + def fill(self): + super(PyPyPage, self).fill() + self.menubar[:] = html.div( + html.a("general documentation", href="../index.html", + class_="menu"), py.xml.raw(" " * 3), + html.a("JIT documentation", href="index.html", + class_="menu"), " ", + " ", id="menubar") + +class Project(Project): + stylesheet = "../style.css" + title = "PyPy JIT" + prefix_title = "PyPy JIT" + Page = PyPyPage Modified: pypy/dist/pypy/doc/jit/howto.txt ============================================================================== --- pypy/dist/pypy/doc/jit/howto.txt (original) +++ pypy/dist/pypy/doc/jit/howto.txt Tue Mar 18 14:37:31 2008 @@ -2,10 +2,6 @@ Make your own JIT compiler ------------------------------------------------------------------------ -.. raw:: html - -
JIT index
- .. contents:: .. sectnum:: Modified: pypy/dist/pypy/doc/jit/index.txt ============================================================================== --- pypy/dist/pypy/doc/jit/index.txt (original) +++ pypy/dist/pypy/doc/jit/index.txt Tue Mar 18 14:37:31 2008 @@ -17,7 +17,7 @@ Content ------------------------------------------------------------ -- Motivation_: introduction and rough overview +- Overview_: motivation, introduction and rough overview - Status_: using a pypy-c with a JIT @@ -33,7 +33,7 @@ ------------------------------------------------------------ -.. _Motivation: overview.html +.. _Overview: overview.html .. _Status: status.html .. _`How-to`: howto.html .. _Theory: theory.html Modified: pypy/dist/pypy/doc/jit/overview.txt ============================================================================== --- pypy/dist/pypy/doc/jit/overview.txt (original) +++ pypy/dist/pypy/doc/jit/overview.txt Tue Mar 18 14:37:31 2008 @@ -1,7 +1,3 @@ ------------------------------------------------------------------------ in-progress ------------------------------------------------------------------------ - -.. raw:: html - -
JIT index
Modified: pypy/dist/pypy/doc/jit/rainbow.txt ============================================================================== --- pypy/dist/pypy/doc/jit/rainbow.txt (original) +++ pypy/dist/pypy/doc/jit/rainbow.txt Tue Mar 18 14:37:31 2008 @@ -1,10 +1,6 @@ Rainbow Interpreter ============================================================ -.. raw:: html - -
JIT index
- in-progress ----------- Modified: pypy/dist/pypy/doc/jit/status.txt ============================================================================== --- pypy/dist/pypy/doc/jit/status.txt (original) +++ pypy/dist/pypy/doc/jit/status.txt Tue Mar 18 14:37:31 2008 @@ -2,10 +2,6 @@ Usage and Status ------------------------------------------------------------------------ -.. raw:: html - -
JIT index
- .. contents:: .. sectnum:: Modified: pypy/dist/pypy/doc/jit/theory.txt ============================================================================== --- pypy/dist/pypy/doc/jit/theory.txt (original) +++ pypy/dist/pypy/doc/jit/theory.txt Tue Mar 18 14:37:31 2008 @@ -2,10 +2,6 @@ JIT Generation in PyPy ======================================================================== -.. raw:: html - -
JIT index
- .. contents:: .. sectnum:: Modified: pypy/dist/pypy/doc/style.css ============================================================================== --- pypy/dist/pypy/doc/style.css (original) +++ pypy/dist/pypy/doc/style.css Tue Mar 18 14:37:31 2008 @@ -1089,7 +1089,3 @@ div.abstract p.topic-title { font-weight: bold ; text-align: center } - -div.innermenu { - font: 109% Verdana, Helvetica, Arial, sans-serif; - float: right } From antocuni at codespeak.net Tue Mar 18 16:01:30 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Tue, 18 Mar 2008 16:01:30 +0100 (CET) Subject: [pypy-svn] r52686 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080318150130.2F255169EB3@codespeak.net> Author: antocuni Date: Tue Mar 18 16:01:28 2008 New Revision: 52686 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Log: start porting tests to ootype. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Tue Mar 18 16:01:28 2008 @@ -16,6 +16,7 @@ from pypy.translator.backendopt.removenoops import remove_same_as from pypy.translator.backendopt.ssa import SSA_to_SSI from pypy.translator.unsimplify import varoftype +from pypy.translator.simplify import get_funcobj, get_functype from cStringIO import StringIO def residual_exception_nontranslated(jitstate, e, rtyper): @@ -39,19 +40,19 @@ def __init__(self, RGenOp, exceptiondesc, FUNCTYPE, colororder=None): self.exceptiondesc = exceptiondesc - self.sigtoken = RGenOp.sigToken(FUNCTYPE.TO) - self.result_kind = RGenOp.kindToken(FUNCTYPE.TO.RESULT) + self.sigtoken = RGenOp.sigToken(get_functype(FUNCTYPE)) + self.result_kind = RGenOp.kindToken(get_functype(FUNCTYPE).RESULT) self.colororder = colororder # xxx what if the result is virtualizable? - self.redboxbuilder = rvalue.ll_redboxbuilder(FUNCTYPE.TO.RESULT) - whatever_return_value = FUNCTYPE.TO.RESULT._defl() - numargs = len(FUNCTYPE.TO.ARGS) + self.redboxbuilder = rvalue.ll_redboxbuilder(get_functype(FUNCTYPE).RESULT) + whatever_return_value = get_functype(FUNCTYPE).RESULT._defl() + numargs = len(get_functype(FUNCTYPE).ARGS) voidargcount = 0 - for ARG in FUNCTYPE.TO.ARGS: + for ARG in get_functype(FUNCTYPE).ARGS: if ARG == lltype.Void: voidargcount += 1 - argiter = unrolling_iterable(FUNCTYPE.TO.ARGS) - RETURN = FUNCTYPE.TO.RESULT + argiter = unrolling_iterable(get_functype(FUNCTYPE).ARGS) + RETURN = get_functype(FUNCTYPE).RESULT if RETURN is lltype.Void: self.gv_whatever_return_value = None else: @@ -1025,7 +1026,7 @@ def handle_oopspec_call(self, op, withexc): from pypy.jit.timeshifter.oop import Index - fnobj = op.args[0].value._obj + fnobj = get_funcobj(op.args[0].value) oopspecdescindex = self.oopspecdesc_position(fnobj, withexc) oopspecdesc = self.oopspecdescs[oopspecdescindex] opargs = op.args[1:] @@ -1152,7 +1153,8 @@ def handle_vable_call(self, op, withexc): assert op.opname == 'direct_call' - oopspec = op.args[0].value._obj._callable.oopspec + fnobj = get_funcobj(op.args[0].value) + oopspec = fnobj._callable.oopspec name, _ = oopspec.split('(') kind, name = name.split('_', 1) @@ -1398,7 +1400,7 @@ def graphs_from(self, spaceop): if spaceop.opname == 'direct_call': c_func = spaceop.args[0] - fnobj = c_func.value._obj + fnobj = get_funcobj(c_func.value) graphs = [fnobj.graph] args_v = spaceop.args[1:] elif spaceop.opname == 'indirect_call': @@ -1446,7 +1448,7 @@ def guess_call_kind(self, spaceop): if spaceop.opname == 'direct_call': c_func = spaceop.args[0] - fnobj = c_func.value._obj + fnobj = get_funcobj(c_func.value) if hasattr(fnobj, 'jitcallkind'): return fnobj.jitcallkind, None if (hasattr(fnobj._callable, 'oopspec') and Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Tue Mar 18 16:01:28 2008 @@ -1908,3 +1908,55 @@ class TestLLType(SimpleTests): type_system = "lltype" + +class TestOOType(SimpleTests): + type_system = "ootype" + + def _skip(self): + py.test.skip('in progress') + + test_green_call = _skip + test_green_call_void_return = _skip + test_degenerated_before_return = _skip + test_degenerated_before_return_2 = _skip + test_degenerated_at_return = _skip + test_degenerated_via_substructure = _skip + test_degenerate_with_voids = _skip + test_plus_minus = _skip + test_red_virtual_container = _skip + test_red_array = _skip + test_red_struct_array = _skip + test_red_varsized_struct = _skip + test_array_of_voids = _skip + test_red_propagate = _skip + test_red_subcontainer = _skip + test_red_subcontainer_cast = _skip + test_merge_structures = _skip + test_deepfrozen_interior = _skip + test_compile_time_const_tuple = _skip + test_residual_red_call = _skip + test_residual_red_call_with_exc = _skip + test_simple_meth = _skip + test_simple_red_meth = _skip + test_simple_red_meth_vars_around = _skip + test_simple_indirect_call = _skip + test_normalize_indirect_call = _skip + test_normalize_indirect_call_more = _skip + test_green_char_at_merge = _skip + test_self_referential_structures = _skip + test_known_nonzero = _skip + test_debug_assert_ptr_nonzero = _skip + test_indirect_red_call = _skip + test_indirect_red_call_with_exc = _skip + test_indirect_gray_call = _skip + test_indirect_residual_red_call = _skip + test_constant_indirect_red_call = _skip + test_constant_indirect_red_call_no_result = _skip + test_indirect_sometimes_residual_pure_red_call = _skip + test_indirect_sometimes_residual_pure_but_fixed_red_call = _skip + test_manual_marking_of_pure_functions = _skip + test_red_int_add_ovf = _skip + test_nonzeroness_assert_while_compiling = _skip + test_segfault_while_compiling = _skip + test_substitute_graph_void = _skip + test_void_args = _skip From arigo at codespeak.net Tue Mar 18 16:34:34 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 16:34:34 +0100 (CET) Subject: [pypy-svn] r52687 - pypy/dist/pypy/doc/jit Message-ID: <20080318153434.96AA8169EA2@codespeak.net> Author: arigo Date: Tue Mar 18 16:34:33 2008 New Revision: 52687 Modified: pypy/dist/pypy/doc/jit/index.txt pypy/dist/pypy/doc/jit/overview.txt Log: Add some motivating text for the JIT. This was written by a group of people some time ago (slightly adapted). Modified: pypy/dist/pypy/doc/jit/index.txt ============================================================================== --- pypy/dist/pypy/doc/jit/index.txt (original) +++ pypy/dist/pypy/doc/jit/index.txt Tue Mar 18 16:34:33 2008 @@ -1,5 +1,5 @@ ======================================================================== - JIT Compiler Generation + JIT documentation ======================================================================== :abstract: @@ -17,7 +17,7 @@ Content ------------------------------------------------------------ -- Overview_: motivation, introduction and rough overview +- Overview_: motivating our approach - Status_: using a pypy-c with a JIT Modified: pypy/dist/pypy/doc/jit/overview.txt ============================================================================== --- pypy/dist/pypy/doc/jit/overview.txt (original) +++ pypy/dist/pypy/doc/jit/overview.txt Tue Mar 18 16:34:33 2008 @@ -1,3 +1,173 @@ ------------------------------------------------------------------------ -in-progress + Motivating JIT Compiler Generation ------------------------------------------------------------------------ + +.. contents:: +.. sectnum:: + +This is a non-technical introduction and motivation for PyPy's approach +to Just-In-Time compiler generation. + + +Motivation +======================================================================== + +Overview +-------- + +Writing an interpreter for a complex dynamic language like Python is not +a small task. So doing it a high-level language looks like a good idea, +because high-level languages have many advantages over low-level ones +(flexibility, ease of implementation, no low-level issues...). This is +the basic observation behind PyPy. + +But coding in a high-level language has other benefits beyond the +obvious ones. Perhaps most importantly, it allows the language +interpreter to be analyzed and turned into a compiler. This is +precisely what our JIT compiler generator does. Based on partial +evaluation techniques, **it can turn the interpreter of an arbitrary +dynamic language into a just-in-time compiler for the same language.** +It works mostly automatically and only needs guidance by the language +implementor in the form of a small number of hints in the source code of +the interpreter. The resulting JIT compiler has the same language +semantics as the original interpreter by construction. It generates +machine code for the user program while aggressively optimizing it, +leading to a big performance boost. + +Partial evaluation vs. manually-written JIT compilers +----------------------------------------------------- + +Partial evaluation is a well-known and much-researched topic, considered +to be very promising. There have been many attempts to use it to +automatically transform an interpreter into a compiler. However, none of +them have lead to substantial speedups for real-world languages. We +believe that the missing key insight is to use partial evaluation to +produce just-in-time compilers, rather than classical ahead-of-time +compilers. If this turns out to be correct, the practical speed of +dynamic languages could be vastly improved. + +By comparison, getting a JIT compiler today involves either manually +writing one, which is a huge amount of effort, or reusing an existing +well-tuned JIT (like that of the JVM). However, the latter is hard +because of concept mismatches between the implementor's language and the +host VM language: the former needs to be compiled to the target +environment in such a way that the JIT is able to speed it up +significantly - an approach which essentially has failed in Python so +far: even though CPython is a simple interpreter, its Java and .NET +re-implementations are not faster (and cannot run all existing Python +applications). + +Partical results +---------------- + +The JIT compilers that we generate use some techniques that are not in +widespread use so far, but they are not exactly new either. The point +we want to make here is not that we are pushing the theoretical limits +of how fast a given dynamic language can be run. Our point is: we are +making it **practical** to have reasonably good Just-In-Time compilers +for all dynamic languages, no matter how complicated or non-widespread +(e.g. Open Source dynamic languages without large industry or academic +support, or internal domain-specific languages). By practical we mean +that this should be: + +* Easy: requires little more efforts than writing the interpreter in the + first place. + +* Maintainable: our generated JIT compilers are not separate projects + (we do not generate separate source code, but only throw-away C code + that is compiled into the generated VM). In other words, the whole + JIT compiler is regenerated anew every time the high-level interpreter + is modified, so that they cannot get out of sync no matter how fast + the language evolves. + +* Fast enough: we think that we can get some rather good performance out + of the generated JIT compilers. That's the whole point, of course. + Previous experience shows that it should be possible (our generated + JIT compilers are similar to the hand-written Psyco). + + +Alternative approaches to improve speed +======================================================================== + ++----------------------------------------------------------------------+ +| :NOTE: | +| | +| Please take the following section as just a statement of opinion. | +| In order to be debated over, the summaries should first be | +| expanded into full arguments. We include them here as links; | +| we are aware of them, even if sometimes pessimistic about them | +| ``:-)`` | ++----------------------------------------------------------------------+ + +There are a large number of approaches to improving the execution speed of +dynamic programming languages, most of which only produce small improvements +and none offer the flexibility and customisability provided by our approach. +Over the last 6 years of tweaking, the speed of CPython has only improved by a +factor of 1.3 or 1.4 (depending on benchmarks). Many tweaks are applicable to +PyPy as well. Indeed, some of the CPython tweaks originated as tweaks for PyPy. + +IronPython initially achieved a speed of about 1.8 times that of CPython by +leaving out some details of the language and by leveraging the large investment +that Microsoft has put into making the .NET platform fast; the current, more +complete implementation has roughly the same speed as CPython. In general, the +existing approaches have reached the end of the road, speed-wise. Microsoft's +Dynamic Language Runtime (DLR), often cited in this context, is essentially +only an API to make the techniques pioneered in IronPython official. At best, +it will give another small improvement. + +Another technique regularly mentioned is adding types to the language in order +to speed it up: either explicit optional typing or soft typing (i.e., inferred +"likely" types). For Python, all projects in this area have started with a +simplified subset of the language; no project has scaled up to anything close +to the complete language. This would be a major effort and be platform- and +language-specific. Moreover maintenance would be a headache: we believe that +many changes that are trivial to implement in CPython, are likely to invalidate +previous carefully-tuned optimisations. + +For major improvements in speed, JIT techniques are necessary. For Python, +Psyco gives typical speedups of 2 to 4 times - up to 100 times in algorithmic +examples. It has come to a dead end because of the difficulty and huge costs +associated with developing and maintaining it. It has a relatively poor +encoding of language semantics - knowledge about Python behavior needs to be +encoded by hand and kept up-to-date. At least, Psyco works correctly even when +encountering one of the numerous Python constructs it does not support, by +falling back to CPython. The PyPy JIT can be seen as a metaprogrammatic, +non-language-specific equivalent of Psyco. + +A different kind of prior art are self-hosting JIT compilers such as Jikes. +Jikes is a JIT compiler for Java written in Java. It has a poor encoding of +language semantics; it would take an enormous amount of work to encode all the +details of a Python-like language directly into a JIT compiler. It also has +limited portability, which is an issue for Python; it is likely that large +parts of the JIT compiler would need retargetting in order to run in a +different environment than the intended low-level one. + +More recently, several larger projects have started in the JIT area. For +instance, Sun Microsystems is investing in JRuby, which aims to use the Java +Hotspot JIT to improve the performance of Ruby. However, this requires a lot of +hand crafting and will only provide speedups for one language on one platform. +Some issues are delicate, e.g., how to remove the overhead of constant boxing +and unboxing, typical in dynamic languages. An advantage compared to PyPy is +that there are some hand optimizations that can be performed, that do not fit +in the metaprogramming approach. But metaprogramming makes the PyPy JIT +reusable for many different languages on many different execution platforms. +It is also possible to combine the approaches - we can get substantial speedups +using our JIT and then feed the result to Java's Hotspot JIT for further +improvement. One of us is even a member of the `JSR 292`_ Expert Group +to define additions to the JVM to better support dynamic languages, and +is contributing insights from our JIT research, in ways that will also +benefit PyPy. + + +Further reading +======================================================================== + +The basic ideas have been shown to work in our prototype JIT-enabled +``pypy-c``, as described in Status_. Further technical documentation is +in progress; see the Index_ page. You can also read more about the +`Theory of partial evaluation`_. + +.. _Index: index.html +.. _Status: status.html +.. _`Theory of partial evaluation`: theory.html#terminology +.. _`JSR 292`: http://jcp.org/en/jsr/detail?id=292 From arigo at codespeak.net Tue Mar 18 16:48:34 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 16:48:34 +0100 (CET) Subject: [pypy-svn] r52688 - pypy/dist/pypy/doc/jit Message-ID: <20080318154834.94496169EC2@codespeak.net> Author: arigo Date: Tue Mar 18 16:48:33 2008 New Revision: 52688 Modified: pypy/dist/pypy/doc/jit/backend.txt pypy/dist/pypy/doc/jit/theory.txt Log: Move the bit about backends and update it. Modified: pypy/dist/pypy/doc/jit/backend.txt ============================================================================== --- pypy/dist/pypy/doc/jit/backend.txt (original) +++ pypy/dist/pypy/doc/jit/backend.txt Tue Mar 18 16:48:33 2008 @@ -1,2 +1,20 @@ -in-progress ============================================================ + JIT Backends +============================================================ + +The JIT compilers that we generate are linked with one of our backends, +which are written by hand in RPython. We currently have a backend for +producing IA32/i386 machine code in memory, PowerPC machine code in +memory, or (for testing) further low-level control flow graphs. There +were some experiments with a backend using the LLVM JIT. Current work +includes a backend that produces CLI bytecode. + +The Backend interface +----------------------- + +The interface (which is not yet completely stable) is documented in +`pypy/jit/codegen/model.py`_. + + + +.. include:: ../_ref.txt Modified: pypy/dist/pypy/doc/jit/theory.txt ============================================================================== --- pypy/dist/pypy/doc/jit/theory.txt (original) +++ pypy/dist/pypy/doc/jit/theory.txt Tue Mar 18 16:48:33 2008 @@ -909,16 +909,9 @@ Backends ==================== -The compilers produced by the timeshifter are linked with one of our -backends, which are written by hand in RPython. We currently have a -backend for producing IA32/i386 machine code in memory, PowerPC machine -code in memory, or (for testing) further low-level control flow graphs. +See Backends_. -The Backend interface ------------------------ - -The interface (which is not yet completely stable) is documented in -`pypy/jit/codegen/model.py`_. +.. _Backends: backend.html Results From cfbolz at codespeak.net Tue Mar 18 17:24:50 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 18 Mar 2008 17:24:50 +0100 (CET) Subject: [pypy-svn] r52689 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080318162450.48FB9169EB2@codespeak.net> Author: cfbolz Date: Tue Mar 18 17:24:48 2008 New Revision: 52689 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: two more virtualizable tests pass Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Tue Mar 18 17:24:48 2008 @@ -42,12 +42,15 @@ if gv is None: return self.build_gv_container(box) if not gv.is_const: - # fetch the value from the machine code stack - gv = self.rgenop.genconst_from_frame_var(box.kind, self.framebase, - self.frameinfo, - self.gv_to_index[gv]) + gv = self.fetch_from_frame(box, gv) return gv + def fetch_from_frame(self, box, gv): + # fetch the value from the machine code stack + return self.rgenop.genconst_from_frame_var(box.kind, self.framebase, + self.frameinfo, + self.gv_to_index[gv]) + def build_gv_container(self, box): # allocate a real structure on the heap mirroring the virtual # container of the box @@ -58,6 +61,9 @@ return self.containers_gv[content] except KeyError: gv_result = content.allocate_gv_container(self.rgenop) + if not gv_result.is_const: + gv_result = self.fetch_from_frame(box, gv_result) + self.containers_gv[content] = gv_result content.populate_gv_container(gv_result, self.getinitialboxgv) return gv_result Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 18 17:24:48 2008 @@ -338,7 +338,7 @@ gv_arg = inputargs_gv[red_i] box = make_arg_redbox(jitstate, inputargs_gv, red_i) redargs += (box,) - red_i += 1 + red_i += make_arg_redbox.consumes redargs = list(redargs) rhotpath.setup_jitstate(interp, jitstate, greenargs, redargs, Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Tue Mar 18 17:24:48 2008 @@ -157,31 +157,42 @@ [lltype.Ptr(XY), lltype.Signed, lltype.Signed]) def test_simple_set(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'xy'] - def f(xy): - x = xy_get_x(xy) - xy_set_y(xy, 1) - y = xy_get_y(xy) - return x+y def main(x, y): xy = lltype.malloc(XY) xy.vable_access = lltype.nullptr(XY_ACCESS) xy.x = x xy.y = y - return f(xy) - - res = self.timeshift_from_portal(main, f, [20, 22], policy=P_OOPSPEC) - assert res == 21 - self.check_insns(getfield=0) + tot = 0 + i = 1024 + while i: + i >>= 1 + x = xy_get_x(xy) + xy_set_y(xy, 1) + y = xy_get_y(xy) + tot += x+y + MyJitDriver.jit_merge_point(tot=tot, i=i, xy=xy) + MyJitDriver.can_enter_jit(tot=tot, i=i, xy=xy) + return tot + + res = self.run(main, [20, 22], 2, policy=P_OOPSPEC) + assert res == 21 * 11 + self.check_insns_in_loops(getfield=0) if self.on_llgraph: residual_graph = self.get_residual_graph() inputargs = residual_graph.startblock.inputargs - assert len(inputargs) == 3 - assert ([v.concretetype for v in inputargs] == + assert len(inputargs) == 5 + assert ([v.concretetype for v in inputargs[-3:]] == [lltype.Ptr(XY), lltype.Signed, lltype.Signed]) def test_set_effect(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'xy'] def f(xy): x = xy_get_x(xy) @@ -194,23 +205,33 @@ xy.vable_access = lltype.nullptr(XY_ACCESS) xy.x = x xy.y = y - v = f(xy) - return v + xy.y - - res = self.timeshift_from_portal(main, f, [20, 22], policy=P_OOPSPEC) - assert res == 26 - self.check_insns(getfield=0) + tot = 0 + i = 1024 + while i: + i >>= 1 + v = f(xy) + tot += v + xy.y + MyJitDriver.jit_merge_point(tot=tot, i=i, xy=xy) + MyJitDriver.can_enter_jit(tot=tot, i=i, xy=xy) + return tot + + res = self.run(main, [20, 22], 2) + assert res == 26 * 11 + self.check_insns_in_loops(getfield=0) if self.on_llgraph: residual_graph = self.get_residual_graph() inputargs = residual_graph.startblock.inputargs - assert len(inputargs) == 3 - assert ([v.concretetype for v in inputargs] == + assert len(inputargs) == 5 + assert ([v.concretetype for v in inputargs[-3:]] == [lltype.Ptr(XY), lltype.Signed, lltype.Signed]) def test_simple_escape(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'xy', 'e'] def f(e, xy): - xy_set_y(xy, 3) + xy_set_y(xy, xy_get_y(xy) + 3) e.xy = xy return 0 @@ -220,18 +241,23 @@ xy.x = x xy.y = y e = lltype.malloc(E) - f(e, xy) - return e.xy.x+e.xy.y - - res = self.timeshift_from_portal(main, f, [20, 22], policy=P_OOPSPEC) - assert res == 23 - self.check_insns(getfield=0) + i = 1024 + while i: + i >>= 1 + f(e, xy) + MyJitDriver.jit_merge_point(i=i, xy=xy, e=e) + MyJitDriver.can_enter_jit(i=i, xy=xy, e=e) + return e.xy.y + + res = self.run(main, [20, 22], 2) + assert res == main(20, 22) + self.check_insns_in_loops(getfield=0) if self.on_llgraph: residual_graph = self.get_residual_graph() inputargs = residual_graph.startblock.inputargs - assert len(inputargs) == 4 - assert ([v.concretetype for v in inputargs] == - [lltype.Ptr(E), lltype.Ptr(XY), lltype.Signed, lltype.Signed]) + assert len(inputargs) == 5 + assert ([v.concretetype for v in inputargs[-4:]] == + [lltype.Ptr(XY), lltype.Signed, lltype.Signed, lltype.Ptr(E)]) def test_simple_return_it(self): def f(which, xy1, xy2): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Tue Mar 18 17:24:48 2008 @@ -1119,6 +1119,14 @@ return None # fall-back return rvalue.ll_fromvalue(jitstate, answer ^ reverse) + def allocate_gv_container(self, rgenop): + typedesc = self.typedesc + gv_outside = self.content_boxes[-1].genvar + if gv_outside is typedesc.gv_null: + return typedesc.allocate(rgenop) + return gv_outside + + # patching VirtualStructCls StructTypeDesc.VirtualStructCls = VirtualStruct VirtualizableStructTypeDesc.VirtualStructCls = VirtualizableStruct From antocuni at codespeak.net Tue Mar 18 17:37:24 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Tue, 18 Mar 2008 17:37:24 +0100 (CET) Subject: [pypy-svn] r52690 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080318163724.CB5BF169EC0@codespeak.net> Author: antocuni Date: Tue Mar 18 17:37:24 2008 New Revision: 52690 Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py (contents, props changed) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: split BytecodeWriter and JitInterpreter into two lltype and ootype subclasses; add a ts void attribute to JITState containing helper functions that need to be specialized per-typesystem. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Tue Mar 18 17:37:24 2008 @@ -11,7 +11,7 @@ from pypy.jit.timeshifter import oop from pypy.jit.timeshifter.oop import maybe_on_top_of_llinterp from pypy.jit.timeshifter.greenkey import KeyDesc -from pypy.jit.rainbow.interpreter import JitCode, JitInterpreter +from pypy.jit.rainbow.interpreter import JitCode, LLTypeJitInterpreter, OOTypeJitInterpreter from pypy.jit.rainbow.interpreter import DEBUG_JITCODES from pypy.translator.backendopt.removenoops import remove_same_as from pypy.translator.backendopt.ssa import SSA_to_SSI @@ -154,7 +154,7 @@ type_system = self.rtyper.type_system.name self.exceptiondesc = exception.ExceptionDesc( RGenOp, etrafo, type_system, True, self.rtyper) - self.interpreter = JitInterpreter(self.exceptiondesc, RGenOp) + self.interpreter = self.create_interpreter(RGenOp) self.RGenOp = RGenOp self.current_block = None self.raise_analyzer = hannotator.exceptiontransformer.raise_analyzer @@ -165,6 +165,9 @@ self.transformer = GraphTransformer(hannotator) self._listcache = {} + def create_interpreter(self, RGenOp): + raise NotImplementedError + def sharelist(self, name): lst = getattr(self, name) # 'lst' is typically a list of descs or low-level pointers. @@ -1545,6 +1548,19 @@ self.emit('can_enter_jit') +class LLTypeBytecodeWriter(BytecodeWriter): + + def create_interpreter(self, RGenOp): + return LLTypeJitInterpreter(self.exceptiondesc, RGenOp) + + +class OOTypeBytecodeWriter(BytecodeWriter): + + def create_interpreter(self, RGenOp): + return OOTypeJitInterpreter(self.exceptiondesc, RGenOp) + + + class GraphTransformer(object): def __init__(self, hannotator): self.hannotator = hannotator Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Tue Mar 18 17:37:24 2008 @@ -6,6 +6,7 @@ from pypy.jit.timeshifter.greenkey import empty_key, GreenKey, newgreendict from pypy.jit.timeshifter.rcontainer import SegfaultException from pypy.jit.rainbow import rhotpath +from pypy.jit.rainbow import typesystem from pypy.rpython.lltypesystem import lltype, llmemory import py @@ -273,7 +274,8 @@ def fresh_jitstate(self, builder): return rtimeshift.JITState(builder, None, self.exceptiondesc.null_exc_type_box, - self.exceptiondesc.null_exc_value_box) + self.exceptiondesc.null_exc_value_box, + self.ts) def finish_jitstate(self, graphsigtoken): jitstate = self.jitstate @@ -1022,6 +1024,12 @@ self.opcode_descs.append(opdesc) return index +class LLTypeJitInterpreter(JitInterpreter): + ts = typesystem.llhelper + +class OOTypeJitInterpreter(JitInterpreter): + ts = typesystem.oohelper + class DebugTrace(object): def __init__(self, *args): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Tue Mar 18 17:37:24 2008 @@ -6,7 +6,7 @@ from pypy.jit.hintannotator.policy import StopAtXPolicy, HintAnnotatorPolicy from pypy.jit.hintannotator.model import SomeLLAbstractConstant, OriginFlags from pypy.jit.hintannotator.model import originalconcretetype -from pypy.jit.rainbow.codewriter import BytecodeWriter, label, tlabel, assemble +from pypy.jit.rainbow.codewriter import LLTypeBytecodeWriter, OOTypeBytecodeWriter, label, tlabel, assemble from pypy.jit.rainbow.portal import PortalRewriter from pypy.jit.rainbow.test.test_serializegraph import AbstractSerializationTest from pypy.jit.timeshifter import rtimeshift, rvalue @@ -98,6 +98,11 @@ del cls._cache del cls._cache_order + def create_writer(self, t, hannotator, RGenOp): + if self.type_system == 'lltype': + return LLTypeBytecodeWriter(t, hannotator, self.RGenOp) + else: + return OOTypeBytecodeWriter(t, hannotator, self.RGenOp) def _serialize(self, func, values, policy=None, inline=None, backendoptimize=False, @@ -121,7 +126,7 @@ graph2 = graphof(t, portal) self.graph = graph2 self.maingraph = graphof(rtyper.annotator.translator, func) - writer = BytecodeWriter(t, hannotator, self.RGenOp) + writer = self.create_writer(t, hannotator, self.RGenOp) jitcode = writer.make_bytecode(graph2) # the bytecode writer can ask for llhelpers about lists and dicts rtyper.specialize_more_blocks() Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py Tue Mar 18 17:37:24 2008 @@ -4,7 +4,7 @@ from pypy.jit.hintannotator.policy import StopAtXPolicy, HintAnnotatorPolicy from pypy.jit.hintannotator.model import SomeLLAbstractConstant, OriginFlags from pypy.jit.codegen.llgraph.rgenop import RGenOp -from pypy.jit.rainbow.codewriter import BytecodeWriter, label, tlabel, assemble +from pypy.jit.rainbow.codewriter import LLTypeBytecodeWriter, label, tlabel, assemble from pypy.rlib.jit import hint from pypy import conftest @@ -47,7 +47,7 @@ if conftest.option.view: t.view() graph2 = graphof(t, func) - writer = BytecodeWriter(t, hannotator, RGenOp) + writer = LLTypeBytecodeWriter(t, hannotator, RGenOp) jitcode = writer.make_bytecode(graph2) return writer, jitcode Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py Tue Mar 18 17:37:24 2008 @@ -0,0 +1,24 @@ +class TypeSystemHelper(object): + + def _freeze_(self): + return True + + +class LLTypeHelper(TypeSystemHelper): + + name = 'lltype' + + def get_typeptr(self, obj): + return obj.typeptr + + +class OOTypeHelper(TypeSystemHelper): + + name = 'ootype' + + def get_typeptr(self, obj): + return obj.meta + + +llhelper = LLTypeHelper() +oohelper = OOTypeHelper() Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Tue Mar 18 17:37:24 2008 @@ -21,6 +21,7 @@ debug_print = lloperation.llop.debug_print debug_pdb = lloperation.llop.debug_pdb + # ____________________________________________________________ # emit ops @@ -986,7 +987,7 @@ memo) assert isinstance(virtualizable_box, rvalue.PtrRedBox) virtualizables.append(virtualizable_box) - return JITState(None, frame, exc_type_box, exc_value_box, + return JITState(None, frame, exc_type_box, exc_value_box, self.ts, virtualizables=virtualizables) @@ -1053,12 +1054,13 @@ promotion_path = None generated_oop_residual_can_raise = False - def __init__(self, builder, frame, exc_type_box, exc_value_box, + def __init__(self, builder, frame, exc_type_box, exc_value_box, ts, resumepoint=-1, newgreens=[], virtualizables=None): self.curbuilder = builder self.frame = frame self.exc_type_box = exc_type_box self.exc_value_box = exc_value_box + self.ts = ts self.resumepoint = resumepoint self.greens = newgreens @@ -1083,6 +1085,7 @@ self.frame.copy(memo), self.exc_type_box .copy(memo), self.exc_value_box.copy(memo), + self.ts, self.resumepoint, self.greens[:], virtualizables) @@ -1097,6 +1100,7 @@ self.frame.copy(memo), self.exc_type_box .copy(memo), self.exc_value_box.copy(memo), + self.ts, newresumepoint, newgreens, virtualizables) @@ -1209,6 +1213,7 @@ result.fz_frame = self.frame.freeze(memo) result.fz_exc_type_box = self.exc_type_box .freeze(memo) result.fz_exc_value_box = self.exc_value_box.freeze(memo) + result.ts = self.ts fz_virtualizables = result.fz_virtualizables = [] for virtualizable_box in self.virtualizables: assert virtualizable_box in memo.boxes @@ -1243,7 +1248,7 @@ def residual_ll_exception(self, ll_evalue): - ll_etype = ll_evalue.typeptr + ll_etype = self.ts.get_typeptr(ll_evalue) etypebox = rvalue.ll_fromvalue(self, ll_etype) evaluebox = rvalue.ll_fromvalue(self, ll_evalue) setexctypebox (self, etypebox ) From cfbolz at codespeak.net Tue Mar 18 17:54:35 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 18 Mar 2008 17:54:35 +0100 (CET) Subject: [pypy-svn] r52691 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080318165435.61FA0169ED0@codespeak.net> Author: cfbolz Date: Tue Mar 18 17:54:33 2008 New Revision: 52691 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: next (failing) virtualizable test Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Tue Mar 18 17:54:33 2008 @@ -260,9 +260,13 @@ [lltype.Ptr(XY), lltype.Signed, lltype.Signed, lltype.Ptr(E)]) def test_simple_return_it(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'xy1', 'xy2', 'xy', 'which'] + def f(which, xy1, xy2): - xy_set_y(xy1, 3) - xy_set_y(xy2, 7) + xy_set_y(xy1, xy_get_y(xy1) + 3) + xy_set_y(xy2, xy_get_y(xy2) + 3) if which == 1: return xy1 else: @@ -277,14 +281,21 @@ xy1.y = y xy2.x = y xy2.y = x - xy = f(which, xy1, xy2) + i = 1024 + while i: + i >>= 1 + xy = f(which, xy1, xy2) + MyJitDriver.jit_merge_point(i=i, xy1=xy1, xy2=xy2, xy=xy, which=which) + MyJitDriver.can_enter_jit(i=i, xy1=xy1, xy2=xy2, xy=xy, which=which) assert xy is xy1 or xy is xy2 return xy.x+xy.y - res = self.timeshift_from_portal(main, f, [1, 20, 22], - policy=P_OOPSPEC) - assert res == 23 - self.check_insns(getfield=0) + res = self.run(main, [1, 20, 22], 2) + assert res == main(1, 20, 22) + self.check_insns_in_loops(getfield=0) + res = self.run(main, [0, 20, 22], 2) + assert res == main(0, 20, 22) + self.check_insns_in_loops(getfield=0) def test_simple_construct_no_escape(self): From arigo at codespeak.net Tue Mar 18 18:14:52 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 18:14:52 +0100 (CET) Subject: [pypy-svn] r52692 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080318171452.37BE1169ED6@codespeak.net> Author: arigo Date: Tue Mar 18 18:14:49 2008 New Revision: 52692 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: Modify the test to avoid for now issues with aliasing between the arguments of the portal. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Tue Mar 18 18:14:49 2008 @@ -262,7 +262,7 @@ def test_simple_return_it(self): class MyJitDriver(JitDriver): greens = [] - reds = ['i', 'xy1', 'xy2', 'xy', 'which'] + reds = ['i', 'xy1', 'xy2', 'res', 'which'] def f(which, xy1, xy2): xy_set_y(xy1, xy_get_y(xy1) + 3) @@ -285,10 +285,11 @@ while i: i >>= 1 xy = f(which, xy1, xy2) - MyJitDriver.jit_merge_point(i=i, xy1=xy1, xy2=xy2, xy=xy, which=which) - MyJitDriver.can_enter_jit(i=i, xy1=xy1, xy2=xy2, xy=xy, which=which) - assert xy is xy1 or xy is xy2 - return xy.x+xy.y + assert xy is xy1 or xy is xy2 + res = xy.x+xy.y + MyJitDriver.jit_merge_point(i=i, xy1=xy1, xy2=xy2, res=res, which=which) + MyJitDriver.can_enter_jit(i=i, xy1=xy1, xy2=xy2, res=res, which=which) + return res res = self.run(main, [1, 20, 22], 2) assert res == main(1, 20, 22) From fijal at codespeak.net Tue Mar 18 18:19:26 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 18 Mar 2008 18:19:26 +0100 (CET) Subject: [pypy-svn] r52693 - in pypy/build/buildbot: . test Message-ID: <20080318171926.B3A86169EC7@codespeak.net> Author: fijal Date: Tue Mar 18 18:19:25 2008 New Revision: 52693 Added: pypy/build/buildbot/netstring_conftest.py (contents, props changed) - copied, changed from r52666, pypy/build/buildbot/netstring-conftest.py pypy/build/buildbot/test/ (props changed) pypy/build/buildbot/test/test_mysession.py (contents, props changed) Modified: pypy/build/buildbot/ (props changed) pypy/build/buildbot/master.cfg pypy/build/buildbot/netstring.py (props changed) pypy/build/buildbot/pypy_status.py (props changed) pypy/build/buildbot/pypybuilders.py (props changed) pypy/build/buildbot/slaveinfo.py (props changed) pypy/build/buildbot/text-conftest.py (props changed) Log: (exarkun, fijal) Write first test for buildbot stuff Modified: pypy/build/buildbot/master.cfg ============================================================================== --- pypy/build/buildbot/master.cfg (original) +++ pypy/build/buildbot/master.cfg Tue Mar 18 18:19:25 2008 @@ -26,46 +26,47 @@ 'change_source': [], 'schedulers': [Nightly("nightly", [ - "pypy-c-allworkingmodules-32", - "pypy-c-allworkingmodules-faassen-32", - "pypy-c-allworkingmodules-faassen-64", - "pypy-c-allworkingmodules-faassen-winxp32"], - hour=19)], +# "pypy-c-allworkingmodules-32", +# "pypy-c-allworkingmodules-faassen-32", +# "pypy-c-allworkingmodules-faassen-64", +# "pypy-c-allworkingmodules-faassen-winxp32"], + ], hour=19)], 'status': [status], 'slaves': [BuildSlave(name, password) for (name, password) in passwords.iteritems()], - 'builders': [{"name": "pypy-c-allworkingmodules-32", - "slavenames": ["charm"], - "builddir": "pypy-c-allworkingmodules-32", - "factory": PyPyBuildFactory(["--boxed"], - [], - ["--allworkingmodules"])}, - - {"name": "pypy-c-allworkingmodules-faassen-32", - "slavenames": ["charm"], - "builddir": "pypy-c-allworkingmodules-faassen-32", - "factory": PyPyBuildFactory(None, - ["--gc=semispace"], - ["--allworkingmodules", - "--faassen"])}, + 'builders': [ +# "name": "pypy-c-allworkingmodules-32", +# "slavenames": ["charm"], +# "builddir": "pypy-c-allworkingmodules-32", +# "factory": PyPyBuildFactory(["--boxed"], +# [], +# ["--allworkingmodules"])}, + +# {"name": "pypy-c-allworkingmodules-faassen-32", +# "slavenames": ["charm"], +# "builddir": "pypy-c-allworkingmodules-faassen-32", +# "factory": PyPyBuildFactory(None, +# ["--gc=semispace"], +# ["--allworkingmodules", +# "--faassen"])}, {"name": "pypy-c-allworkingmodules-faassen-64", - "slavenames": ["linux-dvs0"], + "slavenames": [], "builddir": "pypy-c-allworkingmodules-faassen-64", "factory": PyPyBuildFactory(["--boxed"], [], ["--allworkingmodules", "--faassen"])}, - {"name": "pypy-c-allworkingmodules-faassen-winxp32", - "slavenames": ["winxp32-py2.5"], - "builddir": "pypy-c-allworkingmodules-faassen-winxp32", - "factory": PyPyBuildFactory(None, - [], - ["--allworkingmodules"])}, +# {"name": "pypy-c-allworkingmodules-faassen-winxp32", +# "slavenames": ["winxp32-py2.5"], +# "builddir": "pypy-c-allworkingmodules-faassen-winxp32", +# "factory": PyPyBuildFactory(None, +# [], +# ["--allworkingmodules"])}, ], 'buildbotURL': 'http://office.divmod.com:%d/' % (httpPortNumber,), Added: pypy/build/buildbot/test/test_mysession.py ============================================================================== --- (empty file) +++ pypy/build/buildbot/test/test_mysession.py Tue Mar 18 18:19:25 2008 @@ -0,0 +1,42 @@ + +import py +from netstring_conftest import MyReporter +from StringIO import StringIO +from twisted.spread.banana import decode +from twisted.spread.jelly import unjelly +import netstring + +testfile = py.code.Source(""" +def test_one(): + pass + +def test_two(): + 1/0 +""") + +class XTestReporter(MyReporter): + def __init__(self, *args, **kwds): + out = kwds.pop('stringio') + super(XTestReporter, self).__init__(*args, **kwds) + self.out = out + out.write("\n") + +def test_mysession(): + tmpdir = py.test.ensuretemp('mysession') + fobj = tmpdir.ensure('test_xxx.py') + fobj.write(testfile) + config = py.test.config._reparse([fobj]) + session = config.initsession() + stringio = StringIO() + session.main(XTestReporter(config, [], stringio=stringio)) + stuff = list(netstring.netstringparser(stringio.getvalue())) + events = [(name, unjelly(decode(item))) for name, item in + zip(*[iter(stuff)]*2)] + assert events[0][0] == 'TestStarted' + assert events[-1][0] == 'TestFinished' + assert events[1][0] == 'ItemStart' + assert events[1][1] == ('Module', ['mysession', 'test_xxx.py']) + outcomes = [event for event in events if event[0] == 'ReceivedItemOutcome'] + assert len(outcomes) == 2 + assert outcomes[0][1].passed + assert outcomes[1][1].excinfo.typename == 'ZeroDivisionError' From arigo at codespeak.net Tue Mar 18 18:24:29 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 18:24:29 +0100 (CET) Subject: [pypy-svn] r52694 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080318172429.48678169EC7@codespeak.net> Author: arigo Date: Tue Mar 18 18:24:28 2008 New Revision: 52694 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: Another test. Fails at the moment. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Tue Mar 18 18:24:28 2008 @@ -260,6 +260,39 @@ [lltype.Ptr(XY), lltype.Signed, lltype.Signed, lltype.Ptr(E)]) def test_simple_return_it(self): + py.test.skip("in-progress") + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'xy'] + + def ll_function(xy): + i = 1024 + while i: + i >>= 1 + xy_set_x(xy, xy_get_x(xy) + 3) + xy_set_y(xy, xy_get_y(xy) + 30) + MyJitDriver.jit_merge_point(i=i, xy=xy) + MyJitDriver.can_enter_jit(i=i, xy=xy) + return xy + + def main(x, y): + xy = lltype.malloc(XY) + xy.vable_access = lltype.nullptr(XY_ACCESS) + xy.x = x + xy.y = y + xy2 = ll_function(xy) + assert xy2 is xy + return xy.x * xy.y + + res = self.run(main, [20, 22], 2) + assert res == main(20, 22) + self.check_insns_in_loops(getfield=0, setfield=0) + + res = self.run(main, [20, 22], threshold=1) + assert res == main(20, 22) + self.check_insns_in_loops(getfield=0, setfield=0) + + def test_simple_aliasing(self): class MyJitDriver(JitDriver): greens = [] reds = ['i', 'xy1', 'xy2', 'res', 'which'] From cfbolz at codespeak.net Tue Mar 18 18:31:08 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 18 Mar 2008 18:31:08 +0100 (CET) Subject: [pypy-svn] r52695 - in pypy/branch/jit-hotpath/pypy/jit: rainbow timeshifter Message-ID: <20080318173108.C3A68169E7D@codespeak.net> Author: cfbolz Date: Tue Mar 18 18:31:08 2008 New Revision: 52695 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: remove a now unnecessary indirection Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Tue Mar 18 18:31:08 2008 @@ -773,8 +773,7 @@ @arguments("structtypedesc", returns="red") def opimpl_red_malloc(self, structtypedesc): - redbox = rcontainer.create(self.jitstate, structtypedesc) - return redbox + return structtypedesc.factory(self.jitstate) @arguments("structtypedesc", "red", returns="red") def opimpl_red_malloc_varsize_struct(self, structtypedesc, sizebox): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Tue Mar 18 18:31:08 2008 @@ -222,9 +222,6 @@ return box -def create(jitstate, typedesc): - return typedesc.factory() - def create_varsize(jitstate, contdesc, sizebox): gv_size = sizebox.getgenvar(jitstate) alloctoken = contdesc.varsizealloctoken From arigo at codespeak.net Tue Mar 18 18:35:14 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 18:35:14 +0100 (CET) Subject: [pypy-svn] r52696 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080318173514.6F317169ED0@codespeak.net> Author: arigo Date: Tue Mar 18 18:35:13 2008 New Revision: 52696 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: Fix the store_back() of virtualizables in the code generated for portal exits. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Tue Mar 18 18:35:13 2008 @@ -23,15 +23,10 @@ interp.frame.local_green = greenargs interp.graphsigtoken = graphsigtoken -def leave_graph(interp, store_back_exception=True): +def leave_graph(interp): jitstate = interp.jitstate exceptiondesc = interp.exceptiondesc builder = jitstate.curbuilder - #for virtualizable_box in jitstate.virtualizables: - # assert isinstance(virtualizable_box, rvalue.PtrRedBox) - # content = virtualizable_box.content - # assert isinstance(content, rcontainer.VirtualizableStruct) - # content.store_back(jitstate) exceptiondesc.store_global_excdata(jitstate) jitstate.curbuilder.finish_and_return(interp.graphsigtoken, None) jitstate.curbuilder = None @@ -66,6 +61,7 @@ def hp_return(interp, gv_result): interp.debug_trace("done at hp_return") + interp.jitstate.store_back_virtualizables_at_return() # XXX slowish desc = interp.hotrunnerdesc exitfnptr = llhelper(desc.RAISE_DONE_FUNCPTR, desc.raise_done) @@ -349,6 +345,9 @@ jitstate.curbuilder = excpath_builder excpath_builder.start_writing() + # virtualizables: when we reach this point, the fallback interpreter + # should already have done the right thing, i.e. stored the values + # back into the structure (reading them out of framebase+frameinfo) leave_graph(fbp.hotrunnerdesc.interpreter) # for testing purposes Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Tue Mar 18 18:35:13 2008 @@ -260,7 +260,6 @@ [lltype.Ptr(XY), lltype.Signed, lltype.Signed, lltype.Ptr(E)]) def test_simple_return_it(self): - py.test.skip("in-progress") class MyJitDriver(JitDriver): greens = [] reds = ['i', 'xy'] @@ -288,6 +287,8 @@ assert res == main(20, 22) self.check_insns_in_loops(getfield=0, setfield=0) + # also run the test with a threshold of 1 to check if the return + # path (taken only once) is compiled correctly res = self.run(main, [20, 22], threshold=1) assert res == main(20, 22) self.check_insns_in_loops(getfield=0, setfield=0) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Tue Mar 18 18:35:13 2008 @@ -1131,6 +1131,13 @@ content.store_back(self) return incoming + def store_back_virtualizables_at_return(self): + for virtualizable_box in self.virtualizables: + assert isinstance(virtualizable_box, rvalue.PtrRedBox) + content = virtualizable_box.content + assert isinstance(content, rcontainer.VirtualizableStruct) + content.store_back(self) + def prepare_for_residual_call(self): virtualizables = self.virtualizables if virtualizables: From cfbolz at codespeak.net Tue Mar 18 18:38:43 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 18 Mar 2008 18:38:43 +0100 (CET) Subject: [pypy-svn] r52697 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080318173843.20F53169EC7@codespeak.net> Author: cfbolz Date: Tue Mar 18 18:38:42 2008 New Revision: 52697 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Log: nonsense Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Tue Mar 18 18:38:42 2008 @@ -773,7 +773,7 @@ @arguments("structtypedesc", returns="red") def opimpl_red_malloc(self, structtypedesc): - return structtypedesc.factory(self.jitstate) + return structtypedesc.factory() @arguments("structtypedesc", "red", returns="red") def opimpl_red_malloc_varsize_struct(self, structtypedesc, sizebox): From arigo at codespeak.net Tue Mar 18 18:46:00 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 18:46:00 +0100 (CET) Subject: [pypy-svn] r52698 - pypy/dist/pypy/doc/discussion Message-ID: <20080318174600.A6AC5169EE4@codespeak.net> Author: arigo Date: Tue Mar 18 18:46:00 2008 New Revision: 52698 Removed: pypy/dist/pypy/doc/discussion/jit-spring06-thinking.txt Log: This one is quite outdated. From arigo at codespeak.net Tue Mar 18 18:59:54 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 18 Mar 2008 18:59:54 +0100 (CET) Subject: [pypy-svn] r52699 - in pypy/dist/pypy/doc: . jit tool Message-ID: <20080318175954.A8CC8169EE5@codespeak.net> Author: arigo Date: Tue Mar 18 18:59:52 2008 New Revision: 52699 Added: pypy/dist/pypy/doc/jit/_ref.txt (contents, props changed) Modified: pypy/dist/pypy/doc/_ref.txt pypy/dist/pypy/doc/jit/backend.txt pypy/dist/pypy/doc/jit/howto.txt pypy/dist/pypy/doc/jit/status.txt pypy/dist/pypy/doc/jit/theory.txt pypy/dist/pypy/doc/tool/makeref.py Log: Cannot include ../_ref.txt because all relative paths are bogus. Fix this by generating a new _ref.txt in each directory that needs it (currently only doc/ and doc/jit/). Modified: pypy/dist/pypy/doc/_ref.txt ============================================================================== --- pypy/dist/pypy/doc/_ref.txt (original) +++ pypy/dist/pypy/doc/_ref.txt Tue Mar 18 18:59:52 2008 @@ -1,6 +1,4 @@ .. _`demo/`: ../../demo -.. _`demo/jit/`: ../../demo/jit -.. _`demo/jit/f1.py`: ../../demo/jit/f1.py .. _`demo/pickle_coroutine.py`: ../../demo/pickle_coroutine.py .. _`lib-python/`: ../../lib-python .. _`lib-python/2.4.1/dis.py`: ../../lib-python/2.4.1/dis.py @@ -34,14 +32,9 @@ .. _`pypy/interpreter/typedef.py`: ../../pypy/interpreter/typedef.py .. _`jit/`: ../../pypy/jit .. _`jit/codegen/`: ../../pypy/jit/codegen -.. _`pypy/jit/codegen/model.py`: ../../pypy/jit/codegen/model.py .. _`jit/hintannotator/`: ../../pypy/jit/hintannotator .. _`jit/timeshifter/`: ../../pypy/jit/timeshifter -.. _`pypy/jit/timeshifter/rvalue.py`: ../../pypy/jit/timeshifter/rvalue.py .. _`jit/tl/`: ../../pypy/jit/tl -.. _`pypy/jit/tl/targettiny1.py`: ../../pypy/jit/tl/targettiny1.py -.. _`pypy/jit/tl/tiny1.py`: ../../pypy/jit/tl/tiny1.py -.. _`pypy/jit/tl/tiny2.py`: ../../pypy/jit/tl/tiny2.py .. _`lang/`: ../../pypy/lang .. _`lang/js/`: ../../pypy/lang/js .. _`lang/prolog/`: ../../pypy/lang/prolog Added: pypy/dist/pypy/doc/jit/_ref.txt ============================================================================== --- (empty file) +++ pypy/dist/pypy/doc/jit/_ref.txt Tue Mar 18 18:59:52 2008 @@ -0,0 +1,8 @@ +.. _`demo/jit/`: ../../../demo/jit +.. _`demo/jit/f1.py`: ../../../demo/jit/f1.py +.. _`pypy/jit/codegen/model.py`: ../../../pypy/jit/codegen/model.py +.. _`pypy/jit/timeshifter/rvalue.py`: ../../../pypy/jit/timeshifter/rvalue.py +.. _`pypy/jit/tl/targettiny1.py`: ../../../pypy/jit/tl/targettiny1.py +.. _`pypy/jit/tl/tiny1.py`: ../../../pypy/jit/tl/tiny1.py +.. _`pypy/jit/tl/tiny2.py`: ../../../pypy/jit/tl/tiny2.py +.. _`rpython/rlist.py`: ../../../pypy/rpython/rlist.py \ No newline at end of file Modified: pypy/dist/pypy/doc/jit/backend.txt ============================================================================== --- pypy/dist/pypy/doc/jit/backend.txt (original) +++ pypy/dist/pypy/doc/jit/backend.txt Tue Mar 18 18:59:52 2008 @@ -17,4 +17,4 @@ -.. include:: ../_ref.txt +.. include:: _ref.txt Modified: pypy/dist/pypy/doc/jit/howto.txt ============================================================================== --- pypy/dist/pypy/doc/jit/howto.txt (original) +++ pypy/dist/pypy/doc/jit/howto.txt Tue Mar 18 18:59:52 2008 @@ -275,4 +275,4 @@ Verona, Italy. http://psyco.sourceforge.net/psyco-pepm-a.ps.gz -.. include:: ../_ref.txt +.. include:: _ref.txt Modified: pypy/dist/pypy/doc/jit/status.txt ============================================================================== --- pypy/dist/pypy/doc/jit/status.txt (original) +++ pypy/dist/pypy/doc/jit/status.txt Tue Mar 18 18:59:52 2008 @@ -140,4 +140,4 @@ .. _Psyco: http://psyco.sourceforge.net -.. include:: ../_ref.txt +.. include:: _ref.txt Modified: pypy/dist/pypy/doc/jit/theory.txt ============================================================================== --- pypy/dist/pypy/doc/jit/theory.txt (original) +++ pypy/dist/pypy/doc/jit/theory.txt Tue Mar 18 18:59:52 2008 @@ -937,4 +937,4 @@ .. _`PyPy Standard Interpreter`: ../architecture.html#standard-interpreter .. _`exception transformer`: ../translation.html#making-exception-handling-explicit -.. include:: ../_ref.txt +.. include:: _ref.txt Modified: pypy/dist/pypy/doc/tool/makeref.py ============================================================================== --- pypy/dist/pypy/doc/tool/makeref.py (original) +++ pypy/dist/pypy/doc/tool/makeref.py Tue Mar 18 18:59:52 2008 @@ -7,47 +7,59 @@ dist_url = 'http://codespeak.net/svn/pypy/dist/' issue_url = 'http://codespeak.net/issue/pypy-dev/' -docdir = pypydir.join('doc') -reffile = pypydir.join('doc', '_ref.txt') +def makeref(docdir): + reffile = docdir.join('_ref.txt') -linkrex = py.std.re.compile('`(\S+)`_') + linkrex = py.std.re.compile('`(\S+)`_') -name2target = {} -def addlink(linkname, linktarget): - assert linkname and linkname != '/' - if linktarget in name2target: - if linkname in name2target[linktarget]: - return - name2target.setdefault(linktarget, []).append(linkname) - -for textfile in docdir.visit(lambda x: x.ext == '.txt', - lambda x: x.check(dotfile=0)): - for linkname in linkrex.findall(textfile.read()): - if '/' in linkname: - for startloc in ('', 'pypy'): - cand = distdir.join(startloc, linkname) - if cand.check(): - rel = cand.relto(distdir) - # we are in pypy/doc/x.txt - target = '../../' + cand.relto(distdir) - addlink(linkname, target) - break - else: - print "WARNING %s: link %r may be bogus" %(textfile, linkname) - elif linkname.startswith('issue'): - addlink(linkname, issue_url+linkname) - -items = name2target.items() -items.sort() - -lines = [] -for linktarget, linknamelist in items: - linknamelist.sort() - for linkname in linknamelist[:-1]: - lines.append(".. _`%s`:" % linkname) - lines.append(".. _`%s`: %s" %(linknamelist[-1], linktarget)) - -reffile.write("\n".join(lines)) -print "wrote %d references to %r" %(len(lines), reffile) -#print "last ten lines" -#for x in lines[-10:]: print x + name2target = {} + def addlink(linkname, linktarget): + assert linkname and linkname != '/' + if linktarget in name2target: + if linkname in name2target[linktarget]: + return + name2target.setdefault(linktarget, []).append(linkname) + + for textfile in docdir.listdir(): # for subdirs, see below + if textfile.ext != '.txt': + continue + for linkname in linkrex.findall(textfile.read()): + if '/' in linkname: + for startloc in ('', 'pypy'): + cand = distdir.join(startloc, linkname) + if cand.check(): + rel = cand.relto(distdir) + assert docdir.relto(distdir) + dotdots = 0 + p = docdir + while p != distdir: + p = p.dirpath() + dotdots += 1 + target = '../' * dotdots + cand.relto(distdir) + addlink(linkname, target) + break + else: + print "WARNING %s: link %r may be bogus" %(textfile, linkname) + elif linkname.startswith('issue'): + addlink(linkname, issue_url+linkname) + + items = name2target.items() + items.sort() + + lines = [] + for linktarget, linknamelist in items: + linknamelist.sort() + for linkname in linknamelist[:-1]: + lines.append(".. _`%s`:" % linkname) + lines.append(".. _`%s`: %s" %(linknamelist[-1], linktarget)) + + reffile.write("\n".join(lines)) + print "wrote %d references to %r" %(len(lines), reffile) + #print "last ten lines" + #for x in lines[-10:]: print x + + +# We need to build a new _ref.txt for each directory that uses it, because +# they differ in the number of "../" that they need in the link targets... +makeref(pypydir.join('doc')) +makeref(pypydir.join('doc').join('jit')) From fijal at codespeak.net Tue Mar 18 19:51:29 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 18 Mar 2008 19:51:29 +0100 (CET) Subject: [pypy-svn] r52700 - in pypy/build/buildbot: . test Message-ID: <20080318185129.68F6B169EEB@codespeak.net> Author: fijal Date: Tue Mar 18 19:51:28 2008 New Revision: 52700 Added: pypy/build/buildbot/__init__.py (contents, props changed) pypy/build/buildbot/test/__init__.py (contents, props changed) Modified: pypy/build/buildbot/netstring_conftest.py pypy/build/buildbot/test/test_mysession.py Log: Fix imports. Added: pypy/build/buildbot/__init__.py ============================================================================== Modified: pypy/build/buildbot/netstring_conftest.py ============================================================================== --- pypy/build/buildbot/netstring_conftest.py (original) +++ pypy/build/buildbot/netstring_conftest.py Tue Mar 18 19:51:28 2008 @@ -8,7 +8,7 @@ from twisted.spread.jelly import jelly import cPickle -from netstring import netstring +from buildbot.netstring import netstring from StringIO import StringIO class MyReporter(AbstractReporter): Added: pypy/build/buildbot/test/__init__.py ============================================================================== Modified: pypy/build/buildbot/test/test_mysession.py ============================================================================== --- pypy/build/buildbot/test/test_mysession.py (original) +++ pypy/build/buildbot/test/test_mysession.py Tue Mar 18 19:51:28 2008 @@ -1,10 +1,10 @@ import py -from netstring_conftest import MyReporter +from buildbot.netstring_conftest import MyReporter from StringIO import StringIO from twisted.spread.banana import decode from twisted.spread.jelly import unjelly -import netstring +from buildbot import netstring testfile = py.code.Source(""" def test_one(): From fijal at codespeak.net Tue Mar 18 20:08:12 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 18 Mar 2008 20:08:12 +0100 (CET) Subject: [pypy-svn] r52701 - in pypy/build/buildbot: . test Message-ID: <20080318190812.E7A67169EFC@codespeak.net> Author: fijal Date: Tue Mar 18 20:08:11 2008 New Revision: 52701 Modified: pypy/build/buildbot/netstring_conftest.py pypy/build/buildbot/test/test_mysession.py Log: More testing. Modified: pypy/build/buildbot/netstring_conftest.py ============================================================================== --- pypy/build/buildbot/netstring_conftest.py (original) +++ pypy/build/buildbot/netstring_conftest.py Tue Mar 18 20:08:11 2008 @@ -55,7 +55,12 @@ return {} def report_ReceivedItemOutcome(self, event): - return event.outcome + # XXX whack, because traceback is a subclass of a list, which + # confuses jelly + outcome = event.outcome + if outcome.excinfo is not None: + outcome.excinfo.traceback = [i for i in outcome.excinfo.traceback] + return outcome def report_ItemStart(self, event): return (event.item.__class__.__name__, event.item.listnames()) Modified: pypy/build/buildbot/test/test_mysession.py ============================================================================== --- pypy/build/buildbot/test/test_mysession.py (original) +++ pypy/build/buildbot/test/test_mysession.py Tue Mar 18 20:08:11 2008 @@ -40,3 +40,7 @@ assert len(outcomes) == 2 assert outcomes[0][1].passed assert outcomes[1][1].excinfo.typename == 'ZeroDivisionError' + assert outcomes[1][1].excinfo.traceback[0].lineno == 5 + + + From fijal at codespeak.net Tue Mar 18 20:13:00 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 18 Mar 2008 20:13:00 +0100 (CET) Subject: [pypy-svn] r52702 - in pypy/build: bot bot/test buildbot Message-ID: <20080318191300.6D6B5169EB3@codespeak.net> Author: fijal Date: Tue Mar 18 20:12:59 2008 New Revision: 52702 Added: pypy/build/bot/ - copied from r52693, pypy/build/buildbot/ pypy/build/bot/__init__.py - copied unchanged from r52701, pypy/build/buildbot/__init__.py pypy/build/bot/master.cfg - copied unchanged from r52701, pypy/build/buildbot/master.cfg pypy/build/bot/netstring-conftest.py - copied unchanged from r52701, pypy/build/buildbot/netstring-conftest.py pypy/build/bot/netstring.py - copied unchanged from r52701, pypy/build/buildbot/netstring.py pypy/build/bot/netstring_conftest.py - copied unchanged from r52701, pypy/build/buildbot/netstring_conftest.py pypy/build/bot/pypy_status.py - copied unchanged from r52701, pypy/build/buildbot/pypy_status.py pypy/build/bot/pypybuilders.py - copied unchanged from r52701, pypy/build/buildbot/pypybuilders.py pypy/build/bot/slaveinfo.py - copied unchanged from r52701, pypy/build/buildbot/slaveinfo.py pypy/build/bot/test/ - copied from r52701, pypy/build/buildbot/test/ pypy/build/bot/text-conftest.py - copied unchanged from r52701, pypy/build/buildbot/text-conftest.py Removed: pypy/build/buildbot/ Log: avoid nameclash From fijal at codespeak.net Tue Mar 18 20:25:11 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 18 Mar 2008 20:25:11 +0100 (CET) Subject: [pypy-svn] r52703 - in pypy/build/bot: . test Message-ID: <20080318192511.793A4169EC0@codespeak.net> Author: fijal Date: Tue Mar 18 20:25:09 2008 New Revision: 52703 Modified: pypy/build/bot/netstring_conftest.py pypy/build/bot/test/test_mysession.py Log: (exarkun, fijal) upgrade info Modified: pypy/build/bot/netstring_conftest.py ============================================================================== --- pypy/build/bot/netstring_conftest.py (original) +++ pypy/build/bot/netstring_conftest.py Tue Mar 18 20:25:09 2008 @@ -8,9 +8,12 @@ from twisted.spread.jelly import jelly import cPickle -from buildbot.netstring import netstring +from bot.netstring import netstring from StringIO import StringIO +def itemrepr(item): + return (item.__class__.__name__, item.listnames()) + class MyReporter(AbstractReporter): def __init__(self, *args, **kwds): super(MyReporter, self).__init__(*args, **kwds) @@ -60,13 +63,13 @@ outcome = event.outcome if outcome.excinfo is not None: outcome.excinfo.traceback = [i for i in outcome.excinfo.traceback] - return outcome + return (itemrepr(event.item), outcome) def report_ItemStart(self, event): - return (event.item.__class__.__name__, event.item.listnames()) + return itemrepr(event.item) def report_ItemFinish(self, event): - return (event.item.__class__.__name__, event.item.listnames()) + return itemrepr(event.item) class MySession(Session): reporterclass = MyReporter Modified: pypy/build/bot/test/test_mysession.py ============================================================================== --- pypy/build/bot/test/test_mysession.py (original) +++ pypy/build/bot/test/test_mysession.py Tue Mar 18 20:25:09 2008 @@ -1,10 +1,10 @@ import py -from buildbot.netstring_conftest import MyReporter +from bot.netstring_conftest import MyReporter from StringIO import StringIO from twisted.spread.banana import decode from twisted.spread.jelly import unjelly -from buildbot import netstring +from bot import netstring testfile = py.code.Source(""" def test_one(): @@ -38,9 +38,13 @@ assert events[1][1] == ('Module', ['mysession', 'test_xxx.py']) outcomes = [event for event in events if event[0] == 'ReceivedItemOutcome'] assert len(outcomes) == 2 - assert outcomes[0][1].passed - assert outcomes[1][1].excinfo.typename == 'ZeroDivisionError' - assert outcomes[1][1].excinfo.traceback[0].lineno == 5 + assert outcomes[0][1][0] == ('Function', ['mysession', 'test_xxx.py', + 'test_one']) + assert outcomes[1][1][0] == ('Function', ['mysession', 'test_xxx.py', + 'test_two']) + assert outcomes[0][1][1].passed + assert outcomes[1][1][1].excinfo.typename == 'ZeroDivisionError' + assert outcomes[1][1][1].excinfo.traceback[0].lineno == 5 From cfbolz at codespeak.net Tue Mar 18 21:05:29 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 18 Mar 2008 21:05:29 +0100 (CET) Subject: [pypy-svn] r52704 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080318200529.CAF49169EB5@codespeak.net> Author: cfbolz Date: Tue Mar 18 21:05:27 2008 New Revision: 52704 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: more tests. I have enough for today Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Tue Mar 18 21:05:27 2008 @@ -260,6 +260,7 @@ [lltype.Ptr(XY), lltype.Signed, lltype.Signed, lltype.Ptr(E)]) def test_simple_return_it(self): + py.test.skip("implement me") class MyJitDriver(JitDriver): greens = [] reds = ['i', 'xy'] @@ -333,7 +334,10 @@ self.check_insns_in_loops(getfield=0) def test_simple_construct_no_escape(self): - + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'x', 'y'] + def f(x, y): xy = lltype.malloc(XY) xy.vable_access = lltype.nullptr(XY_ACCESS) @@ -344,13 +348,24 @@ return x+y def main(x, y): - return f(x, y) + tot = 0 + i = 1024 + while i: + i >>= 1 + tot += f(x, y) + MyJitDriver.jit_merge_point(tot=tot, i=i, x=x, y=y) + MyJitDriver.can_enter_jit(tot=tot, i=i, x=x, y=y) + return tot - res = self.timeshift_from_portal(main, f, [20, 22], policy=P_OOPSPEC) - assert res == 42 - self.check_insns({'int_add': 1}) + res = self.run(main, [20, 22], 2) + assert res == 42 * 11 + self.check_insns_in_loops({'int_add': 2, 'int_is_true': 1, + 'int_rshift': 1}) def test_simple_construct_escape(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'x', 'y'] def f(x, y): xy = lltype.malloc(XY) @@ -362,14 +377,24 @@ return xy def main(x, y): - xy = f(x, y) - return xy_get_x(xy)+xy_get_y(xy) + tot = 0 + i = 1024 + while i: + i >>= 1 + xy = f(x, y) + tot += xy_get_x(xy)+xy_get_y(xy) + MyJitDriver.jit_merge_point(tot=tot, i=i, x=x, y=y) + MyJitDriver.can_enter_jit(tot=tot, i=i, x=x, y=y) + return tot - res = self.timeshift_from_portal(main, f, [20, 22], policy=P_OOPSPEC) - assert res == 42 - self.check_insns(getfield=0) + res = self.run(main, [20, 22], 2) + assert res == 42 * 11 + self.check_insns_in_loops(getfield=0) def test_simple_with_struct(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'xp'] def f(xp): x = xp_get_x(xp) @@ -384,14 +409,23 @@ s.a = a s.b = b xp.p = s - return f(xp) - - res = self.timeshift_from_portal(main, f, [20, 10, 12], - policy=P_OOPSPEC) - assert res == 42 - self.check_insns(getfield=2) + tot = 0 + i = 1024 + while i: + i >>= 1 + tot += f(xp) + MyJitDriver.jit_merge_point(tot=tot, i=i, xp=xp) + MyJitDriver.can_enter_jit(tot=tot, i=i, xp=xp) + return tot + + res = self.run(main, [20, 10, 12], 2) + assert res == 42 * 11 + self.check_insns_in_loops(getfield=2) def test_simple_with_setting_struct(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'xp', 's', 'x'] def f(xp, s): xp_set_p(xp, s) @@ -407,15 +441,24 @@ s = lltype.malloc(S) s.a = a s.b = b - v = f(xp, s) - return v+xp.p.b - - res = self.timeshift_from_portal(main, f, [20, 10, 3], - policy=P_OOPSPEC) - assert res == 42 - self.check_insns(getfield=3) + tot = 0 + i = 1024 + while i: + i >>= 1 + v = f(xp, s) + tot += v+xp.p.b + MyJitDriver.jit_merge_point(tot=tot, i=i, xp=xp, s=s, x=x) + MyJitDriver.can_enter_jit(tot=tot, i=i, xp=xp, s=s, x=x) + return tot + + res = self.run(main, [20, 10, 3], 2) + assert res == main(20, 10, 3) + self.check_insns_in_loops(getfield=4) def test_simple_with_setting_new_struct(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'xp', 'a', 'b'] def f(xp, a, b): s = lltype.malloc(S) @@ -431,16 +474,25 @@ xp = lltype.malloc(XP) xp.vable_access = lltype.nullptr(XP_ACCESS) xp.x = x - v = f(xp, a, b) - return v+xp.p.b - - res = self.timeshift_from_portal(main, f, [20, 10, 3], - policy=P_OOPSPEC) - assert res == 42 - self.check_insns(getfield=0, malloc=1) + tot = 0 + i = 1024 + while i: + i >>= 1 + v = f(xp, a, b) + tot += v+xp.p.b + MyJitDriver.jit_merge_point(tot=tot, i=i, xp=xp, a=a, b=b) + MyJitDriver.can_enter_jit(tot=tot, i=i, xp=xp, a=a, b=b) + return tot + + res = self.run(main, [20, 10, 3], 2) + assert res == 42 * 11 + self.check_insns_in_loops(getfield=0, malloc=1) def test_simple_constr_with_setting_new_struct(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'x', 'a', 'b'] def f(x, a, b): xp = lltype.malloc(XP) @@ -456,19 +508,33 @@ return xp def main(x, a, b): - xp = f(x, a, b) - return xp.x+xp.p.a+xp.p.b+xp.p.b - - res = self.timeshift_from_portal(main, f, [20, 10, 3], - policy=P_OOPSPEC) - assert res == 42 - self.check_insns(getfield=0, malloc=2) + tot = 0 + i = 1024 + while i: + i >>= 1 + xp = f(x, a, b) + tot += xp.x+xp.p.a+xp.p.b+xp.p.b + MyJitDriver.jit_merge_point(tot=tot, i=i, x=x, a=a, b=b) + MyJitDriver.can_enter_jit(tot=tot, i=i, x=x, a=a, b=b) + return tot + + res = self.run(main, [20, 10, 3], 2) + assert res == main(20, 10, 3) + self.check_insns_in_loops(getfield=0, malloc=0) + + # run again with threshold 1 to get the return generated too + res = self.run(main, [20, 10, 3], 1) + assert res == main(20, 10, 3) + self.check_insns_in_loops(getfield=0, malloc=0) def test_simple_read(self): - + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'e'] + def f(e): xy = e.xy - xy_set_y(xy, 3) + xy_set_y(xy, xy_get_y(xy) + 3) return xy_get_x(xy)*2 def main(x, y): @@ -478,14 +544,24 @@ xy.y = y e = lltype.malloc(E) e.xy = xy - v = f(e) - return v + e.xy.x+e.xy.y + tot = 0 + i = 1024 + while i: + i >>= 1 + v = f(e) + tot += v + e.xy.x+e.xy.y + MyJitDriver.jit_merge_point(tot=tot, i=i, e=e) + MyJitDriver.can_enter_jit(tot=tot, i=i, e=e) + return tot - res = self.timeshift_from_portal(main, f, [20, 22], policy=P_OOPSPEC) - assert res == 63 - self.check_insns(getfield=3) + res = self.run(main, [20, 22], 2) + assert res == main(x, y) + self.check_insns_in_loops(getfield=9) def test_simple_escape_through_vstruct(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'x', 'y'] def f(x, y): xy = lltype.malloc(XY) @@ -500,12 +576,19 @@ return e def main(x, y): - e = f(x, y) - return e.xy.x+e.xy.y + tot = 0 + i = 1024 + while i: + i >>= 1 + e = f(x, y) + tot += e.xy.x+e.xy.y + MyJitDriver.jit_merge_point(tot=tot, i=i, x=x, y=y) + MyJitDriver.can_enter_jit(tot=tot, i=i, x=x, y=y) + return tot - res = self.timeshift_from_portal(main, f, [20, 11], policy=P_OOPSPEC) - assert res == 42 - self.check_insns(getfield=0, malloc=2) + res = self.run(main, [20, 11], 2) + assert res == 42 * 11 + self.check_insns_in_loops(getfield=0) def test_residual_doing_nothing(self): def g(xy): From cfbolz at codespeak.net Tue Mar 18 21:08:14 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 18 Mar 2008 21:08:14 +0100 (CET) Subject: [pypy-svn] r52705 - in pypy/branch/jit-hotpath/pypy/jit: rainbow/test timeshifter Message-ID: <20080318200814.935C6169EB5@codespeak.net> Author: cfbolz Date: Tue Mar 18 21:08:10 2008 New Revision: 52705 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_vdict.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py Log: write a merging test for dicts. fix fallback code for dicts Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py Tue Mar 18 21:08:10 2008 @@ -28,6 +28,29 @@ assert res == 34 * 11 self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1}) + def test_merge(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'tot', 'flag'] + def ll_function(flag): + tot = 0 + i = 1024 + while i > 0: + i >>= 1 + dic = {} + if flag: + dic[12] = 34 + else: + dic[12] = 35 + dic[13] = 35 + tot += dic[12] + MyJitDriver.jit_merge_point(tot=tot, i=i, flag=flag) + MyJitDriver.can_enter_jit(tot=tot, i=i, flag=flag) + return tot + res = self.run(ll_function, [True], 2, policy=P_OOPSPEC) + assert res == 34 * 11 + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1}) + def test_vdict_and_vlist(self): class MyJitDriver(JitDriver): greens = [] Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_vdict.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_vdict.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_vdict.py Tue Mar 18 21:08:10 2008 @@ -17,6 +17,20 @@ assert res == 34 self.check_insns({}) + def test_merge(self): + def ll_function(flag): + dic = {} + if flag: + dic[12] = 34 + else: + dic[12] = 35 + dic[13] = 35 + return dic[12] + + res = self.interpret(ll_function, [True], [], policy=P_OOPSPEC) + assert res == 34 + self.check_insns({}) + def test_vdict_and_vlist(self): def ll_function(): dic = {} Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Tue Mar 18 21:08:10 2008 @@ -956,7 +956,7 @@ def load_from(self, jitstate, gv_outside): typedesc = self.typedesc assert isinstance(typedesc, VirtualizableStructTypeDesc) - # XXX missing check for gv_outside being NULL + assert self.content_boxes[-1].genvar is typedesc.gv_null boxes = self.content_boxes boxes[-1] = rvalue.PtrRedBox(boxes[-1].kind, gv_outside, Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py Tue Mar 18 21:08:10 2008 @@ -126,6 +126,8 @@ keydesc = LLEqDesc(DICT.KEY, keyeq, keyhash) self.VirtualDict = keydesc.VirtualDict + self._define_allocate() + def _freeze_(self): return True @@ -136,6 +138,27 @@ vdict.ownbox = box return box + def _define_allocate(self): + from pypy.rpython.lltypesystem import rdict + DICT = self.DICT + DICTPTR = self.DICTPTR + KEY = DICT.KEY + + def allocate(rgenop, n): + d = rdict.ll_newdict_size(DICT, n) + return rgenop.genconst(d) + + def populate(item_boxes, gv_lst, box_gv_reader): + d = gv_lst.revealconst(DICTPTR) + for key, valuebox in item_boxes.iteritems(): + if valuebox is not None: + gv_value = box_gv_reader(valuebox) + v = gv_value.revealconst(KEY) + rdict.ll_dict_setitem(key, v) + + self.allocate = allocate + self.populate = populate + TypeDesc = DictTypeDesc @@ -263,6 +286,12 @@ def internal_replace(self, memo): raise NotImplementedError + def allocate_gv_container(self, rgenop): + return self.typedesc.allocate(rgenop, len(self.item_boxes)) + + def populate_gv_container(self, gv_dictptr, box_gv_reader): + return self.typedesc.populate(self.item_boxes, + gv_dictptr, box_gv_reader) def oop_newdict(jitstate, oopspecdesc, deepfrozen): return oopspecdesc.typedesc.factory() From fijal at codespeak.net Tue Mar 18 21:33:38 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 18 Mar 2008 21:33:38 +0100 (CET) Subject: [pypy-svn] r52706 - in pypy/build/bot: . test Message-ID: <20080318203338.1E966169EAE@codespeak.net> Author: fijal Date: Tue Mar 18 21:33:37 2008 New Revision: 52706 Modified: pypy/build/bot/pypy_status.py pypy/build/bot/pypybuilders.py pypy/build/bot/test/test_mysession.py Log: (exarkun, fijal) Create a custom view. Modified: pypy/build/bot/pypy_status.py ============================================================================== --- pypy/build/bot/pypy_status.py (original) +++ pypy/build/bot/pypy_status.py Tue Mar 18 21:33:37 2008 @@ -8,6 +8,18 @@ from buildbot.interfaces import LOG_CHANNEL_STDOUT from buildbot.status.web.base import ICurrentBox, HtmlResource, map_branches, build_get_class +class LogMixin: + def getLog(self, build, name): + for log in build.getLogs(): + if log.name.endswith(name): + stdout = ''.join( + log.getChunks(channels=[LOG_CHANNEL_STDOUT], + onlyText=True)) + return stdout + return '' + + + def body(self, request): status = self.getStatus(request) builderNames = status.getBuilderNames() @@ -88,17 +100,26 @@ testResultsTable]) -class RecentlyFailingTests(HtmlResource): - oldBuildCount = 10 +class Summary(HtmlResource, LogMixin): + def body(self, request): + failedTests = {} + status = self.getStatus(request) + for builderName in status.getBuilderNames(): + builder = status.getBuilder(builderName) + for build in builder.generateFinishedBuilds(branches=[None], + num_builds=1): + log = self.getLog(build, "failedtotal.log") + testNames = log.splitlines() + failedTests.update(dict.fromkeys(testNames)) + return flatten(tags.div[[ + tags.div[tags.a(href="faillog/" + test, + style='color: red; font-weight: bold')['F'], + ' ', test] + for test in failedTests]]) - def getLog(self, build, name): - for log in build.getLogs(): - if log.name.endswith(name): - stdout = ''.join( - log.getChunks(channels=[LOG_CHANNEL_STDOUT], - onlyText=True)) - return stdout - return '' + +class RecentlyFailingTests(HtmlResource, LogMixin): + oldBuildCount = 10 def body(self, request): # Avoid having to restart the master to manually exercise each code Modified: pypy/build/bot/pypybuilders.py ============================================================================== --- pypy/build/bot/pypybuilders.py (original) +++ pypy/build/bot/pypybuilders.py Tue Mar 18 21:33:37 2008 @@ -6,7 +6,9 @@ from buildbot.steps.transfer import FileUpload, FileDownload from buildbot.steps.python_twisted import Trial -from netstring import netstringparser +from bot.netstring import netstringparser +from twisted.spread.banana import decode, encode +from twisted.spread.jelly import unjelly, jelly class Translate(ShellCommand): name = "translate" @@ -23,6 +25,20 @@ self.command = self.command + translationArgs + [self.translationTarget] + targetArgs ShellCommand.__init__(self, workdir, *a, **kw) +def create_summary(stdout, logcreator): + stuff = list(netstringparser(stdout)) + events = [(name, unjelly(decode(item))) for name, item in + zip(*[iter(stuff)]*2)] + failed_names = [] + for name, event in events: + if name == 'ReceivedItemOutcome': + (tp, name), outcome = event + if outcome.excinfo: + # failed test + fullname = '.'.join(name) + logcreator(fullname, encode(jelly(outcome.excinfo))) + failed_names.append(fullname) + logcreator('failedtotal.log', "\n".join(failed_names)) class PyTest(ShellCommand): name = "py.test pypy" @@ -51,19 +67,14 @@ def createSummary(self, log): - """ - 43:foo.test.test_foo.py.AppTestFoo.().test_foo - 6:passed - 43:foo.test.test_foo.py.AppTestFoo.().test_bar - 6:failed - 17:assert foo == bar - 43:foo.test.test_foo.py.AppTestFoo.().test_baz - 7:skipped - """ - stdout = ''.join( - log.getChunks(channels=[LOG_CHANNEL_STDOUT], - onlyText=True)) + stdout = ''.join(log.getChunks(channels=[LOG_CHANNEL_STDOUT], + onlyText=True)) + create_summary(stdout, self.addCompleteLog) + return + + + resultLists = { 'passed': [], 'failed': [], Modified: pypy/build/bot/test/test_mysession.py ============================================================================== --- pypy/build/bot/test/test_mysession.py (original) +++ pypy/build/bot/test/test_mysession.py Tue Mar 18 21:33:37 2008 @@ -5,6 +5,8 @@ from twisted.spread.banana import decode from twisted.spread.jelly import unjelly from bot import netstring +from bot.pypybuilders import create_summary +from bot.pypy_status import Summary testfile = py.code.Source(""" def test_one(): @@ -14,6 +16,52 @@ 1/0 """) + +class MockLog(object): + def __init__(self, name, contents): + self.name = name + self.contents = contents + + def getChunks(self, channels, onlyText): + return [self.contents] + + +class MockBuild(object): + def __init__(self, logs): + self.logs = logs + + def getLogs(self): + return iter(self.logs) + + +class MockBuilder(object): + def __init__(self, name, builds): + self.name = name + self.builds = builds + + def generateFinishedBuilds(self, branches, num_builds): + return iter(self.builds) + + +class MockStatus(object): + def __init__(self, builders): + self.builders = builders + + def getBuilderNames(self): + return iter(self.builders) + + def getBuilder(self, name): + return self.builders[name] + + +class MockSummary(Summary): + def __init__(self, status): + self.status = status + + def getStatus(self, request): + return self.status + + class XTestReporter(MyReporter): def __init__(self, *args, **kwds): out = kwds.pop('stringio') @@ -21,7 +69,7 @@ self.out = out out.write("\n") -def test_mysession(): +def _create_output(): tmpdir = py.test.ensuretemp('mysession') fobj = tmpdir.ensure('test_xxx.py') fobj.write(testfile) @@ -29,7 +77,11 @@ session = config.initsession() stringio = StringIO() session.main(XTestReporter(config, [], stringio=stringio)) - stuff = list(netstring.netstringparser(stringio.getvalue())) + return stringio.getvalue() + +def test_mysession(): + output = _create_output() + stuff = list(netstring.netstringparser(output)) events = [(name, unjelly(decode(item))) for name, item in zip(*[iter(stuff)]*2)] assert events[0][0] == 'TestStarted' @@ -46,5 +98,21 @@ assert outcomes[1][1][1].excinfo.typename == 'ZeroDivisionError' assert outcomes[1][1][1].excinfo.traceback[0].lineno == 5 - - +def test_createsummary(): + output = _create_output() + logger = {} + create_summary(output, logger.__setitem__) + assert logger['failedtotal.log'] == 'mysession.test_xxx.py.test_two' + excinfo = unjelly(decode(logger['mysession.test_xxx.py.test_two'])) + assert excinfo.typename == 'ZeroDivisionError' + +def test_viewsummary(): + output = _create_output() + logger = {} + create_summary(output, logger.__setitem__) + build = MockBuild([MockLog(name, logger[name]) for name in logger]) + builder = MockBuilder("tests", [build]) + status = MockStatus({builder.name: builder}) + mocksum = MockSummary(status) + view = mocksum.body(None) + assert view == '
F mysession.test_xxx.py.test_two
' From fijal at codespeak.net Tue Mar 18 22:24:51 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Tue, 18 Mar 2008 22:24:51 +0100 (CET) Subject: [pypy-svn] r52708 - in pypy/build/bot: . test Message-ID: <20080318212451.A79AF169E91@codespeak.net> Author: fijal Date: Tue Mar 18 22:24:49 2008 New Revision: 52708 Modified: pypy/build/bot/pypy_status.py pypy/build/bot/test/test_mysession.py Log: (exarkun, fijal) Add failure page and per-test traceback page (not fancy enough yet) Modified: pypy/build/bot/pypy_status.py ============================================================================== --- pypy/build/bot/pypy_status.py (original) +++ pypy/build/bot/pypy_status.py Tue Mar 18 22:24:49 2008 @@ -7,6 +7,11 @@ from buildbot.interfaces import LOG_CHANNEL_STDOUT from buildbot.status.web.base import ICurrentBox, HtmlResource, map_branches, build_get_class +from twisted.web.static import Data +from twisted.web.error import NoResource +from StringIO import StringIO +from twisted.spread.jelly import unjelly +from twisted.spread.banana import decode class LogMixin: def getLog(self, build, name): @@ -99,7 +104,6 @@ legend, testResultsTable]) - class Summary(HtmlResource, LogMixin): def body(self, request): failedTests = {} @@ -110,13 +114,33 @@ num_builds=1): log = self.getLog(build, "failedtotal.log") testNames = log.splitlines() - failedTests.update(dict.fromkeys(testNames)) + for test in testNames: + failedTests[test] = builderName return flatten(tags.div[[ - tags.div[tags.a(href="faillog/" + test, + tags.div[tags.a(href=str(URL(None, None, pathsegs=['failures'], + querysegs=[('buildname', builderName), + ('testname', test)]))[1:], style='color: red; font-weight: bold')['F'], ' ', test] - for test in failedTests]]) + for test, builderName in failedTests.iteritems()]]) + def getChild(self, path, request): + if path != 'failures': + return NoResource() + status = self.getStatus(request) + builder = status.getBuilder(request.args['buildname'][0]) + build = builder.generateFinishedBuilds(branches=[None], + num_builds=1).next() + testname = request.args['testname'][0] + log = self.getLog(build, testname) + stuff = unjelly(decode(log)) + s = StringIO() + s.write(testname + '\n\n') + for item in stuff.traceback: + s.write(str(item)) + s.write(item.source.splitlines()[item.relline] + '\n') + s.write(stuff.typename + ': ' + stuff.value + '\n') + return Data(s.getvalue(), 'text/plain') class RecentlyFailingTests(HtmlResource, LogMixin): oldBuildCount = 10 Modified: pypy/build/bot/test/test_mysession.py ============================================================================== --- pypy/build/bot/test/test_mysession.py (original) +++ pypy/build/bot/test/test_mysession.py Tue Mar 18 22:24:49 2008 @@ -7,6 +7,7 @@ from bot import netstring from bot.pypybuilders import create_summary from bot.pypy_status import Summary +from twisted.web.test.test_web import DummyRequest testfile = py.code.Source(""" def test_one(): @@ -63,11 +64,7 @@ class XTestReporter(MyReporter): - def __init__(self, *args, **kwds): - out = kwds.pop('stringio') - super(XTestReporter, self).__init__(*args, **kwds) - self.out = out - out.write("\n") + pass def _create_output(): tmpdir = py.test.ensuretemp('mysession') @@ -76,7 +73,7 @@ config = py.test.config._reparse([fobj]) session = config.initsession() stringio = StringIO() - session.main(XTestReporter(config, [], stringio=stringio)) + session.main(XTestReporter(config, [], out=stringio)) return stringio.getvalue() def test_mysession(): @@ -115,4 +112,17 @@ status = MockStatus({builder.name: builder}) mocksum = MockSummary(status) view = mocksum.body(None) - assert view == '
F mysession.test_xxx.py.test_two
' + for expected in ['mysession.test_xxx.py.test_two">F', + 'mysession.test_xxx.py.test_two']: + assert expected in view + req = DummyRequest(['']) + req.args = {'buildname': ['tests'], 'testname': ['mysession.test_xxx.py.test_two']} + data = mocksum.getChild('failures', req) + expected = ['mysession.test_xxx.py.test_two', + 'line 5 in ', + 'mysession/test_xxx.py', + '1/0', + 'ZeroDivisionError: integer division or modulo by zero'] + for line in expected: + assert line in data.data + From cfbolz at codespeak.net Tue Mar 18 22:40:05 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 18 Mar 2008 22:40:05 +0100 (CET) Subject: [pypy-svn] r52709 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080318214005.07932169EA2@codespeak.net> Author: cfbolz Date: Tue Mar 18 22:40:04 2008 New Revision: 52709 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: skip failing test Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Tue Mar 18 22:40:04 2008 @@ -528,6 +528,7 @@ self.check_insns_in_loops(getfield=0, malloc=0) def test_simple_read(self): + py.test.skip("fails :-(") class MyJitDriver(JitDriver): greens = [] reds = ['i', 'tot', 'e'] @@ -555,7 +556,7 @@ return tot res = self.run(main, [20, 22], 2) - assert res == main(x, y) + assert res == main(20, 22) self.check_insns_in_loops(getfield=9) def test_simple_escape_through_vstruct(self): From cfbolz at codespeak.net Tue Mar 18 23:16:48 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 18 Mar 2008 23:16:48 +0100 (CET) Subject: [pypy-svn] r52710 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080318221648.0BAE8169E74@codespeak.net> Author: cfbolz Date: Tue Mar 18 23:16:47 2008 New Revision: 52710 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Log: fix translation tests Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Tue Mar 18 23:16:47 2008 @@ -308,6 +308,10 @@ # default case of the switch: exceptiondesc = fbp.hotrunnerdesc.exceptiondesc + + # for the annotator: + prevtypebox = None + prevvaluebox = None if check_exceptions: # virtualize the exception into the jitstate (xxx fragile code) prevtypebox = jitstate.exc_type_box From cfbolz at codespeak.net Wed Mar 19 10:56:15 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 10:56:15 +0100 (CET) Subject: [pypy-svn] r52717 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080319095615.9E3B6169E3F@codespeak.net> Author: cfbolz Date: Wed Mar 19 10:56:13 2008 New Revision: 52717 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: add ts attr Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Wed Mar 19 10:56:13 2008 @@ -1047,6 +1047,7 @@ shape_place forced_boxes generated_oop_residual_can_raise + ts """.split() returnbox = None From cfbolz at codespeak.net Wed Mar 19 14:52:23 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 14:52:23 +0100 (CET) Subject: [pypy-svn] r52720 - pypy/branch/jit-hotpath/pypy/jit/tl Message-ID: <20080319135223.7535A169E90@codespeak.net> Author: cfbolz Date: Wed Mar 19 14:52:23 2008 New Revision: 52720 Added: pypy/branch/jit-hotpath/pypy/jit/tl/targettiny2hotpath.py - copied, changed from r52717, pypy/branch/jit-hotpath/pypy/jit/tl/targettiny2.py pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py - copied, changed from r52717, pypy/branch/jit-hotpath/pypy/jit/tl/tiny2.py Log: (arigo, cfbolz): port the tiny2 interp to the hotpath policy From cfbolz at codespeak.net Wed Mar 19 14:53:45 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 14:53:45 +0100 (CET) Subject: [pypy-svn] r52721 - pypy/branch/jit-hotpath/pypy/translator Message-ID: <20080319135345.C0D5B169EE5@codespeak.net> Author: cfbolz Date: Wed Mar 19 14:53:44 2008 New Revision: 52721 Modified: pypy/branch/jit-hotpath/pypy/translator/driver.py Log: (arigo, cfbolz): support the hotpath jit stuff in the driver too Modified: pypy/branch/jit-hotpath/pypy/translator/driver.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/driver.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/driver.py Wed Mar 19 14:53:44 2008 @@ -379,21 +379,26 @@ "Backendopt before Hint-annotate") def task_hintannotate_lltype(self): - from pypy.jit.hintannotator.annotator import HintAnnotator from pypy.jit.hintannotator.model import OriginFlags from pypy.jit.hintannotator.model import SomeLLAbstractConstant get_portal = self.extra['portal'] PORTAL, POLICY = get_portal(self) + assert (PORTAL is None) == POLICY.hotpath t = self.translator - self.orig_portal_graph = graphof(t, PORTAL) - - hannotator = HintAnnotator(base_translator=t, policy=POLICY) + if POLICY.hotpath: + from pypy.jit.hintannotator.hotpath import HotPathHintAnnotator + hannotator = HotPathHintAnnotator(base_translator=t, policy=POLICY) + hs = hannotator.build_hotpath_types() + else: + from pypy.jit.hintannotator.annotator import HintAnnotator + hannotator = HintAnnotator(base_translator=t, policy=POLICY) + self.orig_portal_graph = graphof(t, PORTAL) + hs = hannotator.build_types(self.orig_portal_graph, + [SomeLLAbstractConstant(v.concretetype, + {OriginFlags(): True}) + for v in self.orig_portal_graph.getargs()]) self.hint_translator = hannotator.translator - hs = hannotator.build_types(self.orig_portal_graph, - [SomeLLAbstractConstant(v.concretetype, - {OriginFlags(): True}) - for v in self.orig_portal_graph.getargs()]) hannotator.simplify() count = hannotator.bookkeeper.nonstuboriggraphcount stubcount = hannotator.bookkeeper.stuboriggraphcount @@ -402,7 +407,10 @@ n = len(list(hannotator.translator.graphs[0].iterblocks())) self.log.info("portal has %d blocks" % n) self.hannotator = hannotator - self.portal_graph = graphof(hannotator.translator, PORTAL) + if POLICY.hotpath: + self.portal_graph = hannotator.translator.graphs[0] + else: + self.portal_graph = graphof(hannotator.translator, PORTAL) # task_hintannotate_lltype = taskdef(task_hintannotate_lltype, ['prehannotatebackendopt_lltype'], @@ -411,7 +419,6 @@ def task_rainbow_lltype(self): from pypy.jit.codegen import detect_cpu from pypy.jit.rainbow.codewriter import BytecodeWriter - from pypy.jit.rainbow.portal import PortalRewriter cpu = detect_cpu.autodetect() if cpu == 'i386': from pypy.jit.codegen.i386.rgenop import RI386GenOp as RGenOp @@ -429,11 +436,20 @@ # make the bytecode and the rainbow interp writer = BytecodeWriter(t, ha, RGenOp) jitcode = writer.make_bytecode(self.portal_graph) - rewriter = PortalRewriter(self.hannotator, rtyper, RGenOp, - writer, True) - rewriter.rewrite(origportalgraph=self.orig_portal_graph, - portalgraph=self.portal_graph, - view=False) + if ha.policy.hotpath: + from pypy.jit.rainbow.hotpath import HotRunnerDesc + threshold = 10 # for now + hotrunnerdesc = HotRunnerDesc(ha, rtyper, jitcode, RGenOp, + writer, threshold, + translate_support_code=True) + hotrunnerdesc.rewrite_all() + else: + from pypy.jit.rainbow.portal import PortalRewriter + rewriter = PortalRewriter(self.hannotator, rtyper, RGenOp, + writer, True) + rewriter.rewrite(origportalgraph=self.orig_portal_graph, + portalgraph=self.portal_graph, + view=False) # task_rainbow_lltype = taskdef(task_rainbow_lltype, ["hintannotate_lltype"], From cfbolz at codespeak.net Wed Mar 19 15:25:16 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 15:25:16 +0100 (CET) Subject: [pypy-svn] r52722 - in pypy/branch/jit-hotpath/pypy/jit/codegen: i386 test Message-ID: <20080319142516.24875169EE5@codespeak.net> Author: cfbolz Date: Wed Mar 19 15:25:15 2008 New Revision: 52722 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Log: (cfbolz, arigo) Tests and easy implementation of genconst_from_frame_var() in the 386 backend. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py Wed Mar 19 15:25:15 2008 @@ -746,6 +746,16 @@ return v.revealconst(T) @staticmethod + def genconst_from_frame_var(kind, base, info, index): + v = info[index] + if isinstance(v, StorageInStack): + value = peek_word_at(base + v.get_offset()) + return IntConst(value) + else: + assert isinstance(v, GenConst) + return v + + @staticmethod @specialize.arg(0) def write_frame_place(T, base, place, value): value = cast_whatever_to_int(T, value) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Wed Mar 19 15:25:15 2008 @@ -623,10 +623,16 @@ class FrameVarReader: FUNC = lltype.Ptr(lltype.FuncType([llmemory.Address], lltype.Signed)) - def __init__(self, RGenOp): + def __init__(self, RGenOp, via_genconst): def reader(base): - return RGenOp.read_frame_var(lltype.Signed, base, - self.frameinfo, 0) + if via_genconst: + gv = RGenOp.genconst_from_frame_var( + RGenOp.kindToken(lltype.Signed), + base, self.frameinfo, 0) + return gv.revealconst(lltype.Signed) + else: + return RGenOp.read_frame_var(lltype.Signed, base, + self.frameinfo, 0) self.reader = reader def get_reader(self, info): self.frameinfo = info @@ -654,8 +660,8 @@ return gv_f -def get_read_frame_var_runner(RGenOp): - fvr = FrameVarReader(RGenOp) +def get_read_frame_var_runner(RGenOp, via_genconst): + fvr = FrameVarReader(RGenOp, via_genconst) def read_frame_var_runner(x): rgenop = RGenOp() @@ -1401,7 +1407,20 @@ def test_read_frame_var_direct(self): def get_reader(info): - fvr = FrameVarReader(self.RGenOp) + fvr = FrameVarReader(self.RGenOp, via_genconst=False) + fvr.frameinfo = info + reader_ptr = self.directtesthelper(fvr.FUNC, fvr.reader) + return reader_ptr + + rgenop = self.RGenOp() + gv_callable = make_read_frame_var(rgenop, get_reader) + fnptr = self.cast(gv_callable, 1) + res = fnptr(20) + assert res == 40 + + def test_genconst_from_frame_var_direct(self): + def get_reader(info): + fvr = FrameVarReader(self.RGenOp, via_genconst=True) fvr.frameinfo = info reader_ptr = self.directtesthelper(fvr.FUNC, fvr.reader) return reader_ptr @@ -1413,7 +1432,14 @@ assert res == 40 def test_read_frame_var_compile(self): - fn = self.compile(get_read_frame_var_runner(self.RGenOp), [int]) + runner = get_read_frame_var_runner(self.RGenOp, via_genconst=False) + fn = self.compile(runner, [int]) + res = fn(30) + assert res == 60 + + def test_genconst_from_frame_var_compile(self): + runner = get_read_frame_var_runner(self.RGenOp, via_genconst=True) + fn = self.compile(runner, [int]) res = fn(30) assert res == 60 From arigo at codespeak.net Wed Mar 19 16:24:41 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 19 Mar 2008 16:24:41 +0100 (CET) Subject: [pypy-svn] r52724 - in pypy/branch/jit-hotpath/pypy/jit/codegen: . dump dump/test i386 test Message-ID: <20080319152441.922D2169EE9@codespeak.net> Author: arigo Date: Wed Mar 19 16:24:40 2008 New Revision: 52724 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/dump/test/test_rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/model.py pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Log: Support writing the machine code of function with Void return type. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py Wed Mar 19 16:24:40 2008 @@ -83,7 +83,7 @@ self.dump("%s.finish_and_return(%s, %s)" % ( self.name, self.rgenop.sigtokenname(sigtoken), - self.rgenop.vname(gv_returnvar))) + gv_returnvar and self.rgenop.vname(gv_returnvar))) self.llbuilder.finish_and_return(sigtoken, gv_returnvar) def pause_writing(self, alive_gv): Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/dump/test/test_rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/dump/test/test_rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/dump/test/test_rgenop.py Wed Mar 19 16:24:40 2008 @@ -8,7 +8,7 @@ class TestRDumpGenop(AbstractRGenOpTests): RGenOp = RDumpGenOp - def cast(self, gv, nb_args): + def cast(self, gv, nb_args, RESULT=lltype.Signed): def dummyfn(*whatever): return Whatever() return dummyfn Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py Wed Mar 19 16:24:40 2008 @@ -332,8 +332,13 @@ self.rgenop.close_mc(mc) def finish_and_return(self, sigtoken, gv_returnvar): - gvs = [gv_returnvar] - mc = self.generate_block_code(gvs, [eax]) + if gv_returnvar is not None: + gvs = [gv_returnvar] + gvo = [eax] + else: + gvs = [] + gvo = [] + mc = self.generate_block_code(gvs, gvo) # --- epilogue --- mc.MOV(esp, ebp) mc.POP(ebp) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/model.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/model.py Wed Mar 19 16:24:40 2008 @@ -133,7 +133,9 @@ def finish_and_return(self, sigtoken, gv_returnvar): '''Emit the epilogue code for the function, and the code to - return gv_returnvar. This "closes" the current builder.''' + return gv_returnvar. This "closes" the current builder. + The gv_returnvar must be None if the return type is Void + (and only in this case).''' raise NotImplementedError def finish_and_goto(self, outputargs_gv, target): Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Wed Mar 19 16:24:40 2008 @@ -848,8 +848,8 @@ return self.getcompiled(runner, argtypes, annotatorpolicy = GENOP_POLICY) - def cast(self, gv, nb_args): - F1 = lltype.FuncType([lltype.Signed] * nb_args, lltype.Signed) + def cast(self, gv, nb_args, RESULT=lltype.Signed): + F1 = lltype.FuncType([lltype.Signed] * nb_args, RESULT) return self.RGenOp.get_python_callable(lltype.Ptr(F1), gv) def directtesthelper(self, FUNCTYPE, func): @@ -2184,3 +2184,17 @@ fnptr = self.cast(gv_fn, 1) result = fnptr(42) assert result == 47 + + def test_void_return(self): + # XXX minimal test only + rgenop = self.RGenOp() + FUNCV = lltype.FuncType([lltype.Signed], lltype.Void) + sigtoken = rgenop.sigToken(FUNCV) + builder, gv_fn, [gv_x] = rgenop.newgraph(sigtoken, "nothing") + builder.start_writing() + builder.finish_and_return(sigtoken, None) + builder.end() + + fnptr = self.cast(gv_fn, 1, RESULT=lltype.Void) + fnptr(12) + # assert did not crash From arigo at codespeak.net Wed Mar 19 16:27:02 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 19 Mar 2008 16:27:02 +0100 (CET) Subject: [pypy-svn] r52725 - pypy/branch/jit-hotpath/pypy/jit/codegen/dump Message-ID: <20080319152702.EC0DB169EF1@codespeak.net> Author: arigo Date: Wed Mar 19 16:27:02 2008 New Revision: 52725 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py Log: Record this as an operation too. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py Wed Mar 19 16:27:02 2008 @@ -463,6 +463,13 @@ return llrgenop.RGenOp.read_frame_var(T, base, info, index) @staticmethod + def genconst_from_frame_var(gv_TYPE, base, info, index): + RDumpGenOp.dump("# genconst_from_frame_var(info=%s, index=%d)" + % (info, index)) + return llrgenop.RGenOp.genconst_from_frame_var(gv_TYPE, base, + info, index) + + @staticmethod @specialize.arg(0) def write_frame_place(T, base, place, value): RDumpGenOp.dump("# write_frame_place(place=%s)" % (place,)) From cfbolz at codespeak.net Wed Mar 19 16:49:08 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 16:49:08 +0100 (CET) Subject: [pypy-svn] r52726 - pypy/branch/jit-hotpath/pypy/jit/tl Message-ID: <20080319154908.97F95169F01@codespeak.net> Author: cfbolz Date: Wed Mar 19 16:49:08 2008 New Revision: 52726 Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py Log: (arigo, cfbolz): put the deepfreeze hint into the loop Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py Wed Mar 19 16:49:08 2008 @@ -125,25 +125,13 @@ def interpret(bytecode, args): """The interpreter's entry point and portal function. """ - # ------------------------------ - # First a lot of JIT hints... - # - - # An important hint: 'bytecode' is a list, which is in theory - # mutable. Let's tell the JIT compiler that it can assume that the - # list is entirely frozen, i.e. immutable and only containing immutable - # objects. Otherwise, it cannot do anything - it would have to assume - # that the list can unpredictably change at runtime. - bytecode = hint(bytecode, deepfreeze=True) - - # ------------------------------ - # the real code starts here loops = [] stack = [] pos = 0 while True: TinyJitDriver.jit_merge_point(args=args, loops=loops, stack=stack, bytecode=bytecode, pos=pos) + bytecode = hint(bytecode, deepfreeze=True) if pos >= len(bytecode): break opcode = bytecode[pos] From cfbolz at codespeak.net Wed Mar 19 16:50:53 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 16:50:53 +0100 (CET) Subject: [pypy-svn] r52727 - pypy/branch/jit-hotpath/pypy/translator Message-ID: <20080319155053.59D6F169F01@codespeak.net> Author: cfbolz Date: Wed Mar 19 16:50:52 2008 New Revision: 52727 Modified: pypy/branch/jit-hotpath/pypy/translator/driver.py Log: (cfbolz, arigo): use the low level type system bytecode writer Modified: pypy/branch/jit-hotpath/pypy/translator/driver.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/driver.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/driver.py Wed Mar 19 16:50:52 2008 @@ -418,7 +418,6 @@ def task_rainbow_lltype(self): from pypy.jit.codegen import detect_cpu - from pypy.jit.rainbow.codewriter import BytecodeWriter cpu = detect_cpu.autodetect() if cpu == 'i386': from pypy.jit.codegen.i386.rgenop import RI386GenOp as RGenOp @@ -434,7 +433,8 @@ t = self.translator rtyper = t.rtyper # make the bytecode and the rainbow interp - writer = BytecodeWriter(t, ha, RGenOp) + from pypy.jit.rainbow.codewriter import LLTypeBytecodeWriter + writer = LLTypeBytecodeWriter(t, ha, RGenOp) jitcode = writer.make_bytecode(self.portal_graph) if ha.policy.hotpath: from pypy.jit.rainbow.hotpath import HotRunnerDesc From cfbolz at codespeak.net Wed Mar 19 16:51:29 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 16:51:29 +0100 (CET) Subject: [pypy-svn] r52728 - pypy/branch/jit-hotpath/pypy/translator/c Message-ID: <20080319155129.C68EA169F01@codespeak.net> Author: cfbolz Date: Wed Mar 19 16:51:29 2008 New Revision: 52728 Modified: pypy/branch/jit-hotpath/pypy/translator/c/funcgen.py Log: (cfbolz, arigo): Ignore the jit merge_point hint in normal code Modified: pypy/branch/jit-hotpath/pypy/translator/c/funcgen.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/c/funcgen.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/c/funcgen.py Wed Mar 19 16:51:29 2008 @@ -708,4 +708,11 @@ def OP_IS_EARLY_CONSTANT(self, op): return self.expr(op.result) + ' = 0;' # Allways false + def OP_JIT_MERGE_POINT(self, op): + return '/* JIT_MERGE_POINT %s */' % op + + def OP_CAN_ENTER_JIT(self, op): + return '/* CAN_ENTER_JIT %s */' % op + + assert not USESLOTS or '__dict__' not in dir(FunctionCodeGenerator) From cfbolz at codespeak.net Wed Mar 19 17:19:21 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 17:19:21 +0100 (CET) Subject: [pypy-svn] r52729 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080319161921.E9199169F06@codespeak.net> Author: cfbolz Date: Wed Mar 19 17:19:19 2008 New Revision: 52729 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: (cfbolz, arigo) Translation fix. Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Wed Mar 19 17:19:19 2008 @@ -70,6 +70,7 @@ materialize devirtualize allocate populate + allocate_varsize """.split() From cfbolz at codespeak.net Wed Mar 19 17:34:04 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 17:34:04 +0100 (CET) Subject: [pypy-svn] r52730 - in pypy/branch/jit-hotpath/pypy/jit: rainbow/test tl Message-ID: <20080319163404.DAB63169E90@codespeak.net> Author: cfbolz Date: Wed Mar 19 17:34:04 2008 New Revision: 52730 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py Log: (arigo, cfbolz) adapt the tiny2 hotpath impl some. make a test out of it Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Wed Mar 19 17:34:04 2008 @@ -440,3 +440,23 @@ # would be the case if the 'regs' list was not properly virtualized) self.check_insns_in_loops({'int_add': 2, 'int_is_true': 1}) + + def test_hp_tiny2(self): + from pypy.jit.tl.tiny2_hotpath import interpret, FACTORIAL, FIBONACCI + from pypy.jit.tl.tiny2_hotpath import IntBox, StrBox, repr + + def main(case, n): + if case == 1: + bytecode = FACTORIAL + args = [IntBox(n)] + else: + bytecode = FIBONACCI + args = [IntBox(1), IntBox(1), IntBox(n)] + stack = interpret(bytecode, args) + return repr(stack) + + res = self.run(main, [1, 11], threshold=2) + assert ''.join(res.chars) == "The factorial of 11 is 39916800" + + res = self.run(main, [2, 11], threshold=2) + assert ''.join(res.chars) == "Fibonacci numbers: 1 1 2 3 5 8 13 21 34 55 89" Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py Wed Mar 19 17:34:04 2008 @@ -74,15 +74,28 @@ # calls to as_int() direct calls at compile-time, instead of indirect # ones. The JIT compiler cannot look into indirect calls, but it # can analyze and inline the code in directly-called functions. - y = stack.pop() + stack, y = stack.pop() hint(y.__class__, promote=True) - x = stack.pop() + stack, x = stack.pop() hint(x.__class__, promote=True) try: z = IntBox(func_int(x.as_int(), y.as_int())) except ValueError: z = StrBox(func_str(x.as_str(), y.as_str())) - stack.append(z) + stack = Stack(z, stack) + return stack + +class Stack(object): + def __init__(self, value, next=None): + self.next = next + self.value = value + + def pop(self): + return self.next, self.value + +def empty_stack(): + return None + class TinyJitDriver(JitDriver): reds = ['args', 'loops', 'stack'] @@ -103,15 +116,6 @@ args.append(oldargs[n]) n += 1 self.args = args - oldstack = self.stack - argcount = hint(len(oldstack), promote=True) - stack = [] - n = 0 - while n < argcount: - hint(n, concrete=True) - stack.append(oldstack[n]) - n += 1 - self.stack = stack oldloops = self.loops argcount = hint(len(oldloops), promote=True) loops = [] @@ -126,7 +130,7 @@ """The interpreter's entry point and portal function. """ loops = [] - stack = [] + stack = empty_stack() pos = 0 while True: TinyJitDriver.jit_merge_point(args=args, loops=loops, stack=stack, @@ -137,21 +141,25 @@ opcode = bytecode[pos] hint(opcode, concrete=True) # same as in tiny1.py pos += 1 - if opcode == 'ADD': op2(stack, func_add_int, func_add_str) - elif opcode == 'SUB': op2(stack, func_sub_int, func_sub_str) - elif opcode == 'MUL': op2(stack, func_mul_int, func_mul_str) + if opcode == 'ADD': + stack = op2(stack, func_add_int, func_add_str) + elif opcode == 'SUB': + stack = op2(stack, func_sub_int, func_sub_str) + elif opcode == 'MUL': + stack = op2(stack, func_mul_int, func_mul_str) elif opcode[0] == '#': n = myint(opcode, start=1) - stack.append(args[n-1]) + stack = Stack(args[n-1], stack) elif opcode.startswith('->#'): n = myint(opcode, start=3) if n > len(args): raise IndexError - args[n-1] = stack.pop() + stack, args[n-1] = stack.pop() elif opcode == '{': loops.append(pos) elif opcode == '}': - if stack.pop().as_int() == 0: + stack, flag = stack.pop() + if flag.as_int() == 0: loops.pop() else: pos = loops[-1] @@ -170,15 +178,19 @@ TinyJitDriver.can_enter_jit(args=args, loops=loops, stack=stack, bytecode=bytecode, pos=pos) else: - stack.append(StrBox(opcode)) + stack = Stack(StrBox(opcode), stack) return stack def repr(stack): # this bit moved out of the portal function because JIT'ing it is not # very useful, and the JIT generator is confused by the 'for' right now... - # let's move this back in? - return ' '.join([x.as_str() for x in stack]) + lst = [] + while stack: + stack, x = stack.pop() + lst.append(x.as_str()) + lst.reverse() + return ' '.join(lst) # ------------------------------ From fijal at codespeak.net Wed Mar 19 17:45:50 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 19 Mar 2008 17:45:50 +0100 (CET) Subject: [pypy-svn] r52731 - pypy/dist/pypy/rpython/module Message-ID: <20080319164550.30AB1169F10@codespeak.net> Author: fijal Date: Wed Mar 19 17:45:49 2008 New Revision: 52731 Modified: pypy/dist/pypy/rpython/module/ll_os.py Log: Speed up ll_os.read by about 20x Modified: pypy/dist/pypy/rpython/module/ll_os.py ============================================================================== --- pypy/dist/pypy/rpython/module/ll_os.py (original) +++ pypy/dist/pypy/rpython/module/ll_os.py Wed Mar 19 17:45:49 2008 @@ -19,6 +19,11 @@ from pypy.rlib import rposix from pypy.tool.udir import udir from pypy.translator.tool.cbuild import ExternalCompilationInfo +from pypy.rpython.lltypesystem.rstr import mallocstr +from pypy.rpython.annlowlevel import hlstr +from pypy.rpython.lltypesystem.llmemory import raw_memcopy, sizeof,\ + itemoffsetof, cast_ptr_to_adr, offsetof +from pypy.rpython.lltypesystem.rstr import STR posix = __import__(os.name) @@ -474,20 +479,28 @@ [rffi.INT, rffi.VOIDP, rffi.SIZE_T], rffi.SIZE_T) + offset = offsetof(STR, 'chars') + itemoffsetof(STR.chars, 0) + def os_read_llimpl(fd, count): if count < 0: raise OSError(errno.EINVAL, None) inbuf = lltype.malloc(rffi.CCHARP.TO, count, flavor='raw') - try: - got = rffi.cast(lltype.Signed, os_read(rffi.cast(rffi.INT, fd), - inbuf, rffi.cast(rffi.SIZE_T, count))) - if got < 0: - raise OSError(rposix.get_errno(), "os_read failed") - # XXX too many copies of the data! - l = [inbuf[i] for i in range(got)] - finally: + #try: + got = rffi.cast(lltype.Signed, os_read(rffi.cast(rffi.INT, fd), + inbuf, rffi.cast(rffi.SIZE_T, count))) + if got < 0: lltype.free(inbuf, flavor='raw') - return ''.join(l) + raise OSError(rposix.get_errno(), "os_read failed") + s = mallocstr(got) + source = cast_ptr_to_adr(inbuf) + \ + itemoffsetof(lltype.typeOf(inbuf).TO, 0) + dest = cast_ptr_to_adr(s) + offset + raw_memcopy(source, dest, sizeof(lltype.Char) * got) + lltype.free(inbuf, flavor='raw') + #for i in range(got): + # s.chars[i] = inbuf[i] + #finally: + return hlstr(s) def os_read_oofakeimpl(fd, count): return OOSupport.to_rstr(os.read(fd, count)) From fijal at codespeak.net Wed Mar 19 18:01:07 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 19 Mar 2008 18:01:07 +0100 (CET) Subject: [pypy-svn] r52732 - in pypy/dist/pypy/rpython: . module Message-ID: <20080319170107.07E63169F05@codespeak.net> Author: fijal Date: Wed Mar 19 18:01:05 2008 New Revision: 52732 Modified: pypy/dist/pypy/rpython/module/ll_os.py pypy/dist/pypy/rpython/rbuiltin.py Log: (exarkun, fijal) exception_cannot_occur for raw_memcopy Modified: pypy/dist/pypy/rpython/module/ll_os.py ============================================================================== --- pypy/dist/pypy/rpython/module/ll_os.py (original) +++ pypy/dist/pypy/rpython/module/ll_os.py Wed Mar 19 18:01:05 2008 @@ -485,21 +485,18 @@ if count < 0: raise OSError(errno.EINVAL, None) inbuf = lltype.malloc(rffi.CCHARP.TO, count, flavor='raw') - #try: - got = rffi.cast(lltype.Signed, os_read(rffi.cast(rffi.INT, fd), - inbuf, rffi.cast(rffi.SIZE_T, count))) - if got < 0: + try: + got = rffi.cast(lltype.Signed, os_read(rffi.cast(rffi.INT, fd), + inbuf, rffi.cast(rffi.SIZE_T, count))) + if got < 0: + raise OSError(rposix.get_errno(), "os_read failed") + s = mallocstr(got) + source = cast_ptr_to_adr(inbuf) + \ + itemoffsetof(lltype.typeOf(inbuf).TO, 0) + dest = cast_ptr_to_adr(s) + offset + raw_memcopy(source, dest, sizeof(lltype.Char) * got) + finally: lltype.free(inbuf, flavor='raw') - raise OSError(rposix.get_errno(), "os_read failed") - s = mallocstr(got) - source = cast_ptr_to_adr(inbuf) + \ - itemoffsetof(lltype.typeOf(inbuf).TO, 0) - dest = cast_ptr_to_adr(s) + offset - raw_memcopy(source, dest, sizeof(lltype.Char) * got) - lltype.free(inbuf, flavor='raw') - #for i in range(got): - # s.chars[i] = inbuf[i] - #finally: return hlstr(s) def os_read_oofakeimpl(fd, count): Modified: pypy/dist/pypy/rpython/rbuiltin.py ============================================================================== --- pypy/dist/pypy/rpython/rbuiltin.py (original) +++ pypy/dist/pypy/rpython/rbuiltin.py Wed Mar 19 18:01:05 2008 @@ -521,6 +521,7 @@ def rtype_raw_memcopy(hop): v_list = hop.inputargs(llmemory.Address, llmemory.Address, lltype.Signed) + hop.exception_cannot_occur() return hop.genop('raw_memcopy', v_list) def rtype_raw_memclear(hop): From cfbolz at codespeak.net Wed Mar 19 18:36:40 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 18:36:40 +0100 (CET) Subject: [pypy-svn] r52733 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080319173640.D128E169EEC@codespeak.net> Author: cfbolz Date: Wed Mar 19 18:36:38 2008 New Revision: 52733 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Log: (cfbolz, arigo) An issue with backends that erase Bool to Signed. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Wed Mar 19 18:36:38 2008 @@ -174,7 +174,9 @@ @specialize.arglltype(1) def check_should_compile(self, value): - assert lltype.typeOf(value) is lltype.Bool + # 'value' should be a Bool, but depending on the backend + # it could have been ERASED to about anything else + value = bool(value) threshold = self.hotrunnerdesc.threshold if value: counter = self.truepath_counter + 1 @@ -195,6 +197,7 @@ @specialize.arglltype(2) def prepare_fallbackinterp(self, fallbackinterp, value): + value = bool(value) if value: fallbackinterp.pc = self.truepath_pc else: @@ -202,6 +205,7 @@ @specialize.arglltype(1) def compile_hot_path(self, value): + value = bool(value) if value: pc = self.truepath_pc else: From cfbolz at codespeak.net Wed Mar 19 18:54:44 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 18:54:44 +0100 (CET) Subject: [pypy-svn] r52734 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080319175444.D0B1F169F04@codespeak.net> Author: cfbolz Date: Wed Mar 19 18:54:42 2008 New Revision: 52734 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: (cfbolz, arigo) * Add a case in this test. * Use the same policy as the target. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Wed Mar 19 18:54:42 2008 @@ -444,19 +444,29 @@ def test_hp_tiny2(self): from pypy.jit.tl.tiny2_hotpath import interpret, FACTORIAL, FIBONACCI from pypy.jit.tl.tiny2_hotpath import IntBox, StrBox, repr + from pypy.jit.tl.targettiny2hotpath import MyHintAnnotatorPolicy def main(case, n): if case == 1: bytecode = FACTORIAL args = [IntBox(n)] - else: + elif case == 2: bytecode = FIBONACCI args = [IntBox(1), IntBox(1), IntBox(n)] + elif case == 3: + bytecode = "{ #1 #1 1 SUB ->#1 #1 }".split(" ") + args = [StrBox(str(n))] + else: + assert 0, "unknown case" stack = interpret(bytecode, args) return repr(stack) - res = self.run(main, [1, 11], threshold=2) + POLICY = MyHintAnnotatorPolicy() + res = self.run(main, [1, 11], threshold=2, policy=POLICY) assert ''.join(res.chars) == "The factorial of 11 is 39916800" - res = self.run(main, [2, 11], threshold=2) + res = self.run(main, [2, 11], threshold=2, policy=POLICY) assert ''.join(res.chars) == "Fibonacci numbers: 1 1 2 3 5 8 13 21 34 55 89" + + res = self.run(main, [3, 40], threshold=10, policy=POLICY) + assert ''.join(res.chars) == " ".join([str(n) for n in range(40, 0, -1)]) From cfbolz at codespeak.net Wed Mar 19 19:52:40 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 19:52:40 +0100 (CET) Subject: [pypy-svn] r52735 - in pypy/branch/jit-hotpath/pypy: jit/hintannotator rpython/lltypesystem translator/backendopt translator/backendopt/test Message-ID: <20080319185240.2B0E6169EF5@codespeak.net> Author: cfbolz Date: Wed Mar 19 19:52:38 2008 New Revision: 52735 Added: pypy/branch/jit-hotpath/pypy/translator/backendopt/test/test_graphanalyze.py Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/bookkeeper.py pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py pypy/branch/jit-hotpath/pypy/translator/backendopt/graphanalyze.py Log: (cfbolz, arigo): move the impurity analyzer to translator/backendopt. add tests for it. fix a bug. Note to Antonio: needs a bit more work before it can be useful on ootype :-) Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/bookkeeper.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/bookkeeper.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/bookkeeper.py Wed Mar 19 19:52:38 2008 @@ -8,7 +8,7 @@ from pypy.rpython.lltypesystem import lltype, lloperation from pypy.rpython.ootypesystem import ootype from pypy.tool.algo.unionfind import UnionFind -from pypy.translator.backendopt import graphanalyze +from pypy.translator.backendopt.graphanalyze import ImpurityAnalyzer from pypy.translator.unsimplify import copyvar TLS = tlsobject() @@ -113,29 +113,6 @@ self.tsgraphs.update(other.tsgraphs) -class ImpurityAnalyzer(graphanalyze.GraphAnalyzer): - """An impure graph has side-effects or depends on state that - can be mutated. A pure graph always gives the same answer for - given arguments.""" - - def analyze_exceptblock(self, block, seen=None): - return True # for now, we simplify and say that functions - # raising exceptions cannot be pure - - def operation_is_true(self, op): - operation = lloperation.LL_OPERATIONS[op.opname] - ARGTYPES = [v.concretetype for v in op.args] - return not operation.is_pure(*ARGTYPES) - - def analyze_direct_call(self, graph, seen=None): - try: - func = graph.func - if getattr(func, "_pure_function_", False): - return False - except AttributeError: - pass - return graphanalyze.GraphAnalyzer.analyze_direct_call(self, graph, seen) - class HintBookkeeper(object): def __init__(self, hannotator): Modified: pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py Wed Mar 19 19:52:38 2008 @@ -84,13 +84,6 @@ return op_impl fold = roproperty(get_fold_impl) - def is_pure(self, *ARGTYPES): - return (self.canfold or # canfold => pure operation - self is llop.debug_assert or # debug_assert is pure enough - # reading from immutable - (self in (llop.getfield, llop.getarrayitem) and - ARGTYPES[0].TO._hints.get('immutable'))) - def __repr__(self): return '' % (getattr(self, 'opname', '?'),) Modified: pypy/branch/jit-hotpath/pypy/translator/backendopt/graphanalyze.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/backendopt/graphanalyze.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/backendopt/graphanalyze.py Wed Mar 19 19:52:38 2008 @@ -98,3 +98,53 @@ for graph in graphs: for block, op in graph.iterblockops(): self.analyze(op) + + +class ImpurityAnalyzer(GraphAnalyzer): + """An impure graph has side-effects or depends on state that + can be mutated. A pure graph always gives the same answer for + given arguments.""" + + def analyze_exceptblock(self, block, seen=None): + return True # for now, we simplify and say that functions + # raising exceptions cannot be pure + + def operation_is_true(self, op): + # must return True if the operation is *impure* + operation = LL_OPERATIONS[op.opname] + if operation.canfold: + return False # pure + if operation is llop.debug_assert: + return False # debug_assert is pure enough + if operation in (llop.getfield, llop.getarrayitem): + TYPE = op.args[0].concretetype.TO + return not TYPE._hints.get('immutable') # impure if not immutable + if operation is llop.getinteriorfield: + # if any of the containers along the way is immutable, + # the final field cannot be modified (as it is inside + # that particular immutable container). + TYPE = op.args[0].concretetype.TO + if TYPE._hints.get('immutable'): + return False # pure + for v_index in op.args[1:-1]: + if v_index.concretetype is lltype.Void: + name = v_index.value + assert isinstance(name, str) + TYPE = getattr(TYPE, name) + else: + assert v_index.concretetype is lltype.Signed + TYPE = TYPE.OF + if TYPE._hints.get('immutable'): + return False # pure + return True # all mutable, impure + # --- operation not special-cased, impure --- + return True + + def analyze_direct_call(self, graph, seen=None): + try: + func = graph.func + if getattr(func, "_pure_function_", False): + return False + except AttributeError: + pass + return GraphAnalyzer.analyze_direct_call(self, graph, seen) Added: pypy/branch/jit-hotpath/pypy/translator/backendopt/test/test_graphanalyze.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/translator/backendopt/test/test_graphanalyze.py Wed Mar 19 19:52:38 2008 @@ -0,0 +1,71 @@ +from pypy.translator.backendopt.graphanalyze import ImpurityAnalyzer +from pypy.translator.translator import TranslationContext +from pypy.rpython.test.tool import LLRtypeMixin, OORtypeMixin +from pypy.conftest import option + +class BaseTestImpurityAnalyzer(object): + type_system = None + + def translate(self, func, sig): + t = TranslationContext() + self.translator = t + t.buildannotator().build_types(func, sig) + t.buildrtyper(type_system=self.type_system).specialize() + if option.view: + t.view() + return ImpurityAnalyzer(t) + + def test_simple_pure(self): + def nothing_much(x): + return (x+17) * 2 + impurity = self.translate(nothing_much, [int]) + res = impurity.analyze_direct_call(self.translator.graphs[0]) + assert res is False # not impure + + def test_simple_impure(self): + class Global: + pass + glob = Global() + def has_side_effects(x): + glob.foo = x + impurity = self.translate(has_side_effects, [int]) + res = impurity.analyze_direct_call(self.translator.graphs[0]) + assert res is True # impure + + def test_simple_raising(self): + def raising(x): + if x < 0: + raise ValueError + impurity = self.translate(raising, [int]) + res = impurity.analyze_direct_call(self.translator.graphs[0]) + assert res is True # impure + + def test_larger_example(self): + def myint_internal(case, start=0): + if case == 1: + s = "foobar" + else: + s = "dummy" + if start >= len(s): + return -1 + res = 0 + while start < len(s): + c = s[start] + n = ord(c) - ord('0') + if not (0 <= n <= 9): + return -1 + res = res * 10 + n + start += 1 + return res + impurity = self.translate(myint_internal, [int, int]) + res = impurity.analyze_direct_call(self.translator.graphs[0]) + assert res is False # not impure + + +class TestLLType(LLRtypeMixin, BaseTestImpurityAnalyzer): + pass + +# no chance on OOType before we add "pure" annotations on +# all the relevant built-in methods +#class TestOOType(OORtypeMixin, BaseTestImpurityAnalyzer): +# pass From arigo at codespeak.net Wed Mar 19 19:53:29 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 19 Mar 2008 19:53:29 +0100 (CET) Subject: [pypy-svn] r52736 - pypy/branch/jit-hotpath/pypy/jit/hintannotator/test Message-ID: <20080319185329.477E5169EF5@codespeak.net> Author: arigo Date: Wed Mar 19 19:53:28 2008 New Revision: 52736 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py Log: Fix test. Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py Wed Mar 19 19:53:28 2008 @@ -45,9 +45,13 @@ assert 'int_mul' not in summary(graphs[0]) def test_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['count', 'x', 'y'] + def add(count, x, y): result = x + y - can_enter_jit(red=(count, x, y)) + MyJitDriver.can_enter_jit(count=count, x=x, y=y) return result add._dont_inline_ = True def sub(x, y): @@ -55,7 +59,7 @@ sub._dont_inline_ = True def main(count, x, y): while True: - jit_merge_point(red=(count, x, y)) + MyJitDriver.jit_merge_point(count=count, x=x, y=y) count -= 1 if not count: break From fijal at codespeak.net Wed Mar 19 19:54:29 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 19 Mar 2008 19:54:29 +0100 (CET) Subject: [pypy-svn] r52737 - pypy/dist/pypy/rpython Message-ID: <20080319185429.7707A169EF5@codespeak.net> Author: fijal Date: Wed Mar 19 19:54:27 2008 New Revision: 52737 Modified: pypy/dist/pypy/rpython/annlowlevel.py Log: That makes no sense. Modified: pypy/dist/pypy/rpython/annlowlevel.py ============================================================================== --- pypy/dist/pypy/rpython/annlowlevel.py (original) +++ pypy/dist/pypy/rpython/annlowlevel.py Wed Mar 19 19:54:27 2008 @@ -383,7 +383,7 @@ def hlstr(ll_s): if hasattr(ll_s, 'items'): - return ''.join(items) + return ''.join(ll_s.items) else: return ll_s._str From fijal at codespeak.net Wed Mar 19 20:13:06 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 19 Mar 2008 20:13:06 +0100 (CET) Subject: [pypy-svn] r52738 - pypy/dist/pypy/rpython/lltypesystem/test Message-ID: <20080319191306.924D8169EF5@codespeak.net> Author: fijal Date: Wed Mar 19 20:13:05 2008 New Revision: 52738 Modified: pypy/dist/pypy/rpython/lltypesystem/test/test_llmemory.py Log: failing test. Modified: pypy/dist/pypy/rpython/lltypesystem/test/test_llmemory.py ============================================================================== --- pypy/dist/pypy/rpython/lltypesystem/test/test_llmemory.py (original) +++ pypy/dist/pypy/rpython/lltypesystem/test/test_llmemory.py Wed Mar 19 20:13:05 2008 @@ -570,3 +570,11 @@ adr += gcarrayofptr_itemsoffset + 2 * gcarrayofptr_singleitemoffset adr = adr.address[0] # => s2[1][2] assert (adr + FieldOffset(S1, 'x')).signed[0] == -33 + +def test_raw_memclear_on_empty_array(): + py.test.skip("Fails") + A = lltype.FixedSizeArray(lltype.Signed, 0) + a = lltype.malloc(A, flavor='raw') + src = cast_ptr_to_adr(a) + itemoffsetof(A, 0) + raw_memclear(src, sizeof(lltype.Signed) * 0) + From pypy-svn at codespeak.net Wed Mar 19 20:21:09 2008 From: pypy-svn at codespeak.net (pypy-svn at codespeak.net) Date: Wed, 19 Mar 2008 20:21:09 +0100 (CET) Subject: [pypy-svn] MedHelp 524 Message-ID: <20080319132025.4100.qmail@coltel-gw-vpdn-p1048.coltel.ru> Canadian Doctor Lorena Dow Best Price On Net March 86% OFF! http://www.google.ru/pagead/iclk?sa=l&ai=mtwlj&num=47422&adurl=http://sxqv.samegentle.com From fijal at codespeak.net Wed Mar 19 20:24:38 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 19 Mar 2008 20:24:38 +0100 (CET) Subject: [pypy-svn] r52739 - pypy/dist/pypy/rpython/lltypesystem Message-ID: <20080319192438.E7A11169F01@codespeak.net> Author: fijal Date: Wed Mar 19 20:24:37 2008 New Revision: 52739 Modified: pypy/dist/pypy/rpython/lltypesystem/lltype.py pypy/dist/pypy/rpython/lltypesystem/rlist.py Log: Make rpython list slightly faster, by using memcopy Modified: pypy/dist/pypy/rpython/lltypesystem/lltype.py ============================================================================== --- pypy/dist/pypy/rpython/lltypesystem/lltype.py (original) +++ pypy/dist/pypy/rpython/lltypesystem/lltype.py Wed Mar 19 20:24:37 2008 @@ -1311,6 +1311,7 @@ self._parent_type = typeOf(parent) self._parent_index = parentindex if (isinstance(self._parent_type, Struct) + and self._parent_type._names and parentindex in (self._parent_type._names[0], 0) and self._TYPE._gckind == typeOf(parent)._gckind): # keep strong reference to parent, we share the same allocation Modified: pypy/dist/pypy/rpython/lltypesystem/rlist.py ============================================================================== --- pypy/dist/pypy/rpython/lltypesystem/rlist.py (original) +++ pypy/dist/pypy/rpython/lltypesystem/rlist.py Wed Mar 19 20:24:37 2008 @@ -19,7 +19,7 @@ from pypy.rlib.debug import ll_assert from pypy.rlib.rarithmetic import ovfcheck from pypy.rpython.lltypesystem.llmemory import cast_ptr_to_adr, raw_memclear,\ - raw_memcopy, sizeof, itemoffsetof + raw_memcopy, sizeof, itemoffsetof, offsetof from pypy.rpython.lltypesystem import rffi # ____________________________________________________________ @@ -309,12 +309,13 @@ p = before_len - 1 else: p = new_allocated - 1 - while p >= 0: - newitems[p] = items[p] - ITEM = typeOf(l).TO.ITEM - if isinstance(ITEM, Ptr): - items[p] = nullptr(ITEM.TO) - p -= 1 + ITEM = typeOf(l).TO.ITEM + source = cast_ptr_to_adr(items) + itemoffsetof(typeOf(l.items).TO, 0) + dest = cast_ptr_to_adr(newitems) + itemoffsetof(typeOf(l.items).TO, 0) + s = p + 1 + raw_memcopy(source, dest, sizeof(ITEM) * s) + if isinstance(ITEM, Ptr): + raw_memclear(source, sizeof(ITEM) * s) l.length = newsize l.items = newitems _ll_list_resize_really._annenforceargs_ = (None, int) From fijal at codespeak.net Wed Mar 19 20:43:52 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 19 Mar 2008 20:43:52 +0100 (CET) Subject: [pypy-svn] r52740 - pypy/dist/pypy/rpython/test Message-ID: <20080319194352.A0DA4169EE8@codespeak.net> Author: fijal Date: Wed Mar 19 20:43:51 2008 New Revision: 52740 Modified: pypy/dist/pypy/rpython/test/test_rfloat.py Log: some tests that were lying in my wc for a while Modified: pypy/dist/pypy/rpython/test/test_rfloat.py ============================================================================== --- pypy/dist/pypy/rpython/test/test_rfloat.py (original) +++ pypy/dist/pypy/rpython/test/test_rfloat.py Wed Mar 19 20:43:51 2008 @@ -2,7 +2,8 @@ from pypy.translator.translator import TranslationContext from pypy.rpython.test import snippet from pypy.rpython.test.tool import BaseRtypingTest, LLRtypeMixin, OORtypeMixin -from pypy.rlib.rarithmetic import r_uint, r_longlong, r_singlefloat +from pypy.rlib.rarithmetic import r_uint, r_longlong, r_singlefloat,\ + isnan, isinf class TestSnippet(object): @@ -42,6 +43,16 @@ res = self.interpret(fn, [1.5]) assert float(self.ll_to_string(res)) == 1.5 + res = self.interpret(fn, [-1.5]) + assert float(self.ll_to_string(res)) == -1.5 + inf = 1e200 * 1e200 + nan = inf/inf + res = self.interpret(fn, [inf]) + assert self.ll_to_string(res) == 'inf' + res = self.interpret(fn, [-inf]) + assert self.ll_to_string(res) == '-inf' + res = self.interpret(fn, [nan]) + assert self.ll_to_string(res) == 'nan' def test_string_mod_float(self): def fn(f): From fijal at codespeak.net Wed Mar 19 20:53:35 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 19 Mar 2008 20:53:35 +0100 (CET) Subject: [pypy-svn] r52741 - pypy/dist/pypy/rpython/module Message-ID: <20080319195335.47B9A169EFE@codespeak.net> Author: fijal Date: Wed Mar 19 20:53:34 2008 New Revision: 52741 Modified: pypy/dist/pypy/rpython/module/ll_os.py Log: remove unnecessary casts Modified: pypy/dist/pypy/rpython/module/ll_os.py ============================================================================== --- pypy/dist/pypy/rpython/module/ll_os.py (original) +++ pypy/dist/pypy/rpython/module/ll_os.py Wed Mar 19 20:53:34 2008 @@ -486,8 +486,7 @@ raise OSError(errno.EINVAL, None) inbuf = lltype.malloc(rffi.CCHARP.TO, count, flavor='raw') try: - got = rffi.cast(lltype.Signed, os_read(rffi.cast(rffi.INT, fd), - inbuf, rffi.cast(rffi.SIZE_T, count))) + got = rffi.cast(lltype.Signed, os_read(fd, inbuf, count)) if got < 0: raise OSError(rposix.get_errno(), "os_read failed") s = mallocstr(got) From fijal at codespeak.net Wed Mar 19 20:54:45 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 19 Mar 2008 20:54:45 +0100 (CET) Subject: [pypy-svn] r52742 - pypy/dist/pypy/rpython/lltypesystem Message-ID: <20080319195445.E57B1169F01@codespeak.net> Author: fijal Date: Wed Mar 19 20:54:43 2008 New Revision: 52742 Modified: pypy/dist/pypy/rpython/lltypesystem/rlist.py Log: Use raw_memcopy only for lists of primitives. Modified: pypy/dist/pypy/rpython/lltypesystem/rlist.py ============================================================================== --- pypy/dist/pypy/rpython/lltypesystem/rlist.py (original) +++ pypy/dist/pypy/rpython/lltypesystem/rlist.py Wed Mar 19 20:54:43 2008 @@ -310,12 +310,16 @@ else: p = new_allocated - 1 ITEM = typeOf(l).TO.ITEM - source = cast_ptr_to_adr(items) + itemoffsetof(typeOf(l.items).TO, 0) - dest = cast_ptr_to_adr(newitems) + itemoffsetof(typeOf(l.items).TO, 0) - s = p + 1 - raw_memcopy(source, dest, sizeof(ITEM) * s) if isinstance(ITEM, Ptr): - raw_memclear(source, sizeof(ITEM) * s) + while p >= 0: + newitems[p] = items[p] + items[p] = nullptr(ITEM.TO) + p -= 1 + else: + source = cast_ptr_to_adr(items) + itemoffsetof(typeOf(l.items).TO, 0) + dest = cast_ptr_to_adr(newitems) + itemoffsetof(typeOf(l.items).TO, 0) + s = p + 1 + raw_memcopy(source, dest, sizeof(ITEM) * s) l.length = newsize l.items = newitems _ll_list_resize_really._annenforceargs_ = (None, int) From fijal at codespeak.net Wed Mar 19 20:56:11 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 19 Mar 2008 20:56:11 +0100 (CET) Subject: [pypy-svn] r52743 - pypy/dist/pypy/rpython/lltypesystem Message-ID: <20080319195611.8472B169F04@codespeak.net> Author: fijal Date: Wed Mar 19 20:56:11 2008 New Revision: 52743 Modified: pypy/dist/pypy/rpython/lltypesystem/rlist.py Log: explicit keepalive Modified: pypy/dist/pypy/rpython/lltypesystem/rlist.py ============================================================================== --- pypy/dist/pypy/rpython/lltypesystem/rlist.py (original) +++ pypy/dist/pypy/rpython/lltypesystem/rlist.py Wed Mar 19 20:56:11 2008 @@ -320,6 +320,7 @@ dest = cast_ptr_to_adr(newitems) + itemoffsetof(typeOf(l.items).TO, 0) s = p + 1 raw_memcopy(source, dest, sizeof(ITEM) * s) + keepalive_until_here(items) l.length = newsize l.items = newitems _ll_list_resize_really._annenforceargs_ = (None, int) From fijal at codespeak.net Wed Mar 19 21:02:29 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 19 Mar 2008 21:02:29 +0100 (CET) Subject: [pypy-svn] r52744 - pypy/dist/pypy/rpython/lltypesystem Message-ID: <20080319200229.1E56E169F07@codespeak.net> Author: fijal Date: Wed Mar 19 21:02:28 2008 New Revision: 52744 Modified: pypy/dist/pypy/rpython/lltypesystem/rlist.py Log: imports Modified: pypy/dist/pypy/rpython/lltypesystem/rlist.py ============================================================================== --- pypy/dist/pypy/rpython/lltypesystem/rlist.py (original) +++ pypy/dist/pypy/rpython/lltypesystem/rlist.py Wed Mar 19 21:02:28 2008 @@ -21,6 +21,7 @@ from pypy.rpython.lltypesystem.llmemory import cast_ptr_to_adr, raw_memclear,\ raw_memcopy, sizeof, itemoffsetof, offsetof from pypy.rpython.lltypesystem import rffi +from pypy.rlib.objectmodel import keepalive_until_here # ____________________________________________________________ # From cami at codespeak.net Wed Mar 19 22:20:05 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Wed, 19 Mar 2008 22:20:05 +0100 (CET) Subject: [pypy-svn] r52745 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080319212005.4AE35169EDD@codespeak.net> Author: cami Date: Wed Mar 19 22:20:03 2008 New Revision: 52745 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Log: added unitests added ImmediatePseudoRegister Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Wed Mar 19 22:20:03 2008 @@ -8,9 +8,11 @@ class Register(object): + value =0 def __init__(self, cpu, value=0): self.cpu = cpu - self.set(value) + if value is not 0: + self.set(value) def set(self, value, useCycles=True): self.value = value & 0xFF @@ -28,6 +30,8 @@ class DoubleRegister(Register): cpu = None + hi = Register(None) + lo = Register(None) def __init__(self, cpu, hi=None, lo=None): self.cpu = cpu @@ -77,18 +81,39 @@ self.cpu.cycles -= 2 +class ImmediatePseudoRegister(object): + + hl = DoubleRegister(None) + + def __init__(self, cpu, hl): + self.cpu = cpu + self.hl = hl + + def set(self, value): + sellf.cpu.write(self.get(), value) + self.cycles += 1 + + def get(self, value): + return self.cpu.read(self.get()) # ___________________________________________________________________________ class CPU(object): # Registers - a = 0 - bc = None - de = None - f = 0 - hl = None - sp = None - pc = None - af = None + af = DoubleRegister(None) + a = Register(None) + f = Register(None) + bc = DoubleRegister(None) + b = Register(None) + c = Register(None) + de = DoubleRegister(None) + d = Register(None) + e = Register(None) + hl = DoubleRegister(None) + hli = ImmediatePseudoRegister(None, None) + h = Register(None) + l = Register(None) + sp = DoubleRegister(None) + pc = DoubleRegister(None) # Interrupt Flags ime = False @@ -108,13 +133,20 @@ self.interrupt = interrupt self.memory = memory self.bc = DoubleRegister(self) + self.b = self.bc.hi + self.c = self.bc.lo self.de = DoubleRegister(self) + self.d = self.de.hi + self.e = self.de.lo self.hl = DoubleRegister(self) + self.h = self.hl.hi + self.l = self.hl.lo + self.hli = ImmediatePseudoRegister(self, self.hl) self.pc = DoubleRegister(self) self.sp = DoubleRegister(self) - self.a = Register(self) - self.f = Register(self) - self.af = DoubleRegister(self, self.a, self.f) + self.af = DoubleRegister(self) + self.a = self.af.hi + self.f = self.af.lo self.reset() def reset(self): @@ -138,60 +170,6 @@ val += 0x80 return val - def getA(self): - return self.a.get() - - def setA(self, value): - return self.a.set(value) - - def getB(self): - return self.bc.getHi() - - def setB(self, value): - self.bc.setHi(value) - - def getC(self): - return self.bc.getLo() - - def setC(self, value): - self.bc.setLo(value) - - def getD(self): - return self.de.getHi() - - def setD(self, value): - self.de.setHi(value) - - def getE(self): - return self.de.getLo() - - def setE(self, value): - self.de.setLo(value) - - def getF(self): - return self.f.get() - - def setF(self, value): - return self.f.set(value) - - def getH(self): - return self.hl.getHi() - - def setH(self, value): - self.hl.setHi(value) - - def getL(self): - return self.hl.getLo() - - def setL(self, value): - self.hl.setLo(value) - - def getHLi(self): - return self.read(self.hl.get()) - - def setHLi(self, value): - self.write(self.hl.get(), value) - self.cycles += 1 def setROM(self, banks): self.rom = banks @@ -717,8 +695,8 @@ self.pc.set(hi, lo) # 2 cycles # RET cc 2,5 cycles - def ret_cc(cc): - if (cc): + def ret_cc(getter): + if (getter()): self.ret() # 4 cycles # FIXME maybe this should be the same self.cycles -= 1 @@ -839,17 +817,42 @@ (0xA8, 0x01, CPU.XOR), (0xB0, 0x01, CPU.OR), (0xB8, 0x01, CPU.cpA), - #(0x06, 0x08, CPU.ld_nn), + (0x06, 0x08, lambda s, register:CPU.ld(s, CPU.fetch(s), register.set)), (0x40, 0x01, CPU.res, range(0, 8)) ] +GROUP_CODES_REGISTERS = (CPU.b, CPU.c, CPU.d, CPU.e, CPU.h, CPU.l, CPU.hli, CPU.a) + +def create_group_op_codes(table): + opCodes = [None] * 0xFF + for entry in table: + startCode = entry[0] + step = entry[1] + method = entry[2] + if len(entry) == 4: + for i in range(0, len(GROUP_CODES_REGISTERS)): + for n in entry[3]: + opCode = startCode+step*i + register = GROUP_CODES_REGISTERS[i] + opCodes[opCode] = (opCode, lambda me: method(me, register.get, register.set, n)) + print hex(opCode), method, n, i + else: + for i in range(0, len(GROUP_CODES_REGISTERS)): + opCode = startCode+step*i + register = GROUP_CODES_REGISTERS[i] + opCodes[opCode] = (opCode, lambda me: method(me, register.get, register.set)) + print " ", hex(opCode), method, i + + return opCodes + + REGISTER_OP_CODES = [ (0x01, 0x10, lambda s, register: CPU.popDoubleRegister(s, register=register, getter=CPU.fetch), [CPU.bc, CPU.de, CPU.hl, CPU.sp]), (0x09, 0x10, CPU.addHL, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), (0x03, 0x10, CPU.inc, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), (0x0B, 0x10, CPU.dec, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), - (0xC0, 0x08, CPU.ret, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), + (0xC0, 0x08, CPU.ret_cc, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), (0xC2, 0x08, CPU.jp_nnnn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), (0xC4, 0x08, CPU.call_nnnn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), (0x20, 0x08, CPU.jr_nn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), @@ -887,27 +890,6 @@ ] -GROUP_CODES_GETTERS = (CPU.getB, CPU.getC, CPU.getD, CPU.getE, CPU.getH, CPU.getL, CPU.getHLi, CPU.getA) -GROUP_CODES_SETTERS = (CPU.setB, CPU.setC, CPU.setD, CPU.setE, CPU.setH, CPU.setL, CPU.setHLi, CPU.setA) - -def create_group_op_codes(table): - opCodes = [None] * 0xFF - for entry in table: - startCode = entry[0] - step = entry[1] - method = entry[2] - getters = GROUP_CODES_GETTERS - if len(entry) == 4: - for i in range(0, 8): - for n in entry[3]: - index = startCode+step*i - opCodes[index] = (index, lambda me: method(me, GROUP_CODES_GETTERS[i], GROUP_CODES_SETTERS[i], n)) - else: - for i in range(0, 8): - index = startCode+step*i - opCodes[index] = (index, lambda me: method(me, GROUP_CODES_GETTERS[i], GROUP_CODES_SETTERS[i])) - return opCodes - FIRST_ORDER_OP_CODES.extend(create_group_op_codes(REGISTER_GROUP_OP_CODES)) SECOND_ORDER_OP_CODES = create_group_op_codes(SECOND_ORDER_REGISTER_OP_CODES) @@ -936,6 +918,7 @@ for pos in positions: result[pos] = entry[-1] return result - + OP_CODES = initialize_op_code_table(FIRST_ORDER_OP_CODES) FETCH_EXECUTE_OP_CODES = initialize_op_code_table(SECOND_ORDER_OP_CODES) + Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Wed Mar 19 22:20:03 2008 @@ -1,7 +1,7 @@ import py -from pypy.lang.gameboy.cpu import CPU, Register, DoubleRegister -from pypy.lang.gameboy.ram import RAM -from pypy.lang.gameboy import constants +from pypy.lang.gameboy.cpu import * +from pypy.lang.gameboy.ram import * +from pypy.lang.gameboy import * def get_cpu(): cpu = CPU(None, RAM()) @@ -118,13 +118,7 @@ # TEST CPU def test_getters(): - cpu = get_cpu() - assert cpu.getA() == constants.RESET_A - assert cpu.getF() == constants.RESET_F - assert cpu.bc.get() == constants.RESET_BC - assert cpu.de.get() == constants.RESET_DE - assert cpu.pc.get() == constants.RESET_PC - assert cpu.sp.get() == constants.RESET_SP + assert_default_registers(get_cpu()) def test_fetch(): @@ -182,20 +176,23 @@ def cycle_test(cpu, opCode, cycles=0): startCycles = cpu.cycles - cpu.execute(opCode) + try: + cpu.execute(opCode) + except Exception, inst: + assert False, "Opcode %s %s failed to execute: %s" % (hex(opCode), OP_CODES[opCode], inst) cpuUsedCycles = startCycles-cpu.cycles assert cpuUsedCycles == cycles,\ - "Cycles for opCode %s should be %i not %i" %\ - (hex(opCode), cycles, cpuUsedCycles) + "Cycles for opCode %s,%s should be %i not %i" %\ + (hex(opCode).ljust(2), cpu.OP_CODEs[opCode], CPU.cycles, cpuUsedCycles) # HELPERS -def assert_reset_registers(cpu): - return assert_registers(cpu, \ - constants.RESET_A, constants.RESET_BC,\ - constants.RESET_DE, constants.RESET_F,\ - constants.RESET_HL, constants.RESET_SP,\ - constants.RESET_PC) +def assert_default_registers(cpu, a=constants.RESET_A, bc=constants.RESET_BC,\ + de=constants.RESET_DE, f=constants.RESET_F,\ + hl=constants.RESET_HL, sp=constants.RESET_SP,\ + pc=constants.RESET_PC): + + return assert_registers(cpu, a, bc, de, f, hl, sp, pc) def assert_registers(cpu, a=None, bc=None, de=None, f=None, hl=None, sp=None, pc=None): if a is not None: @@ -218,6 +215,11 @@ if valueLo is not None: cpu.rom[cpu.pc.get()+1] = value & 0xFF +def set_registers(registers, value): + #if registers is not list: + # registers = [registers] + for register in registers: + register.set(value); # ------------------------------------------------------------ # opCode Testing @@ -226,12 +228,12 @@ def test_0x00(): cpu = get_cpu() cycle_test(cpu, 0x00, 1) - assert_reset_registers(cpu) + assert_default_registers(cpu) #load_mem_SP def test_0x08(): cpu = get_cpu() - assert_reset_registers(cpu) + assert_default_registers(cpu) startPC = cpu.pc.get() cpu.sp.set(0x1234) cpu.rom[startPC] = 0xD0 @@ -255,7 +257,7 @@ pc = cpu.pc.get() value = 0x12 cpu.rom[constants.RESET_PC] = value - assert_reset_registers(cpu) + assert_default_registers(cpu) cycle_test(cpu, 0x18, 3) assert_registers(cpu, pc=pc+value+1) @@ -307,7 +309,1593 @@ assert cpu.hl.get() == value value += 1 +# ld_BCi_A +def test_0x02(): + py.test.skip("Op Code Mapping not fully implemented") + cpu = get_cpu(); + cpu.bc.set(0xC2, 0x23); + cpu.a.set(0x12); + cycle_test(cpu, 0x02, 2); + assert cpu.read(cpu.bc.get()) == cpu.a.get() + +# ld_A_BCi +def test_0x0A(): + passs + +# ld_DEi_A +def test_0x12(): + cpu = get_cpu(); + cpu.de.set(0xC2, 0x23); + cpu.a.set(0x12); + cycle_test(cpu, 0x02, 2); + assert cpu.read(cpu.de.get()) == cpu.a.get() + +# load_a_DEi +def test_0x1A(): + pass + +# ldi_HLi_A +def test_0x22(): + cpu = get_cpu(); + cpu.hl.set(0xC2, 0x23); + cpu.a.set(0x12); + cycle_test(cpu, 0x02, 2); + assert cpu.read(cpu.hl.get()) == cpu.a.get()+1 + +# ldi_A_HLi +def test_0x2A(): + pass + +# ldd_HLi_A +def test_0x32(): + cpu = get_cpu(); + cpu.hl.set(0xC2, 0x23); + cpu.a.set(0x12); + cycle_test(cpu, 0x02, 2); + assert cpu.read(cpu.hl.get()) == cpu.a.get()-1 + +# ldd_A_HLi +def test_0x3A(): + pass + +# inc_BC DE HL SP +def test_0x03_to_0x33_inc_double_registers(): + py.test.skip("Op Code Mapping not fully implemented") + cpu = get_cpu() + opCode = 0x03 + registers = [cpu.bc, cpu.de, cpu.hl, cpu.sp] + value = 0x12 + for i in range(0,4): + set_registers(registers, 0) + registers[i].set(value) + cycle_test(cpu, opCode, 2); + assert registers[i].get() == value +1 + cpu.reset() + opCode += 0x10 + value += 3 + + +# dec_BC +def test_0x0B_to_0c38_dec_double_registers(): + py.test.skip("Op Code Mapping not fully implemented") + cpu = get_cpu() + opCode = 0x0B + registers = [cpu.bc, cpu.de, cpu.hl, cpu.sp] + value = 0x12 + for i in range(0,4): + set_registers(registers, 0) + registers[i].set(value) + cycle_test(cpu, opCode, 2); + assert registers[i].get() == value-1 + cpu.reset() + cpu.reset() + opCode += 0x10 + value += 3 + +# inc_B C D E H L A +def test_0x04_to_0x3C_inc_registers(): + py.test.skip("Op Code Mapping not fully implemented") + cpu = get_cpu() + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hl, cpu.a] + opCode = 0x04 + value = 0x12 + for i in range(0, len(registers)): + if registers[i] == cpu.hl: + continue + set_registers(registers, 0) + cycle_test(cpu, opCode, 1) + assert registers[i].get() == value+1 + cpu.reset() + opCode += 0x08 + value += 3 + +# inc_HLi +def test_0x34(): + cpu = get_cpu() + value = 0x1234 + cpu.hl.set(0xC003) + cpu.write(cpu.hl.get(), value) + cycle_test(cpu, 0x34, 3) + assert cpu.read(cpu.hl.get()) == value +1 + +# dec_B C D E H L A +def test_0x05_to_0x3D_dec_registers(): + py.test.skip("Op Code Mapping not fully implemented") + cpu = get_cpu() + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hl, cpu.a] + opCode = 0x05 + value = 0x12 + for i in range(0, len(registers)): + if registers[i] == cpu.hl: + continue + set_registers(registers, 0) + cycle_test(cpu, opCode, 1) + assert registers[i].get() == value-1 + cpu.reset() + opCode += 0x08 + value += 3 + +# dec_HLi +def test_0x35(): + cpu = get_cpu() + value = 0x1234 + cpu.hl.set(0xC003) + cpu.write(cpu.hl.get(), value) + cycle_test(cpu, 0x35, 3) + assert cpu.read(cpu.hl.get()) == value -1 +# ld_B_nn C D E H L A ) +def test_0x06_to_0x3A(): + py.test.skip("Op Code Mapping not fully implemented") + cpu = get_cpu() + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hl, cpu.a] + opCode = 0x06 + value = 0x12 + for i in range(0, len(registers)): + if registers[i] == cpu.hl: + continue + oldPC = cpu.pc.get() + set_registers(registers, 0) + prepare_for_fetch(cpu, value) + cycle_test(cpu, opCode, 2) + assert registers[i].get() == value + assert cpu.pc.get() - oldPC == 1 + cpu.reset() + opCode += 0x08 + value += 3 + +# ld_HLi_nn +def test_0x36(): + cpu = get_cpu() + value = 0x1234 + prepare_for_fetch(cpu, value) + oldPC = cpu.pc.get() + cycle_test(cpu, 0x36, 3) + assert cpu.read(cpu.hl.get()) == value + assert cpu.pc.get() - oldPC == 1 + +# rlca +def test_0x07(): + pass +# rrca +def test_0x0F(): + pass + +# rla +def test_0x17(): + pass + +# rra +def test_0x1F(): + pass + +# daa +def test_0x27(): + pass + +# cpl +def test_0x2F(): + pass + +# scf +def test_0x37(): + pass + +# ccf +def test_0x3F(): + pass + +# halt +def test_0x76(): + pass + +# ld_B_B +def test_0x40(): + pass +# ld_B_C +def test_0x41(): + pass +# ld_B_D +def test_0x42(): + pass +# ld_B_E +def test_0x43(): + pass +# ld_B_H +def test_0x44(): + pass +# ld_B_L +def test_0x45(): + pass +# ld_B_HLi +def test_0x46(): + pass +# ld_B_A +def test_0x47(): + pass +# ld_C_B +def test_0x48(): + pass +# ld_C_C +def test_0x49(): + pass +# ld_C_D +def test_0x4A(): + pass +# ld_C_E +def test_0x4B(): + pass +# ld_C_H +def test_0x4C(): + pass +# ld_C_L +def test_0x4D(): + pass +# ld_C_HLi +def test_0x4E(): + pass +# ld_C_A +def test_0x4F(): + pass +# ld_D_B +def test_0x50(): + pass +# ld_D_C +def test_0x51(): + pass +# ld_D_D +def test_0x52(): + pass +# ld_D_E +def test_0x53(): + pass +# ld_D_H +def test_0x54(): + pass +# ld_D_L +def test_0x55(): + pass +# ld_D_HLi +def test_0x56(): + pass +# ld_D_A +def test_0x57(): + pass +# ld_E_B +def test_0x58(): + pass +# ld_E_C +def test_0x59(): + pass +# ld_E_D +def test_0x5A(): + pass +# ld_E_E +def test_0x5B(): + pass +# ld_E_H +def test_0x5C(): + pass +# ld_E_L +def test_0x5D(): + pass +# ld_E_HLi +def test_0x5E(): + pass +# ld_E_A +def test_0x5F(): + pass +# ld_H_B +def test_0x60(): + pass +# ld_H_C +def test_0x61(): + pass +# ld_H_D +def test_0x62(): + pass +# ld_H_E +def test_0x63(): + pass +# ld_H_H +def test_0x64(): + pass +# ld_H_L +def test_0x65(): + pass +# ld_H_HLi +def test_0x66(): + pass +# ld_H_A +def test_0x67(): + pass +# ld_L_B +def test_0x68(): + pass +# ld_L_C +def test_0x69(): + pass +# ld_L_D +def test_0x6A(): + pass +# ld_L_E +def test_0x6B(): + pass +# ld_L_H +def test_0x6C(): + pass +# ld_L_L +def test_0x6D(): + pass +# ld_L_HLi +def test_0x6E(): + pass +# ld_L_A +def test_0x6F(): + pass +# ld_HLi_B +def test_0x70(): + pass +# ld_HLi_C +def test_0x71(): + pass +# ld_HLi_D +def test_0x72(): + pass +# ld_HLi_E +def test_0x73(): + pass +# ld_HLi_H +def test_0x74(): + pass +# ld_HLi_L +def test_0x75(): + pass +# ld_HLi_A +def test_0x77(): + pass +# ld_A_B +def test_0x78(): + pass +# ld_A_C +def test_0x79(): + pass +# ld_A_D +def test_0x7A(): + pass +# ld_A_E +def test_0x7B(): + pass +# ld_A_H +def test_0x7C(): + pass +# ld_A_L +def test_0x7D(): + pass +# ld_A_HLi +def test_0x7E(): + pass +# ld_A_A +def test_0x7F(): + pass + +# add_A_B +def test_0x80(): + pass +# add_A_C +def test_0x81(): + pass +# add_A_D +def test_0x82(): + pass +# add_A_E +def test_0x83(): + pass +# add_A_H +def test_0x84(): + pass +# add_A_L +def test_0x85(): + pass +# add_A_HLi +def test_0x86(): + pass +# add_A_A +def test_0x87(): + pass + +# adc_A_B +def test_0x88(): + pass +# adc_A_C +def test_0x89(): + pass +# adc_A_D +def test_0x8A(): + pass +# adc_A_E +def test_0x8B(): + pass +# adc_A_H +def test_0x8C(): + pass +# adc_A_L +def test_0x8D(): + pass +# adc_A_HLi +def test_0x8E(): + pass +# adc_A_A +def test_0x8F(): + pass + +# sub_A_B +def test_0x90(): + pass +# sub_A_C +def test_0x91(): + pass +# sub_A_D +def test_0x92(): + pass +# sub_A_E +def test_0x93(): + pass +# sub_A_H +def test_0x94(): + pass +# sub_A_L +def test_0x95(): + pass +# sub_A_HLi +def test_0x96(): + pass +# sub_A_A +def test_0x97(): + pass + +# sbc_A_B +def test_0x98(): + pass +# sbc_A_C +def test_0x99(): + pass +# sbc_A_D +def test_0x9A(): + pass +# sbc_A_E +def test_0x9B(): + pass +# sbc_A_H +def test_0x9C(): + pass +# sbc_A_L +def test_0x9D(): + pass +# sbc_A_HLi +def test_0x9E(): + pass +# sbc_A_A +def test_0x9F(): + pass + +# and_A_B +def test_0xA0(): + pass +# and_A_C +def test_0xA1(): + pass +# and_A_D +def test_0xA2(): + pass +# and_A_E +def test_0xA3(): + pass +# and_A_H +def test_0xA4(): + pass +# and_A_L +def test_0xA5(): + pass +# and_A_HLi +def test_0xA6(): + pass +# and_A_A +def test_0xA7(): + pass + +# xor_A_B +def test_0xA8(): + pass +# xor_A_C +def test_0xA9(): + pass +# xor_A_D +def test_0xAA(): + pass +# xor_A_E +def test_0xAB(): + pass +# xor_A_H +def test_0xAC(): + pass +# xor_A_L +def test_0xAD(): + pass +# xor_A_HLi +def test_0xAE(): + pass +# xor_A_A +def test_0xAF(): + pass + +# or_A_B +def test_0xB0(): + pass +# or_A_C +def test_0xB1(): + pass +# or_A_D +def test_0xB2(): + pass +# or_A_E +def test_0xB3(): + pass +# or_A_H +def test_0xB4(): + pass +# or_A_L +def test_0xB5(): + pass +# or_A_HLi +def test_0xB6(): + pass +# or_A_A +def test_0xB7(): + pass + +# cp_A_B +def test_0xB8(): + pass +# cp_A_C +def test_0xB9(): + pass +# cp_A_D +def test_0xBA(): + pass +# cp_A_E +def test_0xBB(): + pass +# cp_A_H +def test_0xBC(): + pass +# cp_A_L +def test_0xBD(): + pass +# cp_A_HLi +def test_0xBE(): + pass +# cp_A_A +def test_0xBF(): + pass + +# ret_NZ +def test_0xC0(): + pass +# ret_Z +def test_0xC8(): + pass +# ret_NC +def test_0xD0(): + pass +# ret_C +def test_0xD8(): + pass + +# ldh_mem_A +def test_0xE0(): + pass + +# add_SP_nn +def test_0xE8(): + pass + +# ldh_A_mem +def test_0xF0(): + pass + +# ld_HL_SP_nn +def test_0xF8(): + pass + +# pop_BC +def test_0xC1(): + pass +# pop_DE +def test_0xD1(): + pass +# pop_HL +def test_0xE1(): + pass +# pop_AF +def test_0xF1(): + pass + +# ret +def test_0xC9(): + pass + +# reti +def test_0xD9(): + pass + +# ld_PC_HL +def test_0xE9(): + pass + +# ld_SP_HL +def test_0xF9(): + pass + +# jp_NZ_nnnn +def test_0xC2(): + pass +# jp_Z_nnnn +def test_0xCA(): + pass +# jp_NC_nnnn +def test_0xD2(): + pass +# jp_C_nnnn +def test_0xDA(): + pass + +# ldh_Ci_A +def test_0xE2(): + pass + +# ld_mem_A +def test_0xEA(): + pass + +# ldh_A_Ci +def test_0xF2(): + pass + +# ld_A_mem +def test_0xFA(): + pass + +# jp_nnnn +def test_0xC3(): + pass + + +# di +def test_0xF3(): + pass + +# ei +def test_0xFB(): + pass + +# call_NZ_nnnn +def test_0xC4(): + pass +# call_Z_nnnn +def test_0xCC(): + pass +# call_NC_nnnn +def test_0xD4(): + pass +# call_C_nnnn +def test_0xDC(): + pass + +# push_BC +def test_0xC5(): + pass +# push_DE +def test_0xD5(): + pass +# push_HL +def test_0xE5(): + pass +# push_AF +def test_0xF5(): + pass + +# call_nnnn +def test_0xCD(): + pass + +# add_A_nn +def test_0xC6(): + pass + +# adc_A_nn +def test_0xCE(): + pass + +# sub_A_nn +def test_0xD6(): + pass + +# sbc_A_nn +def test_0xDE(): + pass + +# and_A_nn +def test_0xE6(): + pass + +# xor_A_nn +def test_0xEE(): + pass + +# or_A_nn +def test_0xF6(): + pass + +# cp_A_nn +def test_0xFE(): + pass + +# rst +def test_0xC7(): + pass +# rst +def test_0xCF(): + pass +# rst +def test_0xD7(): + pass +# rst +def test_0xDF(): + pass +# rst +def test_0xE7(): + pass +# rst +def test_0xEF(): + pass +# rst +def test_0xF7(): + pass +# rst +def test_0xFF(): + pass + + + +# switching to other opcode set +def test_0xCB(): + pass + + +# rlc_B +def test_0x00(): + pass +# rlc_C +def test_0x01(): + pass +# rlc_D +def test_0x02(): + pass +# rlc_E +def test_0x03(): + pass +# rlc_H +def test_0x04(): + pass +# rlc_L +def test_0x05(): + pass +# rlc_HLi +def test_0x06(): + pass +# rlc_A +def test_0x07(): + pass + +# rrc_B +def test_0x08(): + pass +# rrc_C +def test_0x09(): + pass +# rrc_D +def test_0x0A(): + pass +# rrc_E +def test_0x0B(): + pass +# rrc_H +def test_0x0C(): + pass +# rrc_L +def test_0x0D(): + pass +# rrc_HLi +def test_0x0E(): + pass +# rrc_A +def test_0x0F(): + pass + +# rl_B +def test_0x10(): + pass +# rl_C +def test_0x11(): + pass +# rl_D +def test_0x12(): + pass +# rl_E +def test_0x13(): + pass +# rl_H +def test_0x14(): + pass +# rl_L +def test_0x15(): + pass +# rl_HLi +def test_0x16(): + pass +# rl_A +def test_0x17(): + pass + +# rr_B +def test_0x18(): + pass +# rr_C +def test_0x19(): + pass +# rr_D +def test_0x1A(): + pass +# rr_E +def test_0x1B(): + pass +# rr_H +def test_0x1C(): + pass +# rr_L +def test_0x1D(): + pass +# rr_HLi +def test_0x1E(): + pass +# rr_A +def test_0x1F(): + pass + +# sla_B +def test_0x20(): + pass +# sla_C +def test_0x21(): + pass +# sla_D +def test_0x22(): + pass +# sla_E +def test_0x23(): + pass +# sla_H +def test_0x24(): + pass +# sla_L +def test_0x25(): + pass +# sla_HLi +def test_0x26(): + pass +# sla_A +def test_0x27(): + pass + +# sra_B +def test_0x28(): + pass +# sra_C +def test_0x29(): + pass +# sra_D +def test_0x2A(): + pass +# sra_E +def test_0x2B(): + pass +# sra_H +def test_0x2C(): + pass +# sra_L +def test_0x2D(): + pass +# sra_HLi +def test_0x2E(): + pass +# sra_A +def test_0x2F(): + pass + +# swap_B +def test_0x30(): + pass +# swap_C +def test_0x31(): + pass +# swap_D +def test_0x32(): + pass +# swap_E +def test_0x33(): + pass +# swap_H +def test_0x34(): + pass +# swap_L +def test_0x35(): + pass +# swap_HLi +def test_0x36(): + pass +# swap_A +def test_0x37(): + pass + +# srl_B +def test_0x38(): + pass +# srl_C +def test_0x39(): + pass +# srl_D +def test_0x3A(): + pass +# srl_E +def test_0x3B(): + pass +# srl_H +def test_0x3C(): + pass +# srl_L +def test_0x3D(): + pass +# srl_HLi +def test_0x3E(): + pass +# srl_A +def test_0x3F(): + pass + +# bit_B +def test_0x40(): + pass +# bit_C +def test_0x41(): + pass +# bit_D +def test_0x42(): + pass +# bit_E +def test_0x43(): + pass +# bit_H +def test_0x44(): + pass +# bit_L +def test_0x45(): + pass +# bit_HLi +def test_0x46(): + pass +# bit_A +def test_0x47(): + pass + +# bit_B +def test_0x48(): + pass +# bit_C +def test_0x49(): + pass +# bit_D +def test_0x4A(): + pass +# bit_E +def test_0x4B(): + pass +# bit_H +def test_0x4C(): + pass +# bit_L +def test_0x4D(): + pass +# bit_HLi +def test_0x4E(): + pass +# bit_A +def test_0x4F(): + pass + +# bit_B +def test_0x50(): + pass +# bit_C +def test_0x51(): + pass +# bit_D +def test_0x52(): + pass +# bit_E +def test_0x53(): + pass +# bit_H +def test_0x54(): + pass +# bit_L +def test_0x55(): + pass +# bit_HLi +def test_0x56(): + pass +# bit_A +def test_0x57(): + pass + +# bit_B +def test_0x58(): + pass +# bit_C +def test_0x59(): + pass +# bit_D +def test_0x5A(): + pass +# bit_E +def test_0x5B(): + pass +# bit_H +def test_0x5C(): + pass +# bit_L +def test_0x5D(): + pass +# bit_HLi +def test_0x5E(): + pass +# bit_A +def test_0x5F(): + pass + +# bit_B +def test_0x60(): + pass +# bit_C +def test_0x61(): + pass +# bit_D +def test_0x62(): + pass +# bit_E +def test_0x63(): + pass +# bit_H +def test_0x64(): + pass +# bit_L +def test_0x65(): + pass +# bit_HLi +def test_0x66(): + pass +# bit_A +def test_0x67(): + pass + +# bit_B +def test_0x68(): + pass +# bit_C +def test_0x69(): + pass +# bit_D +def test_0x6A(): + pass +# bit_E +def test_0x6B(): + pass +# bit_H +def test_0x6C(): + pass +# bit_L +def test_0x6D(): + pass +# bit_HLi +def test_0x6E(): + pass +# bit_A +def test_0x6F(): + pass + +# bit_B +def test_0x70(): + pass +# bit_C +def test_0x71(): + pass +# bit_D +def test_0x72(): + pass +# bit_E +def test_0x73(): + pass +# bit_H +def test_0x74(): + pass +# bit_L +def test_0x75(): + pass +# bit_HLi +def test_0x76(): + pass +# bit_A +def test_0x77(): + pass + +# bit_B +def test_0x78(): + pass +# bit_C +def test_0x79(): + pass +# bit_D +def test_0x7A(): + pass +# bit_E +def test_0x7B(): + pass +# bit_H +def test_0x7C(): + pass +# bit_L +def test_0x7D(): + pass +# bit_HLi +def test_0x7E(): + pass +# bit_A +def test_0x7F(): + pass + +# set_B +def test_0xC0(): + pass +# set_C +def test_0xC1(): + pass +# set_D +def test_0xC2(): + pass +# set_E +def test_0xC3(): + pass +# set_H +def test_0xC4(): + pass +# set_L +def test_0xC5(): + pass +# set_HLi +def test_0xC6(): + pass +# set_A +def test_0xC7(): + pass + +# set_B +def test_0xC8(): + pass +# set_C +def test_0xC9(): + pass +# set_D +def test_0xCA(): + pass +# set_E +def test_0xCB(): + pass +# set_H +def test_0xCC(): + pass +# set_L +def test_0xCD(): + pass +# set_HLi +def test_0xCE(): + pass +# set_A +def test_0xCF(): + pass + +# set_B +def test_0xD0(): + pass +# set_C +def test_0xD1(): + pass +# set_D +def test_0xD2(): + pass +# set_E +def test_0xD3(): + pass +# set_H +def test_0xD4(): + pass +# set_L +def test_0xD5(): + pass +# set_HLi +def test_0xD6(): + pass +# set_A +def test_0xD7(): + pass + +# set_B +def test_0xD8(): + pass +# set_C +def test_0xD9(): + pass +# set_D +def test_0xDA(): + pass +# set_E +def test_0xDB(): + pass +# set_H +def test_0xDC(): + pass +# set_L +def test_0xDD(): + pass +# set_HLi +def test_0xDE(): + pass +# set_A +def test_0xDF(): + pass + +# set_B +def test_0xE0(): + pass +# set_C +def test_0xE1(): + pass +# set_D +def test_0xE2(): + pass +# set_E +def test_0xE3(): + pass +# set_H +def test_0xE4(): + pass +# set_L +def test_0xE5(): + pass +# set_HLi +def test_0xE6(): + pass +# set_A +def test_0xE7(): + pass + +# set_B +def test_0xE8(): + pass +# set_C +def test_0xE9(): + pass +# set_D +def test_0xEA(): + pass +# set_E +def test_0xEB(): + pass +# set_H +def test_0xEC(): + pass +# set_L +def test_0xED(): + pass +# set_HLi +def test_0xEE(): + pass +# set_A +def test_0xEF(): + pass + +# set_B +def test_0xF0(): + pass +# set_C +def test_0xF1(): + pass +# set_D +def test_0xF2(): + pass +# set_E +def test_0xF3(): + pass +# set_H +def test_0xF4(): + pass +# set_L +def test_0xF5(): + pass +# set_HLi +def test_0xF6(): + pass +# set_A +def test_0xF7(): + pass + +# set_B +def test_0xF8(): + pass +# set_C +def test_0xF9(): + pass +# set_D +def test_0xFA(): + pass +# set_E +def test_0xFB(): + pass +# set_H +def test_0xFC(): + pass +# set_L +def test_0xFD(): + pass +# set_HLi +def test_0xFE(): + pass +# set_A +def test_0xFF(): + pass + +# res_B +def test_0x80(): + pass +# res_C +def test_0x81(): + pass +# res_D +def test_0x82(): + pass +# res_E +def test_0x83(): + pass +# res_H +def test_0x84(): + pass +# res_L +def test_0x85(): + pass +# res_HLi +def test_0x86(): + pass +# res_A +def test_0x87(): + pass + +# res_B +def test_0x88(): + pass +# res_C +def test_0x89(): + pass +# res_D +def test_0x8A(): + pass +# res_E +def test_0x8B(): + pass +# res_H +def test_0x8C(): + pass +# res_L +def test_0x8D(): + pass +# res_HLi +def test_0x8E(): + pass +# res_A +def test_0x8F(): + pass + +# res_B +def test_0x90(): + pass +# res_C +def test_0x91(): + pass +# res_D +def test_0x92(): + pass +# res_E +def test_0x93(): + pass +# res_H +def test_0x94(): + pass +# res_L +def test_0x95(): + pass +# res_HLi +def test_0x96(): + pass +# res_A +def test_0x97(): + pass + +# res_B +def test_0x98(): + pass +# res_C +def test_0x99(): + pass +# res_D +def test_0x9A(): + pass +# res_E +def test_0x9B(): + pass +# res_H +def test_0x9C(): + pass +# res_L +def test_0x9D(): + pass +# res_HLi +def test_0x9E(): + pass +# res_A +def test_0x9F(): + pass + +# res_B +def test_0xA0(): + pass +# res_C +def test_0xA1(): + pass +# res_D +def test_0xA2(): + pass +# res_E +def test_0xA3(): + pass +# res_H +def test_0xA4(): + pass +# res_L +def test_0xA5(): + pass +# res_HLi +def test_0xA6(): + pass +# res_A +def test_0xA7(): + pass + +# res_B +def test_0xA8(): + pass +# res_C +def test_0xA9(): + pass +# res_D +def test_0xAA(): + pass +# res_E +def test_0xAB(): + pass +# res_H +def test_0xAC(): + pass +# res_L +def test_0xAD(): + pass +# res_HLi +def test_0xAE(): + pass +# res_A +def test_0xAF(): + pass + +# res_B +def test_0xB0(): + pass +# res_C +def test_0xB1(): + pass +# res_D +def test_0xB2(): + pass +# res_E +def test_0xB3(): + pass +# res_H +def test_0xB4(): + pass +# res_L +def test_0xB5(): + pass +# res_HLi +def test_0xB6(): + pass +# res_A +def test_0xB7(): + pass + +# res_B +def test_0xB8(): + pass +# res_C +def test_0xB9(): + pass +# res_D +def test_0xBA(): + pass +# res_E +def test_0xBB(): + pass +# res_H +def test_0xBC(): + pass +# res_L +def test_0xBD(): + pass +# res_HLi +def test_0xBE(): + pass +# res_A +def test_0xBF(): + pass + + + + \ No newline at end of file From cfbolz at codespeak.net Wed Mar 19 22:30:10 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 22:30:10 +0100 (CET) Subject: [pypy-svn] r52746 - pypy/branch/jit-hotpath/pypy/jit/tl Message-ID: <20080319213010.11CEB169EF7@codespeak.net> Author: cfbolz Date: Wed Mar 19 22:30:09 2008 New Revision: 52746 Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py Log: make boxes immutable Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py Wed Mar 19 22:30:09 2008 @@ -43,6 +43,7 @@ pass class IntBox(Box): + _immutable_ = True def __init__(self, intval): self.intval = intval def as_int(self): @@ -51,6 +52,7 @@ return str(self.intval) class StrBox(Box): + _immutable_ = True def __init__(self, strval): self.strval = strval def as_int(self): From cfbolz at codespeak.net Wed Mar 19 22:31:36 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 22:31:36 +0100 (CET) Subject: [pypy-svn] r52747 - pypy/branch/jit-hotpath/pypy/jit/timeshifter/test Message-ID: <20080319213136.287BF169EF7@codespeak.net> Author: cfbolz Date: Wed Mar 19 22:31:35 2008 New Revision: 52747 Removed: pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_timeshift.py Log: these tests are all ported From fijal at codespeak.net Wed Mar 19 22:40:35 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 19 Mar 2008 22:40:35 +0100 (CET) Subject: [pypy-svn] r52748 - in pypy/dist/pypy/rpython: . test Message-ID: <20080319214035.AD9F9169F07@codespeak.net> Author: fijal Date: Wed Mar 19 22:40:35 2008 New Revision: 52748 Added: pypy/dist/pypy/rpython/test/test_annlowlevel.py (contents, props changed) Modified: pypy/dist/pypy/rpython/annlowlevel.py Log: Test and a fix for hlstr called directly on top of pypy-c Modified: pypy/dist/pypy/rpython/annlowlevel.py ============================================================================== --- pypy/dist/pypy/rpython/annlowlevel.py (original) +++ pypy/dist/pypy/rpython/annlowlevel.py Wed Mar 19 22:40:35 2008 @@ -382,8 +382,8 @@ # ____________________________________________________________ def hlstr(ll_s): - if hasattr(ll_s, 'items'): - return ''.join(ll_s.items) + if hasattr(ll_s, 'chars'): + return ''.join(ll_s.chars) else: return ll_s._str Added: pypy/dist/pypy/rpython/test/test_annlowlevel.py ============================================================================== --- (empty file) +++ pypy/dist/pypy/rpython/test/test_annlowlevel.py Wed Mar 19 22:40:35 2008 @@ -0,0 +1,16 @@ + +""" Few tests for annlowlevel helpers +""" + +from pypy.rpython.test.tool import BaseRtypingTest, LLRtypeMixin, OORtypeMixin +from pypy.rpython.lltypesystem.rstr import mallocstr +from pypy.rpython.annlowlevel import hlstr + +class TestLLType(BaseRtypingTest, LLRtypeMixin): + def test_hlstr(self): + s = mallocstr(3) + s.chars[0] = "a" + s.chars[1] = "b" + s.chars[2] = "c" + assert hlstr(s) == "abc" + From cfbolz at codespeak.net Wed Mar 19 22:57:08 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 22:57:08 +0100 (CET) Subject: [pypy-svn] r52749 - pypy/branch/jit-hotpath/pypy/jit/timeshifter/test Message-ID: <20080319215708.E01A4169EEB@codespeak.net> Author: cfbolz Date: Wed Mar 19 22:57:05 2008 New Revision: 52749 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py Log: passing test about virtual structs not merging ptr variables Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py Wed Mar 19 22:57:05 2008 @@ -60,7 +60,6 @@ # check that frozenbox also matches newbox exactly assert self.match(frozenbox, newbox, [constbox23]) - def test_simple_merge_generalize(self): S = self.STRUCT constbox20 = makebox(20) @@ -97,6 +96,17 @@ # constbox20 in oldbox. + def test_merge_with_ptrvar(self): + V0 = FakeGenVar() + ptrbox = rvalue.PtrRedBox("dummy pointer", V0) + S = self.STRUCT + constbox20 = makebox(20) + oldbox = vmalloc(S, constbox20) + frozenbox = oldbox.freeze(rvalue.freeze_memo()) + # check that ptrbox does not match the frozen virtual struct + assert not self.match(frozenbox, ptrbox, [ptrbox]) + + def test_nested_structure_no_vars(self): NESTED = self.NESTEDSTRUCT constbox30 = makebox(30) From fijal at codespeak.net Wed Mar 19 23:38:07 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Wed, 19 Mar 2008 23:38:07 +0100 (CET) Subject: [pypy-svn] r52750 - pypy/branch/faster-calls Message-ID: <20080319223807.3F0E9169F0E@codespeak.net> Author: fijal Date: Wed Mar 19 23:38:05 2008 New Revision: 52750 Added: pypy/branch/faster-calls/ - copied from r52749, pypy/dist/ Log: A branch to try to improve call speed. From cfbolz at codespeak.net Wed Mar 19 23:57:08 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 23:57:08 +0100 (CET) Subject: [pypy-svn] r52751 - pypy/branch/jit-hotpath/pypy/jit/tl Message-ID: <20080319225708.92568168576@codespeak.net> Author: cfbolz Date: Wed Mar 19 23:57:03 2008 New Revision: 52751 Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py Log: a fibonacci that just outputs the final result Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py Wed Mar 19 23:57:03 2008 @@ -246,3 +246,10 @@ def test_fibonacci(): res = interpret(FIBONACCI, [IntBox(1), IntBox(1), IntBox(10)]) assert repr(res) == "Fibonacci numbers: 1 1 2 3 5 8 13 21 34 55" + + +FIBONACCI_SINGLE = """#3 1 SUB ->#3 { #2 #1 #2 ADD ->#2 ->#1 #3 1 SUB ->#3 #3 } #1""".split() + +def test_fibonacci_single(): + res = interpret(FIBONACCI_SINGLE, [IntBox(1), IntBox(1), IntBox(11)]) + assert repr(res) == "89" From cfbolz at codespeak.net Wed Mar 19 23:57:56 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Wed, 19 Mar 2008 23:57:56 +0100 (CET) Subject: [pypy-svn] r52752 - in pypy/branch/jit-hotpath/pypy/jit: rainbow/test timeshifter timeshifter/test Message-ID: <20080319225756.BD71B168573@codespeak.net> Author: cfbolz Date: Wed Mar 19 23:57:56 2008 New Revision: 52752 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py Log: Never merge virtual structures with something non-virtual. I am highly unsure about this checkin. If anything, it proves that we need to think a lot more. However, it produces vastly better (and conceptually correcter too) code for targettiny2hotpath. Two tests are broken or rather behave differently than before. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Wed Mar 19 23:57:56 2008 @@ -442,7 +442,7 @@ 'int_is_true': 1}) def test_hp_tiny2(self): - from pypy.jit.tl.tiny2_hotpath import interpret, FACTORIAL, FIBONACCI + from pypy.jit.tl.tiny2_hotpath import interpret, FACTORIAL, FIBONACCI_SINGLE from pypy.jit.tl.tiny2_hotpath import IntBox, StrBox, repr from pypy.jit.tl.targettiny2hotpath import MyHintAnnotatorPolicy @@ -451,7 +451,7 @@ bytecode = FACTORIAL args = [IntBox(n)] elif case == 2: - bytecode = FIBONACCI + bytecode = FIBONACCI_SINGLE args = [IntBox(1), IntBox(1), IntBox(n)] elif case == 3: bytecode = "{ #1 #1 1 SUB ->#1 #1 }".split(" ") @@ -462,11 +462,16 @@ return repr(stack) POLICY = MyHintAnnotatorPolicy() - res = self.run(main, [1, 11], threshold=2, policy=POLICY) - assert ''.join(res.chars) == "The factorial of 11 is 39916800" + #res = self.run(main, [1, 11], threshold=2, policy=POLICY) + #assert ''.join(res.chars) == "The factorial of 11 is 39916800" + # nothing is forced + self.check_insns_in_loops(malloc=0) - res = self.run(main, [2, 11], threshold=2, policy=POLICY) - assert ''.join(res.chars) == "Fibonacci numbers: 1 1 2 3 5 8 13 21 34 55 89" + res = self.run(main, [2, 20], threshold=2, policy=POLICY) + assert ''.join(res.chars) == "6765" + self.check_insns_in_loops(malloc=0) res = self.run(main, [3, 40], threshold=10, policy=POLICY) assert ''.join(res.chars) == " ".join([str(n) for n in range(40, 0, -1)]) + # XXX should check something about the produced code as well, but no + # clue what Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Wed Mar 19 23:57:56 2008 @@ -623,11 +623,7 @@ res = self.run(ll_function, [], threshold=2) assert res.x == 123 - # ATM 'res' is forced at each iteration, because it gets merged with - # the 'res' that comes from outside (the first copy of the loop body - # which exists outside the portal, up to the jit_merge_point) - self.check_insns_in_loops({'malloc': 1, 'setfield': 1, - 'int_gt': 1, 'int_rshift': 1}) + self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_plus_minus(self): class MyJitDriver(JitDriver): @@ -838,6 +834,7 @@ self.check_insns({'int_lt': 1, 'int_mul': 1}) def test_red_subcontainer_escape(self): + py.test.skip("broken") class MyJitDriver(JitDriver): greens = [] reds = ['k', 'i', 'res'] Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Wed Mar 19 23:57:56 2008 @@ -456,6 +456,7 @@ self.check_insns_in_loops(getfield=4) def test_simple_with_setting_new_struct(self): + py.test.skip("broken?") class MyJitDriver(JitDriver): greens = [] reds = ['i', 'tot', 'xp', 'a', 'b'] Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Wed Mar 19 23:57:56 2008 @@ -487,6 +487,7 @@ self.known_nonzero = known_nonzero def exactmatch(self, box, outgoingvarboxes, memo): + from pypy.jit.timeshifter.rcontainer import VirtualContainer assert isinstance(box, PtrRedBox) memo.partialdatamatch[box] = None if not self.known_nonzero: @@ -494,8 +495,7 @@ match = FrozenVar.exactmatch(self, box, outgoingvarboxes, memo) if self.known_nonzero and not box.known_nonzero: match = False - if not memo.force_merge and not match: - from pypy.jit.timeshifter.rcontainer import VirtualContainer + if not memo.force_merge: if isinstance(box.content, VirtualContainer): raise DontMerge # XXX recursive data structures? return match @@ -534,8 +534,7 @@ def exactmatch(self, box, outgoingvarboxes, memo): assert isinstance(box, PtrRedBox) if box.genvar: - outgoingvarboxes.append(box) - match = False + raise DontMerge else: assert box.content is not None match = self.fz_content.exactmatch(box.content, outgoingvarboxes, Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py Wed Mar 19 23:57:56 2008 @@ -1,3 +1,5 @@ +import py + from pypy.rpython.lltypesystem import lltype from pypy.jit.timeshifter import rvalue, rcontainer from pypy.jit.timeshifter.test.support import FakeJITState, FakeGenVar @@ -97,14 +99,20 @@ def test_merge_with_ptrvar(self): + DontMerge = rvalue.DontMerge V0 = FakeGenVar() ptrbox = rvalue.PtrRedBox("dummy pointer", V0) S = self.STRUCT constbox20 = makebox(20) oldbox = vmalloc(S, constbox20) frozenbox = oldbox.freeze(rvalue.freeze_memo()) - # check that ptrbox does not match the frozen virtual struct - assert not self.match(frozenbox, ptrbox, [ptrbox]) + # check that ptrbox does not match the frozen virtual struct ever + py.test.raises(DontMerge, self.match, frozenbox, ptrbox, [ptrbox]) + + # try it the other way round + frozenptrbox = ptrbox.freeze(rvalue.freeze_memo()) + py.test.raises(DontMerge, self.match, frozenptrbox, oldbox, [oldbox]) + def test_nested_structure_no_vars(self): From fijal at codespeak.net Thu Mar 20 00:18:31 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 20 Mar 2008 00:18:31 +0100 (CET) Subject: [pypy-svn] r52753 - pypy/branch/faster-calls/pypy/interpreter Message-ID: <20080319231831.B07B5169E00@codespeak.net> Author: fijal Date: Thu Mar 20 00:18:29 2008 New Revision: 52753 Modified: pypy/branch/faster-calls/pypy/interpreter/function.py pypy/branch/faster-calls/pypy/interpreter/gateway.py Log: Few lines of simplification. Modified: pypy/branch/faster-calls/pypy/interpreter/function.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/function.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/function.py Thu Mar 20 00:18:29 2008 @@ -66,30 +66,21 @@ def funccall_valuestack(self, nargs, frame): # speed hack code = self.getcode() # hook for the jit - if nargs == 0: - w_res = code.fastcall_0(self.space, self) - if w_res is not None: - return w_res - elif nargs == 1: - w_res = code.fastcall_1(self.space, self, frame.peekvalue(0)) - if w_res is not None: - return w_res - elif nargs == 2: - w_res = code.fastcall_2(self.space, self, frame.peekvalue(1), - frame.peekvalue(0)) - if w_res is not None: - return w_res - elif nargs == 3: - w_res = code.fastcall_3(self.space, self, frame.peekvalue(2), - frame.peekvalue(1), frame.peekvalue(0)) - if w_res is not None: - return w_res - elif nargs == 4: - w_res = code.fastcall_4(self.space, self, frame.peekvalue(3), - frame.peekvalue(2), frame.peekvalue(1), - frame.peekvalue(0)) - if w_res is not None: - return w_res + if nargs == code.do_fastcall: + if nargs == 0: + return code.fastcall_0(self.space, self) + elif nargs == 1: + return code.fastcall_1(self.space, self, frame.peekvalue(0)) + elif nargs == 2: + return code.fastcall_2(self.space, self, frame.peekvalue(1), + frame.peekvalue(0)) + elif nargs == 3: + return code.fastcall_3(self.space, self, frame.peekvalue(2), + frame.peekvalue(1), frame.peekvalue(0)) + elif nargs == 4: + return code.fastcall_4(self.space, self, frame.peekvalue(3), + frame.peekvalue(2), frame.peekvalue(1), + frame.peekvalue(0)) args = frame.make_arguments(nargs) try: return self.call_args(args) @@ -99,24 +90,17 @@ def funccall_obj_valuestack(self, w_obj, nargs, frame): # speed hack code = self.getcode() # hook for the jit - if nargs == 0: - w_res = code.fastcall_1(self.space, self, w_obj) - if w_res is not None: - return w_res - elif nargs == 1: - w_res = code.fastcall_2(self.space, self, w_obj, frame.peekvalue(0)) - if w_res is not None: - return w_res - elif nargs == 2: - w_res = code.fastcall_3(self.space, self, w_obj, frame.peekvalue(1), - frame.peekvalue(0)) - if w_res is not None: - return w_res - elif nargs == 3: - w_res = code.fastcall_4(self.space, self, w_obj, frame.peekvalue(2), - frame.peekvalue(1), frame.peekvalue(0)) - if w_res is not None: - return w_res + if nargs == code.do_fastcall: + if nargs == 0: + return code.fastcall_1(self.space, self, w_obj) + elif nargs == 1: + return code.fastcall_2(self.space, self, w_obj, frame.peekvalue(0)) + elif nargs == 2: + return code.fastcall_3(self.space, self, w_obj, frame.peekvalue(1), + frame.peekvalue(0)) + elif nargs == 3: + w_res = code.fastcall_4(self.space, self, w_obj, frame.peekvalue(2), + frame.peekvalue(1), frame.peekvalue(0)) stkargs = frame.make_arguments(nargs) args = stkargs.prepend(w_obj) try: Modified: pypy/branch/faster-calls/pypy/interpreter/gateway.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/gateway.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/gateway.py Thu Mar 20 00:18:29 2008 @@ -382,6 +382,7 @@ hidden_applevel = True descrmismatch_op = None descr_reqcls = None + do_fastcall = -1 # When a BuiltinCode is stored in a Function object, # you get the functionality of CPython's built-in function type. @@ -551,6 +552,7 @@ return w_result class BuiltinCode0(BuiltinCode): + do_fastcall = 0 def fastcall_0(self, space, w_func): self = hint(self, deepfreeze=True) try: @@ -567,6 +569,7 @@ return w_result class BuiltinCode1(BuiltinCode): + do_fastcall = 1 def fastcall_1(self, space, w_func, w1): self = hint(self, deepfreeze=True) try: @@ -588,6 +591,7 @@ return w_result class BuiltinCode2(BuiltinCode): + do_fastcall = 2 def fastcall_2(self, space, w_func, w1, w2): self = hint(self, deepfreeze=True) try: @@ -609,6 +613,7 @@ return w_result class BuiltinCode3(BuiltinCode): + do_fastcall = 3 def fastcall_3(self, space, func, w1, w2, w3): self = hint(self, deepfreeze=True) try: @@ -630,6 +635,7 @@ return w_result class BuiltinCode4(BuiltinCode): + do_fastcall = 4 def fastcall_4(self, space, func, w1, w2, w3, w4): self = hint(self, deepfreeze=True) try: From fijal at codespeak.net Thu Mar 20 00:19:06 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 20 Mar 2008 00:19:06 +0100 (CET) Subject: [pypy-svn] r52754 - pypy/branch/faster-calls/pypy/interpreter Message-ID: <20080319231906.F337D169E00@codespeak.net> Author: fijal Date: Thu Mar 20 00:19:05 2008 New Revision: 52754 Modified: pypy/branch/faster-calls/pypy/interpreter/executioncontext.py pypy/branch/faster-calls/pypy/interpreter/pyframe.py pypy/branch/faster-calls/pypy/interpreter/pyopcode.py Log: I claim that this speeds up calls a bit. Unable to proove it, because my translation is gone. Modified: pypy/branch/faster-calls/pypy/interpreter/executioncontext.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/executioncontext.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/executioncontext.py Thu Mar 20 00:19:05 2008 @@ -105,7 +105,6 @@ self.ticker = ticker if ticker < 0 or frame.w_f_trace is not None: self._do_bytecode_trace(frame) - bytecode_trace._always_inline_ = True def _do_bytecode_trace(self, frame): if self.ticker < 0: @@ -152,7 +151,8 @@ if frame.instr_lb == frame.last_instr: # At start of line! frame.f_lineno = line - self._trace(frame, 'line', self.space.w_None) + if self.is_tracing: + self._trace(frame, 'line', self.space.w_None) frame.instr_prev = frame.last_instr Modified: pypy/branch/faster-calls/pypy/interpreter/pyframe.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/pyframe.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/pyframe.py Thu Mar 20 00:19:05 2008 @@ -105,7 +105,8 @@ executioncontext = self.space.getexecutioncontext() executioncontext.enter(self) try: - executioncontext.call_trace(self) + if not executioncontext.is_tracing: + executioncontext.call_trace(self) # Execution starts just after the last_instr. Initially, # last_instr is -1. After a generator suspends it points to # the YIELD_VALUE instruction. @@ -113,7 +114,8 @@ w_exitvalue = self.dispatch(self.pycode, next_instr, executioncontext) rstack.resume_point("execute_frame", self, executioncontext, returns=w_exitvalue) - executioncontext.return_trace(self, w_exitvalue) + if not executioncontext.is_tracing: + executioncontext.return_trace(self, w_exitvalue) # on exit, we try to release self.last_exception -- breaks an # obvious reference cycle, so it helps refcounting implementations self.last_exception = None Modified: pypy/branch/faster-calls/pypy/interpreter/pyopcode.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/pyopcode.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/pyopcode.py Thu Mar 20 00:19:05 2008 @@ -124,7 +124,8 @@ pytraceback.record_application_traceback( self.space, operr, self, self.last_instr) if not we_are_jitted(): - ec.exception_trace(self, operr) + if not ec.is_tracing: + ec.exception_trace(self, operr) block = self.unrollstack(SApplicationException.kind) if block is None: @@ -146,7 +147,9 @@ while True: self.last_instr = intmask(next_instr) if not we_are_jitted(): - ec.bytecode_trace(self) + if self.w_f_trace is None or ec.pending_actions \ + or ec.space.pending_actions: + ec.bytecode_trace(self) next_instr = r_uint(self.last_instr) opcode = ord(co_code[next_instr]) next_instr += 1 From cfbolz at codespeak.net Thu Mar 20 00:27:33 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Thu, 20 Mar 2008 00:27:33 +0100 (CET) Subject: [pypy-svn] r52755 - pypy/branch/jit-hotpath/pypy/module/pypyjit Message-ID: <20080319232733.1695A169E1C@codespeak.net> Author: cfbolz Date: Thu Mar 20 00:27:33 2008 New Revision: 52755 Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Log: (arigo, cfbolz): try to adapt the pypy python interpreter to the hotpath way of hints. This is untested and thus likely broken. Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Thu Mar 20 00:27:33 2008 @@ -10,7 +10,7 @@ import sys from pypy.tool.pairtype import extendabletype from pypy.rlib.rarithmetic import r_uint, intmask -from pypy.rlib.jit import hint, _is_early_constant +from pypy.rlib.jit import hint, _is_early_constant, JitDriver import pypy.interpreter.pyopcode # for side-effects from pypy.interpreter.eval import Frame from pypy.interpreter.pycode import PyCode, CO_VARARGS, CO_VARKEYWORDS @@ -23,108 +23,74 @@ PyCode.jit_enable = False # new default attribute super_dispatch = PyFrame.dispatch -class __extend__(PyFrame): - - def dispatch(self, pycode, next_instr, ec): - if pycode.jit_enable: - return self.dispatch_jit(pycode, next_instr, ec) - else: - self = hint(self, access_directly=True) - return super_dispatch(self, pycode, next_instr, ec) - - def dispatch_jit(self, pycode, next_instr, ec): - hint(None, global_merge_point=True) - pycode = hint(pycode, deepfreeze=True) - - entry_fastlocals_w = self.jit_enter_frame(pycode, next_instr) - - # For the sequel, force 'next_instr' to be unsigned for performance - next_instr = r_uint(next_instr) - co_code = pycode.co_code - - try: - try: - while True: - hint(None, global_merge_point=True) - next_instr = self.handle_bytecode(co_code, next_instr, ec) - except Return: - w_result = self.popvalue() - self.blockstack = None - self.valuestack_w = None - return w_result - except Yield: - w_result = self.popvalue() - return w_result - finally: - self.jit_leave_frame(pycode, entry_fastlocals_w) - - def jit_enter_frame(self, pycode, next_instr): +class PyPyJitDriver(JitDriver): + reds = ['frame', 'ec'] + greens = ['next_instr', 'pycode'] + def on_enter_jit(self): # *loads* of nonsense for now + frame = self.frame + pycode = self.pycode fastlocals_w = [None] * pycode.co_nlocals - if next_instr == 0: - # first time we enter this function - depth = 0 - self.blockstack = [] - - numargs = pycode.co_argcount - if pycode.co_flags & CO_VARARGS: numargs += 1 - if pycode.co_flags & CO_VARKEYWORDS: numargs += 1 - while True: - numargs -= 1 - if numargs < 0: - break - hint(numargs, concrete=True) - w_obj = self.fastlocals_w[numargs] - assert w_obj is not None - fastlocals_w[numargs] = w_obj - - else: - stuff = self.valuestackdepth - if len(self.blockstack): - stuff |= (-sys.maxint-1) - - stuff = hint(stuff, promote=True) - if stuff >= 0: - # blockdepth == 0, common case - self.blockstack = [] - depth = stuff & sys.maxint + stuff = frame.valuestackdepth + if len(frame.blockstack): + stuff |= (-sys.maxint-1) + + stuff = hint(stuff, promote=True) + if stuff >= 0: + # blockdepth == 0, common case + # XXX or it was at some point but not now, not at all + # XXX as we expect to *be* in a loop... + frame.blockstack = [] + depth = stuff & sys.maxint - i = pycode.co_nlocals - while True: - i -= 1 - if i < 0: - break - hint(i, concrete=True) - w_obj = self.fastlocals_w[i] - fastlocals_w[i] = w_obj + i = pycode.co_nlocals + while True: + i -= 1 + if i < 0: + break + hint(i, concrete=True) + w_obj = frame.fastlocals_w[i] + fastlocals_w[i] = w_obj - self.pycode = pycode - self.valuestackdepth = depth + frame.pycode = pycode + frame.valuestackdepth = depth - entry_fastlocals_w = self.fastlocals_w - self.fastlocals_w = fastlocals_w + frame.fastlocals_w = fastlocals_w virtualstack_w = [None] * pycode.co_stacksize while depth > 0: depth -= 1 hint(depth, concrete=True) - virtualstack_w[depth] = self.valuestack_w[depth] - self.valuestack_w = virtualstack_w - return entry_fastlocals_w + virtualstack_w[depth] = frame.valuestack_w[depth] + frame.valuestack_w = virtualstack_w - def jit_leave_frame(self, pycode, entry_fastlocals_w): - i = pycode.co_nlocals - while True: - i -= 1 - if i < 0: - break - hint(i, concrete=True) - entry_fastlocals_w[i] = self.fastlocals_w[i] - - self.fastlocals_w = entry_fastlocals_w +class __extend__(PyFrame): + def dispatch(self, pycode, next_instr, ec): + pycode = hint(pycode, deepfreeze=True) + next_instr = r_uint(next_instr) + try: + while True: + PyPyJitDriver.jit_merge_point( + frame=self, ec=ec, next_instr=next_instr, pycode=pycode) + co_code = pycode.co_code + next_instr = self.handle_bytecode(co_code, next_instr, ec) + except Return: + w_result = self.popvalue() + self.blockstack = None + self.valuestack_w = None + return w_result + except Yield: + w_result = self.popvalue() + return w_result + + def JUMP_ABSOLUTE(f, jumpto, next_instr, *ignored): + ec = f.space.getexecutioncontext() + PyPyJitDriver.can_enter_jit(frame=f, ec=ec, next_instr=jumpto, + pycode=self.getcode()) + return jumpto PORTAL = PyFrame.dispatch_jit From fijal at codespeak.net Thu Mar 20 00:38:51 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 20 Mar 2008 00:38:51 +0100 (CET) Subject: [pypy-svn] r52756 - pypy/branch/faster-calls/pypy/interpreter Message-ID: <20080319233851.1EC41169E47@codespeak.net> Author: fijal Date: Thu Mar 20 00:38:50 2008 New Revision: 52756 Modified: pypy/branch/faster-calls/pypy/interpreter/eval.py pypy/branch/faster-calls/pypy/interpreter/gateway.py Log: move this stuff to common base class (it'll die anyway) Modified: pypy/branch/faster-calls/pypy/interpreter/eval.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/eval.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/eval.py Thu Mar 20 00:38:50 2008 @@ -10,6 +10,7 @@ """A code is a compiled version of some source code. Abstract base class.""" hidden_applevel = False + do_fastcall = -1 def __init__(self, co_name): self.co_name = co_name Modified: pypy/branch/faster-calls/pypy/interpreter/gateway.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/gateway.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/gateway.py Thu Mar 20 00:38:50 2008 @@ -382,7 +382,6 @@ hidden_applevel = True descrmismatch_op = None descr_reqcls = None - do_fastcall = -1 # When a BuiltinCode is stored in a Function object, # you get the functionality of CPython's built-in function type. @@ -552,7 +551,6 @@ return w_result class BuiltinCode0(BuiltinCode): - do_fastcall = 0 def fastcall_0(self, space, w_func): self = hint(self, deepfreeze=True) try: @@ -569,7 +567,6 @@ return w_result class BuiltinCode1(BuiltinCode): - do_fastcall = 1 def fastcall_1(self, space, w_func, w1): self = hint(self, deepfreeze=True) try: @@ -591,7 +588,6 @@ return w_result class BuiltinCode2(BuiltinCode): - do_fastcall = 2 def fastcall_2(self, space, w_func, w1, w2): self = hint(self, deepfreeze=True) try: @@ -613,7 +609,6 @@ return w_result class BuiltinCode3(BuiltinCode): - do_fastcall = 3 def fastcall_3(self, space, func, w1, w2, w3): self = hint(self, deepfreeze=True) try: @@ -635,7 +630,6 @@ return w_result class BuiltinCode4(BuiltinCode): - do_fastcall = 4 def fastcall_4(self, space, func, w1, w2, w3, w4): self = hint(self, deepfreeze=True) try: From cfbolz at codespeak.net Thu Mar 20 00:56:44 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Thu, 20 Mar 2008 00:56:44 +0100 (CET) Subject: [pypy-svn] r52757 - pypy/branch/jit-hotpath/pypy/module/pypyjit Message-ID: <20080319235644.ECAED168560@codespeak.net> Author: cfbolz Date: Thu Mar 20 00:56:42 2008 New Revision: 52757 Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py Log: a typo and some missing changes Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Thu Mar 20 00:56:42 2008 @@ -30,6 +30,7 @@ # *loads* of nonsense for now frame = self.frame pycode = self.pycode + pycode = hint(pycode, deepfreeze=True) fastlocals_w = [None] * pycode.co_nlocals @@ -89,11 +90,9 @@ def JUMP_ABSOLUTE(f, jumpto, next_instr, *ignored): ec = f.space.getexecutioncontext() PyPyJitDriver.can_enter_jit(frame=f, ec=ec, next_instr=jumpto, - pycode=self.getcode()) + pycode=f.getcode()) return jumpto -PORTAL = PyFrame.dispatch_jit - class __extend__(Function): __metaclass__ = extendabletype Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py Thu Mar 20 00:56:42 2008 @@ -1,12 +1,11 @@ import pypy -from pypy.module.pypyjit.interp_jit import PORTAL from pypy.module.pypyjit.newbool import NewBoolDesc from pypy.translator.translator import graphof from pypy.annotation.specialize import getuniquenondirectgraph from pypy.jit.hintannotator.policy import ManualGraphPolicy class PyPyHintAnnotatorPolicy(ManualGraphPolicy): - PORTAL = PORTAL + hotpath = True def look_inside_graph_of_module(self, graph, func, mod): if mod.startswith('pypy.objspace'): @@ -127,9 +126,6 @@ def get_portal(drv): t = drv.translator - portal = getattr(PORTAL, 'im_func', PORTAL) - portal_graph = graphof(t, portal) - policy = PyPyHintAnnotatorPolicy() policy.seetranslator(t) - return portal, policy + return None, policy From fijal at codespeak.net Thu Mar 20 01:01:57 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 20 Mar 2008 01:01:57 +0100 (CET) Subject: [pypy-svn] r52758 - in pypy/branch/faster-calls/pypy/interpreter: . test Message-ID: <20080320000157.0170816857B@codespeak.net> Author: fijal Date: Thu Mar 20 01:01:57 2008 New Revision: 52758 Modified: pypy/branch/faster-calls/pypy/interpreter/eval.py pypy/branch/faster-calls/pypy/interpreter/function.py pypy/branch/faster-calls/pypy/interpreter/gateway.py pypy/branch/faster-calls/pypy/interpreter/pycode.py pypy/branch/faster-calls/pypy/interpreter/test/test_code.py pypy/branch/faster-calls/pypy/interpreter/test/test_pickle.py pypy/branch/faster-calls/pypy/interpreter/test/test_py.py Log: kill fastfunc support. Modified: pypy/branch/faster-calls/pypy/interpreter/eval.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/eval.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/eval.py Thu Mar 20 01:01:57 2008 @@ -10,7 +10,6 @@ """A code is a compiled version of some source code. Abstract base class.""" hidden_applevel = False - do_fastcall = -1 def __init__(self, co_name): self.co_name = co_name @@ -56,19 +55,6 @@ frame.setfastscope(scope_w) return frame.run() - - # a performance hack (see gateway.BuiltinCode1/2/3 and pycode.PyCode) - def fastcall_0(self, space, func): - return None - def fastcall_1(self, space, func, w1): - return None - def fastcall_2(self, space, func, w1, w2): - return None - def fastcall_3(self, space, func, w1, w2, w3): - return None - def fastcall_4(self, space, func, w1, w2, w3, w4): - return None - class Frame(Wrappable): """A frame is an environment supporting the execution of a code object. Abstract base class.""" Modified: pypy/branch/faster-calls/pypy/interpreter/function.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/function.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/function.py Thu Mar 20 01:01:57 2008 @@ -40,47 +40,10 @@ def funccall(self, *args_w): # speed hack code = self.getcode() # hook for the jit - if len(args_w) == 0: - w_res = code.fastcall_0(self.space, self) - if w_res is not None: - return w_res - elif len(args_w) == 1: - w_res = code.fastcall_1(self.space, self, args_w[0]) - if w_res is not None: - return w_res - elif len(args_w) == 2: - w_res = code.fastcall_2(self.space, self, args_w[0], args_w[1]) - if w_res is not None: - return w_res - elif len(args_w) == 3: - w_res = code.fastcall_3(self.space, self, args_w[0], - args_w[1], args_w[2]) - if w_res is not None: - return w_res - elif len(args_w) == 4: - w_res = code.fastcall_4(self.space, self, args_w[0], - args_w[1], args_w[2], args_w[3]) - if w_res is not None: - return w_res return self.call_args(Arguments(self.space, list(args_w))) def funccall_valuestack(self, nargs, frame): # speed hack code = self.getcode() # hook for the jit - if nargs == code.do_fastcall: - if nargs == 0: - return code.fastcall_0(self.space, self) - elif nargs == 1: - return code.fastcall_1(self.space, self, frame.peekvalue(0)) - elif nargs == 2: - return code.fastcall_2(self.space, self, frame.peekvalue(1), - frame.peekvalue(0)) - elif nargs == 3: - return code.fastcall_3(self.space, self, frame.peekvalue(2), - frame.peekvalue(1), frame.peekvalue(0)) - elif nargs == 4: - return code.fastcall_4(self.space, self, frame.peekvalue(3), - frame.peekvalue(2), frame.peekvalue(1), - frame.peekvalue(0)) args = frame.make_arguments(nargs) try: return self.call_args(args) @@ -90,17 +53,6 @@ def funccall_obj_valuestack(self, w_obj, nargs, frame): # speed hack code = self.getcode() # hook for the jit - if nargs == code.do_fastcall: - if nargs == 0: - return code.fastcall_1(self.space, self, w_obj) - elif nargs == 1: - return code.fastcall_2(self.space, self, w_obj, frame.peekvalue(0)) - elif nargs == 2: - return code.fastcall_3(self.space, self, w_obj, frame.peekvalue(1), - frame.peekvalue(0)) - elif nargs == 3: - w_res = code.fastcall_4(self.space, self, w_obj, frame.peekvalue(2), - frame.peekvalue(1), frame.peekvalue(0)) stkargs = frame.make_arguments(nargs) args = stkargs.prepend(w_obj) try: Modified: pypy/branch/faster-calls/pypy/interpreter/gateway.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/gateway.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/gateway.py Thu Mar 20 01:01:57 2008 @@ -276,97 +276,6 @@ #________________________________________________________________ -class FastFuncNotSupported(Exception): - pass - -class UnwrapSpec_FastFunc_Unwrap(UnwrapSpecEmit): - - def __init__(self): - UnwrapSpecEmit.__init__(self) - self.args = [] - self.unwrap = [] - self.finger = 0 - - def dispatch(self, el, *args): - UnwrapSpecEmit.dispatch(self, el, *args) - self.finger += 1 - if self.n > 4: - raise FastFuncNotSupported - - def nextarg(self): - arg = "w%d" % self.succ() - self.args.append(arg) - return arg - - def visit_function(self, (func, cls)): - raise FastFuncNotSupported - - def visit_self(self, typ): - self.unwrap.append("space.descr_self_interp_w(%s, %s)" % - (self.use(typ), self.nextarg())) - - def visit__Wrappable(self, typ): - self.unwrap.append("space.interp_w(%s, %s)" % (self.use(typ), - self.nextarg())) - - def visit__ObjSpace(self, el): - if self.finger != 0: - raise FastFuncNotSupported - self.unwrap.append("space") - - def visit__W_Root(self, el): - self.unwrap.append(self.nextarg()) - - def visit__Arguments(self, el): - raise FastFuncNotSupported - - def visit_args_w(self, el): - raise FastFuncNotSupported - - def visit_w_args(self, el): - raise FastFuncNotSupported - - def visit__object(self, typ): - name = int_unwrapping_space_method(typ) - self.unwrap.append("space.%s_w(%s)" % (name, - self.nextarg())) - - def visit_index(self, typ): - self.unwrap.append("space.getindex_w(%s, space.w_OverflowError)" - % (self.nextarg()), ) - - def visit_bufferstr(self, typ): - self.unwrap.append("space.bufferstr_w(%s)" % (self.nextarg(),)) - - def make_fastfunc(unwrap_spec, func): - unwrap_info = UnwrapSpec_FastFunc_Unwrap() - unwrap_info.apply_over(unwrap_spec) - narg = unwrap_info.n - args = ['space'] + unwrap_info.args - if args == unwrap_info.unwrap: - fastfunc = func - else: - # try to avoid excessive bloat - if func.__module__ == 'pypy.interpreter.astcompiler.ast': - raise FastFuncNotSupported - if (not func.__module__.startswith('pypy.module.__builtin__') and - not func.__module__.startswith('pypy.module.sys') and - not func.__module__.startswith('pypy.module.math')): - if not func.__name__.startswith('descr'): - raise FastFuncNotSupported - d = {} - unwrap_info.miniglobals['func'] = func - source = """if 1: - def fastfunc_%s_%d(%s): - return func(%s) - \n""" % (func.__name__, narg, - ', '.join(args), - ', '.join(unwrap_info.unwrap)) - exec compile2(source) in unwrap_info.miniglobals, d - fastfunc = d['fastfunc_%s_%d' % (func.__name__, narg)] - return narg, fastfunc - make_fastfunc = staticmethod(make_fastfunc) - def int_unwrapping_space_method(typ): assert typ in (int, str, float, unicode, r_longlong, r_uint, r_ulonglong) if typ is r_int is r_longlong: @@ -454,22 +363,6 @@ self._bltin = func self._unwrap_spec = unwrap_spec - # speed hack - if 0 <= len(unwrap_spec) <= 5: - try: - arity, fastfunc = UnwrapSpec_FastFunc_Unwrap.make_fastfunc( - unwrap_spec, func) - except FastFuncNotSupported: - if unwrap_spec == [ObjSpace, Arguments]: - self.__class__ = BuiltinCodePassThroughArguments0 - self.func__args__ = func - elif unwrap_spec == [ObjSpace, W_Root, Arguments]: - self.__class__ = BuiltinCodePassThroughArguments1 - self.func__args__ = func - else: - self.__class__ = globals()['BuiltinCode%d' % arity] - setattr(self, 'fastfunc_%d' % arity, fastfunc) - def signature(self): return self.sig @@ -550,108 +443,6 @@ w_result = space.w_None return w_result -class BuiltinCode0(BuiltinCode): - def fastcall_0(self, space, w_func): - self = hint(self, deepfreeze=True) - try: - w_result = self.fastfunc_0(space) - except KeyboardInterrupt: - raise OperationError(space.w_KeyboardInterrupt, space.w_None) - except MemoryError: - raise OperationError(space.w_MemoryError, space.w_None) - except (RuntimeError, DescrMismatch), e: - raise OperationError(space.w_RuntimeError, - space.wrap("internal error: " + str(e))) - if w_result is None: - w_result = space.w_None - return w_result - -class BuiltinCode1(BuiltinCode): - def fastcall_1(self, space, w_func, w1): - self = hint(self, deepfreeze=True) - try: - w_result = self.fastfunc_1(space, w1) - except KeyboardInterrupt: - raise OperationError(space.w_KeyboardInterrupt, space.w_None) - except MemoryError: - raise OperationError(space.w_MemoryError, space.w_None) - except RuntimeError, e: - raise OperationError(space.w_RuntimeError, - space.wrap("internal error: " + str(e))) - except DescrMismatch, e: - return w1.descr_call_mismatch(space, - self.descrmismatch_op, - self.descr_reqcls, - Arguments(space, [w1])) - if w_result is None: - w_result = space.w_None - return w_result - -class BuiltinCode2(BuiltinCode): - def fastcall_2(self, space, w_func, w1, w2): - self = hint(self, deepfreeze=True) - try: - w_result = self.fastfunc_2(space, w1, w2) - except KeyboardInterrupt: - raise OperationError(space.w_KeyboardInterrupt, space.w_None) - except MemoryError: - raise OperationError(space.w_MemoryError, space.w_None) - except RuntimeError, e: - raise OperationError(space.w_RuntimeError, - space.wrap("internal error: " + str(e))) - except DescrMismatch, e: - return w1.descr_call_mismatch(space, - self.descrmismatch_op, - self.descr_reqcls, - Arguments(space, [w1, w2])) - if w_result is None: - w_result = space.w_None - return w_result - -class BuiltinCode3(BuiltinCode): - def fastcall_3(self, space, func, w1, w2, w3): - self = hint(self, deepfreeze=True) - try: - w_result = self.fastfunc_3(space, w1, w2, w3) - except KeyboardInterrupt: - raise OperationError(space.w_KeyboardInterrupt, space.w_None) - except MemoryError: - raise OperationError(space.w_MemoryError, space.w_None) - except RuntimeError, e: - raise OperationError(space.w_RuntimeError, - space.wrap("internal error: " + str(e))) - except DescrMismatch, e: - return w1.descr_call_mismatch(space, - self.descrmismatch_op, - self.descr_reqcls, - Arguments(space, [w1, w2, w3])) - if w_result is None: - w_result = space.w_None - return w_result - -class BuiltinCode4(BuiltinCode): - def fastcall_4(self, space, func, w1, w2, w3, w4): - self = hint(self, deepfreeze=True) - try: - w_result = self.fastfunc_4(space, w1, w2, w3, w4) - except KeyboardInterrupt: - raise OperationError(space.w_KeyboardInterrupt, space.w_None) - except MemoryError: - raise OperationError(space.w_MemoryError, space.w_None) - except RuntimeError, e: - raise OperationError(space.w_RuntimeError, - space.wrap("internal error: " + str(e))) - except DescrMismatch, e: - return w1.descr_call_mismatch(space, - self.descrmismatch_op, - self.descr_reqcls, - Arguments(space, - [w1, w2, w3, w4])) - if w_result is None: - w_result = space.w_None - return w_result - - class interp2app(Wrappable): """Build a gateway that calls 'f' at interp-level.""" Modified: pypy/branch/faster-calls/pypy/interpreter/pycode.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/pycode.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/pycode.py Thu Mar 20 01:01:57 2008 @@ -108,7 +108,6 @@ self._args_as_cellvars.append(-1) # pad self._args_as_cellvars[i] = j - self._compute_fastcall() co_names = property(lambda self: [self.space.unwrap(w_name) for w_name in self.co_names_w]) # for trace @@ -160,63 +159,6 @@ _code_new_w = staticmethod(_code_new_w) - def _compute_fastcall(self): - # Speed hack! - self.do_fastcall = -1 - if not (0 <= self.co_argcount <= 4): - return - if self.co_flags & (CO_VARARGS | CO_VARKEYWORDS): - return - if len(self._args_as_cellvars) > 0: - return - - self.do_fastcall = self.co_argcount - - def fastcall_0(self, space, w_func): - if self.do_fastcall == 0: - frame = space.createframe(self, w_func.w_func_globals, - w_func.closure) - return frame.run() - return None - - def fastcall_1(self, space, w_func, w_arg): - if self.do_fastcall == 1: - frame = space.createframe(self, w_func.w_func_globals, - w_func.closure) - frame.fastlocals_w[0] = w_arg # frame.setfastscope([w_arg]) - return frame.run() - return None - - def fastcall_2(self, space, w_func, w_arg1, w_arg2): - if self.do_fastcall == 2: - frame = space.createframe(self, w_func.w_func_globals, - w_func.closure) - frame.fastlocals_w[0] = w_arg1 # frame.setfastscope([w_arg]) - frame.fastlocals_w[1] = w_arg2 - return frame.run() - return None - - def fastcall_3(self, space, w_func, w_arg1, w_arg2, w_arg3): - if self.do_fastcall == 3: - frame = space.createframe(self, w_func.w_func_globals, - w_func.closure) - frame.fastlocals_w[0] = w_arg1 # frame.setfastscope([w_arg]) - frame.fastlocals_w[1] = w_arg2 - frame.fastlocals_w[2] = w_arg3 - return frame.run() - return None - - def fastcall_4(self, space, w_func, w_arg1, w_arg2, w_arg3, w_arg4): - if self.do_fastcall == 4: - frame = space.createframe(self, w_func.w_func_globals, - w_func.closure) - frame.fastlocals_w[0] = w_arg1 # frame.setfastscope([w_arg]) - frame.fastlocals_w[1] = w_arg2 - frame.fastlocals_w[2] = w_arg3 - frame.fastlocals_w[3] = w_arg4 - return frame.run() - return None - def funcrun(self, func, args): frame = self.space.createframe(self, func.w_func_globals, func.closure) Modified: pypy/branch/faster-calls/pypy/interpreter/test/test_code.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/test/test_code.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/test/test_code.py Thu Mar 20 01:01:57 2008 @@ -128,6 +128,7 @@ assert hash(d1['f'].func_code) == hash(d2['f'].func_code) def test_inspect(self): + skip("xxx") if not hasattr(len, 'func_code'): skip("CPython: no func_code attribute on built-in functions") import inspect Modified: pypy/branch/faster-calls/pypy/interpreter/test/test_pickle.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/test/test_pickle.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/test/test_pickle.py Thu Mar 20 01:01:57 2008 @@ -1,6 +1,8 @@ import py from pypy import conftest +py.test.skip("xxx") + def _attach_helpers(space): from pypy.interpreter import pytraceback def hide_top_frame(space, w_frame): Modified: pypy/branch/faster-calls/pypy/interpreter/test/test_py.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/test/test_py.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/test/test_py.py Thu Mar 20 01:01:57 2008 @@ -4,6 +4,8 @@ import sys import pypy +py.test.skip("xxx") + pypypath = py.path.local(pypy.__file__).dirpath("bin", "py.py") def test_executable(): From cfbolz at codespeak.net Thu Mar 20 01:23:54 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Thu, 20 Mar 2008 01:23:54 +0100 (CET) Subject: [pypy-svn] r52759 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080320002354.09933168563@codespeak.net> Author: cfbolz Date: Thu Mar 20 01:23:53 2008 New Revision: 52759 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: test that shows the problem with the current merging Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Thu Mar 20 01:23:53 2008 @@ -475,3 +475,33 @@ assert ''.join(res.chars) == " ".join([str(n) for n in range(40, 0, -1)]) # XXX should check something about the produced code as well, but no # clue what + + def test_loop_with_more_and_more_structs(self): + py.test.skip("shows problem with current merging logic") + class MyJitDriver(JitDriver): + greens = [] + reds = ['n1', 'res'] + + class List(object): + def __init__(self, value, prev): + self.value = value + self.prev = prev + + def ll_function(n): + n1 = n * 2 + res = None + while True: + MyJitDriver.jit_merge_point(n1=n1, res=res) + if n1 <= 1: + break + n1 -= 1 + res = List(n1, res) + MyJitDriver.can_enter_jit(n1=n1, res=res) + final = [] + while res: + final.append(str(res.value)) + res = res.prev + return " ".join(final) + res = self.run(ll_function, [40], threshold=2) + assert "".join(res.chars) == " ".join([str(i) for i in range(1, 80)]) + self.check_insns(malloc=1) From fijal at codespeak.net Thu Mar 20 01:30:15 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 20 Mar 2008 01:30:15 +0100 (CET) Subject: [pypy-svn] r52760 - pypy/branch/faster-calls/pypy/interpreter Message-ID: <20080320003015.CD2E816856C@codespeak.net> Author: fijal Date: Thu Mar 20 01:30:15 2008 New Revision: 52760 Modified: pypy/branch/faster-calls/pypy/interpreter/executioncontext.py pypy/branch/faster-calls/pypy/interpreter/pyopcode.py Log: This makes no sense if bytecode_trace is called anyway. Modified: pypy/branch/faster-calls/pypy/interpreter/executioncontext.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/executioncontext.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/executioncontext.py Thu Mar 20 01:30:15 2008 @@ -105,6 +105,7 @@ self.ticker = ticker if ticker < 0 or frame.w_f_trace is not None: self._do_bytecode_trace(frame) + bytecode_trace._always_inline_ = True def _do_bytecode_trace(self, frame): if self.ticker < 0: Modified: pypy/branch/faster-calls/pypy/interpreter/pyopcode.py ============================================================================== --- pypy/branch/faster-calls/pypy/interpreter/pyopcode.py (original) +++ pypy/branch/faster-calls/pypy/interpreter/pyopcode.py Thu Mar 20 01:30:15 2008 @@ -147,9 +147,7 @@ while True: self.last_instr = intmask(next_instr) if not we_are_jitted(): - if self.w_f_trace is None or ec.pending_actions \ - or ec.space.pending_actions: - ec.bytecode_trace(self) + ec.bytecode_trace(self) next_instr = r_uint(self.last_instr) opcode = ord(co_code[next_instr]) next_instr += 1 From cami at codespeak.net Thu Mar 20 02:17:07 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Thu, 20 Mar 2008 02:17:07 +0100 (CET) Subject: [pypy-svn] r52761 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080320011707.2BE09168550@codespeak.net> Author: cami Date: Thu Mar 20 02:17:04 2008 New Revision: 52761 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Log: added more tests Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Thu Mar 20 02:17:04 2008 @@ -304,7 +304,7 @@ # 2 cycles def addHL(self, register): s = (self.hl.get() + register.get()) & 0xFFFF - self.f.set((self.f & constants.Z_FLAG), False) + self.f.set((self.f.get() & constants.Z_FLAG), False) if ((s >> 8) & 0x0F) < (self.hl.getHi() & 0x0F): self.f.add(constants.H_FLAG, False) if s < self.hl.get(): @@ -314,69 +314,77 @@ # 1 cycle def adc(self, getter): - s = self.a + getter() + ((self.f & constants.C_FLAG) >> 4) + s = self.a.get() + getter() + ((self.f.get() & constants.C_FLAG) >> 4) self.f.set(0, False) if (s & 0xFF) == 0: self.f.add(constants.Z_FLAG , False) if s >= 0x100: self.f.add(constants.C_FLAG, False) - if ((s ^ self.a ^ getter()) & 0x10) != 0: + if ((s ^ self.a.get() ^ getter()) & 0x10) != 0: self.f.add(constants.H_FLAG, False) self.a.set(s & 0xFF) # 1 cycle # 1 cycle def sbc(self, getter): - s = self.a - getter() - ((self.f & constants.C_FLAG) >> 4) + s = self.a.get() - getter() - ((self.f.get() & constants.C_FLAG) >> 4) self.f.set(constants.N_FLAG, False) if (s & 0xFF) == 0: self.f.add(constants.Z_FLAG , False) if (s & 0xFF00) != 0: self.f.add(constants.C_FLAG, False) - if ((s ^ self.a ^ getter()) & 0x10) != 0: + if ((s ^ self.a.get() ^ getter()) & 0x10) != 0: self.f.add(constants.H_FLAG, False) self.a.set(s & 0xFF) # 1 cycle # 1 cycle def sub(self, getter): - s = (self.a - getter()) & 0xFF + s = (self.a.get() - getter()) & 0xFF self.f.set(constants.N_FLAG, False) self.zFlagAdd(s) if s > self.a: self.f.add(constants.C_FLAG, False) - if (s & 0x0F) > (self.a & 0x0F): + if (s & 0x0F) > (self.a.get() & 0x0F): self.f.add(constants.H_FLAG, False) self.a.set(s) # 1 cycle # 1 cycle def cpA(self, getter): - s = (self.a - getter()) & 0xFF + s = (self.a.get() - getter()) & 0xFF self.f.set(constants.N_FLAG) # 1 cycle self.zFlagAdd(self.a) if s > self.a: self.f.add(constants.C_FLAG, False) - if (s & 0x0F) > (self.a & 0x0F): + if (s & 0x0F) > (self.a.get() & 0x0F): self.f.add(constants.H_FLAG, False) # 1 cycle def AND(self, getter): - self.a.set(self.a & getter()) # 1 cycle + self.a.set(self.a.get() & getter()) # 1 cycle self.zFlagAdd(self.a, resetF=True) # 1 cycle def XOR(self, getter): - self.a.set( self.a ^ getter()) # 1 cycle + self.a.set( self.a.get() ^ getter()) # 1 cycle self.zFlagAdd(self.a, resetF=True) # 1 cycle def OR(self, getter): - self.a.set(self.a | getter()) # 1 cycle + self.a.set(self.a.get() | getter()) # 1 cycle self.zFlagAdd(self.a, resetF=True) + def incDoubleRegister(self, doubleRegister): + print doubleRegister, "inc" + doubleRegister.inc() + + def decDoubleRegister(self, doubleRegister): + print doubleRegister, "dec" + doubleRegister.dec() + # 1 cycle def inc(self, getter, setter): data = (getter() + 1) & 0xFF self.decIncFlagFinish(data) - + # 1 cycle def dec(self, getter, setter): data = (getter() - 1) & 0xFF @@ -388,7 +396,7 @@ self.zFlagAdd(data) if (data & 0x0F) == 0x0F: self.f.add(constants.H_FLAG, False) - self.f.add((self.f & constants.C_FLAG), False) + self.f.add((self.f.get() & constants.C_FLAG), False) setter(data) # 1 cycle @@ -399,7 +407,7 @@ # 1 cycle def rl(self, getter, setter): s = ((getter() & 0x7F) << 1) - if (self.f & constants.C_FLAG) != 0: + if (self.f.get() & constants.C_FLAG) != 0: s += 0x01 flagsAndSetterFinish(s, getter, 0x80) # 1 cycle @@ -410,7 +418,7 @@ # 1 cycle def rr(self, getter, setter): - s = (getter() >> 1) + ((self.f & constants.C_FLAG) << 3) + s = (getter() >> 1) + ((self.f.get() & constants.C_FLAG) << 3) flagsAndSetterFinish(s, getter) # 1 cycle # 2 cycles @@ -445,7 +453,7 @@ # 2 cycles def bit(self, getter, setter, n): - self.f.set((self.f & constants.C_FLAG) + constants.H_FLAG, False) + self.f.set((self.f.get() & constants.C_FLAG) + constants.H_FLAG, False) if (getter() & (1 << n)) == 0: self.f.add(constants.Z_FLAG, False) self.cycles -= 2 @@ -453,27 +461,27 @@ # RLCA 1 cycle def rlca(self): self.cFlagAdd(self.a, 0x80, resetF=True) - self.a.set(((self.a & 0x7F) << 1) + ((self.a & 0x80) >> 7)) + self.a.set(((self.a.get() & 0x7F) << 1) + ((self.a.get() & 0x80) >> 7)) # RLA 1 cycle def rla(self): - s = ((self.a & 0x7F) << 1) - if (self.f & constants.C_FLAG) != 0: + s = ((self.a.get() & 0x7F) << 1) + if (self.f.get() & constants.C_FLAG) != 0: s += 0x01 - self.cFlagAdd(self.a, 0x80, resetF=True) + self.cFlagAdd(self.a.get(), 0x80, resetF=True) self.a.set(s) # 1 cycle # RRCA 1 cycle def rrca(self): self.cFlagAdd(self.a, resetF=True) - self.a.set(((self.a >> 1) & 0x7F) + ((self.a << 7) & 0x80)) #1 cycle + self.a.set(((self.a.get() >> 1) & 0x7F) + ((self.a.get() << 7) & 0x80)) #1 cycle # RRA 1 cycle def rra(self): - s = ((self.a >> 1) & 0x7F) - if (self.f & constants.C_FLAG) != 0: + s = ((self.a.get() >> 1) & 0x7F) + if (self.f.get() & constants.C_FLAG) != 0: s += 0x80 - self.cFlagAdd(self.a, resetF=True) + self.cFlagAdd(self.a.get(), resetF=True) self.a.set(s) # 1 cycle # 2 cycles @@ -627,10 +635,10 @@ # CCF/SCF def ccf(self): - self.f.set((self.f & (constants.Z_FLAG | constants.C_FLAG)) ^ constants.C_FLAG, False) + self.f.set((self.f.get() & (constants.Z_FLAG | constants.C_FLAG)) ^ constants.C_FLAG, False) def scf(self): - self.f.set((self.f & constants.Z_FLAG) | constants.C_FLAG, False) + self.f.set((self.f.get() & constants.Z_FLAG) | constants.C_FLAG, False) # NOP 1 cycle def nop(self): @@ -645,8 +653,8 @@ self.pc.set(hi,lo) # 2 cycles # JP cc,nnnn 3,4 cycles - def jp_cc_nnnn(self, cc): - if (cc): + def jp_cc_nnnn(self, getter): + if getter(): self.jp_nnnn() # 4 cycles else: self.pc.add(2) # 3 cycles @@ -657,8 +665,8 @@ self.cycles += 1 # JR cc,+nn, 2,3 cycles - def jr_cc_nn(self, cc): - if (cc): + def jr_cc_nn(self, getter): + if getter(): self.jr_nn() # 3 cycles else: self.pc.inc() # 2 cycles @@ -670,23 +678,23 @@ self.call((hi << 8) + lo) # 4 cycles # CALL cc,nnnn, 3,6 cycles - def call_cc_nnnn(self, cc): - if (cc): + def call_cc_nnnn(self, getter): + if getter(): self.call_nnnn() # 6 cycles else: self.pc.add(2) # 3 cycles def isNZ(self): - return (self.f & constants.Z_FLAG) == 0 + return (self.f.get() & constants.Z_FLAG) == 0 def isNC(self): - return (self.f & constants.C_FLAG) == 0 + return (self.f.get() & constants.C_FLAG) == 0 def isZ(self): - return (self.f & constants.Z_FLAG) != 0 + return (self.f.get() & constants.Z_FLAG) != 0 def isC(self): - return (self.f & constants.C_FLAG) != 0 + return (self.f.get() & constants.C_FLAG) != 0 # RET 4 cycles def ret(self): @@ -749,6 +757,61 @@ +# OPCODE LOOKUP TABLE GENERATION ----------------------------------------------- + + +GROUPED_REGISTERS = (CPU.b, CPU.c, CPU.d, CPU.e, CPU.h, CPU.l, CPU.hli, CPU.a) +def create_group_op_codes(table): + opCodes =[] + for entry in table: + opCode = entry[0] + step = entry[1] + function = entry[2] + if len(entry) == 4: + for i in range(0, len(GROUPED_REGISTERS)): + for n in entry[3]: + register = GROUPED_REGISTERS[i] + opCodes.append((opCode, lambda me: function(me, register.get, register.set, n))) + #print "A", hex(opCode), function, n, i + opCode += step + else: + for i in range(0, len(GROUPED_REGISTERS)): + register = GROUPED_REGISTERS[i] + opCodes.append((opCode, lambda me: function(me, register.get, register.set))) + #print "B", hex(opCode), function, i + opCode += step + return opCodes + + +def create_register_op_codes(table): + opCodes = [] + for entry in table: + opCode = entry[0] + step = entry[1] + function = entry[2] + for registerOrGetter in entry[3]: + opCodes.append((opCode, lambda s: function(s, registerOrGetter))) + #print "C", hex(opCode), function, registerOrGetter + opCode += step + return opCodes + + +def initialize_op_code_table(table): + result = [None] * (0xFF+1) + for entry in table: + if (entry is None) or len(entry) == 0: + continue + if len(entry) == 2: + positions = [entry[0]] + else: + assert False + positions = range(entry[0], entry[1]+1) + for pos in positions: + result[pos] = entry[-1] + return result + +# OPCODE TABLES --------------------------------------------------------------- + FIRST_ORDER_OP_CODES = [ (0x00, CPU.nop), (0x08, CPU.load_mem_SP), @@ -819,63 +882,25 @@ (0xB8, 0x01, CPU.cpA), (0x06, 0x08, lambda s, register:CPU.ld(s, CPU.fetch(s), register.set)), (0x40, 0x01, CPU.res, range(0, 8)) -] - -GROUP_CODES_REGISTERS = (CPU.b, CPU.c, CPU.d, CPU.e, CPU.h, CPU.l, CPU.hli, CPU.a) - -def create_group_op_codes(table): - opCodes = [None] * 0xFF - for entry in table: - startCode = entry[0] - step = entry[1] - method = entry[2] - if len(entry) == 4: - for i in range(0, len(GROUP_CODES_REGISTERS)): - for n in entry[3]: - opCode = startCode+step*i - register = GROUP_CODES_REGISTERS[i] - opCodes[opCode] = (opCode, lambda me: method(me, register.get, register.set, n)) - print hex(opCode), method, n, i - else: - for i in range(0, len(GROUP_CODES_REGISTERS)): - opCode = startCode+step*i - register = GROUP_CODES_REGISTERS[i] - opCodes[opCode] = (opCode, lambda me: method(me, register.get, register.set)) - print " ", hex(opCode), method, i - - return opCodes - +] + REGISTER_OP_CODES = [ - (0x01, 0x10, lambda s, register: CPU.popDoubleRegister(s, register=register, getter=CPU.fetch), [CPU.bc, CPU.de, CPU.hl, CPU.sp]), + (0x01, 0x10, lambda s, register: CPU.popDoubleRegister(s, register=register,\ + getter=CPU.fetch),\ + [CPU.bc, CPU.de, CPU.hl, CPU.sp]), (0x09, 0x10, CPU.addHL, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), - (0x03, 0x10, CPU.inc, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), - (0x0B, 0x10, CPU.dec, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), - + (0x03, 0x10, CPU.incDoubleRegister, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), + (0x0B, 0x10, CPU.decDoubleRegister, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), (0xC0, 0x08, CPU.ret_cc, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), - (0xC2, 0x08, CPU.jp_nnnn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), - (0xC4, 0x08, CPU.call_nnnn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), - (0x20, 0x08, CPU.jr_nn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), - + (0xC2, 0x08, CPU.jp_cc_nnnn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), + (0xC4, 0x08, CPU.call_cc_nnnn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), + (0x20, 0x08, CPU.jr_cc_nn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), (0xC1, 0x10, CPU.pop, [CPU.bc, CPU.de, CPU.hl, CPU.af]), (0xC5, 0x10, CPU.push, [CPU.bc, CPU.de, CPU.hl, CPU.af]) ] -def create_register_op_codes(table): - opCodes = [None] * 0xFF - for entry in table: - opCode = entry[0] - step = entry[1] - function = entry[2] - for getter in entry[3]: - opCodes[opCode] = (opCode, lambda s: function(s, getter)) - opCode += step - return opCodes - - -FIRST_ORDER_OP_CODES.extend(create_register_op_codes(REGISTER_OP_CODES)) - -SECOND_ORDER_REGISTER_OP_CODES = [ +SECOND_ORDER_REGISTER_GROUP_OP_CODES = [ (0x00, 0x01, CPU.rlc), (0x08, 0x01, CPU.rrc), (0x10, 0x01, CPU.rl), @@ -889,36 +914,12 @@ (0x80, 0x01, CPU.res, range(0, 8)) ] +# RAW OPCODE TABLE INITIALIZATION ---------------------------------------------- -FIRST_ORDER_OP_CODES.extend(create_group_op_codes(REGISTER_GROUP_OP_CODES)) -SECOND_ORDER_OP_CODES = create_group_op_codes(SECOND_ORDER_REGISTER_OP_CODES) - -def create_register_op_codes(): - # not necessary to build a list, you can nicely use a generator here - opCodes = []; - for entry in REGISTER_OP_CODES: - startCode = entry[0] - step = entry[1] - commandBase = entry[2] - changing = entry[3] - return opCodes - -FIRST_ORDER_OP_CODES.extend(create_register_op_codes()) +FIRST_ORDER_OP_CODES += create_register_op_codes(REGISTER_OP_CODES) +FIRST_ORDER_OP_CODES += create_group_op_codes(REGISTER_GROUP_OP_CODES) +SECOND_ORDER_OP_CODES = create_group_op_codes(SECOND_ORDER_REGISTER_GROUP_OP_CODES) -def initialize_op_code_table(table): - result = [None] * 256 - for entry in table: - if entry is None: - continue - if len(entry) == 2: - positions = [entry[0]] - else: - positions = range(entry[0], entry[1]+1) - for pos in positions: - result[pos] = entry[-1] - return result - OP_CODES = initialize_op_code_table(FIRST_ORDER_OP_CODES) FETCH_EXECUTE_OP_CODES = initialize_op_code_table(SECOND_ORDER_OP_CODES) - Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Thu Mar 20 02:17:04 2008 @@ -163,13 +163,13 @@ cpu.rom[constants.RESET_PC] = value # test jr_nn startCycles = cpu.cycles - cpu.jr_cc_nn(True) + cpu.jr_cc_nn((lambda :True)) assert startCycles-cpu.cycles == 3 assert_registers(cpu, pc=pc+value+1) # test pc.inc startCycles = cpu.cycles pc = cpu.pc.get() - cpu.jr_cc_nn(False) + cpu.jr_cc_nn((lambda: False)) assert startCycles-cpu.cycles == 2 assert cpu.pc.get() == pc+1 @@ -182,9 +182,47 @@ assert False, "Opcode %s %s failed to execute: %s" % (hex(opCode), OP_CODES[opCode], inst) cpuUsedCycles = startCycles-cpu.cycles assert cpuUsedCycles == cycles,\ - "Cycles for opCode %s,%s should be %i not %i" %\ - (hex(opCode).ljust(2), cpu.OP_CODEs[opCode], CPU.cycles, cpuUsedCycles) - + "Cycles for opCode %s [CPU.%s] should be %i not %i" %\ + (hex(opCode).ljust(2),\ + OP_CODES[opCode].func_closure[0].cell_contents.func_name,\ + cycles, cpuUsedCycles) + + +# TEST HELPERS --------------------------------------- + +def test_create_group_op_codes(): + assert len(GROUPED_REGISTERS) == 8 + start=0x12 + step=0x03 + func = CPU.inc + table = [(start, step, func)] + grouped = create_group_op_codes(table) + assert len(grouped) == len(table)*8 + + opCode = start + for entry in grouped: + assert len(entry) == 2 + assert entry[0] == opCode + assert entry[1].func_name == "" + assert entry[1].func_closure[0].cell_contents == func + opCode += step + + +def test_create_register_op_codes(): + start = 0x09 + step = 0x10 + func = CPU.addHL + registers = [CPU.bc]*128 + table = [(start, step, func, registers)] + list = create_register_op_codes(table) + opCode = start + assert len(list) == len(registers) + for entry in list: + assert len(entry) == 2 + assert entry[0] == opCode + assert entry[1].func_name == "" + assert entry[1].func_closure[0].cell_contents == func + opCode += step # HELPERS def assert_default_registers(cpu, a=constants.RESET_A, bc=constants.RESET_BC,\ @@ -263,7 +301,7 @@ # jr_NZ_nn see test_jr_cc_nn def test_0x20_0x28_0x30(): - py.test.skip("Op Code Mapping not fully implemented") + py.test.skip("OpCode Table incomplete") cpu = get_cpu() flags = [~constants.Z_FLAG, constants.Z_FLAG, ~constants.C_FLAG, constants.C_FLAG] opCode = 0x20 @@ -284,7 +322,7 @@ # ld_BC_nnnn to ld_SP_nnnn def test_0x01_0x11_0x21_0x31(): - py.test.skip("Op Code Mapping not fully implemented") + py.test.skip("OpCode Table incomplete") cpu = get_cpu() registers= [cpu.bc, cpu.de, cpu.hl, cpu.sp] value = 0x12 @@ -297,7 +335,7 @@ # add_HL_BC to add_HL_SP def test_0x09_0x19_0x29_0x39(): - py.test.skip("Op Code Mapping not fully implemented") + py.test.skip("OpCode Table incomplete") cpu = get_cpu() registers= [cpu.bc, cpu.de, cpu.hl, cpu.sp] value = 0x1234 @@ -311,7 +349,6 @@ # ld_BCi_A def test_0x02(): - py.test.skip("Op Code Mapping not fully implemented") cpu = get_cpu(); cpu.bc.set(0xC2, 0x23); cpu.a.set(0x12); @@ -360,7 +397,7 @@ # inc_BC DE HL SP def test_0x03_to_0x33_inc_double_registers(): - py.test.skip("Op Code Mapping not fully implemented") + py.test.skip("OpCode Table incomplete") cpu = get_cpu() opCode = 0x03 registers = [cpu.bc, cpu.de, cpu.hl, cpu.sp] @@ -377,7 +414,7 @@ # dec_BC def test_0x0B_to_0c38_dec_double_registers(): - py.test.skip("Op Code Mapping not fully implemented") + py.test.skip("OpCode Table incomplete") cpu = get_cpu() opCode = 0x0B registers = [cpu.bc, cpu.de, cpu.hl, cpu.sp] From cfbolz at codespeak.net Thu Mar 20 11:21:39 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Thu, 20 Mar 2008 11:21:39 +0100 (CET) Subject: [pypy-svn] r52762 - pypy/branch/jit-refactoring/pypy/jit/timeshifter Message-ID: <20080320102139.CCF06168525@codespeak.net> Author: cfbolz Date: Thu Mar 20 11:21:37 2008 New Revision: 52762 Removed: pypy/branch/jit-refactoring/pypy/jit/timeshifter/hrtyper.py pypy/branch/jit-refactoring/pypy/jit/timeshifter/transform.py Log: kill the transformation part of the timeshifter, which is no longer used From cfbolz at codespeak.net Thu Mar 20 11:24:36 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Thu, 20 Mar 2008 11:24:36 +0100 (CET) Subject: [pypy-svn] r52763 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080320102436.833BC168525@codespeak.net> Author: cfbolz Date: Thu Mar 20 11:24:35 2008 New Revision: 52763 Removed: pypy/branch/jit-hotpath/pypy/jit/timeshifter/hrtyper.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/transform.py Log: kill the transformation here too From cfbolz at codespeak.net Thu Mar 20 11:27:52 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Thu, 20 Mar 2008 11:27:52 +0100 (CET) Subject: [pypy-svn] r52764 - pypy/branch/jit-refactoring Message-ID: <20080320102752.65EAC168527@codespeak.net> Author: cfbolz Date: Thu Mar 20 11:27:51 2008 New Revision: 52764 Removed: pypy/branch/jit-refactoring/ Log: kill the jit-refactoring branch, it is replaced by jit-hotpath From cfbolz at codespeak.net Thu Mar 20 11:37:35 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Thu, 20 Mar 2008 11:37:35 +0100 (CET) Subject: [pypy-svn] r52765 - pypy/branch/jit-refactoring Message-ID: <20080320103735.18CB3168521@codespeak.net> Author: cfbolz Date: Thu Mar 20 11:37:34 2008 New Revision: 52765 Added: pypy/branch/jit-refactoring/ - copied from r52763, pypy/branch/jit-refactoring/ Log: bah, forgot that maciek does js stuff on this branch. revert From arigo at codespeak.net Thu Mar 20 12:26:39 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 12:26:39 +0100 (CET) Subject: [pypy-svn] r52766 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080320112639.2BDCC168524@codespeak.net> Author: arigo Date: Thu Mar 20 12:26:37 2008 New Revision: 52766 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Log: Report a rough size estimate of the JitCodes. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Thu Mar 20 12:26:37 2008 @@ -12,7 +12,7 @@ from pypy.jit.timeshifter.oop import maybe_on_top_of_llinterp from pypy.jit.timeshifter.greenkey import KeyDesc from pypy.jit.rainbow.interpreter import JitCode, LLTypeJitInterpreter, OOTypeJitInterpreter -from pypy.jit.rainbow.interpreter import DEBUG_JITCODES +from pypy.jit.rainbow.interpreter import DEBUG_JITCODES, log from pypy.translator.backendopt.removenoops import remove_same_as from pypy.translator.backendopt.ssa import SSA_to_SSI from pypy.translator.unsimplify import varoftype @@ -332,6 +332,23 @@ while self.unfinished_graphs: graph = self.unfinished_graphs.pop() self.make_bytecode(graph, is_portal=False) + numjitcodes = len(self.all_graphs) + size_estimate = 76 * numjitcodes + log.info("there are %d JitCode instances containing:" % numjitcodes) + numchars = 0 + for jitcode in self.all_graphs.values(): + numchars += len(jitcode.code) + size_estimate += (len(jitcode.code) + 15) & ~ 3 + log.info("- %d characters in bytecodes" % numchars) + numdesclists = len(self._listcache) + numdescitems = 0 + for lst in self._listcache.values(): + numdescitems += len(lst) + size_estimate += 8 + 4*len(lst) + log.info("- %d unique lists of descs (average length %.2f)" % ( + numdesclists, float(numdescitems) / numdesclists)) + log.info("%d KB total estimated size (without the Descs)" % ( + size_estimate/1024)) def compute_merge_points(self): entrymap = flowmodel.mkentrymap(self.graph) From arigo at codespeak.net Thu Mar 20 12:29:35 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 12:29:35 +0100 (CET) Subject: [pypy-svn] r52767 - pypy/branch/jit-hotpath/pypy/module/pypyjit Message-ID: <20080320112935.167C816852D@codespeak.net> Author: arigo Date: Thu Mar 20 12:29:34 2008 New Revision: 52767 Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py Log: Disable NewBoolDesc for a first try. Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py Thu Mar 20 12:29:34 2008 @@ -1,5 +1,5 @@ import pypy -from pypy.module.pypyjit.newbool import NewBoolDesc +#from pypy.module.pypyjit.newbool import NewBoolDesc from pypy.translator.translator import graphof from pypy.annotation.specialize import getuniquenondirectgraph from pypy.jit.hintannotator.policy import ManualGraphPolicy @@ -101,7 +101,7 @@ self.seegraph(pypy.interpreter.pyframe.PyFrame.execute_frame, False) # -------------------- # special timeshifting logic for newbool - self.seegraph(pypy.objspace.std.Space.newbool, NewBoolDesc) + #self.seegraph(pypy.objspace.std.Space.newbool, NewBoolDesc) self.seepath(pypy.interpreter.pyframe.PyFrame.JUMP_IF_TRUE, pypy.objspace.std.Space.is_true) self.seepath(pypy.interpreter.pyframe.PyFrame.JUMP_IF_FALSE, From arigo at codespeak.net Thu Mar 20 13:14:53 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 13:14:53 +0100 (CET) Subject: [pypy-svn] r52770 - in pypy/branch/jit-hotpath/pypy: jit/hintannotator lang/prolog/interpreter module/pypyjit Message-ID: <20080320121453.32F6516852A@codespeak.net> Author: arigo Date: Thu Mar 20 13:14:51 2008 New Revision: 52770 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/policy.py pypy/branch/jit-hotpath/pypy/lang/prolog/interpreter/portal.py pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py Log: The PORTAL attribute is not defined any more. Nobody used this method's argument though. Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/policy.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/policy.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/policy.py Thu Mar 20 13:14:51 2008 @@ -60,9 +60,7 @@ self.translator = t self.bookkeeper = t.annotator.bookkeeper self.timeshift_graphs = {} - portal = getattr(self.PORTAL, 'im_func', self.PORTAL) - portal_graph = graphof(t, portal) - self.fill_timeshift_graphs(portal_graph) + self.fill_timeshift_graphs() def look_inside_graph(self, graph): if graph in self.timeshift_graphs: @@ -86,7 +84,7 @@ def look_inside_graph_of_module(self, graph, func, mod): return True - def fill_timeshift_graphs(self, portal_graph): + def fill_timeshift_graphs(self): # subclasses should have their own pass Modified: pypy/branch/jit-hotpath/pypy/lang/prolog/interpreter/portal.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/lang/prolog/interpreter/portal.py (original) +++ pypy/branch/jit-hotpath/pypy/lang/prolog/interpreter/portal.py Thu Mar 20 13:14:51 2008 @@ -25,7 +25,7 @@ return False return True - def fill_timeshift_graphs(self, portal_graph): + def fill_timeshift_graphs(self): import pypy for cls in [term.Var, term.Term, term.Number, term.Atom]: self.seegraph(cls.copy) Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py Thu Mar 20 13:14:51 2008 @@ -74,7 +74,7 @@ descr_impl, pypy.objspace.std.typeobject.W_TypeObject.is_heaptype) - def fill_timeshift_graphs(self, portal_graph): + def fill_timeshift_graphs(self): import pypy # -------------------- From cami at codespeak.net Thu Mar 20 13:20:50 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Thu, 20 Mar 2008 13:20:50 +0100 (CET) Subject: [pypy-svn] r52771 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080320122050.229E9168531@codespeak.net> Author: cami Date: Thu Mar 20 13:20:49 2008 New Revision: 52771 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Log: fixed lambda bug test start working now Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Thu Mar 20 13:20:49 2008 @@ -653,8 +653,8 @@ self.pc.set(hi,lo) # 2 cycles # JP cc,nnnn 3,4 cycles - def jp_cc_nnnn(self, getter): - if getter(): + def jp_cc_nnnn(self, cc): + if cc: self.jp_nnnn() # 4 cycles else: self.pc.add(2) # 3 cycles @@ -665,8 +665,8 @@ self.cycles += 1 # JR cc,+nn, 2,3 cycles - def jr_cc_nn(self, getter): - if getter(): + def jr_cc_nn(self, cc): + if cc: self.jr_nn() # 3 cycles else: self.pc.inc() # 2 cycles @@ -703,8 +703,8 @@ self.pc.set(hi, lo) # 2 cycles # RET cc 2,5 cycles - def ret_cc(getter): - if (getter()): + def ret_cc(cc): + if cc: self.ret() # 4 cycles # FIXME maybe this should be the same self.cycles -= 1 @@ -762,52 +762,74 @@ GROUPED_REGISTERS = (CPU.b, CPU.c, CPU.d, CPU.e, CPU.h, CPU.l, CPU.hli, CPU.a) def create_group_op_codes(table): + print "" opCodes =[] for entry in table: opCode = entry[0] step = entry[1] function = entry[2] if len(entry) == 4: - for i in range(0, len(GROUPED_REGISTERS)): + for register in GROUPED_REGISTERS: for n in entry[3]: - register = GROUPED_REGISTERS[i] - opCodes.append((opCode, lambda me: function(me, register.get, register.set, n))) - #print "A", hex(opCode), function, n, i + opCodes.append((opCode, group_lambda(function, register, n))) + #print "A", hex(opCode), function, n opCode += step else: - for i in range(0, len(GROUPED_REGISTERS)): - register = GROUPED_REGISTERS[i] - opCodes.append((opCode, lambda me: function(me, register.get, register.set))) - #print "B", hex(opCode), function, i + for register in GROUPED_REGISTERS: + opCodes.append((opCode,group_lambda(function, register))) + #print "B", hex(opCode), function, register opCode += step return opCodes +def group_lambda(function, register, value=None): + if value == None: + lambda s: function(s, register.get, register.set) + else: + lambda s: function(s, register.get, register.set, value) + + def create_register_op_codes(table): + print "" opCodes = [] for entry in table: opCode = entry[0] step = entry[1] function = entry[2] + #print "------------------------------" + #print "C", hex(opCode), hex(step), function, len(entry[3]) + #print entry[3], len(entry[3]) for registerOrGetter in entry[3]: - opCodes.append((opCode, lambda s: function(s, registerOrGetter))) - #print "C", hex(opCode), function, registerOrGetter + opCodes.append((opCode, register_lambda(function, registerOrGetter))) opCode += step return opCodes - + +def register_lambda(function, registerOrGetter): + if registerOrGetter is object: + return lambda s: function(s, registerOrGetter) + else: + return lambda s: function(s, registerOrGetter(s)) def initialize_op_code_table(table): + print "" result = [None] * (0xFF+1) for entry in table: - if (entry is None) or len(entry) == 0: + if (entry is None) or (len(entry) == 0) or entry[-1] is None: continue if len(entry) == 2: positions = [entry[0]] else: - assert False positions = range(entry[0], entry[1]+1) for pos in positions: + #try: + # print "D1", hex(pos), entry[-1].func_closure[0].cell_contents.func_name + #except: + # pass + #else: + # print "D2", hex(pos), entry[-1] + #print "" result[pos] = entry[-1] + #assert result[pos] is None return result # OPCODE TABLES --------------------------------------------------------------- @@ -882,7 +904,7 @@ (0xB8, 0x01, CPU.cpA), (0x06, 0x08, lambda s, register:CPU.ld(s, CPU.fetch(s), register.set)), (0x40, 0x01, CPU.res, range(0, 8)) -] +] REGISTER_OP_CODES = [ @@ -917,9 +939,9 @@ # RAW OPCODE TABLE INITIALIZATION ---------------------------------------------- FIRST_ORDER_OP_CODES += create_register_op_codes(REGISTER_OP_CODES) -FIRST_ORDER_OP_CODES += create_group_op_codes(REGISTER_GROUP_OP_CODES) +#FIRST_ORDER_OP_CODES += create_group_op_codes(REGISTER_GROUP_OP_CODES) SECOND_ORDER_OP_CODES = create_group_op_codes(SECOND_ORDER_REGISTER_GROUP_OP_CODES) OP_CODES = initialize_op_code_table(FIRST_ORDER_OP_CODES) -FETCH_EXECUTE_OP_CODES = initialize_op_code_table(SECOND_ORDER_OP_CODES) +FETCH_EXECUTE_OP_CODES = []#initialize_op_code_table(SECOND_ORDER_OP_CODES) Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Thu Mar 20 13:20:49 2008 @@ -191,6 +191,7 @@ # TEST HELPERS --------------------------------------- def test_create_group_op_codes(): + py.test.skip() assert len(GROUPED_REGISTERS) == 8 start=0x12 step=0x03 @@ -209,6 +210,7 @@ def test_create_register_op_codes(): + py.test.skip() start = 0x09 step = 0x10 func = CPU.addHL @@ -277,7 +279,7 @@ cpu.rom[startPC] = 0xD0 cpu.rom[startPC+1] = 0xC0 cycle_test(cpu, 0x08, 5) - assert_registers(cpu, pc=startPC+2) + assert_default_registers(cpu, pc=startPC+2) assert cpu.memory.read(0xC0D0) == cpu.sp.getLo() assert cpu.memory.read(0xC0D0+1) == cpu.sp.getHi() @@ -287,7 +289,7 @@ pc = cpu.pc.get() cycle_test(cpu, 0x10, 0) # fetches 1 cycle - assert_registers(cpu, pc=pc+1) + assert_default_registers(cpu, pc=pc+1) # jr_nn def test_0x18(): @@ -297,7 +299,7 @@ cpu.rom[constants.RESET_PC] = value assert_default_registers(cpu) cycle_test(cpu, 0x18, 3) - assert_registers(cpu, pc=pc+value+1) + assert_default_registers(cpu, pc=pc+value+1) # jr_NZ_nn see test_jr_cc_nn def test_0x20_0x28_0x30(): @@ -316,10 +318,9 @@ pc = cpu.pc.get() cpu.f.set(~flags[i]) cycle_test(cpu, opCode, 2) - assert cpu.pc.ge() == pc+1 + assert cpu.pc.get() == pc+1 value += 2 - # ld_BC_nnnn to ld_SP_nnnn def test_0x01_0x11_0x21_0x31(): py.test.skip("OpCode Table incomplete") From arigo at codespeak.net Thu Mar 20 15:15:10 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 15:15:10 +0100 (CET) Subject: [pypy-svn] r52773 - pypy/dist/dotviewer Message-ID: <20080320141510.F125B168528@codespeak.net> Author: arigo Date: Thu Mar 20 15:15:09 2008 New Revision: 52773 Added: pypy/dist/dotviewer/sshgraphserver.py (contents, props changed) Modified: pypy/dist/dotviewer/graphclient.py pypy/dist/dotviewer/graphserver.py Log: A bit hackish but probably convenient: a zero-configuration remote graph viewer. Modified: pypy/dist/dotviewer/graphclient.py ============================================================================== --- pypy/dist/dotviewer/graphclient.py (original) +++ pypy/dist/dotviewer/graphclient.py Thu Mar 20 15:15:09 2008 @@ -110,7 +110,10 @@ def spawn_handler(): gsvar = os.environ.get('GRAPHSERVER') if not gsvar: - return spawn_local_handler() + try: + return spawn_sshgraphserver_handler() + except Exception, e: + return spawn_local_handler() else: try: host, port = gsvar.split(':') @@ -119,10 +122,7 @@ except ValueError: raise ValueError("$GRAPHSERVER must be set to HOST:PORT, got %r" % (gvvar,)) - import socket - s = socket.socket() - s.connect((host, port)) - return msgstruct.SocketIO(s) + return spawn_graphserver_handler((host, port)) def spawn_local_handler(): if hasattr(sys, 'pypy_objspaceclass'): @@ -133,3 +133,19 @@ child_in, child_out = os.popen2(cmdline, 'tb') io = msgstruct.FileIO(child_out, child_in) return io + +def spawn_graphserver_handler(address): + import socket + s = socket.socket() + s.connect(address) + return msgstruct.SocketIO(s) + +def spawn_sshgraphserver_handler(): + import tempfile, getpass + tmpdir = tempfile.gettempdir() + user = getpass.getuser() + fn = os.path.join(tmpdir, 'dotviewer-sshgraphsrv-%s' % user) + f = open(fn, 'r') + port = int(f.readline().rstrip()) + f.close() + return spawn_graphserver_handler(('127.0.0.1', port)) Modified: pypy/dist/dotviewer/graphserver.py ============================================================================== --- pypy/dist/dotviewer/graphserver.py (original) +++ pypy/dist/dotviewer/graphserver.py Thu Mar 20 15:15:09 2008 @@ -144,7 +144,7 @@ } -def listen_server(local_address): +def listen_server(local_address, s1=None): import socket, graphclient, thread if isinstance(local_address, str): if ':' in local_address: @@ -152,8 +152,9 @@ else: interface, port = '', local_address local_address = interface, int(port) - s1 = socket.socket() - s1.bind(local_address) + if s1 is None: + s1 = socket.socket() + s1.bind(local_address) s1.listen(5) print 'listening on %r...' % (s1.getsockname(),) while True: Added: pypy/dist/dotviewer/sshgraphserver.py ============================================================================== --- (empty file) +++ pypy/dist/dotviewer/sshgraphserver.py Thu Mar 20 15:15:09 2008 @@ -0,0 +1,71 @@ +#! /usr/bin/env python +"""This script displays locally the graphs that are built by dotviewer +on remote machines. + +Usage: + sshgraphserver.py hostname [more args for ssh...] + +This logs in to 'hostname' by passing the arguments on the command-line +to ssh. No further configuration is required: it works for all programs +using the dotviewer library as long as they run on 'hostname' under the +same username as the one sshgraphserver logs as. +""" + +import graphserver, socket, subprocess, random + + +def ssh_graph_server(sshargs): + s1 = socket.socket() + s1.bind(('127.0.0.1', socket.INADDR_ANY)) + localhost, localport = s1.getsockname() + remoteport = random.randrange(10000, 20000) + # ^^^ and just hope there is no conflict + + args = ['ssh', '-C', '-R%d:127.0.0.1:%d' % (remoteport, localport)] + args = args + sshargs + ['python -u -c "exec input()"'] + print ' '.join(args[:-1]) + p = subprocess.Popen(args, bufsize=0, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE) + p.stdin.write(repr('port=%d\n%s' % (remoteport, REMOTE_SOURCE)) + '\n') + line = p.stdout.readline() + assert line == 'OK\n' + + graphserver.listen_server(None, s1=s1) + + +REMOTE_SOURCE = r""" +import tempfile, getpass, os, sys + +def main(port): + tmpdir = tempfile.gettempdir() + user = getpass.getuser() + fn = os.path.join(tmpdir, 'dotviewer-sshgraphsrv-%s' % user) + try: + os.unlink(fn) + except OSError: + pass + f = open(fn, 'w') + print >> f, port + f.close() + try: + sys.stdout.write('OK\n') + # just wait for the loss of the remote link, ignoring any data + while sys.stdin.read(1024): + pass + finally: + try: + os.unlink(fn) + except OSError: + pass + +main(port) +""" + + +if __name__ == '__main__': + import sys + if len(sys.argv) <= 1: + print __doc__ + sys.exit(2) + ssh_graph_server(sys.argv[1:]) From arigo at codespeak.net Thu Mar 20 15:19:15 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 15:19:15 +0100 (CET) Subject: [pypy-svn] r52775 - pypy/branch/jit-hotpath/dotviewer Message-ID: <20080320141915.84E9F168529@codespeak.net> Author: arigo Date: Thu Mar 20 15:19:15 2008 New Revision: 52775 Added: pypy/branch/jit-hotpath/dotviewer/ - copied from r52774, pypy/dist/dotviewer/ Log: Merge from trunk. From arigo at codespeak.net Thu Mar 20 15:25:37 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 15:25:37 +0100 (CET) Subject: [pypy-svn] r52776 - pypy/dist/dotviewer Message-ID: <20080320142537.7C7A7168531@codespeak.net> Author: arigo Date: Thu Mar 20 15:25:37 2008 New Revision: 52776 Modified: pypy/dist/dotviewer/dotviewer.py pypy/dist/dotviewer/graphclient.py pypy/dist/dotviewer/graphserver.py Log: Change instructions to point to sshgraphserver instead of graphserver. Modified: pypy/dist/dotviewer/dotviewer.py ============================================================================== --- pypy/dist/dotviewer/dotviewer.py (original) +++ pypy/dist/dotviewer/dotviewer.py Thu Mar 20 15:25:37 2008 @@ -4,14 +4,9 @@ dotviewer.py filename.dot dotviewer.py filename.plain - dotviewer.py --server [interface:]port In the first form, show the graph contained in a .dot file. In the second form, the graph was already compiled to a .plain file. -In the third form, listen for connexion on the given port and display -the graphs sent by the remote side. On the remote site, set the -GRAPHSERVER environment variable to HOST:PORT. See graphserver.py -for more instructions. """ import sys @@ -24,7 +19,7 @@ if option in ('-h', '--help'): print >> sys.stderr, __doc__ sys.exit(2) - if option in ('-s', '--server'): + if option in ('-s', '--server'): # deprecated server_addr = value if not args and server_addr is None: print >> sys.stderr, __doc__ Modified: pypy/dist/dotviewer/graphclient.py ============================================================================== --- pypy/dist/dotviewer/graphclient.py (original) +++ pypy/dist/dotviewer/graphclient.py Thu Mar 20 15:25:37 2008 @@ -108,7 +108,7 @@ pass def spawn_handler(): - gsvar = os.environ.get('GRAPHSERVER') + gsvar = os.environ.get('GRAPHSERVER') # deprecated if not gsvar: try: return spawn_sshgraphserver_handler() Modified: pypy/dist/dotviewer/graphserver.py ============================================================================== --- pypy/dist/dotviewer/graphserver.py (original) +++ pypy/dist/dotviewer/graphserver.py Thu Mar 20 15:25:37 2008 @@ -1,40 +1,7 @@ #! /usr/bin/env python -""" -Usage: - graphserver.py [interface:]port - dotviewer.py --server [interface:]port - -Start a server listening for connexions on the given port. The two ways -to start a server are equivalent. The server displays the graphs sent -by a remote process. On the remote process' side, set the GRAPHSERVER -environment variable to HOST:PORT. - -Here is a step-by-step example on how to use it in combination with ssh -port forwarding (replace 9999 with a random port number of your choice, -e.g. between 8000 and 20000): - - - on your local machine, run: - graphserver.py localhost:9999 - - - connect to a remote machine, allowing the remote side to contact - your local dotviewer: - ssh -R9999:localhost:9999 machinename - - - set the $GRAPHSERVER env var on the remote machine to point to the - redirected port (in bash): - export GRAPHSERVER=:9999 - - - then any graph-viewing command you execute while $GRAPHSERVER is set - will reach your local dotviewer and basically appear to work - completely transparently. - - - to automate steps 2 and 3, I've put the following entry in my local - .ssh/config: - Host machinename - RemoteForward 9999 127.0.0.1:9999 +"""Graph server. - and I've added the 'export GRAPHSERVER=:9999' line to my .bashrc on - the remote machine. +From the command-line it's easier to use sshgraphserver.py instead of this. """ import sys @@ -190,7 +157,7 @@ traceback.print_exc(file=f) # try to add some explanations help = (" | if you want to debug on a remote machine, see\n" - " | instructions in dotviewer/graphserver.py\n") + " | instructions in dotviewer/sshgraphserver.py\n") try: import pygame except ImportError: From antocuni at codespeak.net Thu Mar 20 16:09:29 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Thu, 20 Mar 2008 16:09:29 +0100 (CET) Subject: [pypy-svn] r52778 - in pypy/branch/jit-hotpath/pypy/jit: codegen/llgraph rainbow timeshifter Message-ID: <20080320150929.2DF6E16853B@codespeak.net> Author: antocuni Date: Thu Mar 20 16:09:28 2008 New Revision: 52778 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Log: more refactoring towards a working rainbow for ootype Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py Thu Mar 20 16:09:28 2008 @@ -237,6 +237,8 @@ elif isinstance(T, ootype.StaticMethod): fn = value._obj return ootype._static_meth(T, graph=fn.graph, _callable=fn._callable) + elif isinstance(T, ootype.Instance): + return ootype.ooupcast(T, value) # XXX: oodowncast? else: T1 = lltype.typeOf(value) if T1 is llmemory.Address: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Thu Mar 20 16:09:28 2008 @@ -152,7 +152,7 @@ self.hannotator = hannotator etrafo = hannotator.exceptiontransformer type_system = self.rtyper.type_system.name - self.exceptiondesc = exception.ExceptionDesc( + self.exceptiondesc = self.ExceptionDesc( RGenOp, etrafo, type_system, True, self.rtyper) self.interpreter = self.create_interpreter(RGenOp) self.RGenOp = RGenOp @@ -1567,12 +1567,16 @@ class LLTypeBytecodeWriter(BytecodeWriter): + ExceptionDesc = exception.LLTypeExceptionDesc + def create_interpreter(self, RGenOp): return LLTypeJitInterpreter(self.exceptiondesc, RGenOp) class OOTypeBytecodeWriter(BytecodeWriter): + ExceptionDesc = exception.OOTypeExceptionDesc + def create_interpreter(self, RGenOp): return OOTypeJitInterpreter(self.exceptiondesc, RGenOp) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py Thu Mar 20 16:09:28 2008 @@ -1,3 +1,6 @@ +from pypy.rpython.lltypesystem import llmemory +from pypy.rpython.ootypesystem import ootype + class TypeSystemHelper(object): def _freeze_(self): @@ -7,7 +10,8 @@ class LLTypeHelper(TypeSystemHelper): name = 'lltype' - + ROOT_TYPE = llmemory.Address + def get_typeptr(self, obj): return obj.typeptr @@ -15,6 +19,8 @@ class OOTypeHelper(TypeSystemHelper): name = 'ootype' + ROOT_TYPE = llmemory.Address # XXX: should be ootype.ROOT + #ROOT_TYPE = ootype.ROOT def get_typeptr(self, obj): return obj.meta Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py Thu Mar 20 16:09:28 2008 @@ -2,7 +2,7 @@ from pypy.jit.timeshifter import rvalue, rtimeshift -class ExceptionDesc: +class AbstractExceptionDesc: def __init__(self, RGenOp, etrafo, type_system, lazy_exception_path, rtyper=None): @@ -25,18 +25,7 @@ self.gv_null_exc_type = RGenOp.constPrebuiltGlobal(null_exc_type) self.gv_null_exc_value = RGenOp.constPrebuiltGlobal(null_exc_value) - if type_system == 'lltypesystem': - self.null_exc_type_box = rvalue.PtrRedBox(self.exc_type_kind, - self.gv_null_exc_type) - self.null_exc_value_box = rvalue.PtrRedBox(self.exc_value_kind, - self.gv_null_exc_value) - else: - # XXX: think more about exceptions - self.null_exc_type_box = rvalue.PtrRedBox(self.exc_type_kind, - RGenOp.constPrebuiltGlobal(llmemory.NULL)) - self.null_exc_value_box = rvalue.IntRedBox(self.exc_value_kind, - RGenOp.constPrebuiltGlobal(llmemory.NULL)) - + self._create_boxes(RGenOp) self.lazy_exception_path = lazy_exception_path def _freeze_(self): @@ -71,7 +60,7 @@ builder = jitstate.curbuilder etypebox = jitstate.exc_type_box if etypebox.is_constant(): - ll_etype = rvalue.ll_getvalue(etypebox, llmemory.Address) + ll_etype = rvalue.ll_getvalue(etypebox, jitstate.ts.ROOT_TYPE) if not ll_etype: return # we know there is no exception set evaluebox = jitstate.exc_value_box @@ -83,3 +72,22 @@ def gen_exc_occurred(self, builder): gv_etype = self.genop_get_exc_type(builder) return builder.genop_ptr_nonzero(self.exc_type_kind, gv_etype) + + +class LLTypeExceptionDesc(AbstractExceptionDesc): + + def _create_boxes(self, RGenOp): + self.null_exc_type_box = rvalue.PtrRedBox(self.exc_type_kind, + self.gv_null_exc_type) + self.null_exc_value_box = rvalue.PtrRedBox(self.exc_value_kind, + self.gv_null_exc_value) + + +class OOTypeExceptionDesc(AbstractExceptionDesc): + def _create_boxes(self, RGenOp): + # XXX: think more about exceptions + self.null_exc_type_box = rvalue.PtrRedBox(self.exc_type_kind, + RGenOp.constPrebuiltGlobal(llmemory.NULL)) + self.null_exc_value_box = rvalue.PtrRedBox(self.exc_value_kind, + RGenOp.constPrebuiltGlobal(llmemory.NULL)) + Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Thu Mar 20 16:09:28 2008 @@ -958,7 +958,7 @@ null1 = self.fz_exc_type_box.is_constant_nullptr() box = jitstate.exc_type_box null2 = (box.is_constant() and - not rvalue.ll_getvalue(box, llmemory.Address)) + not rvalue.ll_getvalue(box, jitstate.ts.ROOT_TYPE)) if null1 != null2: raise rvalue.DontMerge # a jit-with-exc. and a jit-without-exc. Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Thu Mar 20 16:09:28 2008 @@ -1,4 +1,5 @@ from pypy.rpython.lltypesystem import lltype, llmemory +from pypy.rpython.ootypesystem import ootype class Memo(object): _annspecialcase_ = 'specialize:ctr_location' @@ -32,6 +33,19 @@ class DontMerge(Exception): pass +class LLTypeMixin(object): + _mixin_ = True + + def _revealconst(self, gv): + return gv.revealconst(llmemory.Address) + +class OOTypeMixin(object): + _mixin_ = True + + def _revealconst(self, gv): + return gv.revealconst(ootype.ROOT) # ??? + + class RedBox(object): _attrs_ = ['kind', 'genvar'] @@ -87,6 +101,7 @@ def redboxbuilder_int(kind, gv_value): return IntRedBox(kind, gv_value) def redboxbuilder_dbl(kind, gv_value): return DoubleRedBox(kind,gv_value) def redboxbuilder_ptr(kind, gv_value): return PtrRedBox(kind, gv_value) +def redboxbuilder_inst(kind, gv_value): return InstanceRedBox(kind, gv_value) def ll_redboxbuilder(TYPE): if TYPE is lltype.Void: @@ -95,6 +110,8 @@ return redboxbuilder_ptr elif TYPE is lltype.Float: return redboxbuilder_dbl + elif isinstance(TYPE, ootype.Instance): + return redboxbuilder_inst else: assert isinstance(TYPE, lltype.Primitive) # XXX what about long longs? @@ -184,20 +201,24 @@ return result -class PtrRedBox(RedBox): +class AbstractPtrRedBox(RedBox): + """ + Base class for PtrRedBox (lltype) and InstanceRedBox (ootype) + """ + content = None # or an AbstractContainer def __init__(self, kind, genvar=None, known_nonzero=False): self.kind = kind self.genvar = genvar # None or a genvar if genvar is not None and genvar.is_const: - known_nonzero = bool(genvar.revealconst(llmemory.Address)) + known_nonzero = bool(self._revealconst(genvar)) self.known_nonzero = known_nonzero def setgenvar(self, newgenvar): RedBox.setgenvar(self, newgenvar) self.known_nonzero = (newgenvar.is_const and - bool(newgenvar.revealconst(llmemory.Address))) + bool(self._revealconst(newgenvar))) def setgenvar_hint(self, newgenvar, known_nonzero): RedBox.setgenvar(self, newgenvar) @@ -226,55 +247,16 @@ else: return RedBox.__repr__(self) - def op_getfield(self, jitstate, fielddesc): - self.learn_nonzeroness(jitstate, True) - if self.content is not None: - box = self.content.op_getfield(jitstate, fielddesc) - if box is not None: - return box - gv_ptr = self.getgenvar(jitstate) - box = fielddesc.generate_get(jitstate, gv_ptr) - if fielddesc.immutable: - self.remember_field(fielddesc, box) - return box - - def op_setfield(self, jitstate, fielddesc, valuebox): - self.learn_nonzeroness(jitstate, True) - gv_ptr = self.genvar - if gv_ptr: - fielddesc.generate_set(jitstate, gv_ptr, - valuebox.getgenvar(jitstate)) - else: - assert self.content is not None - self.content.op_setfield(jitstate, fielddesc, valuebox) - - def op_getsubstruct(self, jitstate, fielddesc): - self.learn_nonzeroness(jitstate, True) - gv_ptr = self.genvar - if gv_ptr: - return fielddesc.generate_getsubstruct(jitstate, gv_ptr) - else: - assert self.content is not None - return self.content.op_getsubstruct(jitstate, fielddesc) - - def remember_field(self, fielddesc, box): - if self.genvar.is_const: - return # no point in remembering field then - if self.content is None: - from pypy.jit.timeshifter import rcontainer - self.content = rcontainer.PartialDataStruct() - self.content.remember_field(fielddesc, box) - def copy(self, memo): boxmemo = memo.boxes try: result = boxmemo[self] except KeyError: - result = PtrRedBox(self.kind, self.genvar, self.known_nonzero) + result = self.__class__(self.kind, self.genvar, self.known_nonzero) boxmemo[self] = result if self.content: result.content = self.content.copy(memo) - assert isinstance(result, PtrRedBox) + assert isinstance(result, AbstractPtrRedBox) return result def replace(self, memo): @@ -286,7 +268,7 @@ if self.content: self.content.replace(memo) result = self - assert isinstance(result, PtrRedBox) + assert isinstance(result, AbstractPtrRedBox) return result def freeze(self, memo): @@ -298,20 +280,20 @@ if not self.genvar: from pypy.jit.timeshifter import rcontainer assert isinstance(content, rcontainer.VirtualContainer) - result = FrozenPtrVirtual(self.kind) + result = self.FrozenPtrVirtual(self.kind) boxmemo[self] = result result.fz_content = content.freeze(memo) return result elif self.genvar.is_const: - result = FrozenPtrConst(self.kind, self.genvar) + result = self.FrozenPtrConst(self.kind, self.genvar) elif content is None: - result = FrozenPtrVar(self.kind, self.known_nonzero) + result = self.FrozenPtrVar(self.kind, self.known_nonzero) else: # if self.content is not None, it's a PartialDataStruct from pypy.jit.timeshifter import rcontainer assert isinstance(content, rcontainer.PartialDataStruct) - result = FrozenPtrVarWithPartialData(self.kind, - known_nonzero=True) + result = self.FrozenPtrVarWithPartialData(self.kind, + known_nonzero=True) boxmemo[self] = result result.fz_partialcontent = content.partialfreeze(memo) return result @@ -353,6 +335,54 @@ if self.content: self.content.enter_block(incoming, memo) + +class PtrRedBox(AbstractPtrRedBox, LLTypeMixin): + + def op_getfield(self, jitstate, fielddesc): + self.learn_nonzeroness(jitstate, True) + if self.content is not None: + box = self.content.op_getfield(jitstate, fielddesc) + if box is not None: + return box + gv_ptr = self.getgenvar(jitstate) + box = fielddesc.generate_get(jitstate, gv_ptr) + if fielddesc.immutable: + self.remember_field(fielddesc, box) + return box + + def op_setfield(self, jitstate, fielddesc, valuebox): + self.learn_nonzeroness(jitstate, True) + gv_ptr = self.genvar + if gv_ptr: + fielddesc.generate_set(jitstate, gv_ptr, + valuebox.getgenvar(jitstate)) + else: + assert self.content is not None + self.content.op_setfield(jitstate, fielddesc, valuebox) + + def op_getsubstruct(self, jitstate, fielddesc): + self.learn_nonzeroness(jitstate, True) + gv_ptr = self.genvar + if gv_ptr: + return fielddesc.generate_getsubstruct(jitstate, gv_ptr) + else: + assert self.content is not None + return self.content.op_getsubstruct(jitstate, fielddesc) + + def remember_field(self, fielddesc, box): + if self.genvar.is_const: + return # no point in remembering field then + if self.content is None: + from pypy.jit.timeshifter import rcontainer + self.content = rcontainer.PartialDataStruct() + self.content.remember_field(fielddesc, box) + + +class InstanceRedBox(AbstractPtrRedBox, OOTypeMixin): + + def forcevar(self, jitstate, memo, forget_nonzeroness): + raise NotImplementedError + # ____________________________________________________________ class FrozenValue(object): @@ -450,7 +480,7 @@ return memo[self] -class FrozenPtrConst(FrozenConst): +class FrozenAbstractPtrConst(FrozenConst): def __init__(self, kind, gv_const): self.kind = kind @@ -458,14 +488,14 @@ def is_constant_equal(self, box): return (box.is_constant() and - self.gv_const.revealconst(llmemory.Address) == - box.genvar.revealconst(llmemory.Address)) + self._revealconst(self.gv_const) == + self._revealconst(box.genvar)) def is_constant_nullptr(self): - return not self.gv_const.revealconst(llmemory.Address) + return not self._revealconst(self.gv_const) def exactmatch(self, box, outgoingvarboxes, memo): - assert isinstance(box, PtrRedBox) + assert isinstance(box, AbstractPtrRedBox) memo.partialdatamatch[box] = None # could do better if self.is_constant_nullptr(): memo.forget_nonzeroness[box] = None @@ -477,7 +507,14 @@ return match def unfreeze(self, incomingvarboxes, memo): - return PtrRedBox(self.kind, self.gv_const) + return self.PtrRedBox(self.kind, self.gv_const) + + +class FrozenPtrConst(FrozenAbstractPtrConst, LLTypeMixin): + PtrRedBox = PtrRedBox + +class FrozenInstanceConst(FrozenAbstractPtrConst, OOTypeMixin): + PtrRedBox = InstanceRedBox class FrozenPtrVar(FrozenVar): @@ -558,3 +595,13 @@ ## else: ## outgoingvarboxes.append(box) ## return False + +PtrRedBox.FrozenPtrVirtual = FrozenPtrVirtual +PtrRedBox.FrozenPtrConst = FrozenPtrConst +PtrRedBox.FrozenPtrVar = FrozenPtrVar +PtrRedBox.FrozenPtrVarWithPartialData = FrozenPtrVarWithPartialData + +InstanceRedBox.FrozenPtrVirtual = None +InstanceRedBox.FrozenPtrConst = FrozenInstanceConst +InstanceRedBox.FrozenPtrVar = None +InstanceRedBox.FrozenPtrVarWithPartialData = None From arigo at codespeak.net Thu Mar 20 16:25:57 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 16:25:57 +0100 (CET) Subject: [pypy-svn] r52779 - pypy/branch/jit-hotpath/pypy/jit/hintannotator Message-ID: <20080320152557.7F1A3168526@codespeak.net> Author: arigo Date: Thu Mar 20 16:25:56 2008 New Revision: 52779 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/bookkeeper.py pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py Log: Record the causes for SomeLLAbstractVariables and print them in the common error message "hint %s makes no sense on %s". Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/bookkeeper.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/bookkeeper.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/bookkeeper.py Thu Mar 20 16:25:56 2008 @@ -125,6 +125,7 @@ self.tsgraphsigs = {} self.nonstuboriggraphcount = 0 self.stuboriggraphcount = 0 + self._abstractvariable_cause = {} if hannotator is not None: # for tests t = hannotator.base_translator self.impurity_analyzer = ImpurityAnalyzer(t) @@ -132,6 +133,20 @@ global hintmodel from pypy.jit.hintannotator import model as hintmodel + def setcause(self, hs, causes): + if not isinstance(causes, (list, tuple)): + causes = (causes,) + for cause in causes: + if isinstance(cause, annmodel.SomeObject): + cause = self.getcause(cause) + if cause is not None: + self._abstractvariable_cause[id(hs)] = hs, cause + break + + def getcause(self, hs): + hs, cause = self._abstractvariable_cause.get(id(hs), (hs, None)) + return cause + def getdesc(self, graph): try: return self.descs[graph] Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py Thu Mar 20 16:25:56 2008 @@ -251,13 +251,16 @@ SomeLLAbstractValue.__init__(self, T, deepfrozen) assert T is not lltype.Void # use bookkeeper.valueoftype() -def variableoftype(TYPE, deepfrozen=False): +def variableoftype(TYPE, deepfrozen=False, cause=None): # the union of all annotations of the given TYPE - that's a # SomeLLAbstractVariable, unless TYPE is Void if TYPE is lltype.Void: return s_void else: - return SomeLLAbstractVariable(TYPE, deepfrozen=deepfrozen) + hs_res = SomeLLAbstractVariable(TYPE, deepfrozen=deepfrozen) + if cause is not None: + getbookkeeper().setcause(hs_res, cause) + return hs_res class SomeLLAbstractContainer(SomeLLAbstractValue): @@ -336,7 +339,8 @@ def hint(hs_v1, hs_flags): if hs_flags.const.get('variable', False): # only for testing purposes!!! - return SomeLLAbstractVariable(hs_v1.concretetype) + return variableoftype(hs_v1.concretetype, + cause='a hint variable=True') if hs_flags.const.get('forget', False): # turn a variable to a constant origin = getbookkeeper().myorigin() @@ -354,19 +358,24 @@ if hs_flags.const.get(name, False): return - raise HintError("hint %s makes no sense on %r" % (hs_flags.const, - hs_v1)) + cause = getbookkeeper().getcause(hs_v1) + if cause is None: + causeinfo = '' + else: + causeinfo = '\n caused by %s' % (cause,) + raise HintError("hint %s makes no sense on %r%s" % (hs_flags.const, + hs_v1, causeinfo)) def is_early_constant(hs_v1): return SomeLLAbstractConstant(lltype.Bool, {}) def getfield(hs_v1, hs_fieldname): S = hs_v1.concretetype.TO FIELD_TYPE = getattr(S, hs_fieldname.const) - return variableoftype(FIELD_TYPE, hs_v1.deepfrozen) + return variableoftype(FIELD_TYPE, hs_v1.deepfrozen, cause=hs_v1) def oogetfield(hs_v1, hs_fieldname): _, FIELD_TYPE = hs_v1.concretetype._lookup_field(hs_fieldname.const) - return variableoftype(FIELD_TYPE, hs_v1.deepfrozen) + return variableoftype(FIELD_TYPE, hs_v1.deepfrozen, cause=hs_v1) def setfield(hs_v1, hs_fieldname, hs_value): pass @@ -377,7 +386,9 @@ def getsubstruct(hs_v1, hs_fieldname): S = hs_v1.concretetype.TO FIELD_TYPE = getattr(S, hs_fieldname.const) - return SomeLLAbstractVariable(lltype.Ptr(FIELD_TYPE), hs_v1.deepfrozen) + hs = SomeLLAbstractVariable(lltype.Ptr(FIELD_TYPE), hs_v1.deepfrozen) + getbookkeeper().setcause(hs, hs_v1) + return hs def _getinterior(hs_v1, *offsets_hs): hs_container = hs_v1 @@ -410,7 +421,9 @@ def cast_pointer(hs_v1): RESTYPE = getbookkeeper().current_op_concretetype() - return SomeLLAbstractVariable(RESTYPE, hs_v1.deepfrozen) + hs = SomeLLAbstractVariable(RESTYPE, hs_v1.deepfrozen) + getbookkeeper().setcause(hs, hs_v1) + return hs ooupcast = cast_pointer oodowncast = cast_pointer @@ -426,7 +439,8 @@ def _call_multiple_graphs(hs_v1, graph_list, RESULT, *args_hs): if graph_list is None: # cannot follow indirect calls to unknown targets - return variableoftype(RESULT) + return variableoftype(RESULT, + cause='an indirect call to unknown targets') bookkeeper = getbookkeeper() myorigin = bookkeeper.myorigin() @@ -454,7 +468,8 @@ # just hope the annotations are correct if (bookkeeper.getdesc(graph)._cache.get(None, None) is bookkeeper.annotator.translator.graphs[0]): - return variableoftype(RESULT) + return variableoftype(RESULT, cause="recursive call from the " + "entry point to itself") myorigin = bookkeeper.myorigin() myorigin.__class__ = CallOpOriginFlags # thud @@ -552,7 +567,8 @@ myorigin=origin, deepfrozen=hs_c1.deepfrozen) else: - return variableoftype(FIELD_TYPE) + return variableoftype(FIELD_TYPE, + cause="getfield on non-immutable %s" % (S,)) def getsubstruct(hs_c1, hs_fieldname): S = hs_c1.concretetype.TO @@ -611,14 +627,17 @@ class __extend__(pairtype(SomeLLAbstractValue, SomeLLAbstractValue)): def getarrayitem((hs_v1, hs_v2)): - return variableoftype(hs_v1.concretetype.TO.OF, hs_v1.deepfrozen) + return variableoftype(hs_v1.concretetype.TO.OF, hs_v1.deepfrozen, + cause=hs_v1) def setarrayitem((hs_v1, hs_v2), hs_v3): pass def getarraysubstruct((hs_v1, hs_v2)): - return SomeLLAbstractVariable(lltype.Ptr(hs_v1.concretetype.TO.OF), + hs = SomeLLAbstractVariable(lltype.Ptr(hs_v1.concretetype.TO.OF), hs_v1.deepfrozen) + getbookkeeper().setcause(hs, (hs_v1, hs_v2)) + return hs def union((hs_v1, hs_v2)): if hs_v1.deepfrozen != hs_v2.deepfrozen: @@ -642,7 +661,15 @@ if (getattr(hs_v1, 'eager_concrete', False) or getattr(hs_v2, 'eager_concrete', False)): pair(hs_v1, hs_v2).invalid_union() - return variableoftype(hs_v1.concretetype, hs_v1.deepfrozen) + hs_res = variableoftype(hs_v1.concretetype, hs_v1.deepfrozen) + # we cannot use cause=... here because getbookkeeper() returns None. + # here is a hack to try to preserve 'cause' anyway... + if hs_res == hs_v1: + return hs_v1 + elif hs_res == hs_v2: + return hs_v2 + else: + return hs_res class __extend__(pairtype(SomeLLAbstractConstant, SomeLLAbstractConstant)): @@ -672,7 +699,8 @@ myorigin=origin, deepfrozen=hs_c1.deepfrozen) else: - return variableoftype(READ_TYPE) + return variableoftype(READ_TYPE, + cause="getarrayitem on non-immutable %s" % A) def getarraysubstruct((hs_c1, hs_index)): A = hs_c1.concretetype.TO @@ -741,7 +769,7 @@ eager_concrete = False, # probably myorigin = myorigin, deepfrozen=deepfrozen) - return variableoftype(RESULT, deepfrozen=deepfrozen) + return variableoftype(RESULT, deepfrozen=deepfrozen, cause=args_hs) def handle_highlevel_operation(bookkeeper, ll_func, *args_hs): @@ -805,7 +833,8 @@ eager_concrete = False, # probably myorigin = myorigin) else: - h_res = variableoftype(RESTYPE) + h_res = variableoftype(RESTYPE, + cause="non-pure residual call to %s" % graph) return h_res # ____________________________________________________________ @@ -814,11 +843,15 @@ def var_unary(hs_v, *rest_hs): RESTYPE = getbookkeeper().current_op_concretetype() - return SomeLLAbstractVariable(RESTYPE) + hs_res = SomeLLAbstractVariable(RESTYPE) + getbookkeeper().setcause(hs_res, hs_v) + return hs_res def var_binary((hs_v1, hs_v2), *rest_hs): RESTYPE = getbookkeeper().current_op_concretetype() - return SomeLLAbstractVariable(RESTYPE) + hs_res = SomeLLAbstractVariable(RESTYPE) + getbookkeeper().setcause(hs_res, (hs_v1, hs_v2)) + return hs_res def const_unary(llop, hs_c1): #XXX unsure hacks From arigo at codespeak.net Thu Mar 20 16:48:24 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 16:48:24 +0100 (CET) Subject: [pypy-svn] r52780 - pypy/dist/dotviewer Message-ID: <20080320154824.2F325168518@codespeak.net> Author: arigo Date: Thu Mar 20 16:48:23 2008 New Revision: 52780 Modified: pypy/dist/dotviewer/graphclient.py Log: Minor fix to avoid snoopy users. Modified: pypy/dist/dotviewer/graphclient.py ============================================================================== --- pypy/dist/dotviewer/graphclient.py (original) +++ pypy/dist/dotviewer/graphclient.py Thu Mar 20 16:48:23 2008 @@ -145,6 +145,9 @@ tmpdir = tempfile.gettempdir() user = getpass.getuser() fn = os.path.join(tmpdir, 'dotviewer-sshgraphsrv-%s' % user) + st = os.stat(fn) + if st.st_uid != os.getuid(): + raise OSError("wrong owner on " + fn) f = open(fn, 'r') port = int(f.readline().rstrip()) f.close() From fijal at codespeak.net Thu Mar 20 17:05:16 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 20 Mar 2008 17:05:16 +0100 (CET) Subject: [pypy-svn] r52781 - pypy/branch/faster-calls Message-ID: <20080320160516.03DCA168528@codespeak.net> Author: fijal Date: Thu Mar 20 17:05:16 2008 New Revision: 52781 Removed: pypy/branch/faster-calls/ Log: Remove this branch. From fijal at codespeak.net Thu Mar 20 17:35:34 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 20 Mar 2008 17:35:34 +0100 (CET) Subject: [pypy-svn] r52782 - pypy/dist/pypy/doc Message-ID: <20080320163534.808F416850E@codespeak.net> Author: fijal Date: Thu Mar 20 17:35:32 2008 New Revision: 52782 Added: pypy/dist/pypy/doc/ctypes-implementation.txt (contents, props changed) Log: add a short document about ctypes. Added: pypy/dist/pypy/doc/ctypes-implementation.txt ============================================================================== --- (empty file) +++ pypy/dist/pypy/doc/ctypes-implementation.txt Thu Mar 20 17:35:32 2008 @@ -0,0 +1,53 @@ + +======================================== +PyPy's ctypes implementation document +======================================== + +* application level code - code written in full python + +* interpreter level code - code written in RPython, compiled + to something else, say C, part of the interpreter. + +PyPy's ctypes implementation is right now mostly proof of concept, +based on idea of quick prototyping. The main idea was to use libffi +(same as CPython's ctypes implementation), but try to keep as much +as possible in Python, not RPython. In cpython's situation, it would +be to write as few as possible code in C. + +Low-level part (called \_rawffi) +================================ + +We implemented direct bindings to libffi in RPython, allowing to create +simple types (arrays, structures), leaving in C world, managed by hand. +This part contains no special code to keep stuff alive and is kept +to minimum possible. + +High-level part (lib/\_ctypes) +=============================== + +This part implements the same interface as \_ctypes module in CPython, +but it's writte in full python. This approach allowed us to experiment +quickly and provide working implementation in 2 months of real time. + +Reuse of the highest level (lib/ctypes) +======================================== + +We just reused the part which is application level in CPython as well. + +Ctypes-platform +=============== + +We released `ctypes-configure`_, which is a package trying to overcome +portability of ctypes-based code. + +.. _`ctypes-configure`: http://codespeak.net/~fijal/configure.html + +Future +====== + +Ctypes implementation in PyPy is pretty much working and can run for example +pyglet. Because it's written in pure-python, it's rather slow. As a next +step we'll measure what so costly and try to move certain parts from +app-level to interp-level to improve speed. Still, we will try to keep +interp-level part as simple as possible, not to loose robustness. + From cfbolz at codespeak.net Thu Mar 20 17:49:46 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Thu, 20 Mar 2008 17:49:46 +0100 (CET) Subject: [pypy-svn] r52783 - pypy/dist/pypy/doc Message-ID: <20080320164946.01CFD168524@codespeak.net> Author: cfbolz Date: Thu Mar 20 17:49:46 2008 New Revision: 52783 Modified: pypy/dist/pypy/doc/ctypes-implementation.txt Log: add articles, enhance a bit Modified: pypy/dist/pypy/doc/ctypes-implementation.txt ============================================================================== --- pypy/dist/pypy/doc/ctypes-implementation.txt (original) +++ pypy/dist/pypy/doc/ctypes-implementation.txt Thu Mar 20 17:49:46 2008 @@ -8,26 +8,29 @@ * interpreter level code - code written in RPython, compiled to something else, say C, part of the interpreter. -PyPy's ctypes implementation is right now mostly proof of concept, -based on idea of quick prototyping. The main idea was to use libffi +PyPy's ctypes implementation is right now mostly a proof of concept, +based on the idea of quick prototyping. The main idea was to use libffi (same as CPython's ctypes implementation), but try to keep as much -as possible in Python, not RPython. In cpython's situation, it would -be to write as few as possible code in C. +code as possible in Python, not RPython. In CPython's situation, +the equivalent would be to write as little as possible code in C. Low-level part (called \_rawffi) ================================ -We implemented direct bindings to libffi in RPython, allowing to create -simple types (arrays, structures), leaving in C world, managed by hand. -This part contains no special code to keep stuff alive and is kept -to minimum possible. +We implemented direct bindings to libffi in RPython, allowing to create simple +types (arrays, structures), living in C world, managed by hand. It also +supports calling C functions. +This part contains no special code to keep objects alive and is kept very minimal. +We tried to keep this as small as possible to allow porting our ctypes +implementation to other platforms easily. It's also thinkable that Jython uses +our ctypes implementation by writing their version of _rawffi. High-level part (lib/\_ctypes) =============================== -This part implements the same interface as \_ctypes module in CPython, -but it's writte in full python. This approach allowed us to experiment -quickly and provide working implementation in 2 months of real time. +This part implements the same interface as the \_ctypes module in CPython, +but it's written in full python. This approach allowed us to experiment +quickly and provide a working implementation in 2 months of real time. Reuse of the highest level (lib/ctypes) ======================================== @@ -45,9 +48,9 @@ Future ====== -Ctypes implementation in PyPy is pretty much working and can run for example -pyglet. Because it's written in pure-python, it's rather slow. As a next -step we'll measure what so costly and try to move certain parts from +The Ctypes implementation in PyPy is pretty much working and can run for example +pyglet. Because it's written in pure python, it's rather slow. As a next +step we'll measure which parts are costly and try to move certain parts from app-level to interp-level to improve speed. Still, we will try to keep -interp-level part as simple as possible, not to loose robustness. +interp-level part as simple as possible, to not loose robustness. From arigo at codespeak.net Thu Mar 20 18:34:26 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 18:34:26 +0100 (CET) Subject: [pypy-svn] r52784 - in pypy/branch/jit-hotpath/pypy/rpython: . lltypesystem lltypesystem/test Message-ID: <20080320173426.9C1E516850B@codespeak.net> Author: arigo Date: Thu Mar 20 18:34:24 2008 New Revision: 52784 Modified: pypy/branch/jit-hotpath/pypy/rpython/llinterp.py pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/opimpl.py pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/test/test_lloperation.py Log: (cfbolz, arigo) Make all the 'tryfold' operations directly runnable too, for example all ovf-checking arithmetic. (done by moving their implementation from llinterp.py to opimpl.py) Modified: pypy/branch/jit-hotpath/pypy/rpython/llinterp.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/llinterp.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/llinterp.py Thu Mar 20 18:34:24 2008 @@ -1,6 +1,4 @@ from pypy.objspace.flow.model import FunctionGraph, Constant, Variable, c_last_exception -from pypy.rlib.rarithmetic import intmask, r_uint, ovfcheck, r_longlong -from pypy.rlib.rarithmetic import r_ulonglong, ovfcheck_lshift from pypy.rpython.lltypesystem import lltype, llmemory, lloperation, llheap from pypy.rpython.lltypesystem import rclass from pypy.rpython.ootypesystem import ootype @@ -243,8 +241,19 @@ ophandler = getattr(self, 'op_' + opname, None) if ophandler is None: # try to import the operation from opimpl.py - ophandler = lloperation.LL_OPERATIONS[opname].fold - setattr(self.__class__, 'op_' + opname, staticmethod(ophandler)) + llop = lloperation.LL_OPERATIONS[opname] + if llop.canraise: + assert not getattr(llop.fold, 'need_result_type', False) + # ^^^ for now + def ophandler(self, *args): + try: + return llop.fold(*args) + except llop.canraise: + self.make_llexception() + else: + ophandler = staticmethod(llop.fold) + setattr(self.__class__, 'op_' + opname, ophandler) + ophandler = getattr(self, 'op_' + opname) return ophandler # _______________________________________________________ # evaling functions @@ -513,9 +522,6 @@ import pdb pdb.set_trace() - def op_debug_assert(self, x, msg): - assert x, msg - def op_debug_fatalerror(self, ll_msg, ll_exc=None): msg = ''.join(ll_msg.chars) if ll_exc is None: @@ -901,129 +907,9 @@ def op_call_boehm_gc_alloc(self): raise NotImplementedError("call_boehm_gc_alloc") - # ____________________________________________________________ - # Overflow-detecting variants - - def op_int_neg_ovf(self, x): - assert type(x) is int - try: - return ovfcheck(-x) - except OverflowError: - self.make_llexception() - - def op_int_abs_ovf(self, x): - assert type(x) is int - try: - return ovfcheck(abs(x)) - except OverflowError: - self.make_llexception() - - def op_llong_neg_ovf(self, x): - assert type(x) is r_longlong - try: - return ovfcheck(-x) - except OverflowError: - self.make_llexception() - - def op_llong_abs_ovf(self, x): - assert type(x) is r_longlong - try: - return ovfcheck(abs(x)) - except OverflowError: - self.make_llexception() - - def op_int_lshift_ovf(self, x, y): - assert isinstance(x, int) - assert isinstance(y, int) - try: - return ovfcheck_lshift(x, y) - except OverflowError: - self.make_llexception() - - def op_int_lshift_ovf_val(self, x, y): - assert isinstance(x, int) - assert isinstance(y, int) - try: - return ovfcheck_lshift(x, y) - except (OverflowError, ValueError): - self.make_llexception() - - def _makefunc2(fn, operator, xtype, ytype=None): - import sys - d = sys._getframe(1).f_locals - if ytype is None: - ytype = xtype - if '_ovf' in fn: - checkfn = 'ovfcheck' - elif fn.startswith('op_int_'): - checkfn = 'intmask' - else: - checkfn = '' - if operator == '//': - code = '''r = %(checkfn)s(x // y) - if x^y < 0 and x%%y != 0: - r += 1 - return r - '''%locals() - elif operator == '%': - code = '''r = %(checkfn)s(x %% y) - if x^y < 0 and x%%y != 0: - r -= y - return r - '''%locals() - else: - code = 'return %(checkfn)s(x %(operator)s y)'%locals() - exec py.code.Source(""" - def %(fn)s(self, x, y): - assert isinstance(x, %(xtype)s) - assert isinstance(y, %(ytype)s) - try: - %(code)s - except (OverflowError, ValueError, ZeroDivisionError): - self.make_llexception() - """ % locals()).compile() in globals(), d - - _makefunc2('op_int_add_ovf', '+', '(int, llmemory.AddressOffset)') - _makefunc2('op_int_mul_ovf', '*', '(int, llmemory.AddressOffset)', 'int') - _makefunc2('op_int_sub_ovf', '-', 'int') - _makefunc2('op_int_floordiv_ovf', '//', 'int') - _makefunc2('op_int_floordiv_zer', '//', 'int') - _makefunc2('op_int_floordiv_ovf_zer', '//', 'int') - _makefunc2('op_int_mod_ovf', '%', 'int') - _makefunc2('op_int_mod_zer', '%', 'int') - _makefunc2('op_int_mod_ovf_zer', '%', 'int') - _makefunc2('op_int_lshift_val', '<<', 'int') - _makefunc2('op_int_rshift_val', '>>', 'int') - - _makefunc2('op_uint_floordiv_zer', '//', 'r_uint') - _makefunc2('op_uint_mod_zer', '%', 'r_uint') - _makefunc2('op_uint_lshift_val', '<<', 'r_uint') - _makefunc2('op_uint_rshift_val', '>>', 'r_uint') - - _makefunc2('op_llong_floordiv_zer', '//', 'r_longlong') - _makefunc2('op_llong_mod_zer', '%', 'r_longlong') - _makefunc2('op_llong_lshift_val', '<<', 'r_longlong') - _makefunc2('op_llong_rshift_val', '>>', 'r_longlong') - - _makefunc2('op_ullong_floordiv_zer', '//', 'r_ulonglong') - _makefunc2('op_ullong_mod_zer', '%', 'r_ulonglong') - _makefunc2('op_ullong_lshift_val', '<<', 'r_ulonglong') - _makefunc2('op_ullong_rshift_val', '>>', 'r_ulonglong') - - def op_int_add_nonneg_ovf(self, x, y): - if isinstance(y, int): - assert y >= 0 - return self.op_int_add_ovf(x, y) - - def op_cast_float_to_int(self, f): - assert type(f) is float - try: - return ovfcheck(int(f)) - except OverflowError: - self.make_llexception() + # special case def op_int_is_true(self, x): - # special case if type(x) is CDefinedIntSymbolic: x = x.default assert isinstance(x, int) Modified: pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py Thu Mar 20 18:34:24 2008 @@ -44,7 +44,7 @@ self.canraise += (StackException,) # The operation can be run directly with __call__ - self.canrun = canrun or canfold + self.canrun = canrun or self.tryfold # The operation belongs to the ootypesystem self.oo = oo @@ -55,7 +55,7 @@ def __call__(self, RESULTTYPE, *args): # llop is meant to be rtyped and not called directly, unless it is - # a canfold=True operation + # a canfold=True or tryfold=True operation fold = self.fold if getattr(fold, 'need_result_type', False): val = fold(RESULTTYPE, *args) Modified: pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/opimpl.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/opimpl.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/opimpl.py Thu Mar 20 18:34:24 2008 @@ -1,7 +1,10 @@ import sys import math +import py from pypy.tool.sourcetools import func_with_new_name from pypy.rlib.objectmodel import ComputedIntSymbolic +from pypy.rlib.rarithmetic import intmask, r_uint, ovfcheck, r_longlong +from pypy.rlib.rarithmetic import r_ulonglong, ovfcheck_lshift from pypy.rpython.lltypesystem import lltype, llmemory from pypy.rpython.lltypesystem.lloperation import opimpls @@ -402,6 +405,9 @@ raise TypeError("cannot fold getfield on mutable array") return p[index] +def op_debug_assert(x, msg): + assert x, msg + def op_debug_print(*args): for arg in args: print >> sys.stderr, arg, @@ -414,6 +420,101 @@ raise DebugFatalError(*args) # ____________________________________________________________ +# Overflow-detecting variants + +def op_int_neg_ovf(x): + assert type(x) is int + return ovfcheck(-x) + +def op_int_abs_ovf(x): + assert type(x) is int + return ovfcheck(abs(x)) + +def op_llong_neg_ovf(x): + assert type(x) is r_longlong + return ovfcheck(-x) + +def op_llong_abs_ovf(x): + assert type(x) is r_longlong + return ovfcheck(abs(x)) + +def op_int_lshift_ovf(x, y): + assert isinstance(x, int) + assert isinstance(y, int) + return ovfcheck_lshift(x, y) + +def op_int_lshift_ovf_val(x, y): + assert isinstance(x, int) + assert isinstance(y, int) + return ovfcheck_lshift(x, y) + +def _makefunc2(fn, operator, xtype, ytype=None): + if ytype is None: + ytype = xtype + if '_ovf' in fn: + checkfn = 'ovfcheck' + elif fn.startswith('op_int_'): + checkfn = 'intmask' + else: + checkfn = '' + if operator == '//': + code = '''r = %(checkfn)s(x // y) + if x^y < 0 and x%%y != 0: + r += 1 + return r + '''%locals() + elif operator == '%': + code = '''r = %(checkfn)s(x %% y) + if x^y < 0 and x%%y != 0: + r -= y + return r + '''%locals() + else: + code = 'return %(checkfn)s(x %(operator)s y)'%locals() + exec py.code.Source(""" + def %(fn)s(x, y): + assert isinstance(x, %(xtype)s) + assert isinstance(y, %(ytype)s) + %(code)s + """ % locals()).compile() in globals() + +_makefunc2('op_int_add_ovf', '+', '(int, llmemory.AddressOffset)') +_makefunc2('op_int_mul_ovf', '*', '(int, llmemory.AddressOffset)', 'int') +_makefunc2('op_int_sub_ovf', '-', 'int') +_makefunc2('op_int_floordiv_ovf', '//', 'int') +_makefunc2('op_int_floordiv_zer', '//', 'int') +_makefunc2('op_int_floordiv_ovf_zer', '//', 'int') +_makefunc2('op_int_mod_ovf', '%', 'int') +_makefunc2('op_int_mod_zer', '%', 'int') +_makefunc2('op_int_mod_ovf_zer', '%', 'int') +_makefunc2('op_int_lshift_val', '<<', 'int') +_makefunc2('op_int_rshift_val', '>>', 'int') + +_makefunc2('op_uint_floordiv_zer', '//', 'r_uint') +_makefunc2('op_uint_mod_zer', '%', 'r_uint') +_makefunc2('op_uint_lshift_val', '<<', 'r_uint') +_makefunc2('op_uint_rshift_val', '>>', 'r_uint') + +_makefunc2('op_llong_floordiv_zer', '//', 'r_longlong') +_makefunc2('op_llong_mod_zer', '%', 'r_longlong') +_makefunc2('op_llong_lshift_val', '<<', 'r_longlong') +_makefunc2('op_llong_rshift_val', '>>', 'r_longlong') + +_makefunc2('op_ullong_floordiv_zer', '//', 'r_ulonglong') +_makefunc2('op_ullong_mod_zer', '%', 'r_ulonglong') +_makefunc2('op_ullong_lshift_val', '<<', 'r_ulonglong') +_makefunc2('op_ullong_rshift_val', '>>', 'r_ulonglong') + +def op_int_add_nonneg_ovf(x, y): + if isinstance(y, int): + assert y >= 0 + return op_int_add_ovf(x, y) + +def op_cast_float_to_int(f): + assert type(f) is float + return ovfcheck(int(f)) + +# ____________________________________________________________ def get_op_impl(opname): # get the op_xxx() function from the globals above Modified: pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/test/test_lloperation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/test/test_lloperation.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/test/test_lloperation.py Thu Mar 20 18:34:24 2008 @@ -48,7 +48,7 @@ def test_llinterp_complete(): for opname, llop in LL_OPERATIONS.items(): - if llop.canfold: + if llop.tryfold: continue if opname.startswith('gc_x_'): continue # ignore experimental stuff From arigo at codespeak.net Thu Mar 20 18:34:56 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 18:34:56 +0100 (CET) Subject: [pypy-svn] r52785 - pypy/branch/jit-hotpath/pypy/module/pypyjit Message-ID: <20080320173456.CDE17168510@codespeak.net> Author: arigo Date: Thu Mar 20 18:34:56 2008 New Revision: 52785 Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Log: (cfbolz, arigo) Hint fixes for pypy-c. Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Thu Mar 20 18:34:56 2008 @@ -30,6 +30,7 @@ # *loads* of nonsense for now frame = self.frame pycode = self.pycode + pycode = hint(pycode, promote=True) # xxx workaround pycode = hint(pycode, deepfreeze=True) fastlocals_w = [None] * pycode.co_nlocals @@ -70,12 +71,12 @@ class __extend__(PyFrame): def dispatch(self, pycode, next_instr, ec): - pycode = hint(pycode, deepfreeze=True) next_instr = r_uint(next_instr) try: while True: PyPyJitDriver.jit_merge_point( frame=self, ec=ec, next_instr=next_instr, pycode=pycode) + pycode = hint(pycode, deepfreeze=True) co_code = pycode.co_code next_instr = self.handle_bytecode(co_code, next_instr, ec) except Return: From arigo at codespeak.net Thu Mar 20 18:36:03 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 18:36:03 +0100 (CET) Subject: [pypy-svn] r52786 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080320173603.C1CD2168520@codespeak.net> Author: arigo Date: Thu Mar 20 18:36:02 2008 New Revision: 52786 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: (cfbolz a bit, arigo) Support for exception-raising operations (mostly arithmetic ovf) in the rainbow and fallback interpreters. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Thu Mar 20 18:36:02 2008 @@ -571,9 +571,14 @@ self.register_redvar(op.result) if (opdesc is not None and opdesc.tryfold and not opdesc.canfold and opdesc.canraise): + # XXX len(canraise) should be 1, except in + # kind-of-deprecated cases exc_class = opdesc.llop.canraise[0] - self.emit("split_raisingop", - self.exceptioninstance_position(exc_class)) + if self.hannotator.policy.hotpath: + self.emit("hp_split_raisingop") + else: + self.emit("split_raisingop") + self.emit(self.exceptioninstance_position(exc_class)) def serialize_opcode(self, color, op): opname = op.opname Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Thu Mar 20 18:36:02 2008 @@ -90,6 +90,11 @@ else: Xxx("capture_exception") + def residual_ll_exception(self, ll_evalue): + ll_etype = self.hotrunnerdesc.ts.get_typeptr(ll_evalue) + self.gv_exc_type = self.rgenop.genconst(ll_etype) + self.gv_exc_value = self.rgenop.genconst(ll_evalue) + def run_directly(self, greenargs, redargs, targetbytecode): return self.perform_call_mixed(greenargs, redargs, targetbytecode.gv_ownfnptr, @@ -539,6 +544,12 @@ if has_result: self.red_result(gv_res) + @arguments("exception") + def opimpl_hp_split_raisingop(self, ll_evalue): + gv_raised = self.local_green.pop() + if gv_raised.revealconst(lltype.Bool): + self.residual_ll_exception(ll_evalue) + def hp_return(self): frame = self.current_source_jitframe.backframe if frame is None: @@ -591,17 +602,33 @@ def get_opcode_implementation(self, func_name, argspec, opdesc): numargs = unrolling_iterable(range(opdesc.nb_args)) - def implementation(self, *args_gv): - args = (opdesc.RESULT, ) - for i in numargs: - arg = args_gv[i].revealconst(opdesc.ARGS[i]) - args += (arg, ) - if not we_are_translated(): - if opdesc.opname == "int_is_true": - # special case for tests, as in llinterp.py - if type(args[1]) is CDefinedIntSymbolic: - args = (args[0], args[1].default) - return self.rgenop.genconst(opdesc.llop(*args)) + if not opdesc.canraise: + def implementation(self, *args_gv): + args = (opdesc.RESULT, ) + for i in numargs: + arg = args_gv[i].revealconst(opdesc.ARGS[i]) + args += (arg, ) + if not we_are_translated(): + if opdesc.opname == "int_is_true": + # special case for tests, as in llinterp.py + if type(args[1]) is CDefinedIntSymbolic: + args = (args[0], args[1].default) + return self.rgenop.genconst(opdesc.llop(*args)) + else: + exceptions_tuple = opdesc.llop.canraise + def implementation(self, *args_gv): + args = (opdesc.RESULT, ) + for i in numargs: + arg = args_gv[i].revealconst(opdesc.ARGS[i]) + args += (arg, ) + try: + result = opdesc.llop(*args) + gv_raised = opdesc.gv_False + except exceptions_tuple: + result = opdesc.whatever_result + gv_raised = opdesc.gv_True + self.local_green.append(gv_raised) + return self.rgenop.genconst(result) implementation.func_name = func_name # the argspec may unwrap *args_gv from local_red or local_green # and put the result back into local_red or local_green Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Thu Mar 20 18:36:02 2008 @@ -27,6 +27,7 @@ self.RGenOp = RGenOp self.exceptiondesc = codewriter.exceptiondesc self.interpreter = codewriter.interpreter + self.ts = self.interpreter.ts self.codewriter = codewriter self.threshold = threshold self.translate_support_code = translate_support_code Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Thu Mar 20 18:36:02 2008 @@ -932,6 +932,11 @@ rhotpath.hp_after_residual_call(self.jitstate, self.hotrunnerdesc, withexc, True) + @arguments("exception") + def opimpl_hp_split_raisingop(self, ll_evalue): + rhotpath.hp_after_raisingop(self.jitstate, self.hotrunnerdesc, + ll_evalue) + def hp_return(self): frame = self.frame.backframe if frame is None: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Thu Mar 20 18:36:02 2008 @@ -420,3 +420,53 @@ generate_fallback_code(fbp, hotpromotiondesc, flagbox, check_exceptions=withexc) assert 0, "unreachable" + +# ____________________________________________________________ + +# support for turning the 'gv_raised' left behind by primitive raising +# operations directly into a virtualized exception on the JITState, +# splitting the machine code in two paths. + +class AfterRaisingOpFallbackPoint(PromoteFallbackPoint): + + def __init__(self, jitstate, hotrunnerdesc, promotebox, hotpromotiondesc, + ll_evalue): + PromoteFallbackPoint.__init__(self, jitstate, hotrunnerdesc, + promotebox, hotpromotiondesc) + self.ll_evalue = ll_evalue + + @specialize.arglltype(2) + def prepare_fallbackinterp(self, fallbackinterp, value): + value = bool(value) + fallbackinterp.local_red.pop() # remove the temporary raisedbox + if value: + # got an exception, register it on the fallbackinterp + fallbackinterp.residual_ll_exception(self.ll_evalue) + + def prepare_compiler(self, interpreter, gv_value): + # remove the temporary raisedbox + interpreter.frame.local_boxes.pop() + if gv_value.revealconst(lltype.Bool): + # got an exception, register it on the interpreter + interpreter.jitstate.residual_ll_exception(self.ll_evalue) + + +def hp_after_raisingop(jitstate, hotrunnerdesc, ll_evalue): + gv_raised = jitstate.greens.pop() # XXX hackish interface, + # pushed here by ll_gen1 or ll_gen2 + # XXX slightly hackish as well, we actually need gv_raised to be + # in local_boxes to be passed along to the new block + assert not gv_raised.is_const + tok_bool = hotrunnerdesc.RGenOp.kindToken(lltype.Bool) + raisedbox = rvalue.IntRedBox(tok_bool, gv_raised) + jitstate.frame.local_boxes.append(raisedbox) + + hotpromotiondesc = hotrunnerdesc.bool_hotpromotiondesc + fbp = AfterRaisingOpFallbackPoint(jitstate, hotrunnerdesc, + raisedbox, hotpromotiondesc, + ll_evalue) + generate_fallback_code(fbp, hotpromotiondesc, raisedbox, + check_exceptions=False) + # NB. check_exceptions is False because no exception should set + # set now (the RGenOp's genraisingop cannot set an exception itself) + assert 0, "unreachable" Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Thu Mar 20 18:36:02 2008 @@ -5,6 +5,7 @@ from pypy.rlib.objectmodel import keepalive_until_here from pypy.jit.hintannotator.policy import HintAnnotatorPolicy, StopAtXPolicy from pypy.jit.rainbow.test import test_hotpath +from pypy.rlib.rarithmetic import ovfcheck import sys @@ -1753,26 +1754,28 @@ def test_red_int_add_ovf(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'm', 'i', 'result'] def f(n, m): - try: - result = ovfcheck(n + m) - except OverflowError: - return -42 + m + i = 1024 + while i > 0: + i >>= 1 + try: + result = ovfcheck(n + m) + except OverflowError: + result = -42 + m + MyJitDriver.jit_merge_point(n=n, m=m, i=i, result=result) + MyJitDriver.can_enter_jit(n=n, m=m, i=i, result=result) return result + 1 - res = self.interpret(f, [100, 20]) + res = self.run(f, [100, 20], threshold=2) assert res == 121 - self.check_insns(int_add_ovf=1) - #res = self.interpret(f, [100, 20], [0, 1]) - #assert res == 121 - #self.check_insns() + self.check_insns_in_loops(int_add_ovf=1) - res = self.interpret(f, [sys.maxint, 1]) - assert res == -41 - self.check_insns(int_add_ovf=1) - res = self.interpret(f, [sys.maxint, 5], [0, 1]) - assert res == -42 + 5 - self.check_insns() + res = self.run(f, [sys.maxint, 1], threshold=2) + assert res == -40 + self.check_insns_in_loops(int_add_ovf=1) def test_green_int_add_ovf(self): py.test.skip("not working yet") From arigo at codespeak.net Thu Mar 20 19:08:30 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 19:08:30 +0100 (CET) Subject: [pypy-svn] r52787 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080320180830.DB4F91684FC@codespeak.net> Author: arigo Date: Thu Mar 20 19:08:29 2008 New Revision: 52787 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py Log: Test and fix, plus whackings trying to make the code translatable. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Thu Mar 20 19:08:29 2008 @@ -65,7 +65,8 @@ gv_result = self.fetch_from_frame(box, gv_result) self.containers_gv[content] = gv_result - content.populate_gv_container(gv_result, self.getinitialboxgv) + content.populate_gv_container(self.rgenop, gv_result, + self.getinitialboxgv) return gv_result def initialize_from_frame(self, frame): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py Thu Mar 20 19:08:29 2008 @@ -38,6 +38,7 @@ while i > 0: i >>= 1 dic = {} + dic[11] = 66 if flag: dic[12] = 34 else: Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Thu Mar 20 19:08:29 2008 @@ -908,9 +908,8 @@ def allocate_gv_container(self, rgenop): return self.typedesc.allocate(rgenop) - def populate_gv_container(self, gv_structptr, box_gv_reader): - return self.typedesc.populate(self.content_boxes, - gv_structptr, box_gv_reader) + def populate_gv_container(self, rgenop, gv_structptr, box_gv_reader): + self.typedesc.populate(self.content_boxes, gv_structptr, box_gv_reader) class VirtualizableStruct(VirtualStruct): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py Thu Mar 20 19:08:29 2008 @@ -32,6 +32,9 @@ def getboxes(self): return self.item_boxes.values() + def getlength(self): + return len(self.item_boxes) + def getitems_and_makeempty(self, rgenop): result = [(rgenop.genconst(key), box, llhash(key)) for key, box in self.item_boxes.iteritems()] @@ -61,6 +64,12 @@ for key, newbox in changes: self.item_boxes[key] = newbox + def populate_gv_container(self, rgenop, gv_dictptr, box_gv_reader): + for key, valuebox in self.item_boxes.iteritems(): + gv_value = box_gv_reader(valuebox) + gv_key = rgenop.genconst(key) + self.typedesc.perform_setitem(gv_dictptr, gv_key, gv_value) + class FrozenVirtualDict(AbstractFrozenVirtualDict): @@ -142,22 +151,19 @@ from pypy.rpython.lltypesystem import rdict DICT = self.DICT DICTPTR = self.DICTPTR - KEY = DICT.KEY def allocate(rgenop, n): d = rdict.ll_newdict_size(DICT, n) return rgenop.genconst(d) - def populate(item_boxes, gv_lst, box_gv_reader): - d = gv_lst.revealconst(DICTPTR) - for key, valuebox in item_boxes.iteritems(): - if valuebox is not None: - gv_value = box_gv_reader(valuebox) - v = gv_value.revealconst(KEY) - rdict.ll_dict_setitem(key, v) + def perform_setitem(gv_dictptr, gv_key, gv_value): + d = gv_dictptr.revealconst(DICTPTR) + k = gv_key.revealconst(DICT.KEY) + v = gv_value.revealconst(DICT.VALUE) + rdict.ll_dict_setitem(d, k, v) self.allocate = allocate - self.populate = populate + self.perform_setitem = perform_setitem TypeDesc = DictTypeDesc @@ -271,6 +277,9 @@ def getboxes(self): raise NotImplementedError + def getlength(self): + raise NotImplementedError + def getitems_and_makeempty(self, rgenop): raise NotImplementedError @@ -287,11 +296,7 @@ raise NotImplementedError def allocate_gv_container(self, rgenop): - return self.typedesc.allocate(rgenop, len(self.item_boxes)) - - def populate_gv_container(self, gv_dictptr, box_gv_reader): - return self.typedesc.populate(self.item_boxes, - gv_dictptr, box_gv_reader) + return self.typedesc.allocate(rgenop, self.getlength()) def oop_newdict(jitstate, oopspecdesc, deepfrozen): return oopspecdesc.typedesc.factory() Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py Thu Mar 20 19:08:29 2008 @@ -291,9 +291,8 @@ def allocate_gv_container(self, rgenop): return self.typedesc.allocate(rgenop, len(self.item_boxes)) - def populate_gv_container(self, gv_listptr, box_gv_reader): - return self.typedesc.populate(self.item_boxes, - gv_listptr, box_gv_reader) + def populate_gv_container(self, rgenop, gv_listptr, box_gv_reader): + self.typedesc.populate(self.item_boxes, gv_listptr, box_gv_reader) def oop_newlist(jitstate, oopspecdesc, deepfrozen, lengthbox, itembox=None): From arigo at codespeak.net Thu Mar 20 19:34:28 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 19:34:28 +0100 (CET) Subject: [pypy-svn] r52788 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080320183428.CBA0A168517@codespeak.net> Author: arigo Date: Thu Mar 20 19:34:27 2008 New Revision: 52788 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: (cfbolz, arigo) Translation fix: can't define functions with a malloc() if the allocated type is not 'gc'. Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Thu Mar 20 19:34:27 2008 @@ -101,12 +101,12 @@ self._compute_fielddescs(RGenOp) - if self.immutable and self.noidentity: - self._define_materialize() - - if fixsize: - self._define_devirtualize() - self._define_allocate(fixsize) + if TYPE._gckind == 'gc': # no 'allocate' for inlined substructs + if self.immutable and self.noidentity: + self._define_materialize() + if fixsize: + self._define_devirtualize() + self._define_allocate(fixsize) def _compute_fielddescs(self, RGenOp): @@ -701,6 +701,11 @@ array[index] = newvalue self.perform_setarrayitem = perform_setarrayitem + if TYPE._gckind == 'gc': # no allocate for inlined arrays + self._define_allocate() + + def _define_allocate(self): + TYPE = self.TYPE def allocate(rgenop, size): a = lltype.malloc(TYPE, size) return rgenop.genconst(a) From arigo at codespeak.net Thu Mar 20 19:35:14 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 19:35:14 +0100 (CET) Subject: [pypy-svn] r52789 - in pypy/branch/jit-hotpath/pypy: jit/rainbow translator Message-ID: <20080320183514.CA28E168518@codespeak.net> Author: arigo Date: Thu Mar 20 19:35:14 2008 New Revision: 52789 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/translator/driver.py Log: Reduce the massive spamming of --jit translations. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Thu Mar 20 19:35:14 2008 @@ -146,7 +146,7 @@ class BytecodeWriter(object): - def __init__(self, t, hannotator, RGenOp): + def __init__(self, t, hannotator, RGenOp, verbose=True): self.translator = t self.rtyper = hannotator.base_translator.rtyper self.hannotator = hannotator @@ -156,6 +156,7 @@ RGenOp, etrafo, type_system, True, self.rtyper) self.interpreter = self.create_interpreter(RGenOp) self.RGenOp = RGenOp + self.verbose = verbose self.current_block = None self.raise_analyzer = hannotator.exceptiontransformer.raise_analyzer self.all_graphs = {} # mapping graph to bytecode @@ -278,7 +279,8 @@ bytecode._source = self.assembler bytecode._interpreter = self.interpreter bytecode._labelpos = labelpos - bytecode.dump() + if self.verbose: + bytecode.dump() if DEBUG_JITCODES: f = StringIO() bytecode.dump(f) Modified: pypy/branch/jit-hotpath/pypy/translator/driver.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/driver.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/driver.py Thu Mar 20 19:35:14 2008 @@ -434,7 +434,7 @@ rtyper = t.rtyper # make the bytecode and the rainbow interp from pypy.jit.rainbow.codewriter import LLTypeBytecodeWriter - writer = LLTypeBytecodeWriter(t, ha, RGenOp) + writer = LLTypeBytecodeWriter(t, ha, RGenOp, verbose=False) jitcode = writer.make_bytecode(self.portal_graph) if ha.policy.hotpath: from pypy.jit.rainbow.hotpath import HotRunnerDesc From arigo at codespeak.net Thu Mar 20 19:38:28 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 19:38:28 +0100 (CET) Subject: [pypy-svn] r52790 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080320183828.2404F168518@codespeak.net> Author: arigo Date: Thu Mar 20 19:38:27 2008 New Revision: 52790 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: Typo (didn't run enough tests, sorry) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Thu Mar 20 19:38:27 2008 @@ -705,7 +705,7 @@ self._define_allocate() def _define_allocate(self): - TYPE = self.TYPE + TYPE = self.PTRTYPE.TO def allocate(rgenop, size): a = lltype.malloc(TYPE, size) return rgenop.genconst(a) From cami at codespeak.net Thu Mar 20 20:27:15 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Thu, 20 Mar 2008 20:27:15 +0100 (CET) Subject: [pypy-svn] r52791 - pypy/branch/gameboy-emulator/pypy/lang/gameboy/test Message-ID: <20080320192715.6DAE8168517@codespeak.net> Author: cami Date: Thu Mar 20 20:27:13 2008 New Revision: 52791 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Log: changed tests Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Thu Mar 20 20:27:13 2008 @@ -163,13 +163,13 @@ cpu.rom[constants.RESET_PC] = value # test jr_nn startCycles = cpu.cycles - cpu.jr_cc_nn((lambda :True)) + cpu.jr_cc_nn(True) assert startCycles-cpu.cycles == 3 assert_registers(cpu, pc=pc+value+1) # test pc.inc startCycles = cpu.cycles pc = cpu.pc.get() - cpu.jr_cc_nn((lambda: False)) + cpu.jr_cc_nn(False) assert startCycles-cpu.cycles == 2 assert cpu.pc.get() == pc+1 @@ -303,7 +303,7 @@ # jr_NZ_nn see test_jr_cc_nn def test_0x20_0x28_0x30(): - py.test.skip("OpCode Table incomplete") + #py.test.skip("OpCode Table incomplete") cpu = get_cpu() flags = [~constants.Z_FLAG, constants.Z_FLAG, ~constants.C_FLAG, constants.C_FLAG] opCode = 0x20 @@ -313,7 +313,7 @@ pc = cpu.pc.get() cpu.f.set(flags[i]) cycle_test(cpu, opCode, 3) - assert cpu.pc.get() == pc+value + assert cpu.pc.get() == pc+value+1 pc = cpu.pc.get() cpu.f.set(~flags[i]) From arigo at codespeak.net Thu Mar 20 21:54:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 20 Mar 2008 21:54:09 +0100 (CET) Subject: [pypy-svn] r52792 - pypy/branch/jit-hotpath/pypy/translator/c Message-ID: <20080320205409.4F50B16850C@codespeak.net> Author: arigo Date: Thu Mar 20 21:54:07 2008 New Revision: 52792 Modified: pypy/branch/jit-hotpath/pypy/translator/c/funcgen.py Log: Support more types in debug_print and don't crash on the remaining unsupported types. Modified: pypy/branch/jit-hotpath/pypy/translator/c/funcgen.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/c/funcgen.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/c/funcgen.py Thu Mar 20 21:54:07 2008 @@ -657,7 +657,13 @@ argv.append('RPyString_AsString(%s)' % self.expr(arg)) continue elif T == Signed: - format.append('%d') + format.append('%ld') + elif T == Unsigned: + format.append('%lu') + elif T == SignedLongLong: + format.append('%lld') + elif T == UnsignedLongLong: + format.append('%llu') elif T == Float: format.append('%f') elif isinstance(T, Ptr) or T == Address: @@ -667,12 +673,19 @@ format.append(arg.value.replace('%', '%%')) continue format.append('%c') + elif T == UniChar: + format.append("\\u%x") elif T == Bool: format.append('%s') argv.append('(%s) ? "True" : "False"' % self.expr(arg)) continue else: - raise Exception("don't know how to debug_print %r" % (T,)) + if isinstance(arg, Constant): + msg = repr(arg) + else: + msg = '(value of type ' + str(T) + ')' + format.append(msg.replace('%', '%%')) + continue argv.append(self.expr(arg)) return "fprintf(stderr, %s%s);" % ( c_string_constant(' '.join(format) + '\n\000'), From arigo at codespeak.net Fri Mar 21 10:38:22 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 21 Mar 2008 10:38:22 +0100 (CET) Subject: [pypy-svn] r52794 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080321093822.9968D1684C5@codespeak.net> Author: arigo Date: Fri Mar 21 10:38:21 2008 New Revision: 52794 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: A failing test. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Fri Mar 21 10:38:21 2008 @@ -1520,6 +1520,11 @@ assert res == 222 def test_type_bug(self): + py.test.skip("in-progress") + class MyJitDriver(JitDriver): + greens = [] + reds = ['x', 'v', 'i', 'res'] + class V(object): _virtualizable_ = True @@ -1527,18 +1532,29 @@ self.v = v def f(x, v): - if x: - v.v = 0 - else: - pass - return x*2, v + i = 1024 + while i > 0: + i >>= 1 + # + if x: + v.v = 0 + else: + pass + res = x*2, v + # + MyJitDriver.jit_merge_point(x=x, v=v, res=res, i=i) + MyJitDriver.can_enter_jit(x=x, v=v, res=res, i=i) + return res def main(x,y): v = V(y) - r, _ = f(x, v) + r, v1 = f(x, v) + assert v1 is v + assert type(v) is V return r - res = self.timeshift_from_portal(main, f, [20, 3], policy=P_OOPSPEC) + assert main(20, 3) == 40 + res = self.run(main, [20, 3], threshold=2) assert res == 40 def test_indirect_residual_call(self): From arigo at codespeak.net Fri Mar 21 10:52:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 21 Mar 2008 10:52:09 +0100 (CET) Subject: [pypy-svn] r52795 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080321095209.4A28C1684C9@codespeak.net> Author: arigo Date: Fri Mar 21 10:52:08 2008 New Revision: 52795 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: Another assert. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Fri Mar 21 10:52:08 2008 @@ -1551,6 +1551,7 @@ r, v1 = f(x, v) assert v1 is v assert type(v) is V + assert v.v == 0 return r assert main(20, 3) == 40 From arigo at codespeak.net Fri Mar 21 11:06:38 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 21 Mar 2008 11:06:38 +0100 (CET) Subject: [pypy-svn] r52796 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080321100638.029E71684CF@codespeak.net> Author: arigo Date: Fri Mar 21 11:06:36 2008 New Revision: 52796 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: Argh! All these tests are testing something else that what was originally intended in test_virtualizable. The remaining tests have the same issue: the portal is the wrong function (it should be f(), not main()). Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Fri Mar 21 11:06:36 2008 @@ -128,11 +128,7 @@ greens = [] reds = ['i', 'tot', 'xy'] - def main(x, y): - xy = lltype.malloc(XY) - xy.vable_access = lltype.nullptr(XY_ACCESS) - xy.x = x - xy.y = y + def f(xy): tot = 0 i = 1024 while i: @@ -144,6 +140,13 @@ MyJitDriver.can_enter_jit(tot=tot, i=i, xy=xy) return tot + def main(x, y): + xy = lltype.malloc(XY) + xy.vable_access = lltype.nullptr(XY_ACCESS) + xy.x = x + xy.y = y + return f(xy) + res = self.run(main, [20, 22], 2, policy=P_OOPSPEC) assert res == 42 * 11 self.check_insns_in_loops(getfield=0) @@ -161,12 +164,7 @@ greens = [] reds = ['i', 'tot', 'xy'] - - def main(x, y): - xy = lltype.malloc(XY) - xy.vable_access = lltype.nullptr(XY_ACCESS) - xy.x = x - xy.y = y + def f(xy): tot = 0 i = 1024 while i: @@ -179,6 +177,13 @@ MyJitDriver.can_enter_jit(tot=tot, i=i, xy=xy) return tot + def main(x, y): + xy = lltype.malloc(XY) + xy.vable_access = lltype.nullptr(XY_ACCESS) + xy.x = x + xy.y = y + return f(xy) + res = self.run(main, [20, 22], 2, policy=P_OOPSPEC) assert res == 21 * 11 self.check_insns_in_loops(getfield=0) @@ -195,28 +200,29 @@ reds = ['i', 'tot', 'xy'] def f(xy): - x = xy_get_x(xy) - xy_set_y(xy, 3) - y = xy_get_y(xy) - return x+y - - def main(x, y): - xy = lltype.malloc(XY) - xy.vable_access = lltype.nullptr(XY_ACCESS) - xy.x = x - xy.y = y tot = 0 i = 1024 while i: i >>= 1 - v = f(xy) - tot += v + xy.y + x = xy_get_x(xy) + xy_set_y(xy, i) + y = xy_get_y(xy) + v = x + y + tot += v MyJitDriver.jit_merge_point(tot=tot, i=i, xy=xy) MyJitDriver.can_enter_jit(tot=tot, i=i, xy=xy) return tot + def main(x, y): + xy = lltype.malloc(XY) + xy.vable_access = lltype.nullptr(XY_ACCESS) + xy.x = x + xy.y = y + v = f(xy) + return v + xy.y + res = self.run(main, [20, 22], 2) - assert res == 26 * 11 + assert res == main(20, 22) self.check_insns_in_loops(getfield=0) if self.on_llgraph: residual_graph = self.get_residual_graph() @@ -229,11 +235,16 @@ class MyJitDriver(JitDriver): greens = [] reds = ['i', 'xy', 'e'] - + def f(e, xy): - xy_set_y(xy, xy_get_y(xy) + 3) - e.xy = xy - return 0 + i = 1024 + while i: + i >>= 1 + xy_set_y(xy, xy_get_y(xy) + 3) + e.xy = xy + MyJitDriver.jit_merge_point(i=i, xy=xy, e=e) + MyJitDriver.can_enter_jit(i=i, xy=xy, e=e) + return e.xy.y def main(x, y): xy = lltype.malloc(XY) @@ -241,13 +252,8 @@ xy.x = x xy.y = y e = lltype.malloc(E) - i = 1024 - while i: - i >>= 1 - f(e, xy) - MyJitDriver.jit_merge_point(i=i, xy=xy, e=e) - MyJitDriver.can_enter_jit(i=i, xy=xy, e=e) - return e.xy.y + f(e, xy) + return e.xy.x+e.xy.y res = self.run(main, [20, 22], 2) assert res == main(20, 22) From arigo at codespeak.net Fri Mar 21 11:25:39 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 21 Mar 2008 11:25:39 +0100 (CET) Subject: [pypy-svn] r52797 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080321102539.646F01684D8@codespeak.net> Author: arigo Date: Fri Mar 21 11:25:37 2008 New Revision: 52797 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: Port more tests. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Fri Mar 21 11:25:37 2008 @@ -266,38 +266,44 @@ [lltype.Ptr(XY), lltype.Signed, lltype.Signed, lltype.Ptr(E)]) def test_simple_return_it(self): - py.test.skip("implement me") class MyJitDriver(JitDriver): greens = [] - reds = ['i', 'xy'] + reds = ['which', 'i', 'xy1', 'xy2'] - def ll_function(xy): + def f(which, xy1, xy2): i = 1024 while i: i >>= 1 - xy_set_x(xy, xy_get_x(xy) + 3) - xy_set_y(xy, xy_get_y(xy) + 30) - MyJitDriver.jit_merge_point(i=i, xy=xy) - MyJitDriver.can_enter_jit(i=i, xy=xy) - return xy + xy_set_y(xy1, xy_get_y(xy1) + 3) + xy_set_y(xy2, xy_get_y(xy2) + 7) + MyJitDriver.jit_merge_point(i=i, which=which, xy1=xy1, xy2=xy2) + MyJitDriver.can_enter_jit(i=i, which=which, xy1=xy1, xy2=xy2) + if which == 1: + return xy1 + else: + return xy2 - def main(x, y): - xy = lltype.malloc(XY) - xy.vable_access = lltype.nullptr(XY_ACCESS) - xy.x = x - xy.y = y - xy2 = ll_function(xy) - assert xy2 is xy - return xy.x * xy.y + def main(which, x, y): + xy1 = lltype.malloc(XY) + xy1.vable_access = lltype.nullptr(XY_ACCESS) + xy2 = lltype.malloc(XY) + xy2.vable_access = lltype.nullptr(XY_ACCESS) + xy1.x = x + xy1.y = y + xy2.x = y + xy2.y = x + xy = f(which, xy1, xy2) + assert xy is xy1 or xy is xy2 + return xy.x+xy.y - res = self.run(main, [20, 22], 2) - assert res == main(20, 22) + res = self.run(main, [1, 20, 22], 2) + assert res == main(1, 20, 22) self.check_insns_in_loops(getfield=0, setfield=0) # also run the test with a threshold of 1 to check if the return # path (taken only once) is compiled correctly - res = self.run(main, [20, 22], threshold=1) - assert res == main(20, 22) + res = self.run(main, [0, 20, 22], threshold=1) + assert res == main(0, 20, 22) self.check_insns_in_loops(getfield=0, setfield=0) def test_simple_aliasing(self): @@ -369,43 +375,51 @@ 'int_rshift': 1}) def test_simple_construct_escape(self): + py.test.skip("in-progress") class MyJitDriver(JitDriver): greens = [] - reds = ['i', 'tot', 'x', 'y'] + reds = ['i', 'xy', 'x', 'y'] def f(x, y): - xy = lltype.malloc(XY) - xy.vable_access = lltype.nullptr(XY_ACCESS) - xy.x = x - xy.y = y - x = xy_get_x(xy) - y = xy_get_y(xy) - return xy - - def main(x, y): - tot = 0 i = 1024 while i: i >>= 1 - xy = f(x, y) - tot += xy_get_x(xy)+xy_get_y(xy) - MyJitDriver.jit_merge_point(tot=tot, i=i, x=x, y=y) - MyJitDriver.can_enter_jit(tot=tot, i=i, x=x, y=y) - return tot + xy = lltype.malloc(XY) + xy.vable_access = lltype.nullptr(XY_ACCESS) + xy.x = x + xy.y = y + x = xy_get_x(xy) + y = xy_get_y(xy) + MyJitDriver.jit_merge_point(xy=xy, i=i, x=x, y=y) + MyJitDriver.can_enter_jit(xy=xy, i=i, x=x, y=y) + return xy + + def main(x, y): + xy = f(x, y) + return xy_get_x(xy)+xy_get_y(xy) + assert main(20, 22) == 42 res = self.run(main, [20, 22], 2) - assert res == 42 * 11 + assert res == 42 self.check_insns_in_loops(getfield=0) def test_simple_with_struct(self): class MyJitDriver(JitDriver): greens = [] reds = ['i', 'tot', 'xp'] - + def f(xp): - x = xp_get_x(xp) - p = xp_get_p(xp) - return x+p.a+p.b + tot = 0 + i = 1024 + while i: + i >>= 1 + x = xp_get_x(xp) + p = xp_get_p(xp) + res = x+p.a+p.b + tot += res + MyJitDriver.jit_merge_point(tot=tot, i=i, xp=xp) + MyJitDriver.can_enter_jit(tot=tot, i=i, xp=xp) + return tot def main(x, a, b): xp = lltype.malloc(XP) @@ -415,14 +429,7 @@ s.a = a s.b = b xp.p = s - tot = 0 - i = 1024 - while i: - i >>= 1 - tot += f(xp) - MyJitDriver.jit_merge_point(tot=tot, i=i, xp=xp) - MyJitDriver.can_enter_jit(tot=tot, i=i, xp=xp) - return tot + return f(xp) res = self.run(main, [20, 10, 12], 2) assert res == 42 * 11 @@ -434,104 +441,105 @@ reds = ['i', 'tot', 'xp', 's', 'x'] def f(xp, s): - xp_set_p(xp, s) - x = xp_get_x(xp) - p = xp_get_p(xp) - p.b = p.b*2 - return x+p.a+p.b - - def main(x, a, b): - xp = lltype.malloc(XP) - xp.vable_access = lltype.nullptr(XP_ACCESS) - xp.x = x - s = lltype.malloc(S) - s.a = a - s.b = b tot = 0 i = 1024 while i: i >>= 1 - v = f(xp, s) + xp_set_p(xp, s) + x = xp_get_x(xp) + p = xp_get_p(xp) + p.b = p.b*2 + v = x+p.a+p.b tot += v+xp.p.b MyJitDriver.jit_merge_point(tot=tot, i=i, xp=xp, s=s, x=x) MyJitDriver.can_enter_jit(tot=tot, i=i, xp=xp, s=s, x=x) return tot + def main(x, a, b): + xp = lltype.malloc(XP) + xp.vable_access = lltype.nullptr(XP_ACCESS) + xp.x = x + s = lltype.malloc(S) + s.a = a + s.b = b + v = f(xp, s) + return v+xp.p.b + res = self.run(main, [20, 10, 3], 2) assert res == main(20, 10, 3) self.check_insns_in_loops(getfield=4) def test_simple_with_setting_new_struct(self): - py.test.skip("broken?") class MyJitDriver(JitDriver): greens = [] reds = ['i', 'tot', 'xp', 'a', 'b'] def f(xp, a, b): - s = lltype.malloc(S) - s.a = a - s.b = b - xp_set_p(xp, s) - p = xp_get_p(xp) - p.b = p.b*2 - x = xp_get_x(xp) - return x+p.a+p.b - - def main(x, a, b): - xp = lltype.malloc(XP) - xp.vable_access = lltype.nullptr(XP_ACCESS) - xp.x = x tot = 0 i = 1024 while i: i >>= 1 - v = f(xp, a, b) - tot += v+xp.p.b + s = lltype.malloc(S) + s.a = a + s.b = b + xp_set_p(xp, s) + p = xp_get_p(xp) + p.b = p.b*2 + x = xp_get_x(xp) + v = x+p.a+p.b + tot += v MyJitDriver.jit_merge_point(tot=tot, i=i, xp=xp, a=a, b=b) MyJitDriver.can_enter_jit(tot=tot, i=i, xp=xp, a=a, b=b) return tot + def main(x, a, b): + xp = lltype.malloc(XP) + xp.vable_access = lltype.nullptr(XP_ACCESS) + xp.x = x + v = f(xp, a, b) + return v+xp.p.b + res = self.run(main, [20, 10, 3], 2) - assert res == 42 * 11 - self.check_insns_in_loops(getfield=0, malloc=1) + assert res == main(20, 10, 3) + self.check_insns_in_loops(getfield=0, malloc=0) def test_simple_constr_with_setting_new_struct(self): class MyJitDriver(JitDriver): greens = [] - reds = ['i', 'tot', 'x', 'a', 'b'] - - def f(x, a, b): - xp = lltype.malloc(XP) - xp.vable_access = lltype.nullptr(XP_ACCESS) - xp.x = x - s = lltype.malloc(S) - s.a = a - s.b = b - xp_set_p(xp, s) - p = xp_get_p(xp) - p.b = p.b*2 - x = xp_get_x(xp) - return xp + reds = ['i', 'xp', 'x', 'a', 'b'] - def main(x, a, b): - tot = 0 + def f(x, a, b): i = 1024 while i: i >>= 1 - xp = f(x, a, b) - tot += xp.x+xp.p.a+xp.p.b+xp.p.b - MyJitDriver.jit_merge_point(tot=tot, i=i, x=x, a=a, b=b) - MyJitDriver.can_enter_jit(tot=tot, i=i, x=x, a=a, b=b) - return tot + # + xp = lltype.malloc(XP) + xp.vable_access = lltype.nullptr(XP_ACCESS) + xp.x = x + s = lltype.malloc(S) + s.a = a + s.b = b + xp_set_p(xp, s) + p = xp_get_p(xp) + p.b = p.b*2 + x = xp_get_x(xp) + # + MyJitDriver.jit_merge_point(xp=xp, i=i, x=x, a=a, b=b) + MyJitDriver.can_enter_jit(xp=xp, i=i, x=x, a=a, b=b) + return xp + + def main(x, a, b): + xp = f(x, a, b) + return xp.x+xp.p.a+xp.p.b+xp.p.b res = self.run(main, [20, 10, 3], 2) - assert res == main(20, 10, 3) + assert res == 42 self.check_insns_in_loops(getfield=0, malloc=0) # run again with threshold 1 to get the return generated too res = self.run(main, [20, 10, 3], 1) - assert res == main(20, 10, 3) + assert res == 42 self.check_insns_in_loops(getfield=0, malloc=0) def test_simple_read(self): From arigo at codespeak.net Fri Mar 21 11:44:08 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 21 Mar 2008 11:44:08 +0100 (CET) Subject: [pypy-svn] r52799 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080321104408.26B671684D8@codespeak.net> Author: arigo Date: Fri Mar 21 11:44:07 2008 New Revision: 52799 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: Finished "fixing" the tests. After discussion with cfbolz many of the tests were actually already testing what they were meant to (sorry). Still, explicit is etc. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Fri Mar 21 11:44:07 2008 @@ -543,15 +543,22 @@ self.check_insns_in_loops(getfield=0, malloc=0) def test_simple_read(self): - py.test.skip("fails :-(") class MyJitDriver(JitDriver): greens = [] reds = ['i', 'tot', 'e'] def f(e): - xy = e.xy - xy_set_y(xy, xy_get_y(xy) + 3) - return xy_get_x(xy)*2 + tot = 0 + i = 1024 + while i: + i >>= 1 + xy = e.xy + xy_set_y(xy, xy_get_y(xy) + 3) + v = xy_get_x(xy)*2 + tot += v + MyJitDriver.jit_merge_point(tot=tot, i=i, e=e) + MyJitDriver.can_enter_jit(tot=tot, i=i, e=e) + return tot def main(x, y): xy = lltype.malloc(XY) @@ -560,72 +567,83 @@ xy.y = y e = lltype.malloc(E) e.xy = xy - tot = 0 - i = 1024 - while i: - i >>= 1 - v = f(e) - tot += v + e.xy.x+e.xy.y - MyJitDriver.jit_merge_point(tot=tot, i=i, e=e) - MyJitDriver.can_enter_jit(tot=tot, i=i, e=e) - return tot + v = f(e) + return v + e.xy.x+e.xy.y res = self.run(main, [20, 22], 2) assert res == main(20, 22) - self.check_insns_in_loops(getfield=9) + self.check_insns_in_loops(getfield=3) def test_simple_escape_through_vstruct(self): class MyJitDriver(JitDriver): greens = [] - reds = ['i', 'tot', 'x', 'y'] - - def f(x, y): - xy = lltype.malloc(XY) - xy.vable_access = lltype.nullptr(XY_ACCESS) - xy.x = x - xy.y = y - e = lltype.malloc(E) - e.xy = xy - y = xy_get_y(xy) - newy = 2*y - xy_set_y(xy, newy) - return e + reds = ['i', 'e', 'x', 'y'] - def main(x, y): - tot = 0 + def f(x, y): i = 1024 while i: i >>= 1 - e = f(x, y) - tot += e.xy.x+e.xy.y - MyJitDriver.jit_merge_point(tot=tot, i=i, x=x, y=y) - MyJitDriver.can_enter_jit(tot=tot, i=i, x=x, y=y) - return tot + # + xy = lltype.malloc(XY) + xy.vable_access = lltype.nullptr(XY_ACCESS) + xy.x = x + xy.y = y + e = lltype.malloc(E) + e.xy = xy + y = xy_get_y(xy) + newy = 2*y + xy_set_y(xy, newy) + # + MyJitDriver.jit_merge_point(e=e, i=i, x=x, y=y) + MyJitDriver.can_enter_jit(e=e, i=i, x=x, y=y) + return e + + def main(x, y): + e = f(x, y) + return e.xy.x+e.xy.y res = self.run(main, [20, 11], 2) - assert res == 42 * 11 - self.check_insns_in_loops(getfield=0) + assert res == 42 + self.check_insns_in_loops(getfield=0, malloc=0) + + res = self.run(main, [20, 11], threshold=1) + assert res == 42 + self.check_insns_in_loops(getfield=0, malloc=0) def test_residual_doing_nothing(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['xy', 'i', 'res'] + + class Counter: + counter = 0 + glob = Counter() + def g(xy): - pass + glob.counter += 1 def f(xy): - hint(None, global_merge_point=True) - g(xy) - return xy.x + 1 - + i = 1024 + while i > 0: + i >>= 1 + g(xy) + res = xy.x + 1 + MyJitDriver.jit_merge_point(xy=xy, res=res, i=i) + MyJitDriver.can_enter_jit(xy=xy, res=res, i=i) + return res + def main(x, y): xy = lltype.malloc(XY) xy.vable_access = lltype.nullptr(XY_ACCESS) xy.x = x xy.y = y v = f(xy) - return v + return v - glob.counter - res = self.timeshift_from_portal(main, f, [2, 20], - policy=StopAtXPolicy(g)) - assert res == 3 + res = self.run(main, [2, 20], threshold=2, + policy=StopAtXPolicy(g)) + assert res == 3 - 11 + self.check_insns_in_loops(direct_call=1) def test_late_residual_red_call(self): def g(e): From arigo at codespeak.net Fri Mar 21 12:03:10 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 21 Mar 2008 12:03:10 +0100 (CET) Subject: [pypy-svn] r52800 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080321110310.C2B281684C1@codespeak.net> Author: arigo Date: Fri Mar 21 12:03:09 2008 New Revision: 52800 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: Finish the "Explicit" tests. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Fri Mar 21 12:03:09 2008 @@ -646,24 +646,34 @@ self.check_insns_in_loops(direct_call=1) def test_late_residual_red_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['e', 'z', 'i', 'res'] + def g(e): xy = e.xy y = xy_get_y(xy) e.w = y def f(e, z): - hint(None, global_merge_point=True) - xy = e.xy - y = xy_get_y(xy) - newy = 2*y - xy_set_y(xy, newy) - if y: - dummy = z*2 - else: - dummy = z*3 - g(e) - return dummy - + i = 1024 + while i > 0: + i >>= 1 + # + xy = e.xy + y = xy_get_y(xy) + newy = 2*y + xy_set_y(xy, newy) + if y: + res = z*2 + else: + res = z*3 + g(e) + # + MyJitDriver.jit_merge_point(e=e, z=z, res=res, i=i) + MyJitDriver.can_enter_jit(e=e, z=z, res=res, i=i) + return res + def main(x, y, z): xy = lltype.malloc(XY) xy.vable_access = lltype.nullptr(XY_ACCESS) @@ -674,25 +684,40 @@ f(e, z) return e.w - res = self.timeshift_from_portal(main, f, [0, 21, 11], - policy=StopAtXPolicy(g)) - assert res == 42 + res = self.run(main, [0, 21, 11], threshold=2, + policy=StopAtXPolicy(g)) + assert res == main(0, 21, 11) + + res = self.run(main, [0, 21, 11], threshold=1, + policy=StopAtXPolicy(g)) + assert res == main(0, 21, 11) def test_residual_red_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['e', 'i', 'res'] + def g(e): xy = e.xy y = xy_get_y(xy) e.w = y def f(e): - hint(None, global_merge_point=True) - xy = e.xy - y = xy_get_y(xy) - newy = 2*y - xy_set_y(xy, newy) - g(e) - return xy.x - + i = 1024 + while i > 0: + i >>= 1 + # + xy = e.xy + y = xy_get_y(xy) + newy = 2*y + xy_set_y(xy, newy) + g(e) + res = xy.x + # + MyJitDriver.jit_merge_point(e=e, res=res, i=i) + MyJitDriver.can_enter_jit(e=e, res=res, i=i) + return res + def main(x, y): xy = lltype.malloc(XY) xy.vable_access = lltype.nullptr(XY_ACCESS) @@ -703,11 +728,18 @@ v = f(e) return v+e.w - res = self.timeshift_from_portal(main, f, [2, 20], - policy=StopAtXPolicy(g)) - assert res == 42 + res = self.run(main, [2, 20], threshold=2, + policy=StopAtXPolicy(g)) + assert res == main(2, 20) + + res = self.run(main, [2, 20], threshold=1, + policy=StopAtXPolicy(g)) + assert res == main(2, 20) def test_force_in_residual_red_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['e', 'a', 'b', 'i', 'res'] def g(e): xp = e.xp @@ -717,19 +749,26 @@ e.w = p.a + p.b + x def f(e, a, b): - hint(None, global_merge_point=True) - xp = e.xp - s = lltype.malloc(S) - s.a = a - s.b = b - - xp_set_p(xp, s) - - x = xp_get_x(xp) - newx = 2*x - xp_set_x(xp, newx) - g(e) - return xp.x + i = 1024 + while i > 0: + i >>= 1 + # + xp = e.xp + s = lltype.malloc(S) + s.a = a + s.b = b + + xp_set_p(xp, s) + + x = xp_get_x(xp) + newx = 2*x + xp_set_x(xp, newx) + g(e) + res = xp.x + # + MyJitDriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) + MyJitDriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) + return res def main(a, b, x): xp = lltype.malloc(XP) @@ -741,11 +780,19 @@ f(e, a, b) return e.w - res = self.timeshift_from_portal(main, f, [2, 20, 10], - policy=StopAtXPolicy(g)) - assert res == 42 + res = self.run(main, [2, 20, 10], threshold=2, + policy=StopAtXPolicy(g)) + assert res == main(2, 20, 10) + + res = self.run(main, [2, 20, 10], threshold=1, + policy=StopAtXPolicy(g)) + assert res == main(2, 20, 10) def test_force_multiple_reads_residual_red_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['e', 'a', 'b', 'i', 'res'] + def g(e): xp = e.xp p1 = xp_get_p(xp) @@ -753,19 +800,26 @@ e.w = int(p1 == p2) def f(e, a, b): - hint(None, global_merge_point=True) - xp = e.xp - s = lltype.malloc(S) - s.a = a - s.b = b - xp_set_p(xp, s) - - x = xp_get_x(xp) - newx = 2*x - xp_set_x(xp, newx) - g(e) - return xp.x - + i = 1024 + while i > 0: + i >>= 1 + # + xp = e.xp + s = lltype.malloc(S) + s.a = a + s.b = b + xp_set_p(xp, s) + + x = xp_get_x(xp) + newx = 2*x + xp_set_x(xp, newx) + g(e) + res = xp.x + # + MyJitDriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) + MyJitDriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) + return res + def main(a, b, x): xp = lltype.malloc(XP) xp.vable_access = lltype.nullptr(XP_ACCESS) @@ -776,12 +830,18 @@ f(e, a, b) return e.w - res = self.timeshift_from_portal(main, f, [2, 20, 10], - policy=StopAtXPolicy(g)) - assert res == 1 - + res = self.run(main, [2, 20, 10], threshold=2, + policy=StopAtXPolicy(g)) + assert res == main(2, 20, 10) + + res = self.run(main, [2, 20, 10], threshold=1, + policy=StopAtXPolicy(g)) + assert res == main(2, 20, 10) def test_force_unaliased_residual_red_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['e', 'a', 'b', 'i', 'res'] def g(e): pq = e.pq @@ -790,20 +850,26 @@ e.w = int(p != q) def f(e, a, b): - hint(None, global_merge_point=True) - pq = e.pq - s = lltype.malloc(S) - s.a = a - s.b = b - pq_set_p(pq, s) - s = lltype.malloc(S) - s.a = a - s.b = b - pq_set_q(pq, s) - g(e) - return pq.p.a - - + i = 1024 + while i > 0: + i >>= 1 + # + pq = e.pq + s = lltype.malloc(S) + s.a = a + s.b = b + pq_set_p(pq, s) + s = lltype.malloc(S) + s.a = a + s.b = b + pq_set_q(pq, s) + g(e) + res = pq.p.a + # + MyJitDriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) + MyJitDriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) + return res + def main(a, b, x): pq = lltype.malloc(PQ) pq.vable_access = lltype.nullptr(PQ_ACCESS) @@ -814,11 +880,18 @@ f(e, a, b) return e.w - res = self.timeshift_from_portal(main, f, [2, 20, 10], - policy=StopAtXPolicy(g)) - assert res == 1 + res = self.run(main, [2, 20, 10], threshold=2, + policy=StopAtXPolicy(g)) + assert res == main(2, 20, 10) + + res = self.run(main, [2, 20, 10], threshold=1, + policy=StopAtXPolicy(g)) + assert res == main(2, 20, 10) def test_force_aliased_residual_red_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['e', 'a', 'b', 'i', 'res'] def g(e): pq = e.pq @@ -827,16 +900,23 @@ e.w = int(p == q) def f(e, a, b): - hint(None, global_merge_point=True) - pq = e.pq - s = lltype.malloc(S) - s.a = a - s.b = b - pq_set_p(pq, s) - pq_set_q(pq, s) - g(e) - return pq.p.a - + i = 1024 + while i > 0: + i >>= 1 + # + pq = e.pq + s = lltype.malloc(S) + s.a = a + s.b = b + pq_set_p(pq, s) + pq_set_q(pq, s) + g(e) + res = pq.p.a + # + MyJitDriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) + MyJitDriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) + return res + def main(a, b, x): pq = lltype.malloc(PQ) pq.vable_access = lltype.nullptr(PQ_ACCESS) @@ -847,11 +927,19 @@ f(e, a, b) return e.w - res = self.timeshift_from_portal(main, f, [2, 20, 10], - policy=StopAtXPolicy(g)) - assert res == 1 + res = self.run(main, [2, 20, 10], threshold=2, + policy=StopAtXPolicy(g)) + assert res == main(2, 20, 10) + + res = self.run(main, [2, 20, 10], threshold=1, + policy=StopAtXPolicy(g)) + assert res == main(2, 20, 10) def test_force_in_residual_red_call_with_more_use(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['e', 'a', 'b', 'i', 'res'] + def g(e): xp = e.xp p = xp_get_p(xp) @@ -860,21 +948,28 @@ p.b, p.a = p.a, p.b def f(e, a, b): - hint(None, global_merge_point=True) - xp = e.xp - s = lltype.malloc(S) - s.a = a - s.b = b - xp_set_p(xp, s) + i = 1024 + while i > 0: + i >>= 1 + # + xp = e.xp + s = lltype.malloc(S) + s.a = a + s.b = b + xp_set_p(xp, s) + + x = xp_get_x(xp) + newx = 2*x + xp_set_x(xp, newx) + g(e) + s.a = s.a*7 + s.b = s.b*5 + res = xp.x + # + MyJitDriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) + MyJitDriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) + return res - x = xp_get_x(xp) - newx = 2*x - xp_set_x(xp, newx) - g(e) - s.a = s.a*7 - s.b = s.b*5 - return xp.x - def main(a, b, x): xp = lltype.malloc(XP) xp.vable_access = lltype.nullptr(XP_ACCESS) @@ -885,36 +980,56 @@ f(e, a, b) return e.w + xp.p.a + xp.p.b - res = self.timeshift_from_portal(main, f, [2, 20, 10], - policy=StopAtXPolicy(g)) - assert res == 42 + 140 + 10 + res = self.run(main, [2, 20, 10], threshold=2, + policy=StopAtXPolicy(g)) + assert res == main(2, 20, 10) + + res = self.run(main, [2, 20, 10], threshold=1, + policy=StopAtXPolicy(g)) + assert res == main(2, 20, 10) def test_virtualizable_escaped_as_argument_to_red_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['x', 'y', 'i', 'res'] + def g(xy): x = xy_get_x(xy) y = xy_get_y(xy) return y*2 + x def f(x, y): - hint(None, global_merge_point=True) - xy = lltype.malloc(XY) - xy.vable_access = lltype.nullptr(XY_ACCESS) - xy.x = x - xy.y = y - r = g(xy) - x = xy_get_x(xy) - y = xy_get_y(xy) - return r - + i = 1024 + while i > 0: + i >>= 1 + # + xy = lltype.malloc(XY) + xy.vable_access = lltype.nullptr(XY_ACCESS) + xy.x = x + xy.y = y + res = g(xy) + x = xy_get_x(xy) + y = xy_get_y(xy) + # + MyJitDriver.jit_merge_point(x=x, y=y, res=res, i=i) + MyJitDriver.can_enter_jit(x=x, y=y, res=res, i=i) + return res + def main(x, y): return f(x,y) - res = self.timeshift_from_portal(main, f, [20, 11], - policy=StopAtXPolicy(g)) - - assert res == 42 + res = self.run(main, [20, 11], threshold=2, + policy=StopAtXPolicy(g)) + assert res == main(20, 11) + + res = self.run(main, [20, 11], threshold=1, + policy=StopAtXPolicy(g)) + assert res == main(20, 11) def test_setting_in_residual_call(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['x', 'i', 'res'] def g(xy): x = xy_get_x(xy) @@ -923,25 +1038,34 @@ xy_set_y(xy, x) def f(x): - hint(None, global_merge_point=True) - xy = lltype.malloc(XY) - xy.vable_access = lltype.nullptr(XY_ACCESS) - xy.x = x - xy.y = 11 - g(xy) - x = xy_get_x(xy) - y = xy_get_y(xy) - return x*2 + y + i = 1024 + while i > 0: + i >>= 1 + # + xy = lltype.malloc(XY) + xy.vable_access = lltype.nullptr(XY_ACCESS) + xy.x = x + xy.y = 11 + g(xy) + x = xy_get_x(xy) + y = xy_get_y(xy) + res = x*2 + y + # + MyJitDriver.jit_merge_point(x=x, res=res, i=i) + MyJitDriver.can_enter_jit(x=x, res=res, i=i) + return res - def main(x): return f(x) - res = self.timeshift_from_portal(main, f, [20], - policy=StopAtXPolicy(g)) + res = self.run(main, [20], threshold=2, + policy=StopAtXPolicy(g)) + assert res == main(20) + + res = self.run(main, [20], threshold=1, + policy=StopAtXPolicy(g)) + assert res == main(20) - assert res == 42 - class TestVirtualizableImplicit(test_hotpath.HotPathTest): type_system = "lltype" From pypy-svn at codespeak.net Fri Mar 21 13:39:14 2008 From: pypy-svn at codespeak.net (pypy-svn at codespeak.net) Date: Fri, 21 Mar 2008 13:39:14 +0100 (CET) Subject: [pypy-svn] MedHelp 62066 Message-ID: <20080321023837.3937.qmail@aeib213.neoplus.adsl.tpnet.pl> An HTML attachment was scrubbed... URL: From arigo at codespeak.net Fri Mar 21 14:40:39 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 21 Mar 2008 14:40:39 +0100 (CET) Subject: [pypy-svn] r52801 - pypy/branch/jit-hotpath/pypy/jit/hintannotator Message-ID: <20080321134039.CEF1A1684E4@codespeak.net> Author: arigo Date: Fri Mar 21 14:40:38 2008 New Revision: 52801 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py Log: Improve "cause". Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py Fri Mar 21 14:40:38 2008 @@ -496,7 +496,7 @@ if not graph_list: # it's a graphless method of a BuiltinADTType bk = getbookkeeper() - return handle_highlevel_operation_novirtual(bk, True, TYPE.immutable, hs_c1, *args_hs) + return handle_highlevel_operation_novirtual(bk, True, name, TYPE.immutable, hs_c1, *args_hs) elif len(graph_list) == 1: # like a direct_call graph = graph_list.pop() @@ -754,7 +754,7 @@ # ____________________________________________________________ -def handle_highlevel_operation_novirtual(bookkeeper, ismethod, immutable, *args_hs): +def handle_highlevel_operation_novirtual(bookkeeper, ismethod, name, immutable, *args_hs): RESULT = bookkeeper.current_op_concretetype() deepfrozen = ismethod and args_hs[0].deepfrozen # if self is deepfrozen, the result is it too if ismethod and (immutable or args_hs[0].deepfrozen): @@ -769,7 +769,10 @@ eager_concrete = False, # probably myorigin = myorigin, deepfrozen=deepfrozen) - return variableoftype(RESULT, deepfrozen=deepfrozen, cause=args_hs) + cause = args_hs + else: + cause = "oopspec call to %s()" % name + return variableoftype(RESULT, deepfrozen=deepfrozen, cause=cause) def handle_highlevel_operation(bookkeeper, ll_func, *args_hs): @@ -793,7 +796,9 @@ # "blue variables" disabled, we just return a red var all the time. # Exception: an operation on a frozen container is constant-foldable. ismethod = '.' in operation_name - return handle_highlevel_operation_novirtual(bookkeeper, ismethod, False, *args_hs) + return handle_highlevel_operation_novirtual(bookkeeper, ismethod, + operation_name, False, + *args_hs) # --- the code below is not used any more except by test_annotator.py --- if operation_name == 'newlist': From arigo at codespeak.net Fri Mar 21 15:06:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 21 Mar 2008 15:06:09 +0100 (CET) Subject: [pypy-svn] r52802 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080321140609.ED80B16845F@codespeak.net> Author: arigo Date: Fri Mar 21 15:06:08 2008 New Revision: 52802 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: Phew. Took me a while to make test_simple_interpreter_with_frame_with_stack fail in a way that looks similar to pypy-c-jit's. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Fri Mar 21 15:06:08 2008 @@ -118,9 +118,6 @@ class TestVirtualizableExplicit(test_hotpath.HotPathTest): - def timeshift_from_portal(self, *args, **kwargs): - py.test.skip("port me") - type_system = "lltype" def test_simple(self): @@ -1073,6 +1070,9 @@ py.test.skip("port me") def test_simple(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['xy', 'i', 'res'] class XY(object): _virtualizable_ = True @@ -1082,17 +1082,28 @@ self.y = y def f(xy): - return xy.x+xy.y + i = 1024 + while i > 0: + i >>= 1 + res = xy.x+xy.y + MyJitDriver.jit_merge_point(xy=xy, res=res, i=i) + MyJitDriver.can_enter_jit(xy=xy, res=res, i=i) + return res def main(x, y): xy = XY(x, y) return f(xy) - res = self.timeshift_from_portal(main, f, [20, 22], policy=P_OOPSPEC) + res = self.run(main, [20, 22], threshold=2) assert res == 42 - self.check_insns(getfield=0) + self.check_insns_in_loops(getfield=0) def test_simple__class__(self): + py.test.skip("in-progress") + class MyJitDriver(JitDriver): + greens = [] + reds = ['v', 'i', 'res'] + class V(object): _virtualizable_ = True def __init__(self, a): @@ -1108,9 +1119,13 @@ V.__init__(self, 2) def f(v): - hint(None, global_merge_point=True) - #V1(0).b - return v.__class__ + i = 1024 + while i > 0: + i >>= 1 + res = v.__class__ + MyJitDriver.jit_merge_point(v=v, res=res, i=i) + MyJitDriver.can_enter_jit(v=v, res=res, i=i) + return res def main(x, y): if x: @@ -1124,12 +1139,17 @@ V2() return c is not None - res = self.timeshift_from_portal(main, f, [0, 1], policy=P_OOPSPEC) + res = self.run(main, [0, 1], threshold=2) assert not res - res = self.timeshift_from_portal(main, f, [1, 0], policy=P_OOPSPEC) + res = self.run(main, [1, 0], threshold=2) + assert res + res = self.run(main, [1, 0], threshold=1) assert res def test_simple_inheritance(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['xy', 'i', 'res'] class X(object): _virtualizable_ = True @@ -1144,18 +1164,32 @@ self.y = y def f(xy): - return xy.x+xy.y + i = 1024 + while i > 0: + i >>= 1 + res = xy.x+xy.y + MyJitDriver.jit_merge_point(xy=xy, res=res, i=i) + MyJitDriver.can_enter_jit(xy=xy, res=res, i=i) + return res def main(x, y): X(0) xy = XY(x, y) return f(xy) - res = self.timeshift_from_portal(main, f, [20, 22], policy=P_OOPSPEC) + res = self.run(main, [20, 22], threshold=2) assert res == 42 - self.check_insns(getfield=0) + self.check_insns_in_loops(getfield=0) + + res = self.run(main, [20, 22], threshold=1) + assert res == 42 + self.check_insns_in_loops(getfield=0) def test_simple_interpreter_with_frame(self): + class MyJitDriver(JitDriver): + greens = ['pc', 'n', 's'] + reds = ['frame'] + class Log: acc = 0 log = Log() @@ -1169,42 +1203,53 @@ def run(self): self.plus_minus(self.code) + assert self.pc == len(self.code) return self.acc def plus_minus(self, s): n = len(s) pc = 0 - while pc < n: - hint(None, global_merge_point=True) + while True: + MyJitDriver.jit_merge_point(frame=self, pc=pc, n=n, s=s) self.pc = pc + if hint(pc >= n, concrete=True): + break op = s[pc] op = hint(op, concrete=True) + pc += 1 if op == '+': self.acc += self.y elif op == '-': self.acc -= self.y + elif op == 'r': + if self.acc > 0: + pc -= 3 + assert pc >= 0 + MyJitDriver.can_enter_jit(frame=self, pc=pc, + n=n, s=s) elif op == 'd': self.debug() - pc += 1 return 0 def debug(self): log.acc = self.acc - def main(x, y): - code = '+d+-+' + def main(x, y, case): + code = ['+d+-+++++ -r++', '+++++++++d-r+++'][case] f = Frame(code, x, y) return f.run() * 10 + log.acc - res = self.timeshift_from_portal(main, Frame.plus_minus.im_func, - [0, 2], - policy=StopAtXPolicy(Frame.debug.im_func)) + assert main(0, 2, 0) == 42 + assert main(0, 2, 1) == 62 + + res = self.run(main, [0, 2, 0], threshold=2, + policy=StopAtXPolicy(Frame.debug.im_func)) assert res == 42 - if self.on_llgraph: - calls = self.count_direct_calls() - call_count = sum(calls.values()) - # one call to "continue_compilation" and one call to debug - assert call_count == 2 + self.check_insns_in_loops({'int_sub': 1, 'int_gt': 1}) + + res = self.run(main, [0, 2, 1], threshold=2, + policy=StopAtXPolicy(Frame.debug.im_func)) + assert res == 62 def test_setting_pointer_in_residual_call(self): @@ -1465,6 +1510,10 @@ def test_virtual_list(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['v', 'i', 'res'] + class V(object): _virtualizable_ = True def __init__(self, l): @@ -1479,21 +1528,32 @@ v.l = [x*100, y*100] def f(v): - hint(None, global_merge_point=True) - l = [1, 10] - v.l = l - g(v) - l2 = v.l - return l[0]*2 + l[1] + l2[0] * 2 + l2[1] + i = 1024 + while i > 0: + i >>= 1 + l = [1, 10] + v.l = l + g(v) + l2 = v.l + res = l[0]*2 + l[1] + l2[0] * 2 + l2[1] + MyJitDriver.jit_merge_point(v=v, res=res, i=i) + MyJitDriver.can_enter_jit(v=v, res=res, i=i) + return res def main(): v = V(None) return f(v) - res = self.timeshift_from_portal(main, f, [], policy=StopAtXPolicy(g)) - assert res == 20 + 1 + 200 + 1000 + res = self.run(main, [], threshold=2, policy=StopAtXPolicy(g)) + assert res == main() + res = self.run(main, [], threshold=1, policy=StopAtXPolicy(g)) + assert res == main() def test_virtual_list_and_struct(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['v', 'i', 'res'] + class S(object): def __init__(self, x, y): self.x = x @@ -1513,24 +1573,47 @@ v.l = [x*100, y*100] def f(v): - hint(None, global_merge_point=True) - l = [1, 10] - s = S(3, 7) - v.l = l - v.s = s - g(v) - l2 = v.l - s2 = v.s - return l[0]*2 + l[1] + l2[0] * 2 + l2[1] + s.x * 7 + s.y + s2.x * 7 + s2.y + i = 1024 + while i > 0: + i >>= 1 + l = [1, 10] + s = S(3, 7) + v.l = l + v.s = s + g(v) + l2 = v.l + s2 = v.s + res = l[0]*2 + l[1] + l2[0] * 2 + l2[1] + s.x * 7 + s.y + s2.x * 7 + s2.y + MyJitDriver.jit_merge_point(v=v, res=res, i=i) + MyJitDriver.can_enter_jit(v=v, res=res, i=i) + return res def main(): v = V(None, None) return f(v) - res = self.timeshift_from_portal(main, f, [], policy=StopAtXPolicy(g)) + res = self.run(main, [], threshold=2, policy=StopAtXPolicy(g)) + assert res == main() + res = self.run(main, [], threshold=1, policy=StopAtXPolicy(g)) assert res == main() def test_simple_interpreter_with_frame_with_stack(self): + class MyJitDriver(JitDriver): + greens = ['pc', 's'] + reds = ['frame'] + + def on_enter_jit(self): + frame = self.frame + origstack = frame.stack + stacklen = hint(len(origstack), promote=True) + curstack = [] + i = 0 + while i < stacklen: + hint(i, concrete=True) + curstack.append(origstack[i]) + i += 1 + frame.stack = curstack + class Log: stack = None log = Log() @@ -1542,25 +1625,19 @@ self.stack = list(args) def run(self): - return self.interpret(self.code) + self.trace = 0 + self.interpret(self.code) + assert self.pc == len(self.code) + assert len(self.stack) == 1 + return self.stack.pop() def interpret(self, s): - hint(None, global_merge_point=True) - n = len(s) pc = 0 - origstack = self.stack - stacklen = len(origstack) - stacklen = hint(stacklen, promote=True) - curstack = [0] * stacklen - i = 0 - while i < stacklen: - hint(i, concrete=True) - curstack[i] = origstack[i] - i += 1 - self.stack = curstack - while pc < n: - hint(None, global_merge_point=True) + while True: + MyJitDriver.jit_merge_point(frame=self, s=s, pc=pc) self.pc = pc + if hint(pc >= len(s), concrete=True): + break op = s[pc] pc += 1 op = hint(op, concrete=True) @@ -1569,6 +1646,8 @@ pc += 1 hint(arg, concrete=True) self.stack.append(ord(arg) - ord('0')) + elif op == 'D': + self.stack.append(self.stack[-1]) # dup elif op == 'p': self.stack.pop() elif op == '+': @@ -1577,27 +1656,52 @@ elif op == '-': arg = self.stack.pop() self.stack[-1] -= arg + elif op == 'J': + target = self.stack.pop() + cond = self.stack.pop() + if cond > 0: + pc = hint(target, promote=True) + MyJitDriver.can_enter_jit(frame=self, s=s, pc=pc) + elif op == 't': + self.trace = self.trace * 3 + self.stack[-1] elif op == 'd': self.debug() else: raise NotImplementedError - result = self.stack.pop() - self.stack = None - return result def debug(self): - log.stack = self.stack[:] + for item in self.stack: + self.trace = self.trace * 7 - item - def main(x): - code = 'P2+P5+P3-' + def main(x, case, expected): + code = ['P2+tP5+tP3-', 'P1+tP3-DP3J', 'P4d-DtP0J'][case] + log.stack = [] f = Frame(code, x) - return f.run() + res = f.run() + assert res == expected + return f.trace + + assert main(38, 0, 42) == 40*3+45 + assert main(15, 1, -2) == ((((16*3+13)*3+10)*3+7)*3+4)*3+1 + main(21, 2, -3) # to check that this works too + + res = self.run(main, [38, 0, 42], threshold=2, + policy=StopAtXPolicy(Frame.debug.im_func)) + assert res == 40*3+45 + self.check_nothing_compiled_at_all() + + res = self.run(main, [15, 1, -2], threshold=2, + policy=StopAtXPolicy(Frame.debug.im_func)) + assert res == ((((16*3+13)*3+10)*3+7)*3+4)*3+1 + self.check_insns_in_loops({'int_sub': 1, 'int_gt': 1, + 'int_mul': 1, 'int_add': 1}) - res = self.timeshift_from_portal(main, Frame.interpret.im_func, - [38], - policy=StopAtXPolicy(Frame.debug.im_func)) - assert res == 42 - self.check_oops(newlist=0) + py.test.skip("in-progress") + res = self.run(main, [21, 2, -3], threshold=2, + policy=StopAtXPolicy(Frame.debug.im_func)) + assert res == main(21, 2, -3) + self.check_insns_in_loops({'int_sub': 1, 'int_gt': 1, + 'int_mul': 1, 'int_add': 1}) def test_recursive(self): From arigo at codespeak.net Fri Mar 21 15:17:15 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 21 Mar 2008 15:17:15 +0100 (CET) Subject: [pypy-svn] r52803 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080321141715.D14C1168461@codespeak.net> Author: arigo Date: Fri Mar 21 15:17:15 2008 New Revision: 52803 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: Add a test with the original intent. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Fri Mar 21 15:17:15 2008 @@ -372,6 +372,33 @@ 'int_rshift': 1}) def test_simple_construct_escape(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['x', 'y'] + + def f(x, y): + MyJitDriver.jit_merge_point(x=x, y=y) + MyJitDriver.can_enter_jit(x=x, y=y) + xy = lltype.malloc(XY) + xy.vable_access = lltype.nullptr(XY_ACCESS) + xy.x = x + xy.y = y + return xy + + def main(x, y): + xy = f(x, y) + return xy_get_x(xy)+xy_get_y(xy) + + assert main(20, 22) == 42 + res = self.run(main, [20, 22], 2) + assert res == 42 + self.check_nothing_compiled_at_all() + + res = self.run(main, [20, 22], threshold=1) + assert res == 42 + self.check_insns(malloc=1) + + def test_pass_in_construct_another_and_escape(self): py.test.skip("in-progress") class MyJitDriver(JitDriver): greens = [] @@ -1700,8 +1727,6 @@ res = self.run(main, [21, 2, -3], threshold=2, policy=StopAtXPolicy(Frame.debug.im_func)) assert res == main(21, 2, -3) - self.check_insns_in_loops({'int_sub': 1, 'int_gt': 1, - 'int_mul': 1, 'int_add': 1}) def test_recursive(self): From arigo at codespeak.net Fri Mar 21 15:46:14 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 21 Mar 2008 15:46:14 +0100 (CET) Subject: [pypy-svn] r52804 - in pypy/branch/jit-hotpath/pypy/jit: rainbow/test timeshifter Message-ID: <20080321144614.4E0CC1684FD@codespeak.net> Author: arigo Date: Fri Mar 21 15:46:13 2008 New Revision: 52804 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: Fix. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Fri Mar 21 15:46:13 2008 @@ -1126,7 +1126,6 @@ self.check_insns_in_loops(getfield=0) def test_simple__class__(self): - py.test.skip("in-progress") class MyJitDriver(JitDriver): greens = [] reds = ['v', 'i', 'res'] @@ -1164,14 +1163,21 @@ else: c = f(v) V2() - return c is not None + return (c is not None) * 2 + (c is V1) res = self.run(main, [0, 1], threshold=2) - assert not res + assert res == 0 + self.check_nothing_compiled_at_all() res = self.run(main, [1, 0], threshold=2) - assert res + assert res == 3 + self.check_insns_in_loops({'getfield': 1, + 'int_gt': 1, 'int_rshift': 1}) res = self.run(main, [1, 0], threshold=1) - assert res + assert res == 3 + res = self.run(main, [0, 0], threshold=2) + assert res == 2 + res = self.run(main, [0, 0], threshold=1) + assert res == 2 def test_simple_inheritance(self): class MyJitDriver(JitDriver): @@ -1805,7 +1811,6 @@ assert res == 222 def test_type_bug(self): - py.test.skip("in-progress") class MyJitDriver(JitDriver): greens = [] reds = ['x', 'v', 'i', 'res'] Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Fri Mar 21 15:46:13 2008 @@ -157,16 +157,13 @@ def populate(content_boxes, gv_s, box_gv_reader): s = gv_s.revealconst(lltype.Ptr(TYPE)) - i = 0 for desc in descs: - box = content_boxes[i] - if box is not None: - gv_value = box_gv_reader(box) - FIELDTYPE = getattr(desc.PTRTYPE.TO, desc.fieldname) - v = gv_value.revealconst(FIELDTYPE) - tgt = lltype.cast_pointer(desc.PTRTYPE, s) - setattr(tgt, desc.fieldname, v) - i += 1 + box = content_boxes[desc.fieldindex] + gv_value = box_gv_reader(box) + FIELDTYPE = getattr(desc.PTRTYPE.TO, desc.fieldname) + v = gv_value.revealconst(FIELDTYPE) + tgt = lltype.cast_pointer(desc.PTRTYPE, s) + setattr(tgt, desc.fieldname, v) self.populate = populate def _define_devirtualize(self): @@ -294,10 +291,29 @@ self._define_access_is_null(RGenOp) + self._define_populate_by_store_back() def _define_virtual_desc(self): pass + def _define_populate_by_store_back(self): + # On a non-virtual virtualizable structure, the boxes that + # don't correspond to redirected fields are nonsense (always NULL)! + # Don't store them back... + TYPE = self.TYPE + redirected_fielddescs = unrolling_iterable(self.redirected_fielddescs) + + def populate_by_store_back(content_boxes, gv_s, box_gv_reader): + s = gv_s.revealconst(lltype.Ptr(TYPE)) + for desc, i in redirected_fielddescs: + box = content_boxes[i] + gv_value = box_gv_reader(box) + FIELDTYPE = getattr(desc.PTRTYPE.TO, desc.fieldname) + v = gv_value.revealconst(FIELDTYPE) + tgt = lltype.cast_pointer(desc.PTRTYPE, s) + setattr(tgt, desc.fieldname, v) + self.populate_by_store_back = populate_by_store_back + def _define_getset_field_ptr(self, RGenOp, fielddesc, j): untouched = self.my_redirected_getsetters_untouched touched = self.my_redirected_getsetters_touched @@ -1128,6 +1144,15 @@ return typedesc.allocate(rgenop) return gv_outside + def populate_gv_container(self, rgenop, gv_structptr, box_gv_reader): + typedesc = self.typedesc + boxes = self.content_boxes + gv_outside = boxes[-1].genvar + if gv_outside is typedesc.gv_null: + typedesc.populate(boxes, gv_structptr, box_gv_reader) + else: + typedesc.populate_by_store_back(boxes, gv_structptr, box_gv_reader) + # patching VirtualStructCls StructTypeDesc.VirtualStructCls = VirtualStruct From antocuni at codespeak.net Fri Mar 21 16:17:25 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Fri, 21 Mar 2008 16:17:25 +0100 (CET) Subject: [pypy-svn] r52805 - in pypy/branch/fixed-list-ootype/pypy/translator: cli cli/src cli/test oosupport Message-ID: <20080321151725.4B6371684E7@codespeak.net> Author: antocuni Date: Fri Mar 21 16:17:24 2008 New Revision: 52805 Modified: pypy/branch/fixed-list-ootype/pypy/translator/cli/constant.py pypy/branch/fixed-list-ootype/pypy/translator/cli/cts.py pypy/branch/fixed-list-ootype/pypy/translator/cli/gencli.py pypy/branch/fixed-list-ootype/pypy/translator/cli/ilgenerator.py pypy/branch/fixed-list-ootype/pypy/translator/cli/metavm.py pypy/branch/fixed-list-ootype/pypy/translator/cli/oopspec.py pypy/branch/fixed-list-ootype/pypy/translator/cli/opcodes.py pypy/branch/fixed-list-ootype/pypy/translator/cli/src/pypylib.cs pypy/branch/fixed-list-ootype/pypy/translator/cli/test/test_list.py pypy/branch/fixed-list-ootype/pypy/translator/oosupport/constant.py Log: add support to ootype.Array to gencli Modified: pypy/branch/fixed-list-ootype/pypy/translator/cli/constant.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/cli/constant.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/cli/constant.py Fri Mar 21 16:17:24 2008 @@ -28,7 +28,7 @@ from pypy.translator.oosupport.constant import \ push_constant, WeakRefConst, StaticMethodConst, CustomDictConst, \ ListConst, ClassConst, InstanceConst, RecordConst, DictConst, \ - BaseConstantGenerator + BaseConstantGenerator, ArrayConst from pypy.translator.cli.ilgenerator import CLIBaseGenerator from pypy.rpython.ootypesystem import ootype from pypy.translator.cli.comparer import EqualityComparer @@ -353,7 +353,23 @@ self.db.const_count.inc('List') self.db.const_count.inc('List', self.value._TYPE.ITEM) self.db.const_count.inc('List', len(self.value._list)) - super(CLIListConst, self).create_pointer(gen) + super(CLIListConst, self).create_pointer(gen) + + +class CLIArrayConst(CLIBaseConstMixin, ArrayConst): + + def _do_not_initialize(self): + # Check if it is an array of all zeroes: + try: + if self.value._list == [0] * len(self.value._list): + return True + except: + pass + return super(CLIArrayConst, self)._do_not_initialize() + + def _setitem(self, SELFTYPE, gen): + gen.array_setitem(SELFTYPE) + class CLIDictConst(CLIDictMixin, DictConst): def create_pointer(self, gen): Modified: pypy/branch/fixed-list-ootype/pypy/translator/cli/cts.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/cli/cts.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/cli/cts.py Fri Mar 21 16:17:24 2008 @@ -91,6 +91,14 @@ arglist = ', '.join([arg.typename() for arg in self.arg_types]) return '[%s]%s`%d<%s>' % (assembly, name, numparam, arglist) +class CliArrayType(CliType): + + def __init__(self, itemtype): + self.itemtype = itemtype + + def typename(self): + return '%s[]' % self.itemtype.typename() + T = CliPrimitiveType class types: @@ -241,6 +249,11 @@ elif isinstance(t, ootype.StaticMethod): delegate = self.db.record_delegate(t) return CliClassType(None, delegate) + elif isinstance(t, ootype.Array): + item_type = self.lltype_to_cts(t.ITEM) + if item_type == types.void: # special case: Array of Void + return types.list_of_void + return CliArrayType(item_type) elif isinstance(t, ootype.List): item_type = self.lltype_to_cts(t.ITEM) if item_type == types.void: # special case: List of Void Modified: pypy/branch/fixed-list-ootype/pypy/translator/cli/gencli.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/cli/gencli.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/cli/gencli.py Fri Mar 21 16:17:24 2008 @@ -32,6 +32,7 @@ RecordConst = constant.CLIRecordConst ClassConst = constant.CLIClassConst ListConst = constant.CLIListConst + ArrayConst = constant.CLIArrayConst StaticMethodConst = constant.CLIStaticMethodConst CustomDictConst = constant.CLICustomDictConst DictConst = constant.CLIDictConst Modified: pypy/branch/fixed-list-ootype/pypy/translator/cli/ilgenerator.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/cli/ilgenerator.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/cli/ilgenerator.py Fri Mar 21 16:17:24 2008 @@ -407,3 +407,31 @@ def dup(self, TYPE): self.ilasm.opcode('dup') + + def oonewarray(self, TYPE, length): + if TYPE.ITEM is ootype.Void: + self.new(TYPE) + self.ilasm.opcode('dup') + self.load(length) + self.ilasm.call_method('void [pypylib]pypy.runtime.ListOfVoid::_ll_resize(int32)', virtual=False) + else: + clitype = self.cts.lltype_to_cts(TYPE) + self.load(length) + self.ilasm.opcode('newarr', clitype.itemtype.typename()) + + def _array_suffix(self, ARRAY, erase_unsigned=False): + from pypy.translator.cli.metavm import OOTYPE_TO_MNEMONIC + suffix = OOTYPE_TO_MNEMONIC.get(ARRAY.ITEM, 'ref') + if erase_unsigned: + suffix = suffix.replace('u', 'i') + return suffix + + def array_setitem(self, ARRAY): + suffix = self._array_suffix(ARRAY, erase_unsigned=True) + self.ilasm.opcode('stelem.%s' % suffix) + + def array_getitem(self, ARRAY): + self.ilasm.opcode('ldelem.%s' % self._array_suffix(ARRAY)) + + def array_length(self, ARRAY): + self.ilasm.opcode('ldlen') Modified: pypy/branch/fixed-list-ootype/pypy/translator/cli/metavm.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/cli/metavm.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/cli/metavm.py Fri Mar 21 16:17:24 2008 @@ -67,6 +67,17 @@ arg_list = ', '.join(arg_types) signature = '%s %s::%s(%s)' % (ret_type, STRING_HELPER_CLASS, method_name, arg_list) generator.call_signature(signature) + elif isinstance(this.concretetype, ootype.Array) and this.concretetype.ITEM is not ootype.Void: + v_array = args[0] + ARRAY = v_array.concretetype + if method_name == 'll_setitem_fast': + generator.array_setitem(ARRAY) + elif method_name == 'll_getitem_fast': + generator.array_getitem(ARRAY) + elif method_name == 'll_length': + generator.array_length(ARRAY) + else: + assert False else: generator.call_method(this.concretetype, method_name) @@ -198,10 +209,14 @@ generator.ilasm.call('class [mscorlib]System.Type class [mscorlib]System.Type::GetTypeFromHandle(valuetype [mscorlib]System.RuntimeTypeHandle)') OOTYPE_TO_MNEMONIC = { + ootype.Bool: 'i1', + ootype.Char: 'i2', + ootype.UniChar: 'i2', ootype.Signed: 'i4', ootype.SignedLongLong: 'i8', ootype.Unsigned: 'u4', ootype.UnsignedLongLong: 'u8', + ootype.Float: 'r8', } class _CastPrimitive(MicroInstruction): Modified: pypy/branch/fixed-list-ootype/pypy/translator/cli/oopspec.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/cli/oopspec.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/cli/oopspec.py Fri Mar 21 16:17:24 2008 @@ -31,9 +31,9 @@ def get_method(TYPE, name): try: - # special case: when having List of Void, look at the concrete - # methods, not the generic ones - if isinstance(TYPE, ootype.List) and TYPE.ITEM is ootype.Void: + # special case: when having List of Void, or an Array, look at + # the concrete methods, not the generic ones + if isinstance(TYPE, ootype.Array) or (isinstance(TYPE, ootype.List) and TYPE.ITEM is ootype.Void): return TYPE._METHODS[name] else: return TYPE._GENERIC_METHODS[name] Modified: pypy/branch/fixed-list-ootype/pypy/translator/cli/opcodes.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/cli/opcodes.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/cli/opcodes.py Fri Mar 21 16:17:24 2008 @@ -3,7 +3,7 @@ MapException, Box, Unbox, NewArray, GetArrayElem, SetArrayElem,\ TypeOf, CastPrimitive from pypy.translator.oosupport.metavm import PushArg, PushAllArgs, StoreResult, InstructionList,\ - New, RuntimeNew, CastTo, PushPrimitive, OOString, OOUnicode + New, RuntimeNew, CastTo, PushPrimitive, OOString, OOUnicode, OONewArray from pypy.translator.cli.cts import WEAKREF from pypy.rpython.ootypesystem import ootype @@ -54,6 +54,7 @@ 'ooparse_int': [PushAllArgs, 'call int32 [pypylib]pypy.runtime.Utils::OOParseInt(string, int32)'], 'ooparse_float': [PushAllArgs, 'call float64 [pypylib]pypy.runtime.Utils::OOParseFloat(string)'], 'oonewcustomdict': [NewCustomDict], + 'oonewarray': [OONewArray, StoreResult], 'same_as': DoNothing, 'hint': [PushArg(0), StoreResult], Modified: pypy/branch/fixed-list-ootype/pypy/translator/cli/src/pypylib.cs ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/cli/src/pypylib.cs (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/cli/src/pypylib.cs Fri Mar 21 16:17:24 2008 @@ -34,10 +34,28 @@ public static string ToPython(object x) { if (x == null) return "None"; + else if (x is Array) + return ArrayToPython((Array)x); else return x.ToString(); } + private static string ArrayToPython(Array array) + { + string res = "["; + foreach(object item in array) { + if (item != null && item.GetType() == typeof(string)) { + object tmp = (object)item; + res += ToPython((string)tmp) + ","; + } + else + res += ToPython(item) + ","; + + } + res += "]"; + return res; + } + public static string InstanceToPython(object obj) { return string.Format("InstanceWrapper('{0}')", obj.GetType().FullName); @@ -338,11 +356,9 @@ return s.Substring(start, count); } - public static List ll_split_chr(string s, char ch) + public static string[] ll_split_chr(string s, char ch) { - List res = new List(); - res.AddRange(s.Split(ch)); - return res; + return s.Split(ch); } public static bool ll_contains(string s, char ch) @@ -382,7 +398,7 @@ res += pypy.test.Result.ToPython((string)tmp) + ","; } else - res += item.ToString() + ","; // XXX: doesn't work for chars + res += pypy.test.Result.ToPython(item) + ","; } res += "]"; return res; Modified: pypy/branch/fixed-list-ootype/pypy/translator/cli/test/test_list.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/cli/test/test_list.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/cli/test/test_list.py Fri Mar 21 16:17:24 2008 @@ -1,6 +1,7 @@ import py from pypy.translator.cli.test.runtest import CliTest from pypy.rpython.test.test_rlist import BaseTestRlist +from pypy.rlib.rarithmetic import r_uint class TestCliList(CliTest, BaseTestRlist): def test_recursive(self): @@ -8,3 +9,19 @@ def test_getitem_exc(self): py.test.skip('fixme!') + + def test_list_unsigned(self): + def fn(x): + lst = [r_uint(0), r_uint(1)] + lst[0] = r_uint(x) + return lst[0] + res = self.interpret(fn, [42]) + assert res == 42 + + def test_list_bool(self): + def fn(x): + lst = [True, False] + lst[0] = x + return lst[0] + res = self.interpret(fn, [False]) + assert res == False Modified: pypy/branch/fixed-list-ootype/pypy/translator/oosupport/constant.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/oosupport/constant.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/oosupport/constant.py Fri Mar 21 16:17:24 2008 @@ -670,9 +670,10 @@ gen.dup(SELFTYPE) push_constant(self.db, ootype.Signed, idx, gen) push_constant(self.db, ITEM, item, gen) - gen.call_method(SELFTYPE, 'll_setitem_fast') - print idx, item + self._setitem(SELFTYPE, gen) + def _setitem(self, SELFTYPE, gen): + gen.call_method(SELFTYPE, 'll_setitem_fast') # ______________________________________________________________________ # Dictionary constants From cami at codespeak.net Fri Mar 21 16:18:44 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Fri, 21 Mar 2008 16:18:44 +0100 (CET) Subject: [pypy-svn] r52806 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080321151844.9952B1684E7@codespeak.net> Author: cami Date: Fri Mar 21 16:18:44 2008 New Revision: 52806 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Log: jr_cc_nn tests working Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Fri Mar 21 16:18:44 2008 @@ -255,6 +255,9 @@ data = self.memory.read(self.pc.get()) self.pc.inc() # 2 cycles return data + + def fetchDoubleRegister(self, register): + self.popDoubleRegister(CPU.fetch, register) # Stack, 2 cycles def push(self, data): @@ -274,12 +277,13 @@ return data # 3 cycles - def popDoubleRegister(self, register, getter): - b = getter() # 1 cycle - a = getter() # 1 cycle + def popDoubleRegister(self, getter, register): + b = getter(self) # 1 cycle + a = getter(self) # 1 cycle register.set(a, b) # 2 cycles self.cycles += 1 + # 4 cycles def call(self, address): self.push(self.pc.getHi()) # 2 cycles @@ -290,6 +294,10 @@ # 1 cycle def ld(self, getter, setter): setter(getter()) # 1 cycle + + def fetchLoad(self, register): + self.ld(self.fetch, register.set) + # ALU, 1 cycle def addA(self, data): @@ -303,14 +311,15 @@ # 2 cycles def addHL(self, register): - s = (self.hl.get() + register.get()) & 0xFFFF + self.hl.set(self.hl.get() + register.get()); # 1 cycle + s = self.hl.get() self.f.set((self.f.get() & constants.Z_FLAG), False) if ((s >> 8) & 0x0F) < (self.hl.getHi() & 0x0F): self.f.add(constants.H_FLAG, False) if s < self.hl.get(): self.f.add(constants.C_FLAG, False) self.cycles -= 1 - self.hl.set(s); # 1 cycle + # 1 cycle def adc(self, getter): @@ -685,10 +694,10 @@ self.pc.add(2) # 3 cycles def isNZ(self): - return (self.f.get() & constants.Z_FLAG) == 0 + return not self.isZ() def isNC(self): - return (self.f.get() & constants.C_FLAG) == 0 + return not self.isC() def isZ(self): return (self.f.get() & constants.Z_FLAG) != 0 @@ -783,14 +792,12 @@ def group_lambda(function, register, value=None): if value == None: - lambda s: function(s, register.get, register.set) + return lambda s: function(s, register.get, register.set) else: - lambda s: function(s, register.get, register.set, value) + return lambda s: function(s, register.get, register.set, value) - def create_register_op_codes(table): - print "" opCodes = [] for entry in table: opCode = entry[0] @@ -805,10 +812,11 @@ return opCodes def register_lambda(function, registerOrGetter): - if registerOrGetter is object: - return lambda s: function(s, registerOrGetter) - else: + if callable(registerOrGetter): return lambda s: function(s, registerOrGetter(s)) + else: + return lambda s: function(s, registerOrGetter) + def initialize_op_code_table(table): print "" @@ -821,15 +829,7 @@ else: positions = range(entry[0], entry[1]+1) for pos in positions: - #try: - # print "D1", hex(pos), entry[-1].func_closure[0].cell_contents.func_name - #except: - # pass - #else: - # print "D2", hex(pos), entry[-1] - #print "" result[pos] = entry[-1] - #assert result[pos] is None return result # OPCODE TABLES --------------------------------------------------------------- @@ -902,15 +902,13 @@ (0xA8, 0x01, CPU.XOR), (0xB0, 0x01, CPU.OR), (0xB8, 0x01, CPU.cpA), - (0x06, 0x08, lambda s, register:CPU.ld(s, CPU.fetch(s), register.set)), + (0x06, 0x08, CPU.fetchLoad), (0x40, 0x01, CPU.res, range(0, 8)) ] REGISTER_OP_CODES = [ - (0x01, 0x10, lambda s, register: CPU.popDoubleRegister(s, register=register,\ - getter=CPU.fetch),\ - [CPU.bc, CPU.de, CPU.hl, CPU.sp]), + (0x01, 0x10, CPU.fetchDoubleRegister, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), (0x09, 0x10, CPU.addHL, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), (0x03, 0x10, CPU.incDoubleRegister, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), (0x0B, 0x10, CPU.decDoubleRegister, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), @@ -939,9 +937,9 @@ # RAW OPCODE TABLE INITIALIZATION ---------------------------------------------- FIRST_ORDER_OP_CODES += create_register_op_codes(REGISTER_OP_CODES) -#FIRST_ORDER_OP_CODES += create_group_op_codes(REGISTER_GROUP_OP_CODES) +FIRST_ORDER_OP_CODES += create_group_op_codes(REGISTER_GROUP_OP_CODES) SECOND_ORDER_OP_CODES = create_group_op_codes(SECOND_ORDER_REGISTER_GROUP_OP_CODES) OP_CODES = initialize_op_code_table(FIRST_ORDER_OP_CODES) -FETCH_EXECUTE_OP_CODES = []#initialize_op_code_table(SECOND_ORDER_OP_CODES) +FETCH_EXECUTE_OP_CODES = initialize_op_code_table(SECOND_ORDER_OP_CODES) Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Fri Mar 21 16:18:44 2008 @@ -174,6 +174,33 @@ assert cpu.pc.get() == pc+1 +def test_flags(): + cpu = get_cpu() + cpu.f.set(constants.Z_FLAG) + assert cpu.isZ() == True + assert cpu.isNZ() == False + cpu.f.set(~constants.Z_FLAG) + assert cpu.isZ() == False + assert cpu.isNZ() == True + + cpu.f.set(constants.C_FLAG) + assert cpu.isC() == True + assert cpu.isNC() == False + cpu.f.set(~constants.C_FLAG) + assert cpu.isC() == False + assert cpu.isNC() == True + +def test_flags_memory_access(): + cpu = get_cpu() + cpu.f.set(constants.Z_FLAG) + assert cpu.isZ() == True + prepare_for_fetch(cpu, 0x1234, 0x1234) + cpu.memory.write(0x1234, 0x12) + assert cpu.isZ() == True + cpu.rom[0x1234] = 0x12 + assert cpu.isZ() == True + + def cycle_test(cpu, opCode, cycles=0): startCycles = cpu.cycles try: @@ -191,7 +218,6 @@ # TEST HELPERS --------------------------------------- def test_create_group_op_codes(): - py.test.skip() assert len(GROUPED_REGISTERS) == 8 start=0x12 step=0x03 @@ -210,7 +236,6 @@ def test_create_register_op_codes(): - py.test.skip() start = 0x09 step = 0x10 func = CPU.addHL @@ -231,7 +256,6 @@ de=constants.RESET_DE, f=constants.RESET_F,\ hl=constants.RESET_HL, sp=constants.RESET_SP,\ pc=constants.RESET_PC): - return assert_registers(cpu, a, bc, de, f, hl, sp, pc) def assert_registers(cpu, a=None, bc=None, de=None, f=None, hl=None, sp=None, pc=None): @@ -251,9 +275,11 @@ assert cpu.pc.get() == pc, "Register pc is %s but should be %s" % (hex(cpu.pc.get()), hex(pc)) def prepare_for_fetch(cpu, value, valueLo=None): - cpu.rom[cpu.pc.get()] = value & 0xFF + cpu.rom[cpu.pc.get()] = value + cpu.memory.write(cpu.pc.get(), value & 0xFF) if valueLo is not None: - cpu.rom[cpu.pc.get()+1] = value & 0xFF + cpu.rom[cpu.pc.get()+1] = valueLo & 0xFF + cpu.memory.write(cpu.pc.get(), valueLo & 0xFF) def set_registers(registers, value): #if registers is not list: @@ -303,7 +329,6 @@ # jr_NZ_nn see test_jr_cc_nn def test_0x20_0x28_0x30(): - #py.test.skip("OpCode Table incomplete") cpu = get_cpu() flags = [~constants.Z_FLAG, constants.Z_FLAG, ~constants.C_FLAG, constants.C_FLAG] opCode = 0x20 @@ -319,7 +344,8 @@ cpu.f.set(~flags[i]) cycle_test(cpu, opCode, 2) assert cpu.pc.get() == pc+1 - value += 2 + value += 3 + opCode += 0x08 # ld_BC_nnnn to ld_SP_nnnn def test_0x01_0x11_0x21_0x31(): @@ -327,12 +353,14 @@ cpu = get_cpu() registers= [cpu.bc, cpu.de, cpu.hl, cpu.sp] value = 0x12 + opCode = 0x01 for index in range(0, 8): prepare_for_fetch(cpu, value, value+1) - cycle_test(cpu, 0x01+index*0x10, 3) + cycle_test(cpu, opCode, 3) assert registers[index].getHi() == value assert registers[index].getlo() == value+1 - value += 2 + value += 3 + opCode += 0x10 # add_HL_BC to add_HL_SP def test_0x09_0x19_0x29_0x39(): @@ -340,13 +368,15 @@ cpu = get_cpu() registers= [cpu.bc, cpu.de, cpu.hl, cpu.sp] value = 0x1234 + opCode = 0x09 for i in range(0, 8): - cpu.hl.set(0x00) + cpu.hl.set(value) registers[i].set(value) assert registers[i].get() == value - cycle_test(cpu, 0x09+i*0x10, 2) - assert cpu.hl.get() == value - value += 1 + cycle_test(cpu, opCode, 2) + assert cpu.hl.get() == value+value + value += 3 + opCode += 0x10 # ld_BCi_A def test_0x02(): From fijal at codespeak.net Fri Mar 21 16:59:38 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 21 Mar 2008 16:59:38 +0100 (CET) Subject: [pypy-svn] r52807 - pypy/branch/js-refactoring Message-ID: <20080321155938.DC8B31684EA@codespeak.net> Author: fijal Date: Fri Mar 21 16:59:37 2008 New Revision: 52807 Added: pypy/branch/js-refactoring/ - copied from r52806, pypy/dist/ Log: create branch for experimenting with js frontend. From fijal at codespeak.net Fri Mar 21 17:01:39 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 21 Mar 2008 17:01:39 +0100 (CET) Subject: [pypy-svn] r52808 - pypy/branch/js-refactoring/pypy/lang/js Message-ID: <20080321160139.92BAA1684EA@codespeak.net> Author: fijal Date: Fri Mar 21 17:01:39 2008 New Revision: 52808 Removed: pypy/branch/js-refactoring/pypy/lang/js/ Log: delete this. From fijal at codespeak.net Fri Mar 21 17:02:56 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 21 Mar 2008 17:02:56 +0100 (CET) Subject: [pypy-svn] r52809 - pypy/branch/js-refactoring/pypy/lang/js Message-ID: <20080321160256.DB8A3168434@codespeak.net> Author: fijal Date: Fri Mar 21 17:02:56 2008 New Revision: 52809 Added: pypy/branch/js-refactoring/pypy/lang/js/ - copied from r52808, pypy/branch/jit-refactoring/pypy/lang/js/ Log: copy it over from a place where I worked last. From cfbolz at codespeak.net Fri Mar 21 17:12:26 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 21 Mar 2008 17:12:26 +0100 (CET) Subject: [pypy-svn] r52812 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080321161226.EBF461684EB@codespeak.net> Author: cfbolz Date: Fri Mar 21 17:12:26 2008 New Revision: 52812 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: first step in removing jitstate.greens: don't put the genvar flag there when a low level operation raised. Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Fri Mar 21 17:12:26 2008 @@ -93,7 +93,7 @@ gv_flag = opdesc.gv_True else: gv_flag = opdesc.gv_False - jitstate.greens.append(gv_flag) + jitstate.gv_op_raised = gv_flag return rvalue.ll_fromvalue(jitstate, res) gv_arg = argbox.getgenvar(jitstate) if not opdesc.canraise: @@ -101,7 +101,7 @@ else: genvar, gv_raised = jitstate.curbuilder.genraisingop1(opdesc.opname, gv_arg) - jitstate.greens.append(gv_raised) # for split_raisingop() + jitstate.gv_op_raised = gv_raised # for split_raisingop() return opdesc.redboxcls(opdesc.result_kind, genvar) def ll_gen2(opdesc, jitstate, argbox0, argbox1): @@ -123,7 +123,7 @@ gv_flag = opdesc.gv_True else: gv_flag = opdesc.gv_False - jitstate.greens.append(gv_flag) + jitstate.gv_op_raised = gv_flag return rvalue.ll_fromvalue(jitstate, res) gv_arg0 = argbox0.getgenvar(jitstate) gv_arg1 = argbox1.getgenvar(jitstate) @@ -132,7 +132,7 @@ else: genvar, gv_raised = jitstate.curbuilder.genraisingop2(opdesc.opname, gv_arg0, gv_arg1) - jitstate.greens.append(gv_raised) # for split_raisingop() + jitstate.gv_op_raised = gv_raised # for split_raisingop() return opdesc.redboxcls(opdesc.result_kind, genvar) def genmalloc_varsize(jitstate, contdesc, sizebox): @@ -448,7 +448,8 @@ return True def split_raisingop(jitstate, resumepoint, ll_evalue, *greens_gv): - exitgvar = jitstate.greens.pop() # pushed here by the raising op + exitgvar = jitstate.gv_op_raised # pushed here by the raising op + jitstate.gv_op_raised = None if exitgvar.is_const: gotexc = exitgvar.revealconst(lltype.Bool) else: @@ -1038,7 +1039,7 @@ class JITState(object): _attrs_ = """curbuilder frame exc_type_box exc_value_box - greens + gv_op_raised returnbox promotion_path resumepoint resuming @@ -1056,16 +1057,19 @@ generated_oop_residual_can_raise = False def __init__(self, builder, frame, exc_type_box, exc_value_box, ts, - resumepoint=-1, newgreens=[], virtualizables=None): + resumepoint=-1, newgreens=None, virtualizables=None): self.curbuilder = builder self.frame = frame self.exc_type_box = exc_type_box self.exc_value_box = exc_value_box self.ts = ts self.resumepoint = resumepoint + if newgreens is None: + newgreens = [] self.greens = newgreens + self.gv_op_raised = None - # XXX can not be adictionary + # XXX can not be a dictionary # it needs to be iterated in a deterministic order. if virtualizables is None: virtualizables = [] @@ -1221,6 +1225,7 @@ result.fz_frame = self.frame.freeze(memo) result.fz_exc_type_box = self.exc_type_box .freeze(memo) result.fz_exc_value_box = self.exc_value_box.freeze(memo) + assert self.gv_op_raised is None result.ts = self.ts fz_virtualizables = result.fz_virtualizables = [] for virtualizable_box in self.virtualizables: From santagada at codespeak.net Fri Mar 21 17:25:36 2008 From: santagada at codespeak.net (santagada at codespeak.net) Date: Fri, 21 Mar 2008 17:25:36 +0100 (CET) Subject: [pypy-svn] r52813 - pypy/branch/jit-refactoring Message-ID: <20080321162536.CC35D1684E6@codespeak.net> Author: santagada Date: Fri Mar 21 17:25:35 2008 New Revision: 52813 Removed: pypy/branch/jit-refactoring/ Log: kill the jit-refactoring branch, it is replaced by jit-hotpath, take 2 From cfbolz at codespeak.net Fri Mar 21 17:50:04 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 21 Mar 2008 17:50:04 +0100 (CET) Subject: [pypy-svn] r52815 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080321165004.026A6168487@codespeak.net> Author: cfbolz Date: Fri Mar 21 17:50:04 2008 New Revision: 52815 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Log: check more here Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Fri Mar 21 17:50:04 2008 @@ -1621,9 +1621,9 @@ res = self.interpret(f, [100, 20]) assert res == 121 self.check_insns(int_add_ovf=1) - #res = self.interpret(f, [100, 20], [0, 1]) - #assert res == 121 - #self.check_insns() + res = self.interpret(f, [100, 20], [0, 1]) + assert res == 121 + self.check_insns() res = self.interpret(f, [sys.maxint, 1]) assert res == -41 From cfbolz at codespeak.net Fri Mar 21 18:11:32 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 21 Mar 2008 18:11:32 +0100 (CET) Subject: [pypy-svn] r52816 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080321171132.3F45F16846C@codespeak.net> Author: cfbolz Date: Fri Mar 21 18:11:31 2008 New Revision: 52816 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: fix red ovf ops in the hotpath stuff that get constant red boxes as args Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Fri Mar 21 18:11:31 2008 @@ -452,10 +452,13 @@ def hp_after_raisingop(jitstate, hotrunnerdesc, ll_evalue): - gv_raised = jitstate.greens.pop() # XXX hackish interface, - # pushed here by ll_gen1 or ll_gen2 + gv_raised = jitstate.get_gv_op_raised() # XXX slightly hackish as well, we actually need gv_raised to be # in local_boxes to be passed along to the new block + if gv_raised.is_const: + if gv_raised.revealconst(lltype.Bool): + jitstate.residual_ll_exception(ll_evalue) + return assert not gv_raised.is_const tok_bool = hotrunnerdesc.RGenOp.kindToken(lltype.Bool) raisedbox = rvalue.IntRedBox(tok_bool, gv_raised) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Fri Mar 21 18:11:31 2008 @@ -1777,6 +1777,34 @@ assert res == -40 self.check_insns_in_loops(int_add_ovf=1) + def test_red_int_add_ovf_consts(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'm', 'i', 'result'] + def on_enter_jit(self): + self.n = hint(hint(self.n, promote=True), variable=True) + self.m = hint(hint(self.m, promote=True), variable=True) + def f(n, m): + i = 1024 + result = 0 + while i > 0: + i >>= 1 + try: + result += ovfcheck(n + m) + except OverflowError: + result += -42 + m + MyJitDriver.jit_merge_point(n=n, m=m, i=i, result=result) + MyJitDriver.can_enter_jit(n=n, m=m, i=i, result=result) + return result + + res = self.run(f, [100, 20], threshold=2) + assert res == 120 * 11 + self.check_insns_in_loops(int_add_ovf=0) + + res = self.run(f, [sys.maxint, 1], threshold=2) + assert res == -41 * 11 + self.check_insns_in_loops(int_add_ovf=0) + def test_green_int_add_ovf(self): py.test.skip("not working yet") def f(n, m): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Fri Mar 21 18:11:31 2008 @@ -448,8 +448,7 @@ return True def split_raisingop(jitstate, resumepoint, ll_evalue, *greens_gv): - exitgvar = jitstate.gv_op_raised # pushed here by the raising op - jitstate.gv_op_raised = None + exitgvar = jitstate.get_gv_op_raised() if exitgvar.is_const: gotexc = exitgvar.revealconst(lltype.Bool) else: @@ -1281,6 +1280,11 @@ f.dispatchqueue.resuming = None f = f.backframe + def get_gv_op_raised(self): + result = self.gv_op_raised + self.gv_op_raised = None + return result + def start_writing(jitstate=None, prevopen=None): if jitstate is not prevopen: @@ -1365,6 +1369,7 @@ myframe = jitstate.frame leave_frame(jitstate) jitstate.greens = [] + assert len(myframe.local_boxes) == 1 jitstate.returnbox = myframe.local_boxes[0] jitstate = jitstate.next return return_chain From cfbolz at codespeak.net Fri Mar 21 18:32:43 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 21 Mar 2008 18:32:43 +0100 (CET) Subject: [pypy-svn] r52817 - in pypy/branch/jit-hotpath/pypy/jit: rainbow timeshifter Message-ID: <20080321173243.5E4BD168414@codespeak.net> Author: cfbolz Date: Fri Mar 21 18:32:41 2008 New Revision: 52817 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: split the ll_gen functions into a raising and a non-raising variant for clarity Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Fri Mar 21 18:32:41 2008 @@ -1003,16 +1003,20 @@ self.green_result(result) elif color == "red": if opdesc.nb_args == 1: - impl = rtimeshift.ll_gen1 + if opdesc.canraise: + impl = rtimeshift.ll_gen1_canraise + else: + impl = rtimeshift.ll_gen1 elif opdesc.nb_args == 2: - impl = rtimeshift.ll_gen2 + if opdesc.canraise: + impl = rtimeshift.ll_gen2_canraise + else: + impl = rtimeshift.ll_gen2 else: XXX - def implementation(self): - args = (opdesc, self.jitstate, ) - for i in numargs: - args += (self.get_redarg(), ) - result = impl(*args) + @arguments(*(("red", ) * opdesc.nb_args)) + def implementation(self, *args): + result = impl(opdesc, self.jitstate, *args) self.red_result(result) else: assert 0, "unknown color" Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Fri Mar 21 18:32:41 2008 @@ -83,25 +83,31 @@ opname = opdesc.opname if opdesc.tryfold and argbox.is_constant(): arg = rvalue.ll_getvalue(argbox, ARG0) - if not opdesc.canraise: + res = opdesc.llop(RESULT, arg) + return rvalue.ll_fromvalue(jitstate, res) + gv_arg = argbox.getgenvar(jitstate) + genvar = jitstate.curbuilder.genop1(opdesc.opname, gv_arg) + return opdesc.redboxcls(opdesc.result_kind, genvar) + +def ll_gen1_canraise(opdesc, jitstate, argbox): + ARG0 = opdesc.ARG0 + RESULT = opdesc.RESULT + opname = opdesc.opname + if opdesc.tryfold and argbox.is_constant(): + arg = rvalue.ll_getvalue(argbox, ARG0) + try: res = opdesc.llop(RESULT, arg) + except Exception: # shouldn't raise anything unexpected + res = opdesc.whatever_result + gv_flag = opdesc.gv_True else: - try: - res = opdesc.llop(RESULT, arg) - except Exception: # shouldn't raise anything unexpected - res = opdesc.whatever_result - gv_flag = opdesc.gv_True - else: - gv_flag = opdesc.gv_False - jitstate.gv_op_raised = gv_flag + gv_flag = opdesc.gv_False + jitstate.gv_op_raised = gv_flag return rvalue.ll_fromvalue(jitstate, res) gv_arg = argbox.getgenvar(jitstate) - if not opdesc.canraise: - genvar = jitstate.curbuilder.genop1(opdesc.opname, gv_arg) - else: - genvar, gv_raised = jitstate.curbuilder.genraisingop1(opdesc.opname, - gv_arg) - jitstate.gv_op_raised = gv_raised # for split_raisingop() + genvar, gv_raised = jitstate.curbuilder.genraisingop1(opdesc.opname, + gv_arg) + jitstate.gv_op_raised = gv_raised # for split_raisingop() return opdesc.redboxcls(opdesc.result_kind, genvar) def ll_gen2(opdesc, jitstate, argbox0, argbox1): @@ -113,26 +119,35 @@ # const propagate arg0 = rvalue.ll_getvalue(argbox0, ARG0) arg1 = rvalue.ll_getvalue(argbox1, ARG1) - if not opdesc.canraise: + return rvalue.ll_fromvalue(jitstate, opdesc.llop(RESULT, arg0, arg1)) + gv_arg0 = argbox0.getgenvar(jitstate) + gv_arg1 = argbox1.getgenvar(jitstate) + genvar = jitstate.curbuilder.genop2(opdesc.opname, gv_arg0, gv_arg1) + return opdesc.redboxcls(opdesc.result_kind, genvar) + +def ll_gen2_canraise(opdesc, jitstate, argbox0, argbox1): + ARG0 = opdesc.ARG0 + ARG1 = opdesc.ARG1 + RESULT = opdesc.RESULT + opname = opdesc.opname + if opdesc.tryfold and argbox0.is_constant() and argbox1.is_constant(): + # const propagate + arg0 = rvalue.ll_getvalue(argbox0, ARG0) + arg1 = rvalue.ll_getvalue(argbox1, ARG1) + try: res = opdesc.llop(RESULT, arg0, arg1) + except Exception: # shouldn't raise anything unexpected + res = opdesc.whatever_result + gv_flag = opdesc.gv_True else: - try: - res = opdesc.llop(RESULT, arg0, arg1) - except Exception: # shouldn't raise anything unexpected - res = opdesc.whatever_result - gv_flag = opdesc.gv_True - else: - gv_flag = opdesc.gv_False - jitstate.gv_op_raised = gv_flag + gv_flag = opdesc.gv_False + jitstate.gv_op_raised = gv_flag return rvalue.ll_fromvalue(jitstate, res) gv_arg0 = argbox0.getgenvar(jitstate) gv_arg1 = argbox1.getgenvar(jitstate) - if not opdesc.canraise: - genvar = jitstate.curbuilder.genop2(opdesc.opname, gv_arg0, gv_arg1) - else: - genvar, gv_raised = jitstate.curbuilder.genraisingop2(opdesc.opname, - gv_arg0, gv_arg1) - jitstate.gv_op_raised = gv_raised # for split_raisingop() + genvar, gv_raised = jitstate.curbuilder.genraisingop2(opdesc.opname, + gv_arg0, gv_arg1) + jitstate.gv_op_raised = gv_raised # for split_raisingop() return opdesc.redboxcls(opdesc.result_kind, genvar) def genmalloc_varsize(jitstate, contdesc, sizebox): From cfbolz at codespeak.net Fri Mar 21 18:56:35 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 21 Mar 2008 18:56:35 +0100 (CET) Subject: [pypy-svn] r52818 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080321175635.556801684DC@codespeak.net> Author: cfbolz Date: Fri Mar 21 18:56:33 2008 New Revision: 52818 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py Log: small rainbow bytecode optimization just because: don't emit make_new_*vars (star wars?) that do nothing. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Fri Mar 21 18:56:33 2008 @@ -549,6 +549,11 @@ reds, greens = self.sort_by_color(link.args, link.target.inputargs) result = [] for color, args in [("red", reds), ("green", greens)]: + if not args: + if color == "red" and self.free_red[link.prevblock] == 0: + continue + if color == "green" and self.free_green[link.prevblock] == 0: + continue result += ["make_new_%svars" % (color, ), len(args)] for v in args: result.append(self.serialize_oparg(color, v)) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Fri Mar 21 18:56:33 2008 @@ -567,18 +567,9 @@ def opimpl_make_new_redvars(self, local_boxes): self.frame.local_boxes = local_boxes - def opimpl_make_new_greenvars(self): - # this uses a "green_varargs" argument, but we do the decoding - # manually for the fast case - num = self.load_2byte() - if num == 0 and len(self.frame.local_green) == 0: - # fast (very common) case - return - newgreens = [] - for i in range(num): - newgreens.append(self.get_greenarg()) + @arguments("green_varargs") + def opimpl_make_new_greenvars(self, newgreens): self.frame.local_green = newgreens - opimpl_make_new_greenvars.argspec = arguments("green_varargs") #for dump.py @arguments("2byte", "greenkey") def opimpl_local_merge(self, mergepointnum, key): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py Fri Mar 21 18:56:33 2008 @@ -61,7 +61,6 @@ assert jitcode.code == assemble(writer.interpreter, "red_int_add", 0, 1, "make_new_redvars", 1, 2, - "make_new_greenvars", 0, "red_return") assert len(jitcode.constants) == 0 assert len(jitcode.typekinds) == 0 @@ -76,7 +75,6 @@ "make_redbox", -1, 0, "red_int_add", 0, 1, "make_new_redvars", 1, 2, - "make_new_greenvars", 0, "red_return") assert len(jitcode.constants) == 1 assert len(jitcode.typekinds) == 1 @@ -126,7 +124,6 @@ label("sub"), "red_int_sub", 0, 1, "make_new_redvars", 1, 2, - "make_new_greenvars", 0, label("return"), "red_return", label("true"), @@ -135,7 +132,6 @@ label("add"), "red_int_add", 0, 1, "make_new_redvars", 1, 2, - "make_new_greenvars", 0, "goto", tlabel("return"), ) assert jitcode.code == expected @@ -156,23 +152,18 @@ "red_int_is_true", 0, "red_goto_iftrue", 3, tlabel("add"), "make_new_redvars", 2, 1, 2, - "make_new_greenvars", 0, "red_int_add", 0, 1, "make_new_redvars", 1, 2, - "make_new_greenvars", 0, label("after"), "local_merge", 0, -1, "make_redbox", -1, 0, "red_int_add", 1, 0, "make_new_redvars", 1, 2, - "make_new_greenvars", 0, "red_return", label("add"), "make_new_redvars", 2, 1, 2, - "make_new_greenvars", 0, "red_int_sub", 0, 1, "make_new_redvars", 1, 2, - "make_new_greenvars", 0, "goto", tlabel("after"), ) assert jitcode.code == expected @@ -231,25 +222,21 @@ JITCODE 'f' pc: 0 | make_redbox (0), 0 => r1 6 | make_new_redvars [r0, r1] - 14 | make_new_greenvars [] | - 18 | local_merge 0, None - 24 | red_int_is_true r0 => r2 - 28 | red_goto_iftrue r2, pc: 48 - 36 | make_new_redvars [r1] - 42 | make_new_greenvars [] + 14 | local_merge 0, None + 20 | red_int_is_true r0 => r2 + 24 | red_goto_iftrue r2, pc: 40 + 32 | make_new_redvars [r1] | - 46 | red_return + 38 | red_return | - 48 | make_new_redvars [r0, r1] - 56 | make_new_greenvars [] + 40 | make_new_redvars [r0, r1] | - 60 | red_int_add r1, r0 => r2 - 66 | make_redbox (1), 0 => r3 - 72 | red_int_sub r0, r3 => r4 - 78 | make_new_redvars [r4, r2] - 86 | make_new_greenvars [] - 90 | goto pc: 18 + 48 | red_int_add r1, r0 => r2 + 54 | make_redbox (1), 0 => r3 + 60 | red_int_sub r0, r3 => r4 + 66 | make_new_redvars [r4, r2] + 74 | goto pc: 14 """.rstrip() assert result == expected @@ -264,7 +251,6 @@ "make_redbox", -1, 0, "red_int_mul", 1, 2, "make_new_redvars", 1, 3, - "make_new_greenvars", 0, "red_return") assert jitcode.is_portal assert len(jitcode.called_bytecodes) == 1 @@ -273,7 +259,6 @@ "make_redbox", -1, 0, "red_int_add", 0, 1, "make_new_redvars", 1, 2, - "make_new_greenvars", 0, "red_return") assert not called_jitcode.is_portal assert len(called_jitcode.called_bytecodes) == 0 From arigo at codespeak.net Fri Mar 21 19:32:36 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 21 Mar 2008 19:32:36 +0100 (CET) Subject: [pypy-svn] r52819 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080321183236.0145916845E@codespeak.net> Author: arigo Date: Fri Mar 21 19:32:35 2008 New Revision: 52819 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py Log: Support for entering the fallback interpreter at the place that is the worst possible for virtualizables: when we just returned from a residual call. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Fri Mar 21 19:32:35 2008 @@ -3,11 +3,15 @@ from pypy.rlib.objectmodel import we_are_translated, CDefinedIntSymbolic from pypy.rpython.lltypesystem import lltype, llmemory, lloperation from pypy.rpython.annlowlevel import cast_base_ptr_to_instance -from pypy.jit.timeshifter import rvalue +from pypy.jit.timeshifter import rvalue, rcontainer from pypy.jit.timeshifter.greenkey import empty_key, GreenKey from pypy.jit.rainbow.interpreter import SIGN_EXTEND2, arguments +class FallStoreBackMemo(object): + pass + + class FallbackInterpreter(object): """ The fallback interp takes an existing suspended jitstate and @@ -21,7 +25,7 @@ self.exceptiondesc = hotrunnerdesc.exceptiondesc self.register_opcode_impls(self.interpreter) - def initialize_state(self, fallback_point, framebase): + def initialize_state(self, fallback_point, framebase, shapemask): self.interpreter.debug_trace("fallback_interp") jitstate = fallback_point.saved_jitstate incoming_gv = jitstate.get_locals_gv() @@ -32,6 +36,7 @@ for i in range(len(incoming_gv)): self.gv_to_index[incoming_gv[i]] = i + self.store_back_virtualizables(jitstate, shapemask) self.initialize_from_frame(jitstate.frame) self.gv_exc_type = self.getinitialboxgv(jitstate.exc_type_box) self.gv_exc_value = self.getinitialboxgv(jitstate.exc_value_box) @@ -61,14 +66,52 @@ return self.containers_gv[content] except KeyError: gv_result = content.allocate_gv_container(self.rgenop) - if not gv_result.is_const: - gv_result = self.fetch_from_frame(box, gv_result) - self.containers_gv[content] = gv_result content.populate_gv_container(self.rgenop, gv_result, self.getinitialboxgv) return gv_result + def store_back_virtualizables(self, jitstate, shapemask): + # this re-populates the virtualizables that already exist in the heap. + # If shapemask != -1, it means that the jitstate is in a state where + # it needs the equivalent of jitstate.reshape(), i.e. the clean-up and + # forced checks that follow a residual call. + if shapemask == -1: + for virtualizable_box in jitstate.virtualizables: + content = virtualizable_box.content + assert isinstance(content, rcontainer.VirtualizableStruct) + gv_ptr = content.store_back_gv(self.rgenop, + self.getinitialboxgv) + if gv_ptr is not None: + self.containers_gv[content] = gv_ptr + else: + # Note that this must be done before initialize_from_frame() + # because store_back_gv_reshaped() could notice some virtual + # containers that were forced during the residual call. + # If we called getinitialboxgv() on their box before we + # reached the "State sanitized" point below, it would buggily + # allocate a new copy instead of reusing the just-forced one. + + # XXX the rest of this function and all the + # store_back_gv_reshaped() are duplicating the + # lengthy logic from the various reshape() methods :-( + memo = FallStoreBackMemo() + memo.containers = {} # for all containers visited + memo.forced_containers_gv = self.containers_gv # forced ones only + memo.copyfields = [] + memo.box_gv_reader = self.getinitialboxgv + memo.bitcount = 1 + + for virtualizable_box in jitstate.virtualizables: + content = virtualizable_box.content + assert isinstance(content, rcontainer.VirtualizableStruct) + content.store_back_gv_reshaped(shapemask, memo) + + # State sanitized. + for gv_ptr, fielddesc, box in memo.copyfields: + gv_value = self.getinitialboxgv(box) + fielddesc.perform_setfield(self.rgenop, gv_ptr, gv_value) + def initialize_from_frame(self, frame): # note that both local_green and local_red contain GenConsts self.current_source_jitframe = frame Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Fri Mar 21 19:32:35 2008 @@ -85,6 +85,7 @@ def __init__(self, ERASED, RGenOp): self.RGenOp = RGenOp pathkind = "%s path" % (ERASED,) + is_signed = (ERASED == RGenOp.erasedType(lltype.Signed)) def ll_reach_fallback_point(fallback_point_ptr, value, framebase): fbp = _cast_base_ptr_to_fallback_point(fallback_point_ptr) @@ -112,7 +113,11 @@ # exceptions below at run-time exceptions, we let them propagate fallbackinterp = fbp.hotrunnerdesc.fallbackinterp - fallbackinterp.initialize_state(fbp, framebase) + if is_signed and fbp.check_virtualizables(): + shapemask = value & ~ 1 + else: + shapemask = -1 + fallbackinterp.initialize_state(fbp, framebase, shapemask) fbp.prepare_fallbackinterp(fallbackinterp, value) fallbackinterp.bytecode_loop() # If the fallback interpreter reached the next jit_merge_point(), @@ -157,6 +162,9 @@ # its GenVars, so that we can fish these values to pass them # to the fallback interpreter + def check_virtualizables(self): + return False + # hack for testing: make the llinterpreter believe this is a Ptr to base # instance _TYPE = base_ptr_lltype() @@ -384,6 +392,9 @@ promotebox, hotpromotiondesc) self.check_forced = check_forced + def check_virtualizables(self): + return self.check_forced + @specialize.arglltype(2) def prepare_fallbackinterp(self, fallbackinterp, value): fallbackinterp.local_red.pop() # remove the temporary flagbox Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Fri Mar 21 19:32:35 2008 @@ -5,6 +5,7 @@ from pypy.rpython.lltypesystem.rvirtualizable import VABLERTIPTR from pypy.rlib.jit import hint from pypy.rlib.jit import JitDriver, hint, JitHintError +from pypy.rlib.rarithmetic import intmask from pypy.jit.rainbow.test import test_hotpath @@ -1646,6 +1647,7 @@ curstack.append(origstack[i]) i += 1 frame.stack = curstack + log.expected_stack = None class Log: stack = None @@ -1659,6 +1661,7 @@ def run(self): self.trace = 0 + log.expected_stack = self.stack self.interpret(self.code) assert self.pc == len(self.code) assert len(self.stack) == 1 @@ -1703,12 +1706,14 @@ raise NotImplementedError def debug(self): + if log.expected_stack is not None: + assert self.stack is log.expected_stack + log.expected_stack = self.stack for item in self.stack: self.trace = self.trace * 7 - item def main(x, case, expected): code = ['P2+tP5+tP3-', 'P1+tP3-DP3J', 'P4d-DtP0J'][case] - log.stack = [] f = Frame(code, x) res = f.run() assert res == expected @@ -1716,7 +1721,7 @@ assert main(38, 0, 42) == 40*3+45 assert main(15, 1, -2) == ((((16*3+13)*3+10)*3+7)*3+4)*3+1 - main(21, 2, -3) # to check that this works too + main(41, 2, -3) # to check that this works too res = self.run(main, [38, 0, 42], threshold=2, policy=StopAtXPolicy(Frame.debug.im_func)) @@ -1729,10 +1734,9 @@ self.check_insns_in_loops({'int_sub': 1, 'int_gt': 1, 'int_mul': 1, 'int_add': 1}) - py.test.skip("in-progress") - res = self.run(main, [21, 2, -3], threshold=2, + res = self.run(main, [41, 2, -3], threshold=2, policy=StopAtXPolicy(Frame.debug.im_func)) - assert res == main(21, 2, -3) + assert intmask(res) == intmask(main(41, 2, -3)) def test_recursive(self): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Fri Mar 21 19:32:35 2008 @@ -291,29 +291,9 @@ self._define_access_is_null(RGenOp) - self._define_populate_by_store_back() - def _define_virtual_desc(self): pass - def _define_populate_by_store_back(self): - # On a non-virtual virtualizable structure, the boxes that - # don't correspond to redirected fields are nonsense (always NULL)! - # Don't store them back... - TYPE = self.TYPE - redirected_fielddescs = unrolling_iterable(self.redirected_fielddescs) - - def populate_by_store_back(content_boxes, gv_s, box_gv_reader): - s = gv_s.revealconst(lltype.Ptr(TYPE)) - for desc, i in redirected_fielddescs: - box = content_boxes[i] - gv_value = box_gv_reader(box) - FIELDTYPE = getattr(desc.PTRTYPE.TO, desc.fieldname) - v = gv_value.revealconst(FIELDTYPE) - tgt = lltype.cast_pointer(desc.PTRTYPE, s) - setattr(tgt, desc.fieldname, v) - self.populate_by_store_back = populate_by_store_back - def _define_getset_field_ptr(self, RGenOp, fielddesc, j): untouched = self.my_redirected_getsetters_untouched touched = self.my_redirected_getsetters_touched @@ -926,10 +906,36 @@ assert content.allowed_in_virtualizable content.reshape(jitstate, shapemask, memo) + def store_back_gv_reshaped(self, shapemask, memo): + if self in memo.containers: + return + typedesc = self.typedesc + memo.containers[self] = None + bitmask = 1< Author: arigo Date: Fri Mar 21 19:45:44 2008 New Revision: 52820 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: Translation fix ('greens' is not gone yet) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Fri Mar 21 19:45:44 2008 @@ -1053,6 +1053,7 @@ class JITState(object): _attrs_ = """curbuilder frame exc_type_box exc_value_box + greens gv_op_raised returnbox promotion_path From arigo at codespeak.net Fri Mar 21 20:12:34 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 21 Mar 2008 20:12:34 +0100 (CET) Subject: [pypy-svn] r52821 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080321191234.6EB6516846A@codespeak.net> Author: arigo Date: Fri Mar 21 20:12:33 2008 New Revision: 52821 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Log: Translation fix for some tests. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Fri Mar 21 20:12:33 2008 @@ -215,7 +215,19 @@ class ContinueRunningNormally(Exception): _go_through_llinterp_uncaught_ = True # ugh + args_gv = [] # for tests where __init__ is not seen + seen_can_enter_jit = False + def __init__(self, args_gv, seen_can_enter_jit): + self.args_gv = args_gv + self.seen_can_enter_jit = seen_can_enter_jit + + def __str__(self): + return 'ContinueRunningNormally(%s)' % ( + ', '.join(map(str, self.args_gv)),) + + def decode_args(self): + args_gv = self.args_gv assert len(args_gv) == len(ARGS) args = () i = 0 @@ -223,11 +235,7 @@ gv_arg = args_gv[i] args += (gv_arg.revealconst(ARG), ) i += 1 - self.args = args - self.seen_can_enter_jit = seen_can_enter_jit - def __str__(self): - return 'ContinueRunningNormally(%s)' % ( - ', '.join(map(str, self.args)),) + return args self.raise_done = raise_done RAISE_DONE_FUNC = lltype.FuncType([RES], lltype.Void) @@ -247,7 +255,7 @@ except DoneWithThisFrame, e: return e.result except ContinueRunningNormally, e: - args = e.args + args = e.decode_args() self.interpreter.debug_trace("fb_leave", *args) check_for_immediate_reentry = e.seen_can_enter_jit From cami at codespeak.net Sat Mar 22 01:07:23 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sat, 22 Mar 2008 01:07:23 +0100 (CET) Subject: [pypy-svn] r52822 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080322000723.AEF41168444@codespeak.net> Author: cami Date: Sat Mar 22 01:07:20 2008 New Revision: 52822 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Log: more working tests removed all class variables in cpu added getters again to CPU Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Sat Mar 22 01:07:20 2008 @@ -7,9 +7,8 @@ class Register(object): - - value =0 def __init__(self, cpu, value=0): + self.value = 0 self.cpu = cpu if value is not 0: self.set(value) @@ -28,11 +27,6 @@ # ___________________________________________________________________________ class DoubleRegister(Register): - - cpu = None - hi = Register(None) - lo = Register(None) - def __init__(self, cpu, hi=None, lo=None): self.cpu = cpu if hi==None: @@ -82,56 +76,25 @@ class ImmediatePseudoRegister(object): - - hl = DoubleRegister(None) - def __init__(self, cpu, hl): self.cpu = cpu self.hl = hl def set(self, value): - sellf.cpu.write(self.get(), value) - self.cycles += 1 + self.cpu.write(self.get(), value) + self.cpu.cycles += 1 - def get(self, value): - return self.cpu.read(self.get()) + def get(self): + return self.cpu.read(self.hl.get()) # ___________________________________________________________________________ class CPU(object): - # Registers - af = DoubleRegister(None) - a = Register(None) - f = Register(None) - bc = DoubleRegister(None) - b = Register(None) - c = Register(None) - de = DoubleRegister(None) - d = Register(None) - e = Register(None) - hl = DoubleRegister(None) - hli = ImmediatePseudoRegister(None, None) - h = Register(None) - l = Register(None) - sp = DoubleRegister(None) - pc = DoubleRegister(None) - - # Interrupt Flags - ime = False - halted = False - cycles = 0 - - # Interrupt Controller - interrupt = None - - # memory Access - memory = None - - # ROM Access - rom = [] - def __init__(self, interrupt, memory): self.interrupt = interrupt self.memory = memory + self.ime = False + self.halted = False + self.cycles = 0 self.bc = DoubleRegister(self) self.b = self.bc.hi self.c = self.bc.lo @@ -160,7 +123,48 @@ self.ime = False self.halted = False self.cycles = 0 - + + def getAF(self): + return self.af + + def getA(self): + return self.a + + def getA(self): + return self.f + + def getBC(self): + return self.bc + + def getB(self): + return self.b + + def getC(self): + return self.c + + def getDE(self): + return self.de + + def getD(self): + return self.d + + def getE(self): + return self.e + + def getHL(self): + return self.hl + + def getHLi(self): + return self.hli + + def getH(self): + return self.h + + def getL(self): + return self.l + + def getSP(self): + return self.sp def getIF(self): val = 0x00 @@ -169,12 +173,10 @@ if self.halted: val += 0x80 return val - - + def setROM(self, banks): self.rom = banks - - + def zFlagAdd(self, s, resetF=False): if (resetF): self.f.set(0, False) @@ -295,6 +297,11 @@ def ld(self, getter, setter): setter(getter()) # 1 cycle + + # LD PC,HL, 1 cycle + def ld_pc_hl(self): + self.ld(self.hl, self.pc) + def fetchLoad(self, register): self.ld(self.fetch, register.set) @@ -382,31 +389,29 @@ self.zFlagAdd(self.a, resetF=True) def incDoubleRegister(self, doubleRegister): - print doubleRegister, "inc" doubleRegister.inc() def decDoubleRegister(self, doubleRegister): - print doubleRegister, "dec" doubleRegister.dec() # 1 cycle def inc(self, getter, setter): data = (getter() + 1) & 0xFF - self.decIncFlagFinish(data) + self.decIncFlagFinish(data, setter) # 1 cycle def dec(self, getter, setter): data = (getter() - 1) & 0xFF - self.decIncFlagFinish(data) + self.decIncFlagFinish(data, setter) self.f.add(constants.N_FLAG, False) - def decIncFlagFinish(data): - self.f.set(0) # 1 cycle + def decIncFlagFinish(self, data, setter): + self.f.set(0, False) self.zFlagAdd(data) if (data & 0x0F) == 0x0F: self.f.add(constants.H_FLAG, False) self.f.add((self.f.get() & constants.C_FLAG), False) - setter(data) + setter(data) # 1 cycle # 1 cycle def rlc(self, getter, setter): @@ -653,8 +658,6 @@ def nop(self): self.cycles -= 1 - # LD PC,HL, 1 cycle - # JP nnnn, 4 cycles def jp_nnnn(self): lo = self.fetch() # 1 cycle @@ -764,12 +767,9 @@ self.cycles += 1 self.fetch() - - # OPCODE LOOKUP TABLE GENERATION ----------------------------------------------- - -GROUPED_REGISTERS = (CPU.b, CPU.c, CPU.d, CPU.e, CPU.h, CPU.l, CPU.hli, CPU.a) +GROUPED_REGISTERS = (CPU.getB, CPU.getC, CPU.getD, CPU.getE, CPU.getH, CPU.getL, CPU.getHLi, CPU.getA) def create_group_op_codes(table): print "" opCodes =[] @@ -778,34 +778,29 @@ step = entry[1] function = entry[2] if len(entry) == 4: - for register in GROUPED_REGISTERS: + for registerGetter in GROUPED_REGISTERS: for n in entry[3]: - opCodes.append((opCode, group_lambda(function, register, n))) - #print "A", hex(opCode), function, n + opCodes.append((opCode, group_lambda(function, registerGetter, n))) opCode += step else: - for register in GROUPED_REGISTERS: - opCodes.append((opCode,group_lambda(function, register))) - #print "B", hex(opCode), function, register + for registerGetter in GROUPED_REGISTERS: + opCodes.append((opCode,group_lambda(function, registerGetter))) opCode += step return opCodes -def group_lambda(function, register, value=None): +def group_lambda(function, registerGetter, value=None): if value == None: - return lambda s: function(s, register.get, register.set) + return lambda s: function(s, registerGetter(s).get, registerGetter(s).set) else: - return lambda s: function(s, register.get, register.set, value) + return lambda s: function(s, registerGetter(s).get, registerGetter(s).set, value) def create_register_op_codes(table): opCodes = [] for entry in table: - opCode = entry[0] - step = entry[1] + opCode = entry[0] + step = entry[1] function = entry[2] - #print "------------------------------" - #print "C", hex(opCode), hex(step), function, len(entry[3]) - #print entry[3], len(entry[3]) for registerOrGetter in entry[3]: opCodes.append((opCode, register_lambda(function, registerOrGetter))) opCode += step @@ -865,7 +860,7 @@ (0xC3, CPU.jp_nnnn), (0xC9, CPU.ret), (0xD9, CPU.reti), - (0xE9, lambda s: CPU.ld(s, CPU.hl, CPU.pc)), + (0xE9, CPU.ld_pc_hl), (0xF9, CPU.ld_SP_HL), (0xE0, CPU.ldh_mem_A), (0xE8, CPU.add_SP_nn), @@ -903,21 +898,24 @@ (0xB0, 0x01, CPU.OR), (0xB8, 0x01, CPU.cpA), (0x06, 0x08, CPU.fetchLoad), - (0x40, 0x01, CPU.res, range(0, 8)) + (0x40, 0x01, CPU.res, range(0, 8)) ] +REGISTER_SET_A = [CPU.getBC, CPU.getDE, CPU.getHL, CPU.getSP] +REGISTER_SET_B = [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC] +REGISTER_SET_C = [CPU.getBC, CPU.getDE, CPU.getHL, CPU.getAF] REGISTER_OP_CODES = [ - (0x01, 0x10, CPU.fetchDoubleRegister, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), - (0x09, 0x10, CPU.addHL, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), - (0x03, 0x10, CPU.incDoubleRegister, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), - (0x0B, 0x10, CPU.decDoubleRegister, [CPU.bc, CPU.de, CPU.hl, CPU.sp]), - (0xC0, 0x08, CPU.ret_cc, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), - (0xC2, 0x08, CPU.jp_cc_nnnn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), - (0xC4, 0x08, CPU.call_cc_nnnn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), - (0x20, 0x08, CPU.jr_cc_nn, [CPU.isNZ, CPU.isZ, CPU.isNC, CPU.isC]), - (0xC1, 0x10, CPU.pop, [CPU.bc, CPU.de, CPU.hl, CPU.af]), - (0xC5, 0x10, CPU.push, [CPU.bc, CPU.de, CPU.hl, CPU.af]) + (0x01, 0x10, CPU.fetchDoubleRegister, REGISTER_SET_A), + (0x09, 0x10, CPU.addHL, REGISTER_SET_A), + (0x03, 0x10, CPU.incDoubleRegister, REGISTER_SET_A), + (0x0B, 0x10, CPU.decDoubleRegister, REGISTER_SET_A), + (0xC0, 0x08, CPU.ret_cc, REGISTER_SET_B), + (0xC2, 0x08, CPU.jp_cc_nnnn, REGISTER_SET_B), + (0xC4, 0x08, CPU.call_cc_nnnn, REGISTER_SET_B), + (0x20, 0x08, CPU.jr_cc_nn, REGISTER_SET_B), + (0xC1, 0x10, CPU.pop, REGISTER_SET_C), + (0xC5, 0x10, CPU.push, REGISTER_SET_C) ] SECOND_ORDER_REGISTER_GROUP_OP_CODES = [ Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Sat Mar 22 01:07:20 2008 @@ -118,7 +118,27 @@ # TEST CPU def test_getters(): - assert_default_registers(get_cpu()) + cpu = get_cpu() + assert_default_registers(cpu) + assert cpu.af.cpu == cpu + assert cpu.a.cpu == cpu + assert cpu.f.cpu == cpu + + assert cpu.bc.cpu == cpu + assert cpu.b.cpu == cpu + assert cpu.c.cpu == cpu + + assert cpu.de.cpu == cpu + assert cpu.d.cpu == cpu + assert cpu.e.cpu == cpu + + assert cpu.hl.cpu == cpu + assert cpu.hli.cpu == cpu + assert cpu.h.cpu == cpu + assert cpu.l.cpu == cpu + + assert cpu.sp.cpu == cpu + assert cpu.pc.cpu == cpu def test_fetch(): @@ -239,7 +259,7 @@ start = 0x09 step = 0x10 func = CPU.addHL - registers = [CPU.bc]*128 + registers = [CPU.getBC]*128 table = [(start, step, func, registers)] list = create_register_op_codes(table) opCode = start @@ -349,27 +369,25 @@ # ld_BC_nnnn to ld_SP_nnnn def test_0x01_0x11_0x21_0x31(): - py.test.skip("OpCode Table incomplete") cpu = get_cpu() registers= [cpu.bc, cpu.de, cpu.hl, cpu.sp] value = 0x12 opCode = 0x01 - for index in range(0, 8): + for index in range(0, len(registers)): prepare_for_fetch(cpu, value, value+1) cycle_test(cpu, opCode, 3) - assert registers[index].getHi() == value - assert registers[index].getlo() == value+1 + assert registers[index].getLo() == value + assert registers[index].getHi() == value+1 value += 3 opCode += 0x10 # add_HL_BC to add_HL_SP def test_0x09_0x19_0x29_0x39(): - py.test.skip("OpCode Table incomplete") cpu = get_cpu() registers= [cpu.bc, cpu.de, cpu.hl, cpu.sp] value = 0x1234 opCode = 0x09 - for i in range(0, 8): + for i in range(0, len(registers)): cpu.hl.set(value) registers[i].set(value) assert registers[i].get() == value @@ -428,7 +446,6 @@ # inc_BC DE HL SP def test_0x03_to_0x33_inc_double_registers(): - py.test.skip("OpCode Table incomplete") cpu = get_cpu() opCode = 0x03 registers = [cpu.bc, cpu.de, cpu.hl, cpu.sp] @@ -445,7 +462,6 @@ # dec_BC def test_0x0B_to_0c38_dec_double_registers(): - py.test.skip("OpCode Table incomplete") cpu = get_cpu() opCode = 0x0B registers = [cpu.bc, cpu.de, cpu.hl, cpu.sp] @@ -468,10 +484,12 @@ opCode = 0x04 value = 0x12 for i in range(0, len(registers)): - if registers[i] == cpu.hl: - continue set_registers(registers, 0) - cycle_test(cpu, opCode, 1) + registers[i].set(value) + if registers[i] == cpu.hl: + cycle_test(cpu, opCode, 3) + else: + cycle_test(cpu, opCode, 1) assert registers[i].get() == value+1 cpu.reset() opCode += 0x08 From arigo at codespeak.net Sat Mar 22 11:31:37 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 22 Mar 2008 11:31:37 +0100 (CET) Subject: [pypy-svn] r52823 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080322103137.17723168453@codespeak.net> Author: arigo Date: Sat Mar 22 11:31:36 2008 New Revision: 52823 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: Failing test. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Sat Mar 22 11:31:36 2008 @@ -1739,6 +1739,66 @@ assert intmask(res) == intmask(main(41, 2, -3)) + def test_virtual_list_and_struct_fallback(self): + py.test.skip("in-progress") + class MyJitDriver(JitDriver): + greens = [] + reds = ['v', 'i', 'res'] + + class Counter: + pass + glob = Counter() + + def residual(idx, see): + print 'RESIDUAL:', idx, see + glob.counter[idx] += 1 + assert see == glob.counter[idx] + + class S(object): + def __init__(self, x, y): + self.x = x + self.y = y + + class V(object): + _virtualizable_ = True + def summary(self): + result = 0 + for s in self.l: + result = (result * 100) + s.x * 10 + s.y + return result + + def f(v): + i = 10 + while i > 0: + i -= 1 + l = v.l = [] + l.append(S(6, 3)) + l.append(S(2, 7)) + #residual(0, len(v.l)) + residual(1, 10 - i) + res = v.summary() + l.pop() + l.pop() + assert len(l) == 0 + v.l = None + #residual(2, len(v.l)) + MyJitDriver.jit_merge_point(v=v, res=res, i=i) + MyJitDriver.can_enter_jit(v=v, res=res, i=i) + return res + + def main(): + v = V() + glob.counter = [0, 0, 0] + res = f(v) + assert glob.counter == [0, 10, 0] + return res + + print main() + + res = self.run(main, [], threshold=2, policy=StopAtXPolicy(residual)) + assert res == main() + + def test_recursive(self): class XY(object): From arigo at codespeak.net Sat Mar 22 11:47:37 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 22 Mar 2008 11:47:37 +0100 (CET) Subject: [pypy-svn] r52824 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080322104737.E15EF16846C@codespeak.net> Author: arigo Date: Sat Mar 22 11:47:37 2008 New Revision: 52824 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py Log: Hack even more to fix the test. Pending clean-up I suppose... Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sat Mar 22 11:47:37 2008 @@ -65,7 +65,8 @@ try: return self.containers_gv[content] except KeyError: - gv_result = content.allocate_gv_container(self.rgenop) + reshaping = content in self.containers_needing_reshaping + gv_result = content.allocate_gv_container(self.rgenop, reshaping) self.containers_gv[content] = gv_result content.populate_gv_container(self.rgenop, gv_result, self.getinitialboxgv) @@ -84,6 +85,7 @@ self.getinitialboxgv) if gv_ptr is not None: self.containers_gv[content] = gv_ptr + self.containers_needing_reshaping = {} else: # Note that this must be done before initialize_from_frame() # because store_back_gv_reshaped() could notice some virtual @@ -101,6 +103,7 @@ memo.copyfields = [] memo.box_gv_reader = self.getinitialboxgv memo.bitcount = 1 + self.containers_needing_reshaping = memo.containers for virtualizable_box in jitstate.virtualizables: content = virtualizable_box.content Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Sat Mar 22 11:47:37 2008 @@ -1740,7 +1740,6 @@ def test_virtual_list_and_struct_fallback(self): - py.test.skip("in-progress") class MyJitDriver(JitDriver): greens = [] reds = ['v', 'i', 'res'] @@ -1763,8 +1762,11 @@ _virtualizable_ = True def summary(self): result = 0 - for s in self.l: + i = 0 + while i < len(self.l): + s = self.l[i] result = (result * 100) + s.x * 10 + s.y + i += 1 return result def f(v): @@ -1774,14 +1776,12 @@ l = v.l = [] l.append(S(6, 3)) l.append(S(2, 7)) - #residual(0, len(v.l)) residual(1, 10 - i) res = v.summary() l.pop() l.pop() assert len(l) == 0 v.l = None - #residual(2, len(v.l)) MyJitDriver.jit_merge_point(v=v, res=res, i=i) MyJitDriver.can_enter_jit(v=v, res=res, i=i) return res @@ -1797,6 +1797,7 @@ res = self.run(main, [], threshold=2, policy=StopAtXPolicy(residual)) assert res == main() + self.check_insns_in_loops(malloc=0, direct_call=1) def test_recursive(self): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Sat Mar 22 11:47:37 2008 @@ -927,7 +927,7 @@ assert content.allowed_in_virtualizable content.store_back_gv_reshaped(shapemask, memo) - def allocate_gv_container(self, rgenop): + def allocate_gv_container(self, rgenop, need_reshaping=False): typedesc = self.typedesc # this should not be used for already-allocated virtualizables assert (not isinstance(self, VirtualizableStruct) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py Sat Mar 22 11:47:37 2008 @@ -295,7 +295,7 @@ def internal_replace(self, memo): raise NotImplementedError - def allocate_gv_container(self, rgenop): + def allocate_gv_container(self, rgenop, need_reshaping=False): return self.typedesc.allocate(rgenop, self.getlength()) def oop_newdict(jitstate, oopspecdesc, deepfrozen): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py Sat Mar 22 11:47:37 2008 @@ -80,7 +80,8 @@ def populate(item_boxes, gv_lst, box_gv_reader): l = gv_lst.revealconst(LISTPTR) - for i in range(len(item_boxes)): + # NB. len(item_boxes) may be l.ll_length()+1 if need_reshaping :-( + for i in range(l.ll_length()): box = item_boxes[i] if box is not None: gv_value = box_gv_reader(box) @@ -309,8 +310,11 @@ assert content.allowed_in_virtualizable content.store_back_gv_reshaped(shapemask, memo) - def allocate_gv_container(self, rgenop): - return self.typedesc.allocate(rgenop, len(self.item_boxes)) + def allocate_gv_container(self, rgenop, need_reshaping=False): + length = len(self.item_boxes) + if need_reshaping: + length -= 1 # hack hack hack + return self.typedesc.allocate(rgenop, length) def populate_gv_container(self, rgenop, gv_listptr, box_gv_reader): self.typedesc.populate(self.item_boxes, gv_listptr, box_gv_reader) From arigo at codespeak.net Sat Mar 22 13:00:47 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 22 Mar 2008 13:00:47 +0100 (CET) Subject: [pypy-svn] r52825 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080322120047.6F6C616845B@codespeak.net> Author: arigo Date: Sat Mar 22 13:00:45 2008 New Revision: 52825 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: Another failing test. This one really looks like the current failure mode of pypy-c-jit. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sat Mar 22 13:00:45 2008 @@ -1023,6 +1023,43 @@ assert res == 7 self.check_insns_in_loops(int_add=0, int_mul=0) + def test_residual_red_call_with_exc_more(self): + py.test.skip("in-progress") + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'x', 'res'] + + def h(x): + if x > 0: + return x + else: + raise ValueError + + def f(x): + res = 0 + i = 256 + while i > 0: + i >>= 1 + try: + v = h(x) - 1 + except ValueError: + v = 7 + res = res * 10 + v + MyJitDriver.jit_merge_point(x=x, i=i, res=res) + MyJitDriver.can_enter_jit(x=x, i=i, res=res) + return res + + stop_at_h = StopAtXPolicy(h) + res = self.run(f, [4], threshold=2, policy=stop_at_h) + assert res == 333333333 + self.check_insns_in_loops(int_sub=1, int_mul=1, int_add=1, + direct_call=1) + + res = self.run(f, [-20], threshold=2, policy=stop_at_h) + assert res == 777777777 + self.check_insns_in_loops(int_sub=0, int_mul=1, int_add=1, + direct_call=1) + def test_red_call_ignored_result(self): def g(n): return n * 7 From pedronis at codespeak.net Sat Mar 22 13:42:37 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Sat, 22 Mar 2008 13:42:37 +0100 (CET) Subject: [pypy-svn] r52826 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080322124237.3E5F9168432@codespeak.net> Author: pedronis Date: Sat Mar 22 13:42:36 2008 New Revision: 52826 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py Log: these skipped tests should pass, the last added test works and should continue to do so Modified: pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py Sat Mar 22 13:42:36 2008 @@ -89,7 +89,7 @@ ## self.check_type(c_char_p, "def") def test_unsupported_restype_1(self): - py.test.skip("I don't understand this limitation") + py.test.skip("WIP") # Only "fundamental" result types are supported for callback # functions, the type must have a non-NULL stgdict->setfunc. # POINTER(c_double), for example, is not supported. @@ -134,3 +134,30 @@ ################################################################ +class TestMoreCallbacks(BaseCTypesTestChecker): + + def test_callback_with_struct_argument(self): + py.test.skip("WIP") + class RECT(Structure): + _fields_ = [("left", c_int), ("top", c_int), + ("right", c_int), ("bottom", c_int)] + + proto = CFUNCTYPE(c_int, RECT) + def callback(point): + return point.left+point.top+point.right+point.bottom + + cbp = proto(callback) + + rect = RECT(1000,100,10,1) + + res = cbp(rect) + + assert res == 1111 + + def test_callback_unsupported_return_struct(self): + class RECT(Structure): + _fields_ = [("left", c_int), ("top", c_int), + ("right", c_int), ("bottom", c_int)] + + proto = CFUNCTYPE(RECT, c_int) + raises(TypeError, proto, lambda r: 0) From arigo at codespeak.net Sat Mar 22 13:56:04 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 22 Mar 2008 13:56:04 +0100 (CET) Subject: [pypy-svn] r52827 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080322125604.BB438168434@codespeak.net> Author: arigo Date: Sat Mar 22 13:56:03 2008 New Revision: 52827 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: Fix. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Sat Mar 22 13:56:03 2008 @@ -23,11 +23,12 @@ interp.frame.local_green = greenargs interp.graphsigtoken = graphsigtoken -def leave_graph(interp): +def leave_graph(interp, store_back_exc_data=True): jitstate = interp.jitstate exceptiondesc = interp.exceptiondesc builder = jitstate.curbuilder - exceptiondesc.store_global_excdata(jitstate) + if store_back_exc_data: + exceptiondesc.store_global_excdata(jitstate) jitstate.curbuilder.finish_and_return(interp.graphsigtoken, None) jitstate.curbuilder = None raise FinishedCompiling @@ -321,14 +322,10 @@ # default case of the switch: exceptiondesc = fbp.hotrunnerdesc.exceptiondesc - # for the annotator: - prevtypebox = None - prevvaluebox = None if check_exceptions: - # virtualize the exception into the jitstate (xxx fragile code) - prevtypebox = jitstate.exc_type_box - prevvaluebox = jitstate.exc_value_box + # virtualize the exception (if any) by loading it into the jitstate exceptiondesc.fetch_global_excdata(jitstate) + # xxx a bit fragile incoming_gv.append(jitstate.exc_type_box.genvar) incoming_gv.append(jitstate.exc_value_box.genvar) @@ -353,10 +350,12 @@ if check_exceptions: # unvirtualize the exception exceptiondesc.store_global_excdata(jitstate) + # note that the exc_type_box and exc_value_box stay in the jitstate, + # where the fallback interp can find them. When compiling more code + # they are replaced by null boxes if we know that no exception + # occurred. incoming_gv.pop() incoming_gv.pop() - jitstate.exc_type_box = prevtypebox - jitstate.exc_value_box = prevvaluebox default_builder.finish_and_goto(incoming_gv, switchblock) jitstate.curbuilder = excpath_builder @@ -364,7 +363,7 @@ # virtualizables: when we reach this point, the fallback interpreter # should already have done the right thing, i.e. stored the values # back into the structure (reading them out of framebase+frameinfo) - leave_graph(fbp.hotrunnerdesc.interpreter) + leave_graph(fbp.hotrunnerdesc.interpreter, store_back_exc_data=False) # for testing purposes def _cast_base_ptr_to_fallback_point(ptr): @@ -402,8 +401,15 @@ def prepare_compiler(self, interpreter, gv_value): # remove the temporary flagbox flagbox = interpreter.frame.local_boxes.pop() + jitstate = interpreter.jitstate exceptiondesc = self.hotrunnerdesc.exceptiondesc - rtimeshift.residual_fetch(interpreter.jitstate, exceptiondesc, + + # remove the temporary exception boxes that may have been + # put on the JITState by generate_fallback_code() + jitstate.exc_type_box = exceptiondesc.null_exc_type_box + jitstate.exc_value_box = exceptiondesc.null_exc_value_box + + rtimeshift.residual_fetch(jitstate, exceptiondesc, self.check_forced, flagbox) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sat Mar 22 13:56:03 2008 @@ -1024,7 +1024,6 @@ self.check_insns_in_loops(int_add=0, int_mul=0) def test_residual_red_call_with_exc_more(self): - py.test.skip("in-progress") class MyJitDriver(JitDriver): greens = [] reds = ['i', 'x', 'res'] From arigo at codespeak.net Sat Mar 22 15:41:01 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 22 Mar 2008 15:41:01 +0100 (CET) Subject: [pypy-svn] r52828 - in pypy/branch/jit-hotpath/pypy/jit: rainbow timeshifter Message-ID: <20080322144101.6EB8616842C@codespeak.net> Author: arigo Date: Sat Mar 22 15:41:00 2008 New Revision: 52828 Added: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py (contents, props changed) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: Some RPython support code to dump the jitstate and redboxes into a nice .dot file. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sat Mar 22 15:41:00 2008 @@ -272,7 +272,7 @@ def green_result_from_red(self, gv): self.green_result(gv) - def trace(self): + def dump(self): bytecode = self.bytecode msg = '*** fallback trace: in %s position %d ***' % (bytecode.name, self.pc) @@ -286,7 +286,7 @@ @arguments() def opimpl_trace(self): - msg = self.trace() + msg = self.dump() self.interpreter.debug_trace(msg) @arguments("green", "2byte", returns="red") Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Sat Mar 22 15:41:00 2008 @@ -442,7 +442,7 @@ else: self.frame = None - def trace(self): + def dump(self): # Prints the current frame position and a dump if available. # Although this opcode is not actually generated by # codewriter.py so far, it can be called manually in a C-level @@ -455,12 +455,15 @@ print msg if bytecode.dump_copy is not None: print bytecode.dump_copy + from pypy.jit.timeshifter import rdump + rdump.dump_jitstate(self.jitstate) return msg + dump._dont_inline_ = True # operation implementations @arguments() def opimpl_trace(self): - msg = self.trace() + msg = self.dump() self.debug_trace(msg) @arguments("green", "2byte", returns="red") Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Sat Mar 22 15:41:00 2008 @@ -86,6 +86,7 @@ def __init__(self, RGenOp, TYPE): self.TYPE = TYPE self.PTRTYPE = lltype.Ptr(TYPE) + self.name = TYPE._name self.ptrkind = RGenOp.kindToken(self.PTRTYPE) self.immutable = TYPE._hints.get('immutable', False) Added: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py Sat Mar 22 15:41:00 2008 @@ -0,0 +1,240 @@ +import os +from pypy.rpython.lltypesystem import lltype, llmemory +from pypy.jit.timeshifter import rvalue, rcontainer, vlist +from pypy.rlib.objectmodel import compute_unique_id as getid + +DUMPFILENAME = '%s.dot' + + +class GraphBuilder: + + def __init__(self): + self.nodelines = [] + self.edgelines = [] + self.memo = rvalue.Memo() + self.none_counter = 0 + self.seen_ids = {} + + def done(self, basename): + lines = ['digraph %s {\n' % basename] + lines += self.nodelines + lines += self.edgelines + lines.append('}\n') + buf = ''.join(lines) + filename = DUMPFILENAME % basename + fd = os.open(filename, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0644) + while buf: + count = os.write(fd, buf) + buf = buf[count:] + os.close(fd) + print "Wrote dump to", filename + + def see(self, id): + if id in self.seen_ids: + return False + else: + self.seen_ids[id] = None + return True + + def quote(self, s): + s = '\\"'.join(s.split('"')) + s = '\\n'.join(s.split('\n')) + return s + + def iname(self, id): + if id != 0: # special support for edges pointing to None + name = 'n_%x' % id + name = name.replace('-', '_') + else: + name = 'None%d' % self.none_counter + self.none_counter += 1 + self.nodelines.append('%s [label="None", color="#A0A0A0"];\n' % + (name,)) + return name + + def emit_node(self, id, label, shape="box", fillcolor="", color=""): + args = [] + args.append('label="%s"' % self.quote(label)) + args.append('shape="%s"' % shape) + if fillcolor: + args.append('fillcolor="%s"' % fillcolor) + if color: + args.append('color="%s"' % color) + self.nodelines.append('%s [%s];\n' % (self.iname(id), ', '.join(args))) + + def emit_edge(self, id1, id2, label="", color="", weak=False): + args = [] + if label: + args.append('label="%s"' % self.quote(label)) + if color: + args.append('color="%s"' % color) + if weak: + args.append('constraint=false') + if args: + args = '[%s]' % (', '.join(args),) + else: + args = '' + self.edgelines.append('%s -> %s %s;\n' % (self.iname(id1), + self.iname(id2), + args)) + + def add_jitstate(self, jitstate): + if jitstate is None: + return 0 + id = getid(jitstate) + if self.see(id): + text = str(jitstate) + self.emit_edge(id, self.add_frame(jitstate.frame), color="red") + self.emit_edge(id, self.add_redbox(jitstate.exc_type_box), + "exc_type") + self.emit_edge(id, self.add_redbox(jitstate.exc_value_box), + "exc_value") + for i in range(len(jitstate.virtualizables)): + box = jitstate.virtualizables[i] + self.emit_edge(id, self.add_redbox(box), + "virtualizables[%d]" % i) + self.emit_node(id, text, fillcolor="#a5e6f0") + return id + + def add_frame(self, frame): + if frame is None: + return 0 + id = getid(frame) + if self.see(id): + text = str(frame) + "\\n" + if frame.bytecode is not None: + text += "bytecode = '%s'\n" % frame.bytecode.name + # XXX large nodes in dot are too annoying + #self.emit_edge(id, self.add_bytecode(frame.bytecode), + # "bytecode") + text += "pc = %d\n" % frame.pc + if frame.backframe is not None: + self.emit_edge(id, self.add_frame(frame.backframe), + color="red") + for i in range(len(frame.local_boxes)): + box = frame.local_boxes[i] + self.emit_edge(id, self.add_redbox(box), "local_boxes[%d]" % i) + self.emit_node(id, text, color="red", fillcolor="#ffd0d0") + return id + + def add_bytecode(self, bytecode): + if bytecode is None: + return 0 + id = getid(bytecode) + if self.see(id): + if bytecode.dump_copy is not None: + text = bytecode.dump_copy + else: + text = "JITCODE %s" % bytecode.name + self.emit_node(id, text, color="red", fillcolor="#FFC0C0") + return id + + def intgenvar(self, genvar): + if genvar is None: + return 'genvar=None' + elif genvar.is_const: + svalue = genvar.revealconst(lltype.Signed) + uvalue = genvar.revealconst(lltype.Unsigned) + return '%d (0x%x)' % (svalue, uvalue) + else: + return str(genvar) + + def doublegenvar(self, genvar): + if genvar is None: + return 'genvar=None' + elif genvar.is_const: + return str(genvar.revealconst(lltype.Float)) + else: + return str(genvar) + + def ptrgenvar(self, genvar): + if genvar is None: + return 'genvar=None' + elif genvar.is_const: + return str(genvar.revealconst(llmemory.Address)) + else: + return str(genvar) + + def add_redbox(self, redbox): + if redbox is None: + return 0 + id = getid(redbox) + if self.see(id): + text = "%s\\n" % str(redbox) + if isinstance(redbox, rvalue.PtrRedBox): + if redbox.genvar is None and redbox.content is not None: + text += "virtual" + else: + text += self.ptrgenvar(redbox.genvar) + if redbox.content is not None: + self.emit_edge(id, self.add_container(redbox.content)) + elif isinstance(redbox, rvalue.DoubleRedBox): + text += self.doublegenvar(redbox.genvar) + else: + text += self.intgenvar(redbox.genvar) + self.emit_node(id, text) + return id + + def add_container(self, container): + if container is None: + return 0 + id = getid(container) + if self.see(id): + text = "%s\\n" % str(container) + + if isinstance(container, rcontainer.VirtualContainer): + # most cases should arrive here, it's not exclusive for + # the cases below + self.emit_edge(id, self.add_redbox(container.ownbox), + color="#808000", weak=True) + + if isinstance(container, rcontainer.VirtualStruct): + text += container.typedesc.name + fielddescs = container.typedesc.fielddescs + for i in range(len(container.content_boxes)): + try: + name = fielddescs[i].fieldname + except IndexError: + name = 'field out of bounds (%d)' % (i,) + box = container.content_boxes[i] + self.emit_edge(id, self.add_redbox(box), name) + + if isinstance(container, vlist.VirtualList): + text += 'length %d' % len(container.item_boxes) + for i in range(len(container.item_boxes)): + box = item_boxes.item_boxes[i] + self.emit_edge(id, self.add_redbox(box), + 'item_boxes[%d]' % i) + + self.emit_node(id, text, fillcolor="#ffff60", color="#808000") + return id + +# ____________________________________________________________ +# +# Public API + +def dump_jitstate(jitstate): + gb = GraphBuilder() + gb.add_jitstate(jitstate) + gb.done("jitstate") + +def dump_frame(frame): + gb = GraphBuilder() + gb.add_frame(frame) + gb.done("frame") + +def dump_redbox(redbox): + gb = GraphBuilder() + gb.add_redbox(redbox) + gb.done("redbox") + +def dump_container(container): + gb = GraphBuilder() + gb.add_container(container) + gb.done("container") + +# keep these functions non-inlined so that they are callable from gdb +dump_jitstate._dont_inline_ = True +dump_frame._dont_inline_ = True +dump_redbox._dont_inline_ = True +dump_container._dont_inline_ = True From pedronis at codespeak.net Sat Mar 22 15:45:14 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Sat, 22 Mar 2008 15:45:14 +0100 (CET) Subject: [pypy-svn] r52829 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080322144514.2E3FD16842C@codespeak.net> Author: pedronis Date: Sat Mar 22 15:45:13 2008 New Revision: 52829 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py Log: callback stuff that ought to work and exist somewhere else as a test in limbo Modified: pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py Sat Mar 22 15:45:13 2008 @@ -161,3 +161,34 @@ proto = CFUNCTYPE(RECT, c_int) raises(TypeError, proto, lambda r: 0) + + + def test_qsort(self): + py.test.skip("WIP") + import conftest + _ctypes_test = str(conftest.sofile) + dll = CDLL(_ctypes_test) + + PI = POINTER(c_int) + A = c_int*5 + a = A() + for i in range(5): + a[i] = 5-i + + assert a[0] == 5 # sanity + + def comp(a, b): + print a,b + a = a.contents.value + b = b.contents.value + return cmp(a,b) + qs = dll.my_qsort + qs.restype = None + CMP = CFUNCTYPE(c_int, PI, PI) + qs.argtypes = (PI, c_size_t, c_size_t, CMP) + + qs(cast(a, PI), 5, sizeof(c_int), CMP(comp)) + + res = list(a) + + assert res == [1,2,3,4,5] From arigo at codespeak.net Sat Mar 22 15:48:23 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 22 Mar 2008 15:48:23 +0100 (CET) Subject: [pypy-svn] r52830 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080322144823.9E56716842C@codespeak.net> Author: arigo Date: Sat Mar 22 15:48:23 2008 New Revision: 52830 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py Log: Translation fixes. Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Sat Mar 22 15:48:23 2008 @@ -59,7 +59,7 @@ VirtualStructCls = None # patched later with VirtualStruct - _attrs_ = """TYPE PTRTYPE + _attrs_ = """TYPE PTRTYPE name firstsubstructdesc arrayfielddesc innermostdesc ptrkind Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py Sat Mar 22 15:48:23 2008 @@ -202,7 +202,7 @@ if isinstance(container, vlist.VirtualList): text += 'length %d' % len(container.item_boxes) for i in range(len(container.item_boxes)): - box = item_boxes.item_boxes[i] + box = container.item_boxes[i] self.emit_edge(id, self.add_redbox(box), 'item_boxes[%d]' % i) From arigo at codespeak.net Sat Mar 22 15:56:32 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 22 Mar 2008 15:56:32 +0100 (CET) Subject: [pypy-svn] r52831 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080322145632.C670516842B@codespeak.net> Author: arigo Date: Sat Mar 22 15:56:29 2008 New Revision: 52831 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py Log: Seems to work. Add some documentation. Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py Sat Mar 22 15:56:29 2008 @@ -1,3 +1,14 @@ +"""Dumps jitstates, frames, redboxes and containers as a .dot file. + +Usage from a C-level debugger: call one the following global functions +with a pointer to the object in question as a single argument: + + * pypy_g_dump_jitstate() + * pypy_g_dump_frame() + * pypy_g_dump_redbox() + * pypy_g_dump_container() + +""" import os from pypy.rpython.lltypesystem import lltype, llmemory from pypy.jit.timeshifter import rvalue, rcontainer, vlist From arigo at codespeak.net Sat Mar 22 17:05:47 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 22 Mar 2008 17:05:47 +0100 (CET) Subject: [pypy-svn] r52832 - in pypy/branch/jit-hotpath/pypy/jit: rainbow/test timeshifter Message-ID: <20080322160547.CA4FF16843A@codespeak.net> Author: arigo Date: Sat Mar 22 17:05:45 2008 New Revision: 52832 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py Log: Put a smaller number of tests in test_hp_llinterp. Translation fixes. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py Sat Mar 22 17:05:45 2008 @@ -2,21 +2,37 @@ import py from pypy.jit.conftest import option -from pypy.jit.rainbow.test import test_hotpath, test_hp_promotion if option.quicktest: py.test.skip("slow") -class TestLLInterpreted(test_hotpath.TestHotPath): - translate_support_code = True - - # for the individual tests see - # ====> test_hotpath.py - - -class TestLLInterpreted(test_hp_promotion.TestHotPromotion): - translate_support_code = True - - # for the individual tests see - # ====> test_hp_promotion.py +def llinterp(unbound_method): + cls = unbound_method.im_class + cls.setup_class.im_func(cls) + try: + self = cls() + self.translate_support_code = True + unbound_method(self) + finally: + cls.teardown_class.im_func(cls) + +# ____________________________________________________________ +# it takes ages to run all these tests, and a few of them are more or less +# enough to pinpoint all the translation issues + +def test_simple_loop(): + from pypy.jit.rainbow.test.test_hotpath import TestHotPath + llinterp(TestHotPath.test_simple_loop) + +def test_hp_tlr(): + from pypy.jit.rainbow.test.test_hotpath import TestHotPath + llinterp(TestHotPath.test_hp_tlr) + +def test_green_across_global_mp(): + from pypy.jit.rainbow.test.test_hp_promotion import TestHotPromotion + llinterp(TestHotPromotion.test_green_across_global_mp) + +def test_simple_interpreter_with_frame_with_stack(): + from pypy.jit.rainbow.test.test_hp_virtualizable import TestVirtualizableImplicit + llinterp(TestVirtualizableImplicit.test_simple_interpreter_with_frame_with_stack) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py Sat Mar 22 17:05:45 2008 @@ -13,6 +13,7 @@ from pypy.rpython.lltypesystem import lltype, llmemory from pypy.jit.timeshifter import rvalue, rcontainer, vlist from pypy.rlib.objectmodel import compute_unique_id as getid +from pypy.tool.pairtype import extendabletype DUMPFILENAME = '%s.dot' @@ -171,18 +172,7 @@ return 0 id = getid(redbox) if self.see(id): - text = "%s\\n" % str(redbox) - if isinstance(redbox, rvalue.PtrRedBox): - if redbox.genvar is None and redbox.content is not None: - text += "virtual" - else: - text += self.ptrgenvar(redbox.genvar) - if redbox.content is not None: - self.emit_edge(id, self.add_container(redbox.content)) - elif isinstance(redbox, rvalue.DoubleRedBox): - text += self.doublegenvar(redbox.genvar) - else: - text += self.intgenvar(redbox.genvar) + text = "%s\\n%s" % (str(redbox), redbox._rdump(id, self)) self.emit_node(id, text) return id @@ -191,35 +181,66 @@ return 0 id = getid(container) if self.see(id): - text = "%s\\n" % str(container) - - if isinstance(container, rcontainer.VirtualContainer): - # most cases should arrive here, it's not exclusive for - # the cases below - self.emit_edge(id, self.add_redbox(container.ownbox), - color="#808000", weak=True) - - if isinstance(container, rcontainer.VirtualStruct): - text += container.typedesc.name - fielddescs = container.typedesc.fielddescs - for i in range(len(container.content_boxes)): - try: - name = fielddescs[i].fieldname - except IndexError: - name = 'field out of bounds (%d)' % (i,) - box = container.content_boxes[i] - self.emit_edge(id, self.add_redbox(box), name) - - if isinstance(container, vlist.VirtualList): - text += 'length %d' % len(container.item_boxes) - for i in range(len(container.item_boxes)): - box = container.item_boxes[i] - self.emit_edge(id, self.add_redbox(box), - 'item_boxes[%d]' % i) - + text = "%s\\n%s" % (str(container), container._rdump(id, self)) self.emit_node(id, text, fillcolor="#ffff60", color="#808000") return id +# We need to avoid using isinstance(x, Cls) because it forces the +# Classes to be seen by the annotator even if the rest of the code is +# not using them; then it chokes because they don't have the attributes +# we are trying to read... + +class __extend__(rvalue.RedBox): + __metaclass__ = extendabletype + def _rdump(self, id, gb): + return gb.intgenvar(self.genvar) + +class __extend__(rvalue.PtrRedBox): + __metaclass__ = extendabletype + def _rdump(self, id, gb): + if self.content is not None: + gb.emit_edge(id, gb.add_container(self.content)) + if self.genvar is None: + return "virtual" + return gb.ptrgenvar(self.genvar) + +class __extend__(rvalue.DoubleRedBox): + __metaclass__ = extendabletype + def _rdump(self, id, gb): + return gb.doublegenvar(self.genvar) + + +class __extend__(rcontainer.VirtualContainer): + __metaclass__ = extendabletype + def _rdump(self, id, gb): + gb.emit_edge(id, gb.add_redbox(self.ownbox), + color="#808000", weak=True) + return '' + +class __extend__(rcontainer.VirtualStruct): + __metaclass__ = extendabletype + def _rdump(self, id, gb): + rcontainer.VirtualContainer._rdump(self, id, gb) + fielddescs = self.typedesc.fielddescs + for i in range(len(self.content_boxes)): + try: + name = fielddescs[i].fieldname + except IndexError: + name = 'field out of bounds (%d)' % (i,) + box = self.content_boxes[i] + gb.emit_edge(id, gb.add_redbox(box), name) + return self.typedesc.name + +class __extend__(vlist.VirtualList): + __metaclass__ = extendabletype + def _rdump(self, id, gb): + rcontainer.VirtualContainer._rdump(self, id, gb) + for i in range(len(self.item_boxes)): + box = self.item_boxes[i] + gb.emit_edge(id, gb.add_redbox(box), + 'item_boxes[%d]' % i) + return 'length %d' % len(self.item_boxes) + # ____________________________________________________________ # # Public API From arigo at codespeak.net Sat Mar 22 17:21:58 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 22 Mar 2008 17:21:58 +0100 (CET) Subject: [pypy-svn] r52833 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080322162158.50766168431@codespeak.net> Author: arigo Date: Sat Mar 22 17:21:55 2008 New Revision: 52833 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py Log: * Don't run several sub-tests in each hp_llinterp test. * Add a test for a not-implemented case in fallback.py. * Implement that case. * Translation fix. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sat Mar 22 17:21:55 2008 @@ -3,6 +3,7 @@ from pypy.rlib.objectmodel import we_are_translated, CDefinedIntSymbolic from pypy.rpython.lltypesystem import lltype, llmemory, lloperation from pypy.rpython.annlowlevel import cast_base_ptr_to_instance +from pypy.rpython.annlowlevel import cast_instance_to_base_ptr from pypy.jit.timeshifter import rvalue, rcontainer from pypy.jit.timeshifter.greenkey import empty_key, GreenKey from pypy.jit.rainbow.interpreter import SIGN_EXTEND2, arguments @@ -135,7 +136,8 @@ self.gv_exc_type = self.rgenop.genconst(llexctype) self.gv_exc_value = self.rgenop.genconst(llvalue) else: - Xxx("capture_exception") + ll_evalue = cast_instance_to_base_ptr(e) + self.residual_ll_exception(ll_evalue) def residual_ll_exception(self, ll_evalue): ll_etype = self.hotrunnerdesc.ts.get_typeptr(ll_evalue) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sat Mar 22 17:21:55 2008 @@ -1015,9 +1015,11 @@ return res stop_at_h = StopAtXPolicy(h) - res = self.run(f, [20], threshold=2, policy=stop_at_h) - assert res == 42 - self.check_insns_in_loops(int_add=0, int_mul=1) + if not self.translate_support_code: + # one case is enough if translating the support code + res = self.run(f, [20], threshold=2, policy=stop_at_h) + assert res == 42 + self.check_insns_in_loops(int_add=0, int_mul=1) res = self.run(f, [-20], threshold=2, policy=stop_at_h) assert res == 7 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py Sat Mar 22 17:21:55 2008 @@ -33,6 +33,10 @@ from pypy.jit.rainbow.test.test_hp_promotion import TestHotPromotion llinterp(TestHotPromotion.test_green_across_global_mp) +def test_residual_red_call_with_exc(): + from pypy.jit.rainbow.test.test_hp_interpreter import TestHotInterpreter + llinterp(TestHotInterpreter.test_residual_red_call_with_exc) + def test_simple_interpreter_with_frame_with_stack(): from pypy.jit.rainbow.test.test_hp_virtualizable import TestVirtualizableImplicit llinterp(TestVirtualizableImplicit.test_simple_interpreter_with_frame_with_stack) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py Sat Mar 22 17:21:55 2008 @@ -346,8 +346,10 @@ def main(n2, n4, total): return ll_function(None, n2, None, n4, total) - res = self.run(main, [7, 3, 100], threshold=2) - assert res == main(7, 3, 100) + if not self.translate_support_code: + # one case is enough if translating the support code + res = self.run(main, [7, 3, 100], threshold=2) + assert res == main(7, 3, 100) res = self.run(main, [7, 3, 100], threshold=1) assert res == main(7, 3, 100) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Sat Mar 22 17:21:55 2008 @@ -1723,16 +1723,18 @@ assert main(15, 1, -2) == ((((16*3+13)*3+10)*3+7)*3+4)*3+1 main(41, 2, -3) # to check that this works too - res = self.run(main, [38, 0, 42], threshold=2, - policy=StopAtXPolicy(Frame.debug.im_func)) - assert res == 40*3+45 - self.check_nothing_compiled_at_all() - - res = self.run(main, [15, 1, -2], threshold=2, - policy=StopAtXPolicy(Frame.debug.im_func)) - assert res == ((((16*3+13)*3+10)*3+7)*3+4)*3+1 - self.check_insns_in_loops({'int_sub': 1, 'int_gt': 1, - 'int_mul': 1, 'int_add': 1}) + if not self.translate_support_code: + # one case is enough if translating the support code + res = self.run(main, [38, 0, 42], threshold=2, + policy=StopAtXPolicy(Frame.debug.im_func)) + assert res == 40*3+45 + self.check_nothing_compiled_at_all() + + res = self.run(main, [15, 1, -2], threshold=2, + policy=StopAtXPolicy(Frame.debug.im_func)) + assert res == ((((16*3+13)*3+10)*3+7)*3+4)*3+1 + self.check_insns_in_loops({'int_sub': 1, 'int_gt': 1, + 'int_mul': 1, 'int_add': 1}) res = self.run(main, [41, 2, -3], threshold=2, policy=StopAtXPolicy(Frame.debug.im_func)) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py Sat Mar 22 17:21:55 2008 @@ -210,6 +210,11 @@ return gb.doublegenvar(self.genvar) +class __extend__(rcontainer.AbstractContainer): + __metaclass__ = extendabletype + def _rdump(self, id, gb): + return '' + class __extend__(rcontainer.VirtualContainer): __metaclass__ = extendabletype def _rdump(self, id, gb): From arigo at codespeak.net Sat Mar 22 17:33:15 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 22 Mar 2008 17:33:15 +0100 (CET) Subject: [pypy-svn] r52834 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080322163315.DD897168433@codespeak.net> Author: arigo Date: Sat Mar 22 17:33:15 2008 New Revision: 52834 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Log: Small tweaks. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sat Mar 22 17:33:15 2008 @@ -467,6 +467,8 @@ if self.hannotator.policy.hotpath and color == "red": self.emit("hp_red_goto_iftrue") elif reverse is not None: + assert not self.hannotator.policy.hotpath, ( + """XXX reimplement me for the hotpath policy""") self.emit("red_goto_ifptrnonzero") self.emit(reverse) self.emit(ptrindex) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sat Mar 22 17:33:15 2008 @@ -317,13 +317,11 @@ self.pc = targets[i] break - @arguments("bool", "red", "red", "jumptarget") - def opimpl_red_goto_ifptrnonzero(self, reverse, gv_ptr, gv_switch, target): - Xxx("red_goto_ifptrnonzero") - @arguments("red", "jumptarget") def opimpl_goto_if_constant(self, gv_value, target): - Xxx("goto_if_constant") + # it is probably better to consider the value as non-constant to + # avoid the logic that typically follows the constant case. + pass @arguments("red", returns="red") @@ -357,18 +355,9 @@ def opimpl_make_new_redvars(self, local_red): self.local_red = local_red - def opimpl_make_new_greenvars(self): - # this uses a "green_varargs" argument, but we do the decoding - # manually for the fast case - num = self.load_2byte() - if num == 0 and len(self.local_green) == 0: - # fast (very common) case - return - newgreens = [] - for i in range(num): - newgreens.append(self.get_greenarg()) + @arguments("green_varargs") + def opimpl_make_new_greenvars(self, newgreens): self.local_green = newgreens - opimpl_make_new_greenvars.argspec = arguments("green_varargs") @arguments("green", "calldesc", "green_varargs") def opimpl_green_call(self, gv_fnptr, calldesc, greenargs): From arigo at codespeak.net Sat Mar 22 17:39:20 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 22 Mar 2008 17:39:20 +0100 (CET) Subject: [pypy-svn] r52835 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080322163920.5943A168437@codespeak.net> Author: arigo Date: Sat Mar 22 17:39:20 2008 New Revision: 52835 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Log: Explain why this should be unreachable. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sat Mar 22 17:39:20 2008 @@ -402,7 +402,11 @@ @arguments("metacalldesc", "red_varargs", returns="red") def opimpl_metacall(self, metafunc, redargs): - Xxx("metacall") + # the fallback interp should not reach this opcode, because it + # only occurs inside a small stub graph. The stub graph is not + # interpreted but instead the original function it corresponds + # to is called. + assert 0, "unreachable" # exceptions @@ -671,8 +675,3 @@ # the argspec may unwrap *args_gv from local_red or local_green # and put the result back into local_red or local_green return argspec(implementation) - - -def Xxx(msg): - lloperation.llop.debug_fatalerror(lltype.Void, "not implemented: " + msg) - assert 0 From cfbolz at codespeak.net Sat Mar 22 20:04:24 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 22 Mar 2008 20:04:24 +0100 (CET) Subject: [pypy-svn] r52836 - pypy/dist/pypy/module/_rawffi Message-ID: <20080322190424.AE46F168429@codespeak.net> Author: cfbolz Date: Sat Mar 22 20:04:22 2008 New Revision: 52836 Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py Log: prevent "demoting" warning Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/interp_rawffi.py (original) +++ pypy/dist/pypy/module/_rawffi/interp_rawffi.py Sat Mar 22 20:04:22 2008 @@ -270,6 +270,9 @@ return space.wrap(RawFFIBuffer(self)) descr_buffer.unwrap_spec = ['self', ObjSpace] + def getrawsize(self): + raise NotImplementedError("abstract base class") + def unwrap_truncate_int(TP, space, w_arg): if space.is_true(space.isinstance(w_arg, space.w_int)): return rffi.cast(TP, space.int_w(w_arg)) From cfbolz at codespeak.net Sat Mar 22 21:11:13 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 22 Mar 2008 21:11:13 +0100 (CET) Subject: [pypy-svn] r52837 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080322201113.1C8BD16843A@codespeak.net> Author: cfbolz Date: Sat Mar 22 21:11:10 2008 New Revision: 52837 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py Log: don't use negativity to encode information, use even/oddness Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sat Mar 22 21:11:10 2008 @@ -656,7 +656,7 @@ assert isinstance(arg, flowmodel.Variable) or not check assert getattr(arg, 'concretetype', '?') is not lltype.Void if where is None: - where = self.free_green[self.current_block] + where = self.free_green[self.current_block] * 2 self.free_green[self.current_block] += 1 if verbose: self.emit('# => g%d' % (where,)) @@ -665,8 +665,9 @@ def green_position(self, arg): if isinstance(arg, flowmodel.Variable): + # greenvar_positions contains even numbers usually return self.greenvar_positions[arg] - return ~self.const_position(arg) + return self.const_position(arg) * 2 + 1 def const_position(self, const): if const in self.const_positions: @@ -1565,7 +1566,7 @@ greens_v, reds_v = self.check_hp_hint_args(op) key = () for i, v in enumerate(greens_v): - assert self.green_position(v) == i + assert self.green_position(v) == i * 2 key += (v.concretetype,) for i, v in enumerate(reds_v): assert self.redvar_position(v) == i Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py Sat Mar 22 21:11:10 2008 @@ -38,9 +38,9 @@ def get_greenarg(self): i = self.load_2byte() - if i < 0: - return self.jitcode.constants[~i] - return CustomRepr('g%d' % i) + if i % 2: + return self.jitcode.constants[i // 2] + return CustomRepr('g%d' % (i // 2)) def get_green_varargs(self): greenargs = [] Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sat Mar 22 21:11:10 2008 @@ -234,9 +234,9 @@ def get_greenarg(self): i = self.load_2byte() - if i < 0: - return self.bytecode.constants[~i] - return self.local_green[i] + if i % 2: + return self.bytecode.constants[i // 2] + return self.local_green[i // 2] def get_green_varargs(self): greenargs = [] Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Sat Mar 22 21:11:10 2008 @@ -391,9 +391,9 @@ def get_greenarg(self): i = self.load_2byte() - if i < 0: - return self.frame.bytecode.constants[~i] - return self.frame.local_green[i] + if i % 2: + return self.frame.bytecode.constants[i // 2] + return self.frame.local_green[i // 2] def get_green_varargs(self): greenargs = [] Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py Sat Mar 22 21:11:10 2008 @@ -72,7 +72,7 @@ return x + 1 writer, jitcode = self.serialize(f, [int]) assert jitcode.code == assemble(writer.interpreter, - "make_redbox", -1, 0, + "make_redbox", 1, 0, "red_int_add", 0, 1, "make_new_redvars", 1, 2, "red_return") @@ -92,7 +92,7 @@ writer, jitcode = self.serialize(f, [int, int, int]) expected = assemble(writer.interpreter, "green_int_is_true", 0, - "green_goto_iftrue", 1, tlabel("true"), + "green_goto_iftrue", 2, tlabel("true"), "make_new_redvars", 1, 1, "make_new_greenvars", 0, label("return"), @@ -118,7 +118,7 @@ writer, jitcode = self.serialize(f, [int, int, int]) expected = assemble(writer.interpreter, "green_int_is_true", 0, - "green_goto_iftrue", 1, tlabel("true"), + "green_goto_iftrue", 2, tlabel("true"), "make_new_redvars", 2, 0, 1, "make_new_greenvars", 0, label("sub"), @@ -156,7 +156,7 @@ "make_new_redvars", 1, 2, label("after"), "local_merge", 0, -1, - "make_redbox", -1, 0, + "make_redbox", 1, 0, "red_int_add", 1, 0, "make_new_redvars", 1, 2, "red_return", @@ -181,11 +181,11 @@ return r writer, jitcode = self.serialize(f, [int]) expected = assemble(writer.interpreter, - "make_redbox", -1, 0, + "make_redbox", 1, 0, "make_new_redvars", 2, 0, 1, "make_new_greenvars", 0, label("while"), - "local_merge", 0, -1, + "local_merge", 0, 1, "red_int_is_true", 0, "red_goto_iftrue", 2, tlabel("body"), "make_new_redvars", 1, 0, @@ -195,7 +195,7 @@ "make_new_redvars", 2, 0, 1, "make_new_greenvars", 0, "red_int_add", 1, 0, - "make_redbox", -2, 0, + "make_redbox", 3, 0, "red_int_sub", 0, 3, "make_new_redvars", 2, 2, 4, "goto", tlabel("while")) @@ -248,7 +248,7 @@ writer, jitcode = self.serialize(f, [int]) assert jitcode.code == assemble(writer.interpreter, "red_direct_call", 0, 1, 0, 0, - "make_redbox", -1, 0, + "make_redbox", 1, 0, "red_int_mul", 1, 2, "make_new_redvars", 1, 3, "red_return") @@ -256,7 +256,7 @@ assert len(jitcode.called_bytecodes) == 1 called_jitcode = jitcode.called_bytecodes[0] assert called_jitcode.code == assemble(writer.interpreter, - "make_redbox", -1, 0, + "make_redbox", 1, 0, "red_int_add", 0, 1, "make_new_redvars", 1, 2, "red_return") @@ -273,8 +273,8 @@ writer, jitcode = self.serialize(ll_function, [int]) assert jitcode.code == assemble(writer.interpreter, - "green_call", -1, 0, 1, 0, - "make_redbox", 1, 0, + "green_call", 1, 0, 1, 0, + "make_redbox", 2, 0, "make_new_redvars", 1, 0, "make_new_greenvars", 0, "red_return") @@ -296,8 +296,8 @@ assert jitcode.code == assemble(writer.interpreter, "yellow_direct_call", 0, 1, 0, 0, "yellow_retrieve_result", - "green_int_add", 0, -1, - "make_redbox", 1, 0, + "green_int_add", 0, 1, + "make_redbox", 2, 0, "make_new_redvars", 1, 1, "make_new_greenvars", 0, "red_return") @@ -305,16 +305,16 @@ assert len(jitcode.called_bytecodes) == 1 called_jitcode = jitcode.called_bytecodes[0] assert called_jitcode.code == assemble(writer.interpreter, - "make_redbox", -1, 0, + "make_redbox", 1, 0, "red_int_gt", 0, 1, "red_goto_iftrue", 2, tlabel("true"), "make_new_redvars", 0, - "make_new_greenvars", 1, -2, + "make_new_greenvars", 1, 3, label("return"), "yellow_return", label("true"), "make_new_redvars", 0, - "make_new_greenvars", 1, -3, + "make_new_greenvars", 1, 5, "goto", tlabel("return") ) assert not called_jitcode.is_portal From arigo at codespeak.net Sat Mar 22 21:19:32 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 22 Mar 2008 21:19:32 +0100 (CET) Subject: [pypy-svn] r52838 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080322201932.0C46216843D@codespeak.net> Author: arigo Date: Sat Mar 22 21:19:32 2008 New Revision: 52838 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: Test and fix for Void arguments in mixed argument colors in calls performed by the fallback interpreter. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sat Mar 22 21:19:32 2008 @@ -302,6 +302,8 @@ colororder = "" in_order = True # "in order" means allgreens+allreds for v in graph.getargs(): + if v.concretetype is lltype.Void: + continue if self.hannotator.binding(v).is_green(): if "r" in colororder: in_order = False Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sat Mar 22 21:19:32 2008 @@ -324,6 +324,39 @@ res = self.run(ll_function, [1, 2, 4, 8], threshold=2) assert res == ll_function(1, 2, 4, 8) + def test_call_mixed_color_args_with_void(self): + class MyJitDriver(JitDriver): + greens = ['g1', 'g2'] + reds = ['r1', 'r2', 'i', 'res'] + + def ll_vrg(a, b, c): return 1 + 3*b + 7*c + def ll_gvr(a, b, c): return a + 3*1 + 7*c + def ll_rgv(a, b, c): return a + 3*b + 7*1 + def ll_vgr(a, b, c): return 1 + 3*b + 7*c + def ll_rvg(a, b, c): return a + 3*1 + 7*c + def ll_grv(a, b, c): return a + 3*b + 7*1 + + def ll_function(g1, g2, r1, r2): + i = 1024 + while i > 0: + i >>= 1 + vv = None + res = (ll_vrg(vv, r1, g2) * 1 + + ll_gvr(g1, vv, r2) * 10 + + ll_rgv(r2, g1, vv) * 100 + + ll_vgr(vv, g2, r2) * 1000 + + ll_rvg(r2, vv, g1) * 10000 + + ll_grv(g1, r2, vv) * 100000) + hint(g1, concrete=True) + hint(g2, concrete=True) + MyJitDriver.jit_merge_point(g1=g1, g2=g2, r1=r1, r2=r2, + i=i, res=res) + MyJitDriver.can_enter_jit(g1=g1, g2=g2, r1=r1, r2=r2, + i=i, res=res) + return res + res = self.run(ll_function, [1, 2, 4, 8], threshold=2) + assert res == ll_function(1, 2, 4, 8) + def test_void_call(self): class MyJitDriver(JitDriver): greens = [] From cfbolz at codespeak.net Sat Mar 22 21:31:44 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 22 Mar 2008 21:31:44 +0100 (CET) Subject: [pypy-svn] r52839 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080322203144.89AA7168435@codespeak.net> Author: cfbolz Date: Sat Mar 22 21:31:43 2008 New Revision: 52839 Added: pypy/dist/pypy/lib/app_test/ctypes/test_find.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_find.py Log: port over ctypes test file: passes From cfbolz at codespeak.net Sat Mar 22 21:42:01 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 22 Mar 2008 21:42:01 +0100 (CET) Subject: [pypy-svn] r52840 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080322204201.8CFB2168418@codespeak.net> Author: cfbolz Date: Sat Mar 22 21:42:01 2008 New Revision: 52840 Added: pypy/dist/pypy/lib/app_test/ctypes/test_incomplete.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_incomplete.py Log: passes From cfbolz at codespeak.net Sat Mar 22 21:45:38 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 22 Mar 2008 21:45:38 +0100 (CET) Subject: [pypy-svn] r52841 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080322204538.63F0B168419@codespeak.net> Author: cfbolz Date: Sat Mar 22 21:45:38 2008 New Revision: 52841 Added: pypy/dist/pypy/lib/app_test/ctypes/test_init.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_init.py Log: port another test. it fails, but looks obscure From cfbolz at codespeak.net Sat Mar 22 21:46:45 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 22 Mar 2008 21:46:45 +0100 (CET) Subject: [pypy-svn] r52842 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080322204645.F3458168419@codespeak.net> Author: cfbolz Date: Sat Mar 22 21:46:45 2008 New Revision: 52842 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py Log: don't use negative numbers for green keys either Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sat Mar 22 21:46:45 2008 @@ -691,14 +691,14 @@ def keydesc_position(self, key): # key is a tuple of TYPEs if not key: - keyindex = -1 # use prebuilt empty_key + return 0 # use prebuilt empty_key elif key not in self.keydesc_positions: keyindex = len(self.keydesc_positions) self.keydesc_positions[key] = keyindex self.keydescs.append(KeyDesc(self.RGenOp, *key)) else: keyindex = self.keydesc_positions[key] - return keyindex + return keyindex + 1 def structtypedesc_position(self, TYPE): if TYPE in self.structtypedesc_positions: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py Sat Mar 22 21:46:45 2008 @@ -61,10 +61,10 @@ def get_greenkey(self): keydescnum = self.load_2byte() - if keydescnum == -1: + if keydescnum == 0: return None else: - keydesc = self.jitcode.keydescs[keydescnum] + keydesc = self.jitcode.keydescs[keydescnum - 1] return keydesc def load_4byte(self): # for jump targets Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sat Mar 22 21:46:45 2008 @@ -257,10 +257,10 @@ def get_greenkey(self): keydescnum = self.load_2byte() - if keydescnum == -1: + if keydescnum == 0: return empty_key else: - keydesc = self.bytecode.keydescs[keydescnum] + keydesc = self.bytecode.keydescs[keydescnum - 1] return GreenKey(self.local_green[:keydesc.nb_vals], keydesc) def red_result(self, gv): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Sat Mar 22 21:46:45 2008 @@ -414,10 +414,10 @@ def get_greenkey(self): keydescnum = self.load_2byte() - if keydescnum == -1: + if keydescnum == 0: return empty_key else: - keydesc = self.frame.bytecode.keydescs[keydescnum] + keydesc = self.frame.bytecode.keydescs[keydescnum - 1] return GreenKey(self.frame.local_green[:keydesc.nb_vals], keydesc) def red_result(self, box): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py Sat Mar 22 21:46:45 2008 @@ -155,7 +155,7 @@ "red_int_add", 0, 1, "make_new_redvars", 1, 2, label("after"), - "local_merge", 0, -1, + "local_merge", 0, 0, "make_redbox", 1, 0, "red_int_add", 1, 0, "make_new_redvars", 1, 2, From cfbolz at codespeak.net Sat Mar 22 21:51:17 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 22 Mar 2008 21:51:17 +0100 (CET) Subject: [pypy-svn] r52843 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080322205117.B3383168419@codespeak.net> Author: cfbolz Date: Sat Mar 22 21:51:17 2008 New Revision: 52843 Added: pypy/dist/pypy/lib/app_test/ctypes/description.txt (contents, props changed) pypy/dist/pypy/lib/app_test/ctypes/test_bitfields.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_bitfields.py pypy/dist/pypy/lib/app_test/ctypes/test_funcptr.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_funcptr.py Log: port some more tests. start description file about status of tests Added: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- (empty file) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sat Mar 22 21:51:17 2008 @@ -0,0 +1,26 @@ +test_bitfields.py # bitfields not supported +test_byteswap.py # __ctype_be__ and __ctypes_le__ not implemented +test_checkretval.py +test_errcheck.py # empty +test_init.py # obscure +test_internals.py # uses gc.getrefcounts +test_keeprefs.py +test_libc.py +test_loading.py +test_macholib.py # OS X specific +test_objects.py +test_parameters.py +test_prototypes.py +test_python_api.py # CPython specific +test_random_things.py +test_refcounts.py # CPython specific +test_repr.py +test_returnfuncptrs.py +test_simplesubclasses.py +test_slicing.py +test_stringptr.py +test_struct_fields.py +test_unaligned_structures.py +test_values.py +test_varsize_struct.py +test_win32.py # Windows specific From cfbolz at codespeak.net Sat Mar 22 22:00:32 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 22 Mar 2008 22:00:32 +0100 (CET) Subject: [pypy-svn] r52844 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080322210032.85107168421@codespeak.net> Author: cfbolz Date: Sat Mar 22 22:00:29 2008 New Revision: 52844 Added: pypy/dist/pypy/lib/app_test/ctypes/test_keeprefs.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_keeprefs.py Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt Log: port test. tests implementation details in my opinion Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/description.txt (original) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sat Mar 22 22:00:29 2008 @@ -4,7 +4,7 @@ test_errcheck.py # empty test_init.py # obscure test_internals.py # uses gc.getrefcounts -test_keeprefs.py +test_keeprefs.py # implementation details: ._objects test_libc.py test_loading.py test_macholib.py # OS X specific From cfbolz at codespeak.net Sat Mar 22 22:11:35 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 22 Mar 2008 22:11:35 +0100 (CET) Subject: [pypy-svn] r52845 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080322211135.C8FB216842D@codespeak.net> Author: cfbolz Date: Sat Mar 22 22:11:35 2008 New Revision: 52845 Added: pypy/dist/pypy/lib/app_test/ctypes/test_loading.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_loading.py Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt Log: passes Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/description.txt (original) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sat Mar 22 22:11:35 2008 @@ -6,7 +6,6 @@ test_internals.py # uses gc.getrefcounts test_keeprefs.py # implementation details: ._objects test_libc.py -test_loading.py test_macholib.py # OS X specific test_objects.py test_parameters.py From cfbolz at codespeak.net Sat Mar 22 23:35:03 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 22 Mar 2008 23:35:03 +0100 (CET) Subject: [pypy-svn] r52846 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080322223503.B7E59168427@codespeak.net> Author: cfbolz Date: Sat Mar 22 23:35:01 2008 New Revision: 52846 Added: pypy/dist/pypy/lib/app_test/ctypes/test_prototypes.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_prototypes.py Modified: pypy/dist/pypy/lib/_ctypes/function.py pypy/dist/pypy/lib/app_test/ctypes/description.txt Log: port more tests, fix a bug Modified: pypy/dist/pypy/lib/_ctypes/function.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/function.py (original) +++ pypy/dist/pypy/lib/_ctypes/function.py Sat Mar 22 23:35:01 2008 @@ -49,7 +49,11 @@ elif callable(argument): self.callable = argument argtypes = [arg._ffiargshape for arg in self._argtypes_] - restype = self._restype_._ffiargshape + restype = self._restype_ + if restype is not None: + restype = restype._ffiargshape + else: + restype = 'O' # void self._ptr = _rawffi.CallbackPtr(argument, argtypes, restype) self._needs_free = True self._buffer = self._ptr.byptr() Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/description.txt (original) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sat Mar 22 23:35:01 2008 @@ -7,7 +7,7 @@ test_keeprefs.py # implementation details: ._objects test_libc.py test_macholib.py # OS X specific -test_objects.py +test_objects.py # implementation details: ._objects test_parameters.py test_prototypes.py test_python_api.py # CPython specific From cfbolz at codespeak.net Sat Mar 22 23:57:32 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 22 Mar 2008 23:57:32 +0100 (CET) Subject: [pypy-svn] r52847 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080322225732.97DC3168418@codespeak.net> Author: cfbolz Date: Sat Mar 22 23:57:31 2008 New Revision: 52847 Added: pypy/dist/pypy/lib/app_test/ctypes/test_repr.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_repr.py Modified: pypy/dist/pypy/lib/_ctypes/primitive.py pypy/dist/pypy/lib/app_test/ctypes/description.txt Log: port repr test. at least make it import, even though the tests fail. Modified: pypy/dist/pypy/lib/_ctypes/primitive.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/primitive.py (original) +++ pypy/dist/pypy/lib/_ctypes/primitive.py Sat Mar 22 23:57:31 2008 @@ -47,7 +47,15 @@ class SimpleType(_CDataMeta): def __new__(self, name, bases, dct): - tp = dct['_type_'] + try: + tp = dct['_type_'] + except KeyError: + for base in bases: + if hasattr(base, '_type_'): + tp = base._type_ + break + else: + raise AttributeError("cannot find _type_ attribute") if (not isinstance(tp, str) or not len(tp) == 1 or tp not in SIMPLE_TYPE_CHARS): Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/description.txt (original) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sat Mar 22 23:57:31 2008 @@ -9,11 +9,10 @@ test_macholib.py # OS X specific test_objects.py # implementation details: ._objects test_parameters.py -test_prototypes.py test_python_api.py # CPython specific test_random_things.py test_refcounts.py # CPython specific -test_repr.py +test_repr.py # not implemented test_returnfuncptrs.py test_simplesubclasses.py test_slicing.py From cfbolz at codespeak.net Sat Mar 22 23:58:21 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 22 Mar 2008 23:58:21 +0100 (CET) Subject: [pypy-svn] r52848 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080322225821.A1854168418@codespeak.net> Author: cfbolz Date: Sat Mar 22 23:58:20 2008 New Revision: 52848 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_bitfields.py Log: missing import Modified: pypy/dist/pypy/lib/app_test/ctypes/test_bitfields.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_bitfields.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_bitfields.py Sat Mar 22 23:58:20 2008 @@ -1,3 +1,4 @@ +import py from ctypes import * from support import BaseCTypesTestChecker import os From cfbolz at codespeak.net Sun Mar 23 00:05:14 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 23 Mar 2008 00:05:14 +0100 (CET) Subject: [pypy-svn] r52849 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080322230514.68459168418@codespeak.net> Author: cfbolz Date: Sun Mar 23 00:05:13 2008 New Revision: 52849 Added: pypy/dist/pypy/lib/app_test/ctypes/test_values.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_values.py Log: port another file From cfbolz at codespeak.net Sun Mar 23 00:10:38 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 23 Mar 2008 00:10:38 +0100 (CET) Subject: [pypy-svn] r52850 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080322231038.05E58168418@codespeak.net> Author: cfbolz Date: Sun Mar 23 00:10:38 2008 New Revision: 52850 Added: pypy/dist/pypy/lib/app_test/ctypes/test_stringptr.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_stringptr.py Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt Log: port another one Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/description.txt (original) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sun Mar 23 00:10:38 2008 @@ -19,6 +19,6 @@ test_stringptr.py test_struct_fields.py test_unaligned_structures.py -test_values.py +test_values.py # some strange stuff test_varsize_struct.py test_win32.py # Windows specific From cfbolz at codespeak.net Sun Mar 23 00:15:39 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 23 Mar 2008 00:15:39 +0100 (CET) Subject: [pypy-svn] r52851 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080322231539.2B686168412@codespeak.net> Author: cfbolz Date: Sun Mar 23 00:15:39 2008 New Revision: 52851 Added: pypy/dist/pypy/lib/app_test/ctypes/test_slicing.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_slicing.py Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt pypy/dist/pypy/lib/app_test/ctypes/test_stringptr.py Log: port another test file. works, but one test leaks Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/description.txt (original) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sun Mar 23 00:15:39 2008 @@ -15,8 +15,6 @@ test_repr.py # not implemented test_returnfuncptrs.py test_simplesubclasses.py -test_slicing.py -test_stringptr.py test_struct_fields.py test_unaligned_structures.py test_values.py # some strange stuff Modified: pypy/dist/pypy/lib/app_test/ctypes/test_stringptr.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_stringptr.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_stringptr.py Sun Mar 23 00:15:39 2008 @@ -7,6 +7,7 @@ _ctypes_test = str(conftest.sofile) mod.lib = CDLL(_ctypes_test) + class TestStringPtr(BaseCTypesTestChecker): def test__POINTER_c_char(self): From cfbolz at codespeak.net Sun Mar 23 00:20:43 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 23 Mar 2008 00:20:43 +0100 (CET) Subject: [pypy-svn] r52852 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080322232043.E0443168412@codespeak.net> Author: cfbolz Date: Sun Mar 23 00:20:37 2008 New Revision: 52852 Added: pypy/dist/pypy/lib/app_test/ctypes/test_simplesubclasses.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_simplesubclasses.py Log: another test. mostly fails From fijal at codespeak.net Sun Mar 23 02:22:01 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 23 Mar 2008 02:22:01 +0100 (CET) Subject: [pypy-svn] r52853 - pypy/dist/pypy/rlib Message-ID: <20080323012201.1DD021683D6@codespeak.net> Author: fijal Date: Sun Mar 23 02:21:58 2008 New Revision: 52853 Modified: pypy/dist/pypy/rlib/libffi.py Log: add assert laying forever in my wc Modified: pypy/dist/pypy/rlib/libffi.py ============================================================================== --- pypy/dist/pypy/rlib/libffi.py (original) +++ pypy/dist/pypy/rlib/libffi.py Sun Mar 23 02:21:58 2008 @@ -277,6 +277,7 @@ "%d instead of %d" % (self.name, len(args_ll), len(self.argtypes))) ll_args = lltype.malloc(rffi.VOIDPP.TO, len(args_ll), flavor='raw') for i in range(len(args_ll)): + assert args_ll[i] # none should be NULL ll_args[i] = args_ll[i] c_ffi_call(self.ll_cif, self.funcsym, ll_result, ll_args) lltype.free(ll_args, flavor='raw') From fijal at codespeak.net Sun Mar 23 05:22:11 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 23 Mar 2008 05:22:11 +0100 (CET) Subject: [pypy-svn] r52854 - pypy/dist/pypy/rlib Message-ID: <20080323042211.556C2168422@codespeak.net> Author: fijal Date: Sun Mar 23 05:22:09 2008 New Revision: 52854 Modified: pypy/dist/pypy/rlib/objectmodel.py Log: This argument is never used. Modified: pypy/dist/pypy/rlib/objectmodel.py ============================================================================== --- pypy/dist/pypy/rlib/objectmodel.py (original) +++ pypy/dist/pypy/rlib/objectmodel.py Sun Mar 23 05:22:09 2008 @@ -361,7 +361,7 @@ def compute_result_annotation(self, s_sizehint): return self.bookkeeper.newlist() - def specialize_call(self, orig_hop, i_sizehint): + def specialize_call(self, orig_hop, i_sizehint=None): from pypy.rpython.rlist import rtype_newlist from pypy.rpython.lltypesystem import lltype # fish a bit hop From cfbolz at codespeak.net Sun Mar 23 10:26:02 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 23 Mar 2008 10:26:02 +0100 (CET) Subject: [pypy-svn] r52855 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080323092602.68FF61683EF@codespeak.net> Author: cfbolz Date: Sun Mar 23 10:26:00 2008 New Revision: 52855 Added: pypy/dist/pypy/lib/app_test/ctypes/test_varsize_struct.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_varsize_struct.py Modified: pypy/dist/pypy/lib/_ctypes/array.py pypy/dist/pypy/lib/app_test/ctypes/description.txt Log: port another file. fix one problem Modified: pypy/dist/pypy/lib/_ctypes/array.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/array.py (original) +++ pypy/dist/pypy/lib/_ctypes/array.py Sun Mar 23 10:26:00 2008 @@ -189,6 +189,8 @@ ARRAY_CACHE = {} def create_array_type(base, length): + if length < 0: + raise ValueError("Array length must be >= 0") key = (base, length) try: return ARRAY_CACHE[key] Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/description.txt (original) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sun Mar 23 10:26:00 2008 @@ -14,9 +14,8 @@ test_refcounts.py # CPython specific test_repr.py # not implemented test_returnfuncptrs.py -test_simplesubclasses.py test_struct_fields.py test_unaligned_structures.py test_values.py # some strange stuff -test_varsize_struct.py +test_varsize_struct.py # resize not implemented test_win32.py # Windows specific From cfbolz at codespeak.net Sun Mar 23 10:41:09 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 23 Mar 2008 10:41:09 +0100 (CET) Subject: [pypy-svn] r52856 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080323094109.2F15E1683FA@codespeak.net> Author: cfbolz Date: Sun Mar 23 10:41:08 2008 New Revision: 52856 Added: pypy/dist/pypy/lib/app_test/ctypes/test_struct_fields.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_struct_fields.py Modified: pypy/dist/pypy/lib/_ctypes/structure.py pypy/dist/pypy/lib/app_test/ctypes/description.txt Log: port another test file. fix one of them. Modified: pypy/dist/pypy/lib/_ctypes/structure.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/structure.py (original) +++ pypy/dist/pypy/lib/_ctypes/structure.py Sun Mar 23 10:41:08 2008 @@ -85,7 +85,7 @@ def struct_setattr(self, name, value): if name == '_fields_': - if self.__dict__.get('_fields_', None): + if self.__dict__.get('_fields_', None) is not None: raise AttributeError("_fields_ is final") if self in [v for k, v in value]: raise AttributeError("Structure or union cannot contain itself") Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/description.txt (original) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sun Mar 23 10:41:08 2008 @@ -15,7 +15,7 @@ test_repr.py # not implemented test_returnfuncptrs.py test_struct_fields.py -test_unaligned_structures.py +test_unaligned_structures.py # _pack_ not implemented test_values.py # some strange stuff test_varsize_struct.py # resize not implemented test_win32.py # Windows specific From cfbolz at codespeak.net Sun Mar 23 10:52:48 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 23 Mar 2008 10:52:48 +0100 (CET) Subject: [pypy-svn] r52857 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080323095248.B3340168406@codespeak.net> Author: cfbolz Date: Sun Mar 23 10:52:48 2008 New Revision: 52857 Added: pypy/dist/pypy/lib/app_test/ctypes/test_returnfuncptrs.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_returnfuncptrs.py Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt Log: port test file. they all fail Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/description.txt (original) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sun Mar 23 10:52:48 2008 @@ -13,8 +13,6 @@ test_random_things.py test_refcounts.py # CPython specific test_repr.py # not implemented -test_returnfuncptrs.py -test_struct_fields.py test_unaligned_structures.py # _pack_ not implemented test_values.py # some strange stuff test_varsize_struct.py # resize not implemented From cfbolz at codespeak.net Sun Mar 23 11:03:39 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 23 Mar 2008 11:03:39 +0100 (CET) Subject: [pypy-svn] r52858 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080323100339.13D7116840A@codespeak.net> Author: cfbolz Date: Sun Mar 23 11:03:38 2008 New Revision: 52858 Added: pypy/dist/pypy/lib/app_test/ctypes/test_parameters.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_parameters.py Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt Log: port another one Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/description.txt (original) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sun Mar 23 11:03:38 2008 @@ -8,7 +8,6 @@ test_libc.py test_macholib.py # OS X specific test_objects.py # implementation details: ._objects -test_parameters.py test_python_api.py # CPython specific test_random_things.py test_refcounts.py # CPython specific From cfbolz at codespeak.net Sun Mar 23 11:07:03 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 23 Mar 2008 11:07:03 +0100 (CET) Subject: [pypy-svn] r52859 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080323100703.5D2B516840A@codespeak.net> Author: cfbolz Date: Sun Mar 23 11:07:02 2008 New Revision: 52859 Added: pypy/dist/pypy/lib/app_test/ctypes/test_libc.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_libc.py Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt Log: next Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/description.txt (original) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sun Mar 23 11:07:02 2008 @@ -5,7 +5,6 @@ test_init.py # obscure test_internals.py # uses gc.getrefcounts test_keeprefs.py # implementation details: ._objects -test_libc.py test_macholib.py # OS X specific test_objects.py # implementation details: ._objects test_python_api.py # CPython specific From cfbolz at codespeak.net Sun Mar 23 11:10:28 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 23 Mar 2008 11:10:28 +0100 (CET) Subject: [pypy-svn] r52860 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080323101028.33C3A16840E@codespeak.net> Author: cfbolz Date: Sun Mar 23 11:10:27 2008 New Revision: 52860 Added: pypy/dist/pypy/lib/app_test/ctypes/test_checkretval.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_checkretval.py Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt Log: next Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/description.txt (original) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sun Mar 23 11:10:27 2008 @@ -1,6 +1,5 @@ test_bitfields.py # bitfields not supported test_byteswap.py # __ctype_be__ and __ctypes_le__ not implemented -test_checkretval.py test_errcheck.py # empty test_init.py # obscure test_internals.py # uses gc.getrefcounts From cfbolz at codespeak.net Sun Mar 23 11:12:49 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 23 Mar 2008 11:12:49 +0100 (CET) Subject: [pypy-svn] r52861 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080323101249.8ADF116840E@codespeak.net> Author: cfbolz Date: Sun Mar 23 11:12:48 2008 New Revision: 52861 Added: pypy/dist/pypy/lib/app_test/ctypes/test_random_things.py - copied, changed from r52827, pypy/dist/pypy/lib/ctypes/test/test_random_things.py Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt Log: port another file. this test is strange Modified: pypy/dist/pypy/lib/app_test/ctypes/description.txt ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/description.txt (original) +++ pypy/dist/pypy/lib/app_test/ctypes/description.txt Sun Mar 23 11:12:48 2008 @@ -7,7 +7,6 @@ test_macholib.py # OS X specific test_objects.py # implementation details: ._objects test_python_api.py # CPython specific -test_random_things.py test_refcounts.py # CPython specific test_repr.py # not implemented test_unaligned_structures.py # _pack_ not implemented From pedronis at codespeak.net Sun Mar 23 11:26:33 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Sun, 23 Mar 2008 11:26:33 +0100 (CET) Subject: [pypy-svn] r52862 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080323102633.A705E16840B@codespeak.net> Author: pedronis Date: Sun Mar 23 11:26:31 2008 New Revision: 52862 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_random_things.py Log: tweak Modified: pypy/dist/pypy/lib/app_test/ctypes/test_random_things.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_random_things.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_random_things.py Sun Mar 23 11:26:31 2008 @@ -1,25 +1,13 @@ +# derived from test_random_things.py +import py from ctypes import * -import unittest, sys +import sys def callback_func(arg): 42 / arg raise ValueError, arg -if sys.platform == "win32": - - class call_function_TestCase(unittest.TestCase): - # _ctypes.call_function is deprecated and private, but used by - # Gary Bishp's readline module. If we have it, we must test it as well. - - def test(self): - from _ctypes import call_function - hdll = windll.kernel32.LoadLibraryA("kernel32") - funcaddr = windll.kernel32.GetProcAddress(hdll, "GetModuleHandleA") - - assert call_function(funcaddr, (None,)) == ( - windll.kernel32.GetModuleHandleA(None)) - -py.test.skip("exception gets eaten??") +py.test.skip("implementation details are different on pypy") class TestCallbackTraceback: # When an exception is raised in a ctypes callback function, the C From pedronis at codespeak.net Sun Mar 23 11:28:10 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Sun, 23 Mar 2008 11:28:10 +0100 (CET) Subject: [pypy-svn] r52863 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080323102810.7AE1816840B@codespeak.net> Author: pedronis Date: Sun Mar 23 11:28:09 2008 New Revision: 52863 Added: pypy/dist/pypy/lib/app_test/ctypes/test_callback_traceback.py - copied unchanged from r52862, pypy/dist/pypy/lib/app_test/ctypes/test_random_things.py Removed: pypy/dist/pypy/lib/app_test/ctypes/test_random_things.py Log: saner name From pedronis at codespeak.net Sun Mar 23 11:34:20 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Sun, 23 Mar 2008 11:34:20 +0100 (CET) Subject: [pypy-svn] r52864 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080323103420.C16DB1683F5@codespeak.net> Author: pedronis Date: Sun Mar 23 11:34:20 2008 New Revision: 52864 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_checkretval.py Log: fix skipping Modified: pypy/dist/pypy/lib/app_test/ctypes/test_checkretval.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_checkretval.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_checkretval.py Sun Mar 23 11:34:20 2008 @@ -1,3 +1,4 @@ +import py import sys from ctypes import * @@ -15,7 +16,7 @@ class TestRetval: def test_checkretval(self): - py.test.skip("subclassing problems?") + py.test.skip("restype being a function not implemented") assert 42 == dll._testfunc_p_p(42) From pedronis at codespeak.net Sun Mar 23 11:38:39 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Sun, 23 Mar 2008 11:38:39 +0100 (CET) Subject: [pypy-svn] r52865 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080323103839.864AD168407@codespeak.net> Author: pedronis Date: Sun Mar 23 11:38:39 2008 New Revision: 52865 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_libc.py pypy/dist/pypy/lib/app_test/ctypes/test_returnfuncptrs.py pypy/dist/pypy/lib/app_test/ctypes/test_struct_fields.py Log: fix skipping Modified: pypy/dist/pypy/lib/app_test/ctypes/test_libc.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_libc.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_libc.py Sun Mar 23 11:38:39 2008 @@ -1,3 +1,4 @@ +import py import sys, os from ctypes import * Modified: pypy/dist/pypy/lib/app_test/ctypes/test_returnfuncptrs.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_returnfuncptrs.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_returnfuncptrs.py Sun Mar 23 11:38:39 2008 @@ -1,3 +1,5 @@ +import py + from ctypes import * def setup_module(mod): Modified: pypy/dist/pypy/lib/app_test/ctypes/test_struct_fields.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_struct_fields.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_struct_fields.py Sun Mar 23 11:38:39 2008 @@ -26,13 +26,14 @@ raises(AttributeError, setattr, X, "_fields_", []) def test_2(self): + py.test.skip("no _fields_ unsupported") class X(Structure): pass X() raises(AttributeError, setattr, X, "_fields_", []) def test_3(self): - py.test.skip("XXX fails") + py.test.skip("fails: no _fields_ and subclassing") class X(Structure): pass class Y(Structure): @@ -40,7 +41,7 @@ raises(AttributeError, setattr, X, "_fields_", []) def test_4(self): - py.test.skip("XXX fails") + py.test.skip("fails: no _fields_ and subclassing") class X(Structure): pass class Y(X): From pedronis at codespeak.net Sun Mar 23 11:39:39 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Sun, 23 Mar 2008 11:39:39 +0100 (CET) Subject: [pypy-svn] r52866 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080323103939.E9F5D168407@codespeak.net> Author: pedronis Date: Sun Mar 23 11:39:39 2008 New Revision: 52866 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_structures.py Log: clarify skip Modified: pypy/dist/pypy/lib/app_test/ctypes/test_structures.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_structures.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_structures.py Sun Mar 23 11:39:39 2008 @@ -358,7 +358,7 @@ assert p.age == 6 def test_subclassing_field_is_a_tuple(self): - py.test.skip("this leaks") + py.test.skip("suclassing not supported") class Person(Structure): _fields_ = (("name", c_char*6), ("age", c_int)) From arigo at codespeak.net Sun Mar 23 11:43:03 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 23 Mar 2008 11:43:03 +0100 (CET) Subject: [pypy-svn] r52867 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080323104303.043431683F7@codespeak.net> Author: arigo Date: Sun Mar 23 11:43:03 2008 New Revision: 52867 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: Create a fresh FallbackInterpreter every time we need one. Test showing why this is necessary. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sun Mar 23 11:43:03 2008 @@ -19,15 +19,12 @@ actual values for the live red vars, and interprets the jitcode normally until it reaches the 'jit_merge_point' or raises. """ - def __init__(self, hotrunnerdesc): - self.hotrunnerdesc = hotrunnerdesc - self.interpreter = hotrunnerdesc.interpreter - self.rgenop = self.interpreter.rgenop - self.exceptiondesc = hotrunnerdesc.exceptiondesc - self.register_opcode_impls(self.interpreter) + def __init__(self, fallback_point, framebase, shapemask): + self.hotrunnerdesc = fallback_point.hotrunnerdesc + self.fbrunnerdesc = self.hotrunnerdesc.fbrunnerdesc + self.fbrunnerdesc.debug_trace("fallback_interp") + self.rgenop = self.fbrunnerdesc.rgenop - def initialize_state(self, fallback_point, framebase, shapemask): - self.interpreter.debug_trace("fallback_interp") jitstate = fallback_point.saved_jitstate incoming_gv = jitstate.get_locals_gv() self.framebase = framebase @@ -168,18 +165,18 @@ def leave_fallback_interp(self, gv_result): # at this point we might have an exception set in self.gv_exc_xxx # and we have to really raise it. - exceptiondesc = self.exceptiondesc + exceptiondesc = self.fbrunnerdesc.exceptiondesc llvalue = self.gv_exc_value.revealconst(exceptiondesc.LL_EXC_VALUE) if llvalue: if we_are_translated(): exception = cast_base_ptr_to_instance(Exception, llvalue) - self.interpreter.debug_trace("fb_raise", str(exception)) + self.fbrunnerdesc.debug_trace("fb_raise", str(exception)) raise Exception, exception # non-translatable hack follows... from pypy.rpython.llinterp import LLException, type_name llexctype = self.gv_exc_type.revealconst(exceptiondesc.LL_EXC_TYPE) assert llexctype and llvalue - self.interpreter.debug_trace("fb_raise", type_name(llexctype)) + self.fbrunnerdesc.debug_trace("fb_raise", type_name(llexctype)) raise LLException(llexctype, llvalue) else: ARG = self.hotrunnerdesc.RAISE_DONE_FUNCPTR.TO.ARGS[0] @@ -187,7 +184,7 @@ result = gv_result.revealconst(ARG) else: result = None - self.interpreter.debug_trace("fb_return", result) + self.fbrunnerdesc.debug_trace("fb_return", result) DoneWithThisFrame = self.hotrunnerdesc.DoneWithThisFrame raise DoneWithThisFrame(result) @@ -198,7 +195,7 @@ while 1: bytecode = self.load_2byte() assert bytecode >= 0 - result = self.opcode_implementations[bytecode](self) + result = self.fbrunnerdesc.opcode_implementations[bytecode](self) # operation helper functions def getjitcode(self): @@ -289,7 +286,7 @@ @arguments() def opimpl_trace(self): msg = self.dump() - self.interpreter.debug_trace(msg) + self.fbrunnerdesc.debug_trace(msg) @arguments("green", "2byte", returns="red") def opimpl_make_redbox(self, genconst, typeid): @@ -621,16 +618,30 @@ else: self.green_result(gv_result) - # ____________________________________________________________ - # construction-time helpers + +# ____________________________________________________________ +# construction-time helpers + +class FallbackRunnerDesc(object): + + def __init__(self, hotrunnerdesc): + self.hotrunnerdesc = hotrunnerdesc + self.interpreter = hotrunnerdesc.interpreter + self.rgenop = self.interpreter.rgenop + self.exceptiondesc = hotrunnerdesc.exceptiondesc + self.debug_trace = self.interpreter.debug_trace + self.register_opcode_impls(self.interpreter) + + def _freeze_(self): + return True def register_opcode_impls(self, interp): impl = [None] * len(interp.opcode_implementations) for opname, index in interp.opname_to_index.items(): argspec = interp.opcode_implementations[index].argspec name = 'opimpl_' + opname - if hasattr(self, name): - fbopimpl = getattr(self, name).im_func + if hasattr(FallbackInterpreter, name): + fbopimpl = getattr(FallbackInterpreter, name).im_func assert fbopimpl.argspec == argspec else: opdesc = interp.opcode_descs[index] Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Sun Mar 23 11:43:03 2008 @@ -12,8 +12,7 @@ from pypy.jit.timeshifter.oop import maybe_on_top_of_llinterp from pypy.jit.timeshifter.greenkey import KeyDesc, empty_key from pypy.jit.timeshifter.greenkey import GreenKey, newgreendict -from pypy.jit.rainbow import rhotpath -from pypy.jit.rainbow.fallback import FallbackInterpreter +from pypy.jit.rainbow import rhotpath, fallback from pypy.jit.rainbow.portal import getjitenterargdesc @@ -43,7 +42,7 @@ self.make_enter_function() self.rewrite_graphs() self.make_descs() - self.fallbackinterp = FallbackInterpreter(self) + self.fbrunnerdesc = fallback.FallbackRunnerDesc(self) if self.translate_support_code: self.annhelper.finish() Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Sun Mar 23 11:43:03 2008 @@ -113,12 +113,12 @@ report_compile_time_exception(interpreter, e) # exceptions below at run-time exceptions, we let them propagate - fallbackinterp = fbp.hotrunnerdesc.fallbackinterp + from pypy.jit.rainbow.fallback import FallbackInterpreter if is_signed and fbp.check_virtualizables(): shapemask = value & ~ 1 else: shapemask = -1 - fallbackinterp.initialize_state(fbp, framebase, shapemask) + fallbackinterp = FallbackInterpreter(fbp, framebase, shapemask) fbp.prepare_fallbackinterp(fallbackinterp, value) fallbackinterp.bytecode_loop() # If the fallback interpreter reached the next jit_merge_point(), Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sun Mar 23 11:43:03 2008 @@ -444,16 +444,51 @@ assert res == 4 self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) + def test_recursive_via_residual(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'fudge', 'res', 'i'] + def indirection(n, fudge): + return ll_pseudo_factorial(n, fudge) + def ll_pseudo_factorial(n, fudge): + res = 0 + i = 4 + while i > 0: + i >>= 1 + if n <= 0: + v = 1 + else: + v = n * indirection(n - 1, fudge + n) - fudge + res += v + MyJitDriver.jit_merge_point(n=n, fudge=fudge, res=res, i=i) + MyJitDriver.can_enter_jit(n=n, fudge=fudge, res=res, i=i) + return res + res = self.run(ll_pseudo_factorial, [3, 2], threshold=2, + policy=StopAtXPolicy(indirection)) + expected = ll_pseudo_factorial(3, 2) + assert res == expected + def test_recursive_call(self): + py.test.skip("in-progress") + class MyJitDriver(JitDriver): + greens = ['n'] + reds = ['fudge', 'res', 'i'] def indirection(n, fudge): return ll_pseudo_factorial(n, fudge) def ll_pseudo_factorial(n, fudge): - k = hint(n, concrete=True) - if n <= 0: - return 1 - return n * ll_pseudo_factorial(n - 1, fudge + n) - fudge - res = self.interpret(indirection, [4, 2], [0]) - expected = ll_pseudo_factorial(4, 2) + i = 4 + while i > 0: + i >>= 1 + hint(n, concrete=True) + if n <= 0: + res = 1 + else: + res = n * indirection(n - 1, fudge + n) - fudge + MyJitDriver.jit_merge_point(n=n, fudge=fudge, res=res, i=i) + MyJitDriver.can_enter_jit(n=n, fudge=fudge, res=res, i=i) + return res + res = self.run(ll_pseudo_factorial, [3, 2], threshold=2) + expected = ll_pseudo_factorial(3, 2) assert res == expected From pedronis at codespeak.net Sun Mar 23 11:43:10 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Sun, 23 Mar 2008 11:43:10 +0100 (CET) Subject: [pypy-svn] r52868 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080323104310.BA401168409@codespeak.net> Author: pedronis Date: Sun Mar 23 11:43:10 2008 New Revision: 52868 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_prototypes.py Log: clarify Modified: pypy/dist/pypy/lib/app_test/ctypes/test_prototypes.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_prototypes.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_prototypes.py Sun Mar 23 11:43:10 2008 @@ -97,7 +97,7 @@ assert "a" == func(byref(ca))[0] def test_c_void_p_arg(self): - py.test.skip("XXX fails and leaks") + py.test.skip("XXX fails") func = testdll._testfunc_p_p func.restype = c_char_p func.argtypes = c_void_p, From arigo at codespeak.net Sun Mar 23 11:44:15 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 23 Mar 2008 11:44:15 +0100 (CET) Subject: [pypy-svn] r52869 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080323104415.9035C1683F7@codespeak.net> Author: arigo Date: Sun Mar 23 11:44:15 2008 New Revision: 52869 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Log: Subtle bug discovered by the refactoring: in the case of store_back_gv() we need an empty containers_needing_reshaping. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sun Mar 23 11:44:15 2008 @@ -76,6 +76,7 @@ # it needs the equivalent of jitstate.reshape(), i.e. the clean-up and # forced checks that follow a residual call. if shapemask == -1: + self.containers_needing_reshaping = {} for virtualizable_box in jitstate.virtualizables: content = virtualizable_box.content assert isinstance(content, rcontainer.VirtualizableStruct) @@ -83,7 +84,6 @@ self.getinitialboxgv) if gv_ptr is not None: self.containers_gv[content] = gv_ptr - self.containers_needing_reshaping = {} else: # Note that this must be done before initialize_from_frame() # because store_back_gv_reshaped() could notice some virtual From pedronis at codespeak.net Sun Mar 23 11:52:04 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Sun, 23 Mar 2008 11:52:04 +0100 (CET) Subject: [pypy-svn] r52870 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080323105204.925A81680C1@codespeak.net> Author: pedronis Date: Sun Mar 23 11:52:04 2008 New Revision: 52870 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_simplesubclasses.py pypy/dist/pypy/lib/app_test/ctypes/test_slicing.py Log: clarify skips Modified: pypy/dist/pypy/lib/app_test/ctypes/test_simplesubclasses.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_simplesubclasses.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_simplesubclasses.py Sun Mar 23 11:52:04 2008 @@ -15,7 +15,7 @@ assert not MyInt(42) == MyInt(43) def test_ignore_retval(self): - py.test.skip("XXX leaks") + py.test.skip("XXX different callback behavior") # Test if the return value of a callback is ignored # if restype is None proto = CFUNCTYPE(None) @@ -27,7 +27,7 @@ def test_int_callback(self): - py.test.skip("XXX leaks") + py.test.skip("XXX different callback behavior") args = [] def func(arg): args.append(arg) Modified: pypy/dist/pypy/lib/app_test/ctypes/test_slicing.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_slicing.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_slicing.py Sun Mar 23 11:52:04 2008 @@ -21,7 +21,7 @@ assert a[0:5] == range(5, 10) def test_setslice_cint(self): - py.test.skip("XXX leaks") + py.test.skip("XXX bugs") a = (c_int * 100)(*xrange(1100, 1200)) b = range(1100, 1200) From arigo at codespeak.net Sun Mar 23 11:52:06 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 23 Mar 2008 11:52:06 +0100 (CET) Subject: [pypy-svn] r52871 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080323105206.AAB5B1683DB@codespeak.net> Author: arigo Date: Sun Mar 23 11:52:06 2008 New Revision: 52871 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Log: Introduce an explicit crash in case of reshaping bugs. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sun Mar 23 11:52:06 2008 @@ -63,6 +63,8 @@ try: return self.containers_gv[content] except KeyError: + # if shapemask != -1 in store_back_virtualizables(), we should + # not reach this point before we reach the "State sanitized" line. reshaping = content in self.containers_needing_reshaping gv_result = content.allocate_gv_container(self.rgenop, reshaping) self.containers_gv[content] = gv_result @@ -101,7 +103,6 @@ memo.copyfields = [] memo.box_gv_reader = self.getinitialboxgv memo.bitcount = 1 - self.containers_needing_reshaping = memo.containers for virtualizable_box in jitstate.virtualizables: content = virtualizable_box.content @@ -109,6 +110,7 @@ content.store_back_gv_reshaped(shapemask, memo) # State sanitized. + self.containers_needing_reshaping = memo.containers for gv_ptr, fielddesc, box in memo.copyfields: gv_value = self.getinitialboxgv(box) fielddesc.perform_setfield(self.rgenop, gv_ptr, gv_value) From pedronis at codespeak.net Sun Mar 23 15:30:49 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Sun, 23 Mar 2008 15:30:49 +0100 (CET) Subject: [pypy-svn] r52872 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080323143049.1D9231683FE@codespeak.net> Author: pedronis Date: Sun Mar 23 15:30:48 2008 New Revision: 52872 Modified: pypy/dist/pypy/lib/_ctypes/array.py pypy/dist/pypy/lib/_ctypes/basics.py pypy/dist/pypy/lib/_ctypes/pointer.py pypy/dist/pypy/lib/_ctypes/primitive.py pypy/dist/pypy/lib/_ctypes/structure.py pypy/dist/pypy/lib/_ctypes/union.py pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py pypy/dist/pypy/lib/app_test/ctypes/test_keeprefs.py Log: make test_keeprefs pass except for where the behavior is really differrent (we copy string contents), all a bit obscure Modified: pypy/dist/pypy/lib/_ctypes/array.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/array.py (original) +++ pypy/dist/pypy/lib/_ctypes/array.py Sun Mar 23 15:30:48 2008 @@ -2,7 +2,8 @@ import _rawffi from _ctypes.basics import _CData, cdata_from_address, _CDataMeta, sizeof -from _ctypes.basics import keepalive_key, store_reference, CArgObject +from _ctypes.basics import keepalive_key, store_reference, ensure_objects +from _ctypes.basics import CArgObject from _ctypes.builtin import _string_at_addr, _wstring_at_addr def _create_unicode(buffer, maxlength): @@ -133,7 +134,6 @@ def __init__(self, *args): self._buffer = self._ffiarray(self._length_, autofree=True) - self._objects = {} for i, arg in enumerate(args): self[i] = arg @@ -160,7 +160,7 @@ self._slice_setitem(index, value) return index = self._fix_index(index) - if getattr(value, '_objects', None) is not None: + if ensure_objects(value) is not None: store_reference(self, index, value._objects) arg = self._type_._CData_value(value) if self._type_._fficompositesize is None: Modified: pypy/dist/pypy/lib/_ctypes/basics.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/basics.py (original) +++ pypy/dist/pypy/lib/_ctypes/basics.py Sun Mar 23 15:30:48 2008 @@ -4,18 +4,24 @@ keepalive_key = str # XXX fix this when provided with test +def ensure_objects(where): + try: + ensure = where._ensure_objects + except AttributeError: + return None + return ensure() + def store_reference(where, base_key, target): - #self.__dict__['_objects'][key] = value._objects - if '_objects' in where.__dict__: + if '_index' not in where.__dict__: # shortcut - where.__dict__['_objects'][str(base_key)] = target + where._ensure_objects()[str(base_key)] = target return key = [base_key] - while not '_objects' in where.__dict__: + while '_index' in where.__dict__: key.append(where.__dict__['_index']) where = where.__dict__['_base'] real_key = ":".join([str(i) for i in key]) - where.__dict__['_objects'][real_key] = target + where._ensure_objects()[real_key] = target class ArgumentError(Exception): pass @@ -95,6 +101,13 @@ def __init__(self, *args, **kwds): raise TypeError("%s has no type" % (type(self),)) + def _ensure_objects(self): + if '_objects' not in self.__dict__: + if '_index' in self.__dict__: + return None + self.__dict__['_objects'] = {} + return self._objects + def __ctypes_from_outparam__(self): return self Modified: pypy/dist/pypy/lib/_ctypes/pointer.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/pointer.py (original) +++ pypy/dist/pypy/lib/_ctypes/pointer.py Sun Mar 23 15:30:48 2008 @@ -58,8 +58,6 @@ self._buffer = ffiarray(1, autofree=True) if value is not None: self.contents = value - else: - self._objects = {} self._ffiarray = ffiarray self.__init__ = __init__ self._type_ = TP @@ -80,7 +78,7 @@ raise TypeError("expected %s instead of %s" % ( self._type_.__name__, type(value).__name__)) self._objects = {keepalive_key(1):value} - if getattr(value, '_objects', None) is not None: + if value._ensure_objects() is not None: self._objects[keepalive_key(0)] = value._objects value = value._buffer self._buffer[0] = value Modified: pypy/dist/pypy/lib/_ctypes/primitive.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/primitive.py (original) +++ pypy/dist/pypy/lib/_ctypes/primitive.py Sun Mar 23 15:30:48 2008 @@ -83,7 +83,7 @@ if isinstance(value, unicode): value = value.encode(ConvMode.encoding, ConvMode.errors) - self._objects = value + #self._objects = value array = _rawffi.Array('c')(len(value)+1, value) value = array.buffer self._objects = {'0': CArgObject(array)} @@ -106,7 +106,7 @@ if isinstance(value, str): value = value.decode(ConvMode.encoding, ConvMode.errors) - self._objects = value + #self._objects = value array = _rawffi.Array('u')(len(value)+1, value) value = array.buffer self._objects = {'0': CArgObject(array)} @@ -212,6 +212,9 @@ if value is not DEFAULT_VALUE: self.value = value + def _ensure_objects(self): + return None + def _getvalue(self): return self._buffer[0] Modified: pypy/dist/pypy/lib/_ctypes/structure.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/structure.py (original) +++ pypy/dist/pypy/lib/_ctypes/structure.py Sun Mar 23 15:30:48 2008 @@ -1,7 +1,7 @@ import _rawffi from _ctypes.basics import _CData, _CDataMeta, keepalive_key,\ - store_reference, CArgObject + store_reference, ensure_objects, CArgObject import inspect def round_up(size, alignment): @@ -115,7 +115,6 @@ if not hasattr(self, '_ffistruct'): raise TypeError("Cannot instantiate structure, has no _fields_") self.__dict__['_buffer'] = self._ffistruct(autofree=True) - self.__dict__['_objects'] = {} if len(args) > len(self._names): raise TypeError("too many arguments") for name, arg in zip(self._names, args): @@ -181,7 +180,7 @@ fieldtype = self._fieldtypes[name].ctype except KeyError: raise AttributeError(name) - if getattr(value, '_objects', None) is not None: + if ensure_objects(value) is not None: key = keepalive_key(getattr(self.__class__, name).num) store_reference(self, key, value._objects) arg = fieldtype._CData_value(value) Modified: pypy/dist/pypy/lib/_ctypes/union.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/union.py (original) +++ pypy/dist/pypy/lib/_ctypes/union.py Sun Mar 23 15:30:48 2008 @@ -2,6 +2,7 @@ import _rawffi from _ctypes.basics import _CData, _CDataMeta, store_reference, keepalive_key +from _ctypes.basics import ensure_objects from _ctypes.structure import round_up, names_and_fields, struct_getattr,\ struct_setattr import inspect @@ -99,7 +100,7 @@ fieldtype = self._fieldtypes[name].ctype except KeyError: raise AttributeError(name) - if getattr(value, '_objects', None) is not None: + if ensure_objects(value) is not None: key = keepalive_key(getattr(self.__class__, name).num) store_reference(self, key, value._objects) arg = fieldtype._CData_value(value) Modified: pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_keepalive.py Sun Mar 23 15:30:48 2008 @@ -19,6 +19,19 @@ assert p._objects == {'1':l} assert a._objects == {'3':{'1':l}} + def test_simple_structure_and_pointer(self): + class X(Structure): + _fields_ = [('x', POINTER(c_int))] + + x = X() + p = POINTER(c_int)() + assert x._objects is None + assert p._objects is None + x.x = p + assert p._objects == {} + assert len(x._objects) == 1 + assert x._objects['0'] is p._objects + def test_structure_with_pointers(self): class X(Structure): _fields_ = [('x', POINTER(c_int)), Modified: pypy/dist/pypy/lib/app_test/ctypes/test_keeprefs.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_keeprefs.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_keeprefs.py Sun Mar 23 15:30:48 2008 @@ -1,8 +1,6 @@ import py from ctypes import * -py.test.skip("tests implementation details") - class TestSimple: def test_cint(self): x = c_int() @@ -13,6 +11,7 @@ assert x._objects == None def test_ccharp(self): + py.test.skip("we make copies of strings") x = c_char_p() assert x._objects == None x.value = "abc" @@ -33,6 +32,7 @@ assert x._objects == None def test_ccharp_struct(self): + py.test.skip("we make copies of strings") class X(Structure): _fields_ = [("a", c_char_p), ("b", c_char_p)] From pedronis at codespeak.net Sun Mar 23 15:35:00 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Sun, 23 Mar 2008 15:35:00 +0100 (CET) Subject: [pypy-svn] r52873 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080323143500.CCD411683FE@codespeak.net> Author: pedronis Date: Sun Mar 23 15:35:00 2008 New Revision: 52873 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_cast.py Log: clarify, I think we may want to have our own copy of this kind of test, maybe in test_keepalive, not sure Modified: pypy/dist/pypy/lib/app_test/ctypes/test_cast.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_cast.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_cast.py Sun Mar 23 15:35:00 2008 @@ -31,7 +31,7 @@ assert [ptr[i] for i in range(3)] == [42, 17, 2] def test_p2a_objects(self): - py.test.skip("We don't keep alive strings") + py.test.skip("we make copies of strings") array = (c_char_p * 5)() assert array._objects is None array[0] = "foo bar" From pedronis at codespeak.net Sun Mar 23 16:00:51 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Sun, 23 Mar 2008 16:00:51 +0100 (CET) Subject: [pypy-svn] r52874 - in pypy/dist/pypy: lib/app_test/ctypes module/_rawffi/test Message-ID: <20080323150051.98E741683E2@codespeak.net> Author: pedronis Date: Sun Mar 23 16:00:47 2008 New Revision: 52874 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_funcptr.py pypy/dist/pypy/lib/app_test/ctypes/test_functions.py pypy/dist/pypy/lib/app_test/ctypes/test_init.py pypy/dist/pypy/lib/app_test/ctypes/test_numbers.py pypy/dist/pypy/lib/app_test/ctypes/test_structures.py pypy/dist/pypy/module/_rawffi/test/test__rawffi.py Log: some more skip clarifications Modified: pypy/dist/pypy/lib/app_test/ctypes/test_funcptr.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_funcptr.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_funcptr.py Sun Mar 23 16:00:47 2008 @@ -48,7 +48,7 @@ raises(TypeError, s, 1, 2, 3) def test_structures(self): - py.test.skip("XXX no clue") + py.test.skip("win32 related") WNDPROC = WINFUNCTYPE(c_long, c_int, c_int, c_int, c_int) def wndproc(hwnd, msg, wParam, lParam): Modified: pypy/dist/pypy/lib/app_test/ctypes/test_functions.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_functions.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_functions.py Sun Mar 23 16:00:47 2008 @@ -393,7 +393,7 @@ assert result == "bcd" def test_sf1651235(self): - py.test.skip("???") + py.test.skip("XXX parameter checking for callbacks should be stricter") # see http://www.python.org/sf/1651235 proto = CFUNCTYPE(c_int, RECT, POINT) Modified: pypy/dist/pypy/lib/app_test/ctypes/test_init.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_init.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_init.py Sun Mar 23 16:00:47 2008 @@ -1,7 +1,7 @@ import py from ctypes import * -py.test.skip("XXX looks like a fairly obscure test to me") +py.test.skip("XXX subclassing behavior and implementation details tests") class X(Structure): _fields_ = [("a", c_int), Modified: pypy/dist/pypy/lib/app_test/ctypes/test_numbers.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_numbers.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_numbers.py Sun Mar 23 16:00:47 2008 @@ -78,13 +78,13 @@ def test_from_param(self): # the from_param class method attribute always # returns PyCArgObject instances - py.test.skip("bogus test") + py.test.skip("testing implementation internals") for t in signed_types + unsigned_types + float_types: assert ArgType == type(t.from_param(0)) def test_byref(self): # calling byref returns also a PyCArgObject instance - py.test.skip("bogus test") + py.test.skip("testing implementation internals") for t in signed_types + unsigned_types + float_types: parm = byref(t()) assert ArgType == type(parm) Modified: pypy/dist/pypy/lib/app_test/ctypes/test_structures.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_structures.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_structures.py Sun Mar 23 16:00:47 2008 @@ -332,7 +332,7 @@ ## (AttributeError, "class must define a '_fields_' attribute")) def test_abstract_class(self): - py.test.skip("What is _abstract_?") + py.test.skip("_abstract_ not implemented") class X(Structure): _abstract_ = "something" # try 'X()' @@ -429,7 +429,7 @@ def test_vice_versa(self): - py.test.skip("I don't understand this test at all") + py.test.skip("XXX mutually dependent lazily defined structures") class First(Structure): pass class Second(Structure): Modified: pypy/dist/pypy/module/_rawffi/test/test__rawffi.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/test/test__rawffi.py (original) +++ pypy/dist/pypy/module/_rawffi/test/test__rawffi.py Sun Mar 23 16:00:47 2008 @@ -121,6 +121,10 @@ return s.x + s.y; } + long run_on_x_y(struct x_y s, long (*f)(struct x_y)) { + return f(s); + } + struct s2h { short x; short y; @@ -678,6 +682,26 @@ s2h.free() + def test_callback_taking_struct(self): + import _rawffi + X_Y = _rawffi.Structure([('x', 'l'), ('y', 'l')]) + x_y = X_Y() + lib = _rawffi.CDLL(self.lib_name) + runo_on_x_y = lib.ptr('run_on_x_y', [(X_Y, 1), 'P'], 'l') + x_y.x = 201 + x_y.y = 222 + def add(s): + return s.x+s.y + cb = _rawffi.CallbackPtr(add, [(X_Y, 1)], 'l') + ap = cb.byptr() + + res = run_on_x_y(x_y, ap) + assert res == 423 + + ap.free() + x_y.free() + del cb + def test_buffer(self): import _rawffi S = _rawffi.Structure((40, 1)) From pedronis at codespeak.net Sun Mar 23 16:04:08 2008 From: pedronis at codespeak.net (pedronis at codespeak.net) Date: Sun, 23 Mar 2008 16:04:08 +0100 (CET) Subject: [pypy-svn] r52875 - pypy/dist/pypy/module/_rawffi/test Message-ID: <20080323150408.04FD31683E2@codespeak.net> Author: pedronis Date: Sun Mar 23 16:04:08 2008 New Revision: 52875 Modified: pypy/dist/pypy/module/_rawffi/test/test__rawffi.py Log: oops, this was not meant to be checked in, is a non-passing WIP tests Modified: pypy/dist/pypy/module/_rawffi/test/test__rawffi.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/test/test__rawffi.py (original) +++ pypy/dist/pypy/module/_rawffi/test/test__rawffi.py Sun Mar 23 16:04:08 2008 @@ -121,10 +121,6 @@ return s.x + s.y; } - long run_on_x_y(struct x_y s, long (*f)(struct x_y)) { - return f(s); - } - struct s2h { short x; short y; @@ -682,26 +678,6 @@ s2h.free() - def test_callback_taking_struct(self): - import _rawffi - X_Y = _rawffi.Structure([('x', 'l'), ('y', 'l')]) - x_y = X_Y() - lib = _rawffi.CDLL(self.lib_name) - runo_on_x_y = lib.ptr('run_on_x_y', [(X_Y, 1), 'P'], 'l') - x_y.x = 201 - x_y.y = 222 - def add(s): - return s.x+s.y - cb = _rawffi.CallbackPtr(add, [(X_Y, 1)], 'l') - ap = cb.byptr() - - res = run_on_x_y(x_y, ap) - assert res == 423 - - ap.free() - x_y.free() - del cb - def test_buffer(self): import _rawffi S = _rawffi.Structure((40, 1)) From arigo at codespeak.net Sun Mar 23 19:07:12 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 23 Mar 2008 19:07:12 +0100 (CET) Subject: [pypy-svn] r52879 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080323180712.64FB3168408@codespeak.net> Author: arigo Date: Sun Mar 23 19:07:11 2008 New Revision: 52879 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Log: Remove a debug print. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 23 19:07:11 2008 @@ -966,7 +966,6 @@ def serialize_op_direct_call(self, op): kind, withexc = self.guess_call_kind(op) handler = getattr(self, "handle_%s_call" % (kind, )) - print op, kind, withexc return handler(op, withexc) def serialize_op_ts_metacall(self, op): From arigo at codespeak.net Sun Mar 23 20:08:25 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 23 Mar 2008 20:08:25 +0100 (CET) Subject: [pypy-svn] r52880 - in pypy/branch/jit-hotpath/pypy: jit/hintannotator jit/rainbow jit/rainbow/test module/pypyjit module/pypyjit/test rlib translator Message-ID: <20080323190825.B716016840A@codespeak.net> Author: arigo Date: Sun Mar 23 20:08:24 2008 New Revision: 52880 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/module/pypyjit/__init__.py pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_jit_setup.py pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_newbool.py pypy/branch/jit-hotpath/pypy/rlib/jit.py pypy/branch/jit-hotpath/pypy/translator/driver.py Log: Some minimal wacking until the threshold is configurable at run-time in a pypy-c-jit. Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Sun Mar 23 20:08:24 2008 @@ -13,6 +13,7 @@ class HotPathHintAnnotator(HintAnnotator): def build_hotpath_types(self): + self.jitdriverclasses = {} self.prepare_portal_graphs() graph = self.portalgraph_with_on_enter_jit input_args_hs = [SomeLLAbstractConstant(v.concretetype, @@ -32,6 +33,7 @@ " expected 1 (for now)" % len(found_at)) origportalgraph, _, origportalop = found_at[0] drivercls = origportalop.args[0].value + self.jitdriverclasses[drivercls] = True # # We make a copy of origportalgraph and mutate it to make it # the portal. The portal really starts at the jit_merge_point() Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Sun Mar 23 20:08:24 2008 @@ -19,7 +19,7 @@ class HotRunnerDesc: def __init__(self, hintannotator, rtyper, entryjitcode, RGenOp, - codewriter, threshold, translate_support_code = True): + codewriter, jitdrivercls, translate_support_code = True): self.hintannotator = hintannotator self.entryjitcode = entryjitcode self.rtyper = rtyper @@ -28,7 +28,7 @@ self.interpreter = codewriter.interpreter self.ts = self.interpreter.ts self.codewriter = codewriter - self.threshold = threshold + self.jitdrivercls = jitdrivercls self.translate_support_code = translate_support_code def _freeze_(self): @@ -82,7 +82,7 @@ counter = state.counters.get(key, 0) if counter >= 0: counter += 1 - if counter < self.threshold: + if counter < self.jitdrivercls.getcurrentthreshold(): interpreter.debug_trace("jit_not_entered", *args) state.counters[key] = counter return Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Sun Mar 23 20:08:24 2008 @@ -186,7 +186,7 @@ # 'value' should be a Bool, but depending on the backend # it could have been ERASED to about anything else value = bool(value) - threshold = self.hotrunnerdesc.threshold + threshold = self.hotrunnerdesc.jitdrivercls.getcurrentthreshold() if value: counter = self.truepath_counter + 1 assert counter > 0, ( @@ -257,7 +257,7 @@ # XXX unsafe with a moving GC hash = cast_whatever_to_int(lltype.typeOf(value), value) counter = self.counters.get(hash, 0) + 1 - threshold = self.hotrunnerdesc.threshold + threshold = self.hotrunnerdesc.jitdrivercls.getcurrentthreshold() assert counter > 0, ( "reaching a fallback point for an already-compiled path") if counter >= threshold: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Sun Mar 23 20:08:24 2008 @@ -70,9 +70,13 @@ return self._run(main, main_args) def _rewrite(self, threshold, small): + assert len(self.hintannotator.jitdriverclasses) == 1 + jitdrivercls = self.hintannotator.jitdriverclasses.keys()[0] # hack + jitdrivercls.getcurrentthreshold = staticmethod(lambda : threshold) #.. self.hotrunnerdesc = HotRunnerDesc(self.hintannotator, self.rtyper, self.jitcode, self.RGenOp, self.writer, - threshold, self.translate_support_code) + jitdrivercls, + self.translate_support_code) self.hotrunnerdesc.rewrite_all() if small and conftest.option.view: self.rtyper.annotator.translator.view() Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/__init__.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/__init__.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/__init__.py Sun Mar 23 20:08:24 2008 @@ -5,9 +5,17 @@ } interpleveldefs = { - 'enable': 'interp_jit.enable', + 'getthreshold': 'interp_jit.getthreshold', + 'setthreshold': 'interp_jit.setthreshold', + 'enable': 'interp_jit.enable', + 'disable': 'interp_jit.disable', + 'isenabled': 'interp_jit.isenabled', } def setup_after_space_initialization(self): - # force the setup() to run early + # force the __extend__ hacks to occur early import pypy.module.pypyjit.interp_jit + + def startup(self, space): + from pypy.module.pypyjit import interp_jit + interp_jit.startup(space) Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Sun Mar 23 20:08:24 2008 @@ -12,6 +12,7 @@ from pypy.rlib.rarithmetic import r_uint, intmask from pypy.rlib.jit import hint, _is_early_constant, JitDriver import pypy.interpreter.pyopcode # for side-effects +from pypy.interpreter.gateway import ObjSpace from pypy.interpreter.eval import Frame from pypy.interpreter.pycode import PyCode, CO_VARARGS, CO_VARKEYWORDS from pypy.interpreter.pyframe import PyFrame @@ -68,6 +69,10 @@ virtualstack_w[depth] = frame.valuestack_w[depth] frame.valuestack_w = virtualstack_w + def getcurrentthreshold(): + return pypyjitconfig.cur_threshold + getcurrentthreshold = staticmethod(getcurrentthreshold) + class __extend__(PyFrame): def dispatch(self, pycode, next_instr, ec): @@ -113,15 +118,54 @@ # # Public interface -def enable(space, w_code, w_enabled=True): +class PyPyJITConfig: + def __init__(self): + self.cur_threshold = sys.maxint # disabled until the space is ready + self.configured_threshold = JitDriver.getcurrentthreshold() + + def isenabled(self): + return self.cur_threshold < sys.maxint + + def enable(self): + self.cur_threshold = self.configured_threshold + + def disable(self): + self.cur_threshold = sys.maxint + + def setthreshold(self, threshold): + self.configured_threshold = threshold + if self.isenabled(): + self.cur_threshold = threshold + + def getthreshold(self): + return self.configured_threshold + +pypyjitconfig = PyPyJITConfig() + + +def startup(space): # save the app-level sys.executable in JITInfo, where the machine - # code backend can fish for it - XXX the following import will look - # less obscure once codebuf.py is moved to a general - # processor-independent place + # code backend can fish for it. A bit hackish. from pypy.jit.codegen.hlinfo import highleveljitinfo if highleveljitinfo.sys_executable is None: highleveljitinfo.sys_executable = space.str_w( space.sys.get('executable')) + # -- for now, we start disabled and you have to use pypyjit.enable() + #pypyjitconfig.enable() + + +def setthreshold(space, threshold): + pypyjitconfig.setthreshold(threshold) +setthreshold.unwrap_spec = [ObjSpace, int] + +def getthreshold(space): + return space.wrap(pypyjitconfig.getthreshold()) + +def enable(space): + pypyjitconfig.enable() + +def disable(space): + pypyjitconfig.disable() - code = space.interp_w(PyCode, w_code) - code.jit_enable = space.is_true(w_enabled) +def isenabled(space): + return space.newbool(pypyjitconfig.isenabled()) Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_jit_setup.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_jit_setup.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_jit_setup.py Sun Mar 23 20:08:24 2008 @@ -9,13 +9,24 @@ # this just checks that the module is setting up things correctly, and # the resulting code makes sense on top of CPython. import pypyjit + #assert pypyjit.isenabled() -- should we start disabled or enabled? + pypyjit.disable() + assert not pypyjit.isenabled() + pypyjit.setthreshold(41) + assert not pypyjit.isenabled() + assert pypyjit.getthreshold() == 41 + pypyjit.enable() + assert pypyjit.getthreshold() == 41 + assert pypyjit.isenabled() + assert pypyjit.getthreshold() == 41 + pypyjit.setthreshold(43) + assert pypyjit.isenabled() + assert pypyjit.getthreshold() == 43 def f(x, y): return x*y+1 assert f(6, 7) == 43 - pypyjit.enable(f.func_code) - assert f(6, 7) == 43 def gen(x): i = 0 @@ -24,5 +35,3 @@ i += 1 assert list(gen(3)) == [0, 1, 4] - pypyjit.enable(gen.func_code) - assert list(gen(3)) == [0, 1, 4] Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_newbool.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_newbool.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_newbool.py Sun Mar 23 20:08:24 2008 @@ -1,3 +1,5 @@ +import py;py.test.skip("in-progress") + from pypy.rpython.lltypesystem import lltype from pypy.jit.hintannotator.annotator import HintAnnotatorPolicy from pypy.jit.timeshifter import rvalue Modified: pypy/branch/jit-hotpath/pypy/rlib/jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/jit.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/jit.py Sun Mar 23 20:08:24 2008 @@ -167,6 +167,10 @@ jit_merge_point = _JitHintClassMethod("jit_merge_point") can_enter_jit = _JitHintClassMethod("can_enter_jit") + def getcurrentthreshold(): + return 10 + getcurrentthreshold = staticmethod(getcurrentthreshold) + def _check_class(cls): if cls is JitDriver: raise JitHintError("must subclass JitDriver") Modified: pypy/branch/jit-hotpath/pypy/translator/driver.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/driver.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/driver.py Sun Mar 23 20:08:24 2008 @@ -438,9 +438,10 @@ jitcode = writer.make_bytecode(self.portal_graph) if ha.policy.hotpath: from pypy.jit.rainbow.hotpath import HotRunnerDesc - threshold = 10 # for now + assert len(ha.jitdriverclasses) == 1 + jitdrivercls = ha.jitdriverclasses.keys()[0] # hack hotrunnerdesc = HotRunnerDesc(ha, rtyper, jitcode, RGenOp, - writer, threshold, + writer, jitdrivercls, translate_support_code=True) hotrunnerdesc.rewrite_all() else: From arigo at codespeak.net Sun Mar 23 21:23:07 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sun, 23 Mar 2008 21:23:07 +0100 (CET) Subject: [pypy-svn] r52881 - pypy/branch/jit-hotpath/pypy/module/pypyjit Message-ID: <20080323202307.ADDED168072@codespeak.net> Author: arigo Date: Sun Mar 23 21:23:05 2008 New Revision: 52881 Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Log: Fix (in the previous version we would end up with just "py.py" in highleveljitinfo.sys_executable even in translated builds). Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Sun Mar 23 21:23:05 2008 @@ -147,9 +147,8 @@ # save the app-level sys.executable in JITInfo, where the machine # code backend can fish for it. A bit hackish. from pypy.jit.codegen.hlinfo import highleveljitinfo - if highleveljitinfo.sys_executable is None: - highleveljitinfo.sys_executable = space.str_w( - space.sys.get('executable')) + highleveljitinfo.sys_executable = space.str_w( + space.sys.get('executable')) # -- for now, we start disabled and you have to use pypyjit.enable() #pypyjitconfig.enable() From cami at codespeak.net Sun Mar 23 23:53:41 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sun, 23 Mar 2008 23:53:41 +0100 (CET) Subject: [pypy-svn] r52882 - pypy/branch/gameboy-emulator/pypy/lang/gameboy/test Message-ID: <20080323225341.369191683F6@codespeak.net> Author: cami Date: Sun Mar 23 23:53:39 2008 New Revision: 52882 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Log: implemented more tests Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Sun Mar 23 23:53:39 2008 @@ -406,7 +406,15 @@ # ld_A_BCi def test_0x0A(): - passs + cpu = get_cpu() + value = 0x12 + address = 0xC020 + cpu.bc.set(address) + cpu.write(address, value) + assert cpu.read(address) == value + cycle_test(cpu, 0x0A, 2) + assert_default_registers(cpu, a=value) + # ld_DEi_A def test_0x12(): @@ -418,7 +426,14 @@ # load_a_DEi def test_0x1A(): - pass + cpu = get_cpu() + value = 0x12 + address = 0xC020 + cpu.de.set(address) + cpu.write(address, value) + assert cpu.read(address) == value + cycle_test(cpu, 0x1A, 2) + assert_default_registers(cpu, a=value) # ldi_HLi_A def test_0x22(): @@ -430,7 +445,15 @@ # ldi_A_HLi def test_0x2A(): - pass + cpu = get_cpu() + value = 0x12 + address = 0xC020 + hlValue = cpu.hl.get() + cpu.hl.set(address) + cpu.write(address, value) + assert cpu.read(address) == value + cycle_test(cpu, 0x0A, 2) + assert_default_registers(cpu, a=value, hl=hlValue+1) # ldd_HLi_A def test_0x32(): @@ -442,7 +465,15 @@ # ldd_A_HLi def test_0x3A(): - pass + cpu = get_cpu() + value = 0x12 + address = 0xC020 + hlValue = cpu.hl.get() + cpu.hl.set(address) + cpu.write(address, value) + assert cpu.read(address) == value + cycle_test(cpu, 0x0A, 2) + assert_default_registers(cpu, a=value, hl=hlValue-1) # inc_BC DE HL SP def test_0x03_to_0x33_inc_double_registers(): @@ -459,7 +490,6 @@ opCode += 0x10 value += 3 - # dec_BC def test_0x0B_to_0c38_dec_double_registers(): cpu = get_cpu() @@ -562,405 +592,208 @@ # rlca def test_0x07(): - pass - + cpu = get_cpu() + cycle_test(cpu, 0x07, 1) # rrca def test_0x0F(): - pass + cpu = get_cpu() + cycle_test(cpu, 0x0F, 1) # rla def test_0x17(): - pass + cpu = get_cpu() + cycle_test(cpu, 0x17, 1) # rra def test_0x1F(): - pass + cpu = get_cpu() + cycle_test(cpu, 0x1F, 1) # daa def test_0x27(): - pass + cpu = get_cpu() + cycle_test(cpu, 0x27, 1) # cpl def test_0x2F(): - pass + cpu = get_cpu() + value = 0x12 + cpu.a.set(value) + cpu.f.set(value) + cycle_test(cpu, 0x07, 1) + assert_default_registers(cpu, a=value^0xFF, f=value|constants.N_FLAG+constants.H_FLAG) # scf def test_0x37(): - pass + cpu = get_cpu() + value = 0x12 + cpu.f.set(value) + cycle_test(cpu, 0x37, 0) + assert_default_registers(cpu, f=(value & constants.Z_FLAG)|constants.C_FLAG) # ccf def test_0x3F(): - pass + cpu = get_cpu() + value = 0x12 + cpu.f.set(value) + cycle_test(cpu, 0x3F, 0) + assert_default_registers(cpu, f=(value & (constants.Z_FLAG|constants.C_FLAG))^constants.C_FLAG) # halt def test_0x76(): - pass + cpu = get_cpu() + assert cpu.halted == False + cycle_test(cpu, 0x76, 0) + assert cpu.halted == True + # ld_B_B def test_0x40(): - pass -# ld_B_C -def test_0x41(): - pass -# ld_B_D -def test_0x42(): - pass -# ld_B_E -def test_0x43(): - pass -# ld_B_H -def test_0x44(): - pass -# ld_B_L -def test_0x45(): - pass -# ld_B_HLi -def test_0x46(): - pass -# ld_B_A -def test_0x47(): - pass -# ld_C_B -def test_0x48(): - pass -# ld_C_C -def test_0x49(): - pass -# ld_C_D -def test_0x4A(): - pass -# ld_C_E -def test_0x4B(): - pass -# ld_C_H -def test_0x4C(): - pass -# ld_C_L -def test_0x4D(): - pass -# ld_C_HLi -def test_0x4E(): - pass -# ld_C_A -def test_0x4F(): - pass -# ld_D_B -def test_0x50(): - pass -# ld_D_C -def test_0x51(): - pass -# ld_D_D -def test_0x52(): - pass -# ld_D_E -def test_0x53(): - pass -# ld_D_H -def test_0x54(): - pass -# ld_D_L -def test_0x55(): - pass -# ld_D_HLi -def test_0x56(): - pass -# ld_D_A -def test_0x57(): - pass -# ld_E_B -def test_0x58(): - pass -# ld_E_C -def test_0x59(): - pass -# ld_E_D -def test_0x5A(): - pass -# ld_E_E -def test_0x5B(): - pass -# ld_E_H -def test_0x5C(): - pass -# ld_E_L -def test_0x5D(): - pass -# ld_E_HLi -def test_0x5E(): - pass -# ld_E_A -def test_0x5F(): - pass -# ld_H_B -def test_0x60(): - pass -# ld_H_C -def test_0x61(): - pass -# ld_H_D -def test_0x62(): - pass -# ld_H_E -def test_0x63(): - pass -# ld_H_H -def test_0x64(): - pass -# ld_H_L -def test_0x65(): - pass -# ld_H_HLi -def test_0x66(): - pass -# ld_H_A -def test_0x67(): - pass -# ld_L_B -def test_0x68(): - pass -# ld_L_C -def test_0x69(): - pass -# ld_L_D -def test_0x6A(): - pass -# ld_L_E -def test_0x6B(): - pass -# ld_L_H -def test_0x6C(): - pass -# ld_L_L -def test_0x6D(): - pass -# ld_L_HLi -def test_0x6E(): - pass -# ld_L_A -def test_0x6F(): - pass -# ld_HLi_B -def test_0x70(): - pass -# ld_HLi_C -def test_0x71(): - pass -# ld_HLi_D -def test_0x72(): - pass -# ld_HLi_E -def test_0x73(): - pass -# ld_HLi_H -def test_0x74(): - pass -# ld_HLi_L -def test_0x75(): - pass -# ld_HLi_A -def test_0x77(): - pass -# ld_A_B -def test_0x78(): - pass -# ld_A_C -def test_0x79(): - pass -# ld_A_D -def test_0x7A(): - pass -# ld_A_E -def test_0x7B(): - pass -# ld_A_H -def test_0x7C(): - pass -# ld_A_L -def test_0x7D(): - pass -# ld_A_HLi -def test_0x7E(): - pass -# ld_A_A -def test_0x7F(): - pass + cpu = get_cpu() + opCode = 0x04 + value = 0x12 + registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] + for store in registers: + for load in registers: + cpu.reset() + load.set(value) + numCycles= 1 + if store == cpu.getHLi or load == cpu.getHLi: + numCycles = 2 + cycle_test(cpu, opCode, numCycles) + assert store.get() == value + opCode += 0x01 + -# add_A_B +# add_A_B to add_A_A def test_0x80(): - pass -# add_A_C -def test_0x81(): - pass -# add_A_D -def test_0x82(): - pass -# add_A_E -def test_0x83(): - pass -# add_A_H -def test_0x84(): - pass -# add_A_L -def test_0x85(): - pass -# add_A_HLi -def test_0x86(): - pass -# add_A_A -def test_0x87(): - pass + cpu = get_cpu() + opCode = 0x80 + valueA = 0x11 + value = 0x12 + registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] + for add in registers: + cpu.reset() + cpu.a.set(valueA) + add.set(value) + numCycles= 1 + if add == cpu.getHLi: + numCycles = 2 + cycle_test(cpu, opCode, numCycles) + assert cpu.a.get() == valueA+value + value += 3 + opCode += 0x01 -# adc_A_B +# adc_A_B to adx_A_A def test_0x88(): - pass -# adc_A_C -def test_0x89(): - pass -# adc_A_D -def test_0x8A(): - pass -# adc_A_E -def test_0x8B(): - pass -# adc_A_H -def test_0x8C(): - pass -# adc_A_L -def test_0x8D(): - pass -# adc_A_HLi -def test_0x8E(): - pass -# adc_A_A -def test_0x8F(): - pass + py.test.skip("need a full flag checker imlementation") + cpu = get_cpu() + opCode = 0x88 + value = 0x12 + registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] + for add in registers: + cpu.reset() + cpu.a.set(value) + add.set(value) + numCycles= 1 + if add == cpu.getHLi: + numCycles = 2 + cycle_test(cpu, opCode, numCycles) + assert cpu.a.get() == 2*value + value += 3 + opCode += 0x01 -# sub_A_B +# sub_A_B to sub_A_A def test_0x90(): - pass -# sub_A_C -def test_0x91(): - pass -# sub_A_D -def test_0x92(): - pass -# sub_A_E -def test_0x93(): - pass -# sub_A_H -def test_0x94(): - pass -# sub_A_L -def test_0x95(): - pass -# sub_A_HLi -def test_0x96(): - pass -# sub_A_A -def test_0x97(): - pass + cpu = get_cpu() + opCode = 0x90 + value = 0x12 + registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] + for add in registers: + cpu.reset() + cpu.a.set(value) + add.set(value) + numCycles= 1 + if add == cpu.getHLi: + numCycles = 2 + cycle_test(cpu, opCode, numCycles) + assert cpu.a.get() == 0 + value += 3 + opCode += 0x01 -# sbc_A_B +# sbc_A_B to sbc_A_A def test_0x98(): pass -# sbc_A_C -def test_0x99(): - pass -# sbc_A_D -def test_0x9A(): - pass -# sbc_A_E -def test_0x9B(): - pass -# sbc_A_H -def test_0x9C(): - pass -# sbc_A_L -def test_0x9D(): - pass -# sbc_A_HLi -def test_0x9E(): - pass -# sbc_A_A -def test_0x9F(): - pass -# and_A_B +# and_A_B to and_A_A def test_0xA0(): - pass -# and_A_C -def test_0xA1(): - pass -# and_A_D -def test_0xA2(): - pass -# and_A_E -def test_0xA3(): - pass -# and_A_H -def test_0xA4(): - pass -# and_A_L -def test_0xA5(): - pass -# and_A_HLi -def test_0xA6(): - pass -# and_A_A -def test_0xA7(): - pass + cpu = get_cpu() + opCode = 0xA0 + value = 0x12 + valueA = 0x11 + registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] + for add in registers: + cpu.reset() + cpu.a.set(valueA) + add.set(value) + numCycles= 1 + if add == cpu.getHLi: + numCycles = 2 + cycle_test(cpu, opCode, numCycles) + assert cpu.a.get() == (valueA & value) + if cpu.a.get() == 0: + assert cpu.f.get() == constants.Z_FLAG + else: + assert cpu.f.get() == 0 + value += 1 + opCode += 0x01 -# xor_A_B -def test_0xA8(): - pass -# xor_A_C -def test_0xA9(): - pass -# xor_A_D -def test_0xAA(): - pass -# xor_A_E -def test_0xAB(): - pass -# xor_A_H -def test_0xAC(): - pass -# xor_A_L -def test_0xAD(): - pass -# xor_A_HLi -def test_0xAE(): - pass -# xor_A_A -def test_0xAF(): - pass +# xor_A_B to xor_A_A +def test_0xA0(): + cpu = get_cpu() + opCode = 0xA0 + value = 0x12 + valueA = 0x11 + registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] + for add in registers: + cpu.reset() + cpu.a.set(valueA) + add.set(value) + numCycles= 1 + if add == cpu.getHLi: + numCycles = 2 + cycle_test(cpu, opCode, numCycles) + assert cpu.a.get() == (valueA ^ value) + if cpu.a.get() == 0: + assert cpu.f.get() == constants.Z_FLAG + else: + assert cpu.f.get() == 0 + value += 1 + opCode += 0x01 -# or_A_B +# or_A_B to or_A_A def test_0xB0(): - pass -# or_A_C -def test_0xB1(): - pass -# or_A_D -def test_0xB2(): - pass -# or_A_E -def test_0xB3(): - pass -# or_A_H -def test_0xB4(): - pass -# or_A_L -def test_0xB5(): - pass -# or_A_HLi -def test_0xB6(): - pass -# or_A_A -def test_0xB7(): - pass + cpu = get_cpu() + opCode = 0xA0 + value = 0x12 + valueA = 0x11 + registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] + for add in registers: + cpu.reset() + cpu.a.set(valueA) + add.set(value) + numCycles= 1 + if add == cpu.getHLi: + numCycles = 2 + cycle_test(cpu, opCode, numCycles) + assert cpu.a.get() == (valueA | value) + if cpu.a.get() == 0: + assert cpu.f.get() == constants.Z_FLAG + else: + assert cpu.f.get() == 0 + value += 1 + opCode += 0x01 # cp_A_B def test_0xB8(): From arigo at codespeak.net Mon Mar 24 12:37:39 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 24 Mar 2008 12:37:39 +0100 (CET) Subject: [pypy-svn] r52883 - pypy/branch/jit-hotpath/pypy/module/pypyjit Message-ID: <20080324113739.53BEF1683F4@codespeak.net> Author: arigo Date: Mon Mar 24 12:37:38 2008 New Revision: 52883 Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Log: Remove outdated comment. Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Mon Mar 24 12:37:38 2008 @@ -1,10 +1,6 @@ """This is not the JIT :-) -The pypyjit module helpers set the 'jit_enable' flag on code objects. -The code below makes two identical copies of the interpreter's main -loop, and the flag controls which of them is used. One of them -(dispatch_jit) is transformed to become a JIT by code elsewhere: -pypy/jit/* +This is transformed to become a JIT by code elsewhere: pypy/jit/* """ import py import sys From arigo at codespeak.net Mon Mar 24 13:30:11 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 24 Mar 2008 13:30:11 +0100 (CET) Subject: [pypy-svn] r52884 - pypy/dist/pypy/doc/jit Message-ID: <20080324123011.903991683F0@codespeak.net> Author: arigo Date: Mon Mar 24 13:30:09 2008 New Revision: 52884 Modified: pypy/dist/pypy/doc/jit/rainbow.txt Log: Think about 'access_directly'. Modified: pypy/dist/pypy/doc/jit/rainbow.txt ============================================================================== --- pypy/dist/pypy/doc/jit/rainbow.txt (original) +++ pypy/dist/pypy/doc/jit/rainbow.txt Mon Mar 24 13:30:09 2008 @@ -282,3 +282,32 @@ "continue" statement was in a try:finally:. This is not necessarily a problem, just a note that we have to allow this hint to be in some subfunction, potentially. + +- the previous pypy-c-jit used SomeInstance annotations with a + special flag "access_directly" for frame objects at some + point, with the goal of making the regular (non-JITing) + interpretation access the frame directly without going + through the overhead of checking if it was virtualized. I + don't quite see how to keep this approach now. Let's try to + think about a "safe" way to detect when the overhead can be + removed. + + Here is a vague plan (draft to be expanded): let's try to + add a data flow pass that follows local variables and + function call arguments only. An object can be virtualized + only in two cases: if it is passed as an argument to a + residual call by the JIT, or if it is read out of a heap + data structure. We can easily record which functions are + residually callable during the generation of the JIT + bytecode, but not really before, so we need to remove + the overhead in an extra backendopt-style pass. + + Conversely, an object cannot be virtualized if we can see it + going from its creation point to its usage point via local + vars and args (without entering a residually callable + function). It cannot be virtualized either if we can see it + going from the 'jit_merge_point' hint to its usage point + (without entering a residually callable function): indeed, + if we cross 'jit_merge_point' but stay in the non-JITing + path, then we are sure that all the local vars are + non-virtualized. From cami at codespeak.net Mon Mar 24 17:33:40 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Mon, 24 Mar 2008 17:33:40 +0100 (CET) Subject: [pypy-svn] r52886 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080324163340.DD18216842D@codespeak.net> Author: cami Date: Mon Mar 24 17:33:39 2008 New Revision: 52886 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Log: removed java like ; from python files changed prepare_for_pop / fetch and added test for it more working tests improved inheritance of the cartridges Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Mon Mar 24 17:33:39 2008 @@ -12,20 +12,17 @@ or cartridgeType == constants.TYPE_MBC3_RAM_BATTERY \ or cartridgeType == constants.TYPE_MBC5_RAM_BATTERY \ or cartridgeType == constants.TYPE_MBC5_RUMBLE_RAM_BATTERY \ - or cartridgeType == constants.TYPE_HUC1_RAM_BATTERY); - + or cartridgeType == constants.TYPE_HUC1_RAM_BATTERY) def hasCartridgeType(self, catridgeType): return constants.CATRIDGE_TYPE_MAPPING.has_key(cartridgeType); - def createBankController(self, cartridgeType, rom, ram, clock): if hasCartridgeType(cartridgeType): - return constants.CATRIDGE_TYPE_MAPPING[cartridgeType](rom, ram, clock); + return constants.CATRIDGE_TYPE_MAPPING[cartridgeType](rom, ram, clock) else: raise InvalidMemoryBankTypeError("Unsupported memory bank controller (0x"+hex(cartridgeType)+")") - class InvalidMemoryBankTypeError(Exception): pass @@ -34,128 +31,90 @@ # ============================================================================== # CARTRIDGE -class Cartridge(object): +class CartridgeLoader(object): def __init__(self, storeDriver, clockDriver): self.store = storeDriver self.clock = clockDriver - - def initialize(self): - pass - - - def getTitle(self): - pass - - def getCartridgeType(self): return self.rom[constants.CARTRIDGE_TYPE_ADDRESS] & 0xFF - def getRom(self): return self.rom - def getROMSize(self): romSize = self.rom[constants.CARTRIDGE_SIZE_ADDRESS] & 0xFF if romSize>=0x00 and romSize<=0x07: return 32768 << romSize return -1 - def getRAMSize(self): return constants.RAM_SIZE_MAPPING[self.rom[constants.RAM_SIZE_ADDRESS]] - def getDestinationCode(self): - return self.rom[constants.DESTINATION_CODE_ADDRESS] & 0xFF; - + return self.rom[constants.DESTINATION_CODE_ADDRESS] & 0xFF def getLicenseeCode(): - return self.rom[constants.LICENSEE_ADDRESS] & 0xFF; + return self.rom[constants.LICENSEE_ADDRESS] & 0xFF - def getROMVersion(self): - return self.rom[constants.ROM_VERSION_ADDRESS] & 0xFF; - + return self.rom[constants.ROM_VERSION_ADDRESS] & 0xFF def getHeaderChecksum(self): - return self.rom[constants.HEADER_CHECKSUM_ADDRESS] & 0xFF; - + return self.rom[constants.HEADER_CHECKSUM_ADDRESS] & 0xFF def getChecksum(self): - return ((rom[constants.CHECKSUM_A_ADDRESS] & 0xFF) << 8) + (rom[constants.CHECKSUM_B_ADDRESS] & 0xFF); - + return ((rom[constants.CHECKSUM_A_ADDRESS] & 0xFF) << 8) + (rom[constants.CHECKSUM_B_ADDRESS] & 0xFF) def hasBattery(self): return hasCartridgeBattery(self.getCartridgeType()) - def reset(self): if not self.hasBattery(): - self.ram[0:len(self.ram):1] = 0xFF; - self.mbc.reset(); + self.ram[0:len(self.ram):1] = 0xFF + self.mbc.reset() - def read(self, address): - return self.mbc.read(address); - + return self.mbc.read(address) def write(self, address, data): - self.mbc.write(address, data); - + self.mbc.write(address, data) def load(self, cartridgeName): - romSize = self.store.getCartridgeSize(cartridgeName); - self.rom = range(0, romSize) - for i in range(0, romSize): - self.rom[i] = 0 - + romSize = self.store.getCartridgeSize(cartridgeName) + self.rom = [0]*romSize self.store.readCartridge(cartridgeName, self.rom) - if not self.verifyHeader(): raise Exeption("Cartridge header is corrupted") - if romSize < self.getROMSize(): raise Exeption("Cartridge is truncated") - ramSize = self.getRAMSize() - if (getCartridgeType() >= constants.TYPE_MBC2 and getCartridgeType() <= constants.TYPE_MBC2_BATTERY): - ramSize = 512; - - self.ram = [] - - for i in range(0, ramSize): - self.ram[i] = 0xFF - + ramSize = 512 + self.ram = [0xFF]*ramSize if self.store.hasBattery(cartridgeName): self.store.readBattery(cartridgeName, ram) - self.mbc = createBankController(self.getCartridgeType(), rom, ram, clock) - def save(self, cartridgeName): if self.hasBattery(): self.store.writeBattery(cartridgeName, self.ram) - def verify(self): - checksum = 0; + checksum = 0 for address in range(len(self.rom)): if address is not 0x014E and address is not 0x014F: checksum = (checksum + (self.rom[address] & 0xFF)) & 0xFFFF - return (checksum == self.getChecksum()); - + return (checksum == self.getChecksum()) def verifyHeader(self): if self.rom.length < 0x0150: - return false; - checksum = 0xE7; + return false + checksum = 0xE7 for address in range(0x0134, 0x014C): - checksum = (checksum - (rom[address] & 0xFF)) & 0xFF; + checksum = (checksum - (rom[address] & 0xFF)) & 0xFF return (checksum == self.getHeaderChecksum()) @@ -164,47 +123,51 @@ class MBC(object): - ramEnable = False - - rom = [] - ram = [] - - romSize = 0; - ramSize = 0; - - minRomBankSize = 0 - maxRomBankSize = 0 - - minRamBankSize = 0 - maxRamBankSize = 0 - - romBank = constants.ROM_BANK_SIZE - ramBank = 0 - - def reset(self): - self.romBank = constants.ROM_BANK_SIZE; - self.ramBank = 0; - self.ramEnable = False; + self.romBank = constants.ROM_BANK_SIZE + self.ramBank = 0 + self.ramEnable = False + self.rom = [] + self.ram = [] + self.romSize = 0 + self.ramSize = 0 + self.minRomBankSize = 0 + self.maxRomBankSize = 0 + self.minRamBankSize = 0 + self.maxRamBankSize = 0 def setROM(self, buffer): - banks = len(buffer) / constants.ROM_BANK_SIZE; + banks = len(buffer) / constants.ROM_BANK_SIZE if (banks < minRomBankSize or banks > maxRomBankSize): - raise Exception("Invalid constants.ROM size"); - self.rom = buffer; - self.romSize = constants.ROM_BANK_SIZE*banks - 1; + raise Exception("Invalid constants.ROM size") + self.rom = buffer + self.romSize = constants.ROM_BANK_SIZE*banks - 1 def setRAM(buffer): - banks = len(buffer) / constants.RAM_BANK_SIZE; + banks = len(buffer) / constants.RAM_BANK_SIZE if (banks < minRamBankSize or banks > maxRamBankSize): - raise Exception("Invalid constants.RAM size"); - self.ram = buffer; - self.ramSize = constants.RAM_BANK_SIZE*banks - 1; + raise Exception("Invalid constants.RAM size") + self.ram = buffer + self.ramSize = constants.RAM_BANK_SIZE*banks - 1 + + + def read(self, address): + if address <= 0x3FFF: # 0000-3FFF + return self.rom[address] & 0xFF + elif (address <= 0x7FFF):# 4000-7FFF + return self.rom[romBank + (address & 0x3FFF)] & 0xFF + elif (address >= 0xA000 and address <= 0xBFFF and self.ramEnable): # A000-BFFF + return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF + return 0xFF + + def write(self, address, data): + pass + """ -Mario GameBoy (TM) Emulator +PyBoy GameBoy (TM) Emulator Memory Bank Controller 1 (2MB constants.ROM, 32KB constants.RAM) @@ -226,56 +189,35 @@ def reset(self): super.reset() - self.memoryModel = 0 - - - def read(self, address): - if address <= 0x3FFF: - # 0000-3FFF - return self.rom[address] & 0xFF - elif (address <= 0x7FFF): - # 4000-7FFF - return self.rom[romBank + (address & 0x3FFF)] & 0xFF; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF - if (self.ramEnable): - return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; - return 0xFF; def write(self, address, data): - if (address <= 0x1FFF): - # 0000-1FFF + if (address <= 0x1FFF): # 0000-1FFF if (self.ramSize > 0): self.ramEnable = ((data & 0x0A) == 0x0A) - elif (address <= 0x3FFF): - # 2000-3FFF + elif (address <= 0x3FFF): # 2000-3FFF if ((data & 0x1F) == 0): - data = 1; + data = 1 if (self.memoryModel == 0): - self.romBank = ((self.romBank & 0x180000) + ((data & 0x1F) << 14)) & self.romSize; + self.romBank = ((self.romBank & 0x180000) + ((data & 0x1F) << 14)) & self.romSize else: - self.romBank = ((data & 0x1F) << 14) & self.romSize; - elif (address <= 0x5FFF): - # 4000-5FFF + self.romBank = ((data & 0x1F) << 14) & self.romSize + elif (address <= 0x5FFF): # 4000-5FFF if (self.memoryModel == 0): - self.romBank = ((self.romBank & 0x07FFFF) + ((data & 0x03) << 19)) & self.romSize; + self.romBank = ((self.romBank & 0x07FFFF) + ((data & 0x03) << 19)) & self.romSize else: - self.ramBank = ((data & 0x03) << 13) & self.ramSize; - elif (address <= 0x7FFF): - # 6000-7FFF + self.ramBank = ((data & 0x03) << 13) & self.ramSize + elif (address <= 0x7FFF): # 6000-7FFF self.memoryModel = data & 0x01 - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF - if (self.ramEnable): - self.ram[self.ramBank + (address & 0x1FFF)] = data; + elif (address >= 0xA000 and address <= 0xBFFF and self.ramEnable): # A000-BFFF + self.ram[self.ramBank + (address & 0x1FFF)] = data """ -Mario GameBoy (TM) Emulator +PyBoy GameBoy (TM) Emulator Memory Bank Controller 2 (256KB constants.ROM, 512x4bit constants.RAM) @@ -285,7 +227,7 @@ """ class MBC2(MBC): - RAM_BANK_SIZE = 512; + RAM_BANK_SIZE = 512 def __init__(self, rom, ram): self.minRamBankSize = constants.RAM_BANK_SIZE @@ -293,46 +235,51 @@ self.minRomBankSize = 2 self.maxRomBankSize = 16 - self.setROM(rom); - self.setRAM(ram); - - - def reset(self): - super.reset() - + self.setROM(rom) + self.setRAM(ram) def read(self, address): - if (address <= 0x3FFF): - # 0000-3FFF - return self.rom[address] & 0xFF; - elif (address <= 0x7FFF): - # 4000-7FFF - return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; - elif (address >= 0xA000 and address <= 0xA1FF): - # A000-A1FF - return self.ram[address & 0x01FF] & 0x0F; - return 0xFF; - + if address > 0xA1FF: + return 0xFF + else: + return super.read(address) def write(self, address, data): - if (address <= 0x1FFF): - # 0000-1FFF + if (address <= 0x1FFF): # 0000-1FFF if ((address & 0x0100) == 0): - self.ramEnable = ((data & 0x0A) == 0x0A); - elif (address <= 0x3FFF): - # 2000-3FFF + self.ramEnable = ((data & 0x0A) == 0x0A) + elif (address <= 0x3FFF): # 2000-3FFF if ((address & 0x0100) != 0): if ((data & 0x0F) == 0): - data = 1; - self.romBank = ((data & 0x0F) << 14) & self.romSize; - elif (address >= 0xA000 and address <= 0xA1FF): - # A000-A1FF + data = 1 + self.romBank = ((data & 0x0F) << 14) & self.romSize + elif (address >= 0xA000 and address <= 0xA1FF): # A000-A1FF if (self.ramEnable): - self.ram[address & 0x01FF] = (byte) (data & 0x0F); + self.ram[address & 0x01FF] = (byte) (data & 0x0F) + def write(self, address, data): + if (address <= 0x1FFF): # 0000-1FFF + if (self.ramSize > 0): + self.ramEnable = ((data & 0x0A) == 0x0A) + elif (address <= 0x3FFF): # 2000-3FFF + if ((data & 0x1F) == 0): + data = 1 + if (self.memoryModel == 0): + self.romBank = ((self.romBank & 0x180000) + ((data & 0x1F) << 14)) & self.romSize + else: + self.romBank = ((data & 0x1F) << 14) & self.romSize + elif (address <= 0x5FFF): # 4000-5FFF + if (self.memoryModel == 0): + self.romBank = ((self.romBank & 0x07FFFF) + ((data & 0x03) << 19)) & self.romSize + else: + self.ramBank = ((data & 0x03) << 13) & self.ramSize + elif (address <= 0x7FFF): # 6000-7FFF + self.memoryModel = data & 0x01 + elif (address >= 0xA000 and address <= 0xBFFF and self.ramEnable): # A000-BFFF + self.ram[self.ramBank + (address & 0x1FFF)] = data """ -Mario GameBoy (TM) Emulator +PyBoy GameBoy (TM) Emulator Memory Bank Controller 3 (2MB constants.ROM, 32KB constants.RAM, Real Time Clock) @@ -342,15 +289,6 @@ """ class MBC3(MBC): - #ClockDriver - clock = None; - - romBank = 0; - ramBank = 0; - - clockRegister = 0; - clockLatch = 0; - clockTime = 0; clockSeconds = 0 clockMinutes = 0 @@ -368,144 +306,119 @@ self.minRomBankSize = 2 self.maxRomBankSize = 128 - self.clock = clock; + self.clock = clock + self.clockRegister = 0 + self.clockLatch = 0 + self.clockTime = 0 - self.setROM(rom); - self.setRAM(ram); + self.setROM(rom) + self.setRAM(ram) def reset(): super.reset() - - self.clockTime = self.clock.getTime(); - - self.clockLatch = self.clockRegister = 0; - - self.clockSeconds = self.clockMinutes = self.clockHours = self.clockDays = self.clockControl = 0; - self.clockLSeconds = self.clockLMinutes = self.clockLHours = self.clockLDays = self.clockLControl = 0; + self.clockTime = self.clock.getTime() + self.clockLatch = self.clockRegister = 0 + self.clockSeconds = self.clockMinutes = self.clockHours = self.clockDays = self.clockControl = 0 + self.clockLSeconds = self.clockLMinutes = self.clockLHours = self.clockLDays = self.clockLControl = 0 def read(self, address): - if (address <= 0x3FFF): - # 0000-3FFF - return self.rom[address] & 0xFF; - elif (address <= 0x7FFF): - # 4000-5FFF - return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF + if (address >= 0xA000 and address <= 0xBFFF): # A000-BFFF if (self.ramBank >= 0): - return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; + return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF else: if (self.clockRegister == 0x08): - return self.clockLSeconds; + return self.clockLSeconds if (self.clockRegister == 0x09): - return self.clockLMinutes; + return self.clockLMinutes if (self.clockRegister == 0x0A): - return self.clockLHours; + return self.clockLHours if (self.clockRegister == 0x0B): - return self.clockLDays; + return self.clockLDays if (self.clockRegister == 0x0C): - return self.clockLControl; - return 0xFF; - + return self.clockLControl + else: + return super.read(address) + def write(self, address, data): - if (address <= 0x1FFF): - # 0000-1FFF + if (address <= 0x1FFF): # 0000-1FFF if (self.ramSize > 0): - self.ramEnable = ((data & 0x0A) == 0x0A); - elif (address <= 0x3FFF): - # 2000-3FFF + self.ramEnable = ((data & 0x0A) == 0x0A) + elif (address <= 0x3FFF): # 2000-3FFF if (data == 0): - data = 1; - self.romBank = ((data & 0x7F) << 14) & self.romSize; - elif (address <= 0x5FFF): - # 4000-5FFF + data = 1 + self.romBank = ((data & 0x7F) << 14) & self.romSize + elif (address <= 0x5FFF): # 4000-5FFF if (data >= 0x00 and data <= 0x03): - self.ramBank = (data << 13) & self.ramSize; + self.ramBank = (data << 13) & self.ramSize else: - self.ramBank = -1; - self.clockRegister = data; - elif (address <= 0x7FFF): - # 6000-7FFF + self.ramBank = -1 + self.clockRegister = data + elif (address <= 0x7FFF): # 6000-7FFF if (self.clockLatch == 0 and data == 1): - self.latchClock(); + self.latchClock() if (data == 0 or data == 1): - self.clockLatch = data; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF - if (self.ramEnable): - if (self.ramBank >= 0): - # constants.TODO conversion to byte - self.ram[self.ramBank + (address & 0x1FFF)] = data; - else: - self.updateClock(); - - if (self.clockRegister == 0x08): - self.clockSeconds = data; - if (self.clockRegister == 0x09): - self.clockMinutes = data; - if (self.clockRegister == 0x0A): - self.clockHours = data; - if (self.clockRegister == 0x0B): - self.clockDays = data; - if (self.clockRegister == 0x0C): - self.clockControl = (self.clockControl & 0x80) | data; + self.clockLatch = data + elif (address >= 0xA000 and address <= 0xBFFF and self.ramEnable): # A000-BFFF + if (self.ramBank >= 0): + self.ram[self.ramBank + (address & 0x1FFF)] = data + else: + self.updateClock() + if (self.clockRegister == 0x08): + self.clockSeconds = data + if (self.clockRegister == 0x09): + self.clockMinutes = data + if (self.clockRegister == 0x0A): + self.clockHours = data + if (self.clockRegister == 0x0B): + self.clockDays = data + if (self.clockRegister == 0x0C): + self.clockControl = (self.clockControl & 0x80) | data def latchClock(self): - self.updateClock(); - - self.clockLSeconds = self.clockSeconds; - self.clockLMinutes = self.clockMinutes; - self.clockLHours = self.clockHours; - self.clockLDays = self.clockDays & 0xFF; - self.clockLControl = (self.clockControl & 0xFE) | ((self.clockDays >> 8) & 0x01); + self.updateClock() + self.clockLSeconds = self.clockSeconds + self.clockLMinutes = self.clockMinutes + self.clockLHours = self.clockHours + self.clockLDays = self.clockDays & 0xFF + self.clockLControl = (self.clockControl & 0xFE) | ((self.clockDays >> 8) & 0x01) def updateClock(): - now = self.clock.getTime(); - + now = self.clock.getTime() if ((self.clockControl & 0x40) == 0): - elapsed = now - self.clockTime; - + elapsed = now - self.clockTime while (elapsed >= 246060): elapsed -= 246060 self.clockDays+=1 - while (elapsed >= 6060): - elapsed -= 6060; + elapsed -= 6060 self.clockHours+=1 - while (elapsed >= 60): - elapsed -= 60; + elapsed -= 60 self.clockMinutes+=1 - - self.clockSeconds += elapsed; - + self.clockSeconds += elapsed while (self.clockSeconds >= 60): - self.clockSeconds -= 60; + self.clockSeconds -= 60 self.clockMinutes+=1 - while (self.clockMinutes >= 60): - self.clockMinutes -= 60; + self.clockMinutes -= 60 self.clockHours+=1 - while (self.clockHours >= 24): - self.clockHours -= 24; + self.clockHours -= 24 self.clockDays+=1 - while (self.clockDays >= 512): - self.clockDays -= 512; - self.clockControl |= 0x80; - - self.clockTime = now; + self.clockDays -= 512 + self.clockControl |= 0x80 + self.clockTime = now """ -Mario GameBoy (TM) Emulator +PyBoy GameBoy (TM) Emulator Memory Bank Controller 5 (8MB constants.ROM, 128KB constants.RAM) * @@ -515,9 +428,6 @@ """ class MBC5(MBC): - romBank = 0; - - rumble = False; def __init__(self, rom, ram, rumble): self.minRamBankSize = 0 @@ -525,50 +435,26 @@ self.minRomBankSize = 2 self.maxRomBankSize = 512 - self.rumble = rumble; - self.setROM(rom); - self.setRAM(ram); - - - def reset(): - super.reset() - - - def read(self, address): - if (address <= 0x3FFF): - # 0000-3FFF - return self.rom[address] & 0xFF; - elif (address <= 0x7FFF): - # 4000-7FFF - return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF - return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; - return 0xFF; + self.rumble = rumble + self.setROM(rom) + self.setRAM(ram) def write(self, address, data): - if (address <= 0x1FFF): - # 0000-1FFF + if (address <= 0x1FFF): # 0000-1FFF if (self.ramSize > 0): - self.ramEnable = ((data & 0x0A) == 0x0A); - elif (address <= 0x2FFF): - # 2000-2FFF - self.romBank = ((self.romBank & (0x01 << 22)) + ((data & 0xFF) << 14)) & self.romSize; - elif (address <= 0x3FFF): - # 3000-3FFF - self.romBank = ((self.romBank & (0xFF << 14)) + ((data & 0x01) << 22)) & self.romSize; - elif (address <= 0x4FFF): - # 4000-4FFF + self.ramEnable = ((data & 0x0A) == 0x0A) + elif (address <= 0x2FFF): # 2000-2FFF + self.romBank = ((self.romBank & (0x01 << 22)) + ((data & 0xFF) << 14)) & self.romSize + elif (address <= 0x3FFF): # 3000-3FFF + self.romBank = ((self.romBank & (0xFF << 14)) + ((data & 0x01) << 22)) & self.romSize + elif (address <= 0x4FFF): # 4000-4FFF if (self.rumble): - self.ramBank = ((data & 0x07) << 13) & self.ramSize; + self.ramBank = ((data & 0x07) << 13) & self.ramSize else: - self.ramBank = ((data & 0x0F) << 13) & self.ramSize; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF - if (self.ramEnable): - #TODO byte conversion - self.ram[self.ramBank + (address & 0x1FFF)] = data; + self.ramBank = ((data & 0x0F) << 13) & self.ramSize + elif (address >= 0xA000 and address <= 0xBFFF and self.ramEnable): # A000-BFFF + self.ram[self.ramBank + (address & 0x1FFF)] = data @@ -579,7 +465,7 @@ """ -Mario GameBoy (TM) Emulator +PyBoy GameBoy (TM) Emulator Hudson Memory Bank Controller 3 (2MB constants.ROM, 128KB constants.RAM, constants.RTC) @@ -588,125 +474,104 @@ A000-BFFF RAM Bank 0-15 (8KB) """ class HuC3(MBC): - clock = None; - - romBank = 0; - - ramFlag = 0; - - ramValue = 0; - - clockRegister = 0; - clockShift = 0; - clockTime = 0; def __init__(self, rom, ram, clock): self.minRamBankSize = 0 self.maxRamBankSize = 4 self.minRomBankSize = 2 self.maxRomBankSize = 128 - self.clock = clock; - self.setROM(rom); - self.setRAM(ram); + self.clock = clock + self.clockRegister = 0 + self.clockShift = 0 + self.clockTime = 0 + + self.setROM(rom) + self.setRAM(ram) + self.ramFlag = 0 + self.ramValue = 0 def reset(): super.reset() - - self.ramFlag = 0; - self.ramValue = 0; - - self.clockRegister = 0; - self.clockShift = 0; - - self.clockTime = self.clock.getTime(); + self.ramFlag = 0 + self.ramValue = 0 + self.clockRegister = 0 + self.clockShift = 0 + self.clockTime = self.clock.getTime() def read(self, address): - if (address <= 0x3FFF): - # 0000-3FFF - return self.rom[address] & 0xFF; - elif (address <= 0x7FFF): - # 4000-5FFF - return self.rom[self.romBank + (address & 0x3FFF)] & 0xFF; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF + if (address >= 0xA000 and address <= 0xBFFF):# A000-BFFF if (self.ramFlag == 0x0C): - return self.ramValue; + return self.ramValue elif (self.ramFlag == 0x0D): - return 0x01; + return 0x01 elif (self.ramFlag == 0x0A or self.ramFlag == 0x00): if (self.ramSize > 0): - return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF; - return 0xFF; - - + return self.ram[self.ramBank + (address & 0x1FFF)] & 0xFF + else: + super.read(address) + def write(self, address, data): - if (address <= 0x1FFF): - # 0000-1FFF - self.ramFlag = data; - elif (address <= 0x3FFF): - # 2000-3FFF + if (address <= 0x1FFF): # 0000-1FFF + self.ramFlag = data + elif (address <= 0x3FFF):# 2000-3FFF if ((data & 0x7F) == 0): - data = 1; - self.romBank = ((data & 0x7F) << 14) & self.romSize; - elif (address <= 0x5FFF): - # 4000-5FFF - self.ramBank = ((data & 0x0F) << 13) & self.ramSize; - elif (address >= 0xA000 and address <= 0xBFFF): - # A000-BFFF + data = 1 + self.romBank = ((data & 0x7F) << 14) & self.romSize + elif (address <= 0x5FFF): # 4000-5FFF + self.ramBank = ((data & 0x0F) << 13) & self.ramSize + elif (address >= 0xA000 and address <= 0xBFFF): # A000-BFFF if (self.ramFlag == 0x0B): - if ((data & 0xF0) == 0x10): - if (self.clockShift <= 24): - self.ramValue = (self.clockRegister >> self.clockShift) & 0x0F; - self.clockShift += 4; - elif ((data & 0xF0) == 0x30): - if (self.clockShift <= 24): - self.clockRegister &= ~(0x0F << self.clockShift); - self.clockRegister |= ((data & 0x0F) << self.clockShift); - self.clockShift += 4; - elif ((data & 0xF0) == 0x40): - self.updateClock(); - if ((data & 0x0F) == 0x00): - self.clockShift = 0; - elif ((data & 0x0F) == 0x03): - self.clockShift = 0; - elif ((data & 0x0F) == 0x07): - self.clockShift = 0; - elif ((data & 0xF0) == 0x50): - pass - elif ((data & 0xF0) == 0x60): - self.ramValue = 0x01; + self.writeWithRamFlag0x0B(address, data) elif (self.ramFlag >= 0x0C and self.ramFlag <= 0x0E): pass - elif (self.ramFlag == 0x0A): - if (self.ramSize > 0): - #TODO byte conversion - self.ram[self.ramBank + (address & 0x1FFF)] = data; - - + elif (self.ramFlag == 0x0A and self.ramSize > 0): + self.ram[self.ramBank + (address & 0x1FFF)] = data + + def writeWithRamFlag0x0B(self, address, data): + if ((data & 0xF0) == 0x10): + if (self.clockShift <= 24): + self.ramValue = (self.clockRegister >> self.clockShift) & 0x0F + self.clockShift += 4 + elif ((data & 0xF0) == 0x30): + if (self.clockShift <= 24): + self.clockRegister &= ~(0x0F << self.clockShift) + self.clockRegister |= ((data & 0x0F) << self.clockShift) + self.clockShift += 4 + elif ((data & 0xF0) == 0x40): + self.updateClock() + if ((data & 0x0F) == 0x00): + self.clockShift = 0 + elif ((data & 0x0F) == 0x03): + self.clockShift = 0 + elif ((data & 0x0F) == 0x07): + self.clockShift = 0 + elif ((data & 0xF0) == 0x50): + pass + elif ((data & 0xF0) == 0x60): + self.ramValue = 0x01 + def updateClock(self): - now = self.clock.getTime(); - elapsed = now - self.clockTime; + now = self.clock.getTime() + elapsed = now - self.clockTime # years (4 bits) while (elapsed >= 365246060): - self.clockRegister += 1 << 24; - elapsed -= 365246060; + self.clockRegister += 1 << 24 + elapsed -= 365246060 # days (12 bits) while (elapsed >= 246060): - self.clockRegister += 1 << 12; - elapsed -= 246060; + self.clockRegister += 1 << 12 + elapsed -= 246060 # minutes (12 bits) while (elapsed >= 60): - self.clockRegister += 1; - elapsed -= 60; - + self.clockRegister += 1 + elapsed -= 60 if ((self.clockRegister & 0x0000FFF) >= 2460): - self.clockRegister += (1 << 12) - 2460; + self.clockRegister += (1 << 12) - 2460 if ((self.clockRegister & 0x0FFF000) >= (365 << 12)): - self.clockRegister += (1 << 24) - (365 << 12); - - self.clockTime = now - elapsed; + self.clockRegister += (1 << 24) - (365 << 12) + self.clockTime = now - elapsed Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py Mon Mar 24 17:33:39 2008 @@ -228,7 +228,7 @@ ] # Timer Register Addresses -DIV = 0xFF04 # Divider Register */ -TIMA = 0xFF05 # Timer Counter */ -TMA = 0xFF06 # Timer Modulo */ -TAC = 0xFF07 # Timer Control */ +DIV = 0xFF04 # Divider Register +TIMA = 0xFF05 # Timer Counter +TMA = 0xFF06 # Timer Modulo +TAC = 0xFF07 # Timer Control Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Mon Mar 24 17:33:39 2008 @@ -1,5 +1,5 @@ """ -Mario GameBoy (TM) EmulatOR +PyBoy GameBoy (TM) Emulator Central Unit ProcessOR (Sharp LR35902 CPU) """ @@ -279,7 +279,10 @@ return data # 3 cycles - def popDoubleRegister(self, getter, register): + def popDoubleRegister(self, getter, register=None): + if register == None: + register = getter + getter = CPU.pop b = getter(self) # 1 cycle a = getter(self) # 1 cycle register.set(a, b) # 2 cycles @@ -516,10 +519,10 @@ # 2 cycles def ld_BCi_A(self): - self.write(self.bc.get(), self.a.get()); + self.write(self.bc.get(), self.a.get()) def ld_DEi_A(self): - self.write(self.de.get(), self.a.get()); + self.write(self.de.get(), self.a.get()) def ld_A_BCi(self): self.a.set(self.read(self.bc.get())) @@ -914,7 +917,7 @@ (0xC2, 0x08, CPU.jp_cc_nnnn, REGISTER_SET_B), (0xC4, 0x08, CPU.call_cc_nnnn, REGISTER_SET_B), (0x20, 0x08, CPU.jr_cc_nn, REGISTER_SET_B), - (0xC1, 0x10, CPU.pop, REGISTER_SET_C), + (0xC1, 0x10, CPU.popDoubleRegister, REGISTER_SET_C), (0xC5, 0x10, CPU.push, REGISTER_SET_C) ] Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py Mon Mar 24 17:33:39 2008 @@ -1,5 +1,5 @@ """ -Mario GameBoy (TM) Emulator +PyBoy GameBoy (TM) Emulator Gameboy Scheduler and Memory Mapper @@ -9,88 +9,88 @@ class GameBoy(object): # RAM - ram = None; - cartridge = None; - interrupt = None; - cpu = None; - serial = None; - timer = None; - joypad = None; - video = None; - sound = None; + ram = None + cartridge = None + interrupt = None + cpu = None + serial = None + timer = None + joypad = None + video = None + sound = None def __init__(self, videoDriver, soundDriver, joypadDriver, storeDriver, clockDriver): - self.ram = RAM(); - self.cartridge = Cartridge(storeDriver, clockDriver); - self.interrupt = Interrupt(); - self.cpu = CPU(self.interrupt, this); - self.serial = Serial(self.interrupt); - self.timer = Timer(self.interrupt); - self.joypad = Joypad(joypadDriver, self.interrupt); - self.video = Video(videoDriver, self.interrupt, this); - self.sound = Sound(soundDriver); + self.ram = RAM() + self.cartridge = Cartridge(storeDriver, clockDriver) + self.interrupt = Interrupt() + self.cpu = CPU(self.interrupt, this) + self.serial = Serial(self.interrupt) + self.timer = Timer(self.interrupt) + self.joypad = Joypad(joypadDriver, self.interrupt) + self.video = Video(videoDriver, self.interrupt, this) + self.sound = Sound(soundDriver) def getCartridge(self): - return self.cartridge; + return self.cartridge def getFrameSkip(self): - return self.video.getFrameSkip(); + return self.video.getFrameSkip() def setFrameSkip(self, frameSkip): - self.video.setFrameSkip(frameSkip); + self.video.setFrameSkip(frameSkip) def load(self, cartridgeName): - self.cartridge.load(cartridgeName); + self.cartridge.load(cartridgeName) def save(self, cartridgeName): - self.cartridge.save(cartridgeName); + self.cartridge.save(cartridgeName) def start(self): - self.sound.start(); + self.sound.start() def stop(self): - self.sound.stop(); + self.sound.stop() def reset(self): - self.ram.reset(); - self.cartridge.reset(); - self.interrupt.reset(); - self.cpu.reset(); - self.serial.reset(); - self.timer.reset(); - self.joypad.reset(); - self.video.reset(); - self.sound.reset(); - self.cpu.setROM(self.cartridge.getROM()); - self.drawLogo(); + self.ram.reset() + self.cartridge.reset() + self.interrupt.reset() + self.cpu.reset() + self.serial.reset() + self.timer.reset() + self.joypad.reset() + self.video.reset() + self.sound.reset() + self.cpu.setROM(self.cartridge.getROM()) + self.drawLogo() def cycles(self): return min(self.video.cycles(), self.serial.cycles(), self.timer.cycles(), self.sound.cycles(), - self.joypad.cycles()); + self.joypad.cycles()) def emulate(self, ticks): while (ticks > 0): - count = self.cycles(); + count = self.cycles() - self.cpu.emulate(count); - self.serial.emulate(count); - self.timer.emulate(count); - self.video.emulate(count); - self.sound.emulate(count); - self.joypad.emulate(count); + self.cpu.emulate(count) + self.serial.emulate(count) + self.timer.emulate(count) + self.video.emulate(count) + self.sound.emulate(count) + self.joypad.emulate(count) - ticks -= count; + ticks -= count def write(self, address, data): @@ -129,26 +129,26 @@ def drawLogo(self): for index in range(0, 48): - bits = self.cartridge.read(0x0104 + index); + bits = self.cartridge.read(0x0104 + index) pattern0 = ((bits >> 0) & 0x80) + ((bits >> 1) & 0x60)\ + ((bits >> 2) & 0x18) + ((bits >> 3) & 0x06)\ - + ((bits >> 4) & 0x01); + + ((bits >> 4) & 0x01) pattern1 = ((bits << 4) & 0x80) + ((bits << 3) & 0x60)\ + ((bits << 2) & 0x18) + ((bits << 1) & 0x06)\ - + ((bits << 0) & 0x01); + + ((bits << 0) & 0x01) - self.video.write(0x8010 + (index << 3), pattern0); - self.video.write(0x8012 + (index << 3), pattern0); + self.video.write(0x8010 + (index << 3), pattern0) + self.video.write(0x8012 + (index << 3), pattern0) - self.video.write(0x8014 + (index << 3), pattern1); - self.video.write(0x8016 + (index << 3), pattern1); + self.video.write(0x8014 + (index << 3), pattern1) + self.video.write(0x8016 + (index << 3), pattern1) for index in range(0, 8): - self.video.write(0x8190 + (index << 1), constants.REGISTERED_BITMAP[index]); + self.video.write(0x8190 + (index << 1), constants.REGISTERED_BITMAP[index]) for tile in range(0, 12): - self.video.write(0x9904 + tile, tile + 1); - self.video.write(0x9924 + tile, tile + 13); + self.video.write(0x9904 + tile, tile + 1) + self.video.write(0x9924 + tile, tile + 13) - self.video.write(0x9905 + 12, 25); + self.video.write(0x9905 + 12, 25) Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py Mon Mar 24 17:33:39 2008 @@ -1,5 +1,5 @@ """ -Mario GameBoy (TM) Emulator +PyBoy GameBoy (TM) Emulator Interrupt Controller """ @@ -9,60 +9,60 @@ class Interrupt(object): # Registers - enable = 0; - flag = 0; + enable = 0 + flag = 0 def __init__(self): - self.reset(); + self.reset() def reset(self): - self.enable = 0; - self.flag = VBLANK; + self.enable = 0 + self.flag = constants.VBLANK def isPending(self): - return (self.enable & self.flag) != 0; + return (self.enable & self.flag) != 0 def isPending(self, mask): - return (self.enable & self.flag & mask) != 0; + return (self.enable & self.flag & mask) != 0 def raiseInterrupt(self, mask): - self.flag |= mask; + self.flag |= mask def lower(self, mask): - self.flag &= ~mask; + self.flag &= ~mask def write(self, address, data): if address == constants.IE: - self.setInterruptEnable(data); + self.setInterruptEnable(data) elif address == constants.IF: - self.setInterruptFlag(data); + self.setInterruptFlag(data) def read(self, address): if address == constants.IE: - return self.getInterruptEnable(); + return self.getInterruptEnable() elif address == constants.IF: - return self.getInterruptFlag(); - return 0xFF; + return self.getInterruptFlag() + return 0xFF def getInterruptEnable(self): - return self.enable; + return self.enable def getInterruptFlag(self): - return 0xE0 | self.flag; + return 0xE0 | self.flag def setInterruptEnable(self, data): - self.enable = data; + self.enable = data def setInterruptFlag(self, data): - self.flag = data; + self.flag = data Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py Mon Mar 24 17:33:39 2008 @@ -1,5 +1,5 @@ """ -Mario GameBoy (TM) Emulator +PyBoy GameBoy (TM) Emulator Joypad Input """ @@ -7,64 +7,64 @@ class Joypad(object): # Registers - joyp = 0; - cycles = 0; + joyp = 0 + cycles = 0 # Interrupt Controller - interrupt = None; + interrupt = None # Driver JoypadDriver - driver = None; + driver = None def __init__(self, joypadDriver, interrupt): - self.driver = joypadDriver; - self.interrupt = interrupt; - self.reset(); + self.driver = joypadDriver + self.interrupt = interrupt + self.reset() def reset(self): - self.joyp = 0xFF; - self.cycles = constants.JOYPAD_CLOCK; + self.joyp = 0xFF + self.cycles = constants.JOYPAD_CLOCK def cycles(self): - return self.cycles; + return self.cycles def emulate(self, ticks): - self.cycles -= ticks; + self.cycles -= ticks if (self.cycles <= 0): if (self.driver.isRaised()): - self.update(); + self.update() - self.cycles = constants.JOYPAD_CLOCK; + self.cycles = constants.JOYPAD_CLOCK def write(self, address, data): if (address == constants.JOYP): - self.joyp = (self.joyp & 0xCF) + (data & 0x30); - self.update(); + self.joyp = (self.joyp & 0xCF) + (data & 0x30) + self.update() def read(self, address): if (address == constants.JOYP): - return self.joyp; - return 0xFF; + return self.joyp + return 0xFF def update(self): - data = self.joyp & 0xF0; + data = self.joyp & 0xF0 switch = (data & 0x30) if switch==0x10: - data |= self.driver.getButtons(); + data |= self.driver.getButtons() elif switch==0x20: - data |= self.driver.getDirections(); + data |= self.driver.getDirections() elif switch==0x30: - data |= 0x0F; + data |= 0x0F if ((self.joyp & ~data & 0x0F) != 0): - self.interrupt.raiseInterrupt(constants.JOYPAD); + self.interrupt.raiseInterrupt(constants.JOYPAD) - self.joyp = data; + self.joyp = data Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py Mon Mar 24 17:33:39 2008 @@ -1,5 +1,5 @@ """ -Mario GameBoy (TM) Emulator +PyBoy GameBoy (TM) Emulator Work and High RAM """ @@ -15,29 +15,27 @@ hram = [] def __init__(self): - self.reset(); + self.reset() def reset(self): - self.wram = [0x00]*8192; - self.hram = [0x00]*128; + self.wram = [0x00]*8192 + self.hram = [0x00]*128 def write(self, address, data): if (address >= 0xC000 and address <= 0xFDFF): # C000-DFFF Work RAM (8KB) # E000-FDFF Echo RAM - #TODO convert to byte - self.wram[address & 0x1FFF] = data; + self.wram[address & 0x1FFF] = data elif (address >= 0xFF80 and address <= 0xFFFE): # FF80-FFFE High RAM - #TODO convert to byte - self.hram[address & 0x7F] = data; + self.hram[address & 0x7F] = data def read(self, address): if (address >= 0xC000 and address <= 0xFDFF): # C000-DFFF Work RAM # E000-FDFF Echo RAM - return self.wram[address & 0x1FFF] & 0xFF; + return self.wram[address & 0x1FFF] & 0xFF elif (address >= 0xFF80 and address <= 0xFFFE): # FF80-FFFE High RAM - return self.hram[address & 0x7F] & 0xFF; - return 0xFF; + return self.hram[address & 0x7F] & 0xFF + return 0xFF Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py Mon Mar 24 17:33:39 2008 @@ -1,5 +1,5 @@ """ -Mario GameBoy (TM) Emulator +PyBoy GameBoy (TM) Emulator Serial Link Controller """ from pypy.lang.gameboy import constants Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py Mon Mar 24 17:33:39 2008 @@ -1,5 +1,5 @@ """ -Mario GameBoy (TM) Emulator +PyBoy GameBoy (TM) Emulator Audio Processor Unit (Sharp LR35902 APU) """ @@ -9,372 +9,372 @@ class Sound(object): # Audio Channel 1 int - nr10=0; - nr11=0; - nr12=0; - nr13=0; - nr14=0; - audio1Index=0; - audio1Length=0; - audio1Volume=0; - audio1EnvelopeLength=0; - audio1SweepLength=0; - audio1Frequency=0; + nr10=0 + nr11=0 + nr12=0 + nr13=0 + nr14=0 + audio1Index=0 + audio1Length=0 + audio1Volume=0 + audio1EnvelopeLength=0 + audio1SweepLength=0 + audio1Frequency=0 # Audio Channel 2 int - nr21=0; - nr22=0; - nr23=0; - nr24=0; - audio2Index=0; - audio2Length=0; - audio2Volume=0; - audio2EnvelopeLength=0; - audio2Frequency=0; + nr21=0 + nr22=0 + nr23=0 + nr24=0 + audio2Index=0 + audio2Length=0 + audio2Volume=0 + audio2EnvelopeLength=0 + audio2Frequency=0 # Audio Channel 3 int - nr30=0; - nr31=0; - nr32=0; - nr33=0; - nr34=0; - audio3Index=0; - audio3Length=0; - audio3Frequency=0; - audio3WavePattern = []# = new byte[16]; + nr30=0 + nr31=0 + nr32=0 + nr33=0 + nr34=0 + audio3Index=0 + audio3Length=0 + audio3Frequency=0 + audio3WavePattern = []# = new byte[16] # Audio Channel 4 int - nr41=0; - nr42=0; - nr43=0; - nr44=0; - audio4Index=0; - audio4Length=0; - audio4Volume=0; - audio4EnvelopeLength=0; - audio4Frequency=0; + nr41=0 + nr42=0 + nr43=0 + nr44=0 + audio4Index=0 + audio4Length=0 + audio4Volume=0 + audio4EnvelopeLength=0 + audio4Frequency=0 # Output Control int - nr50=0; - nr51=0; - nr52=0; + nr50=0 + nr51=0 + nr52=0 # Sound DriverSoundDriver - #driver; - buffer = []# = new byte[512]; + #driver + buffer = []# = new byte[512] #int - #frames; - #cycles; + #frames + #cycles # Frequency Table - frequencyTable = []#= new int[2048]; - noiseFreqRatioTable = [] #= new int[8]; + frequencyTable = []#= new int[2048] + noiseFreqRatioTable = [] #= new int[8] # Noise Tables - noiseStep7Table = [] #= new int[128 / 32]; - noiseStep15Table = [] #= new int[32768 / 32]; + noiseStep7Table = [] #= new int[128 / 32] + noiseStep15Table = [] #= new int[32768 / 32] def __init__(self, soundDriver): - self.driver = soundDriver; - self.generateFrequencyTables(); - self.generateNoiseTables(); - self.reset(); + self.driver = soundDriver + self.generateFrequencyTables() + self.generateNoiseTables() + self.reset() def start(self): - self.driver.start(); + self.driver.start() def stop(self): - self.driver.stop(); + self.driver.stop() def cycles(self): - return self.cycles; + return self.cycles def emulate(self, ticks): - self.cycles -= ticks; + self.cycles -= ticks while (self.cycles <= 0): - self.updateAudio(); + self.updateAudio() if (self.driver.isEnabled()): - self.frames += self.driver.getSampleRate(); - length = (self.frames / constants.SOUND_CLOCK) << 1; - self.mixAudio(self.buffer, length); - self.driver.write(self.buffer, length); - self.frames %= constants.SOUND_CLOCK; + self.frames += self.driver.getSampleRate() + length = (self.frames / constants.SOUND_CLOCK) << 1 + self.mixAudio(self.buffer, length) + self.driver.write(self.buffer, length) + self.frames %= constants.SOUND_CLOCK - self.cycles += constants.GAMEBOY_CLOCK / constants.SOUND_CLOCK; + self.cycles += constants.GAMEBOY_CLOCK / constants.SOUND_CLOCK def reset(self): - self.cycles = constants.GAMEBOY_CLOCK / constants.SOUND_CLOCK; - self.frames = 0; - self.audio1Index = self.audio2Index = self.audio3Index = self.audio4Index = 0; - self.write(constants.NR10, 0x80); + self.cycles = constants.GAMEBOY_CLOCK / constants.SOUND_CLOCK + self.frames = 0 + self.audio1Index = self.audio2Index = self.audio3Index = self.audio4Index = 0 + self.write(constants.NR10, 0x80) self.write(constants.NR11, 0x3F); # 0xBF self.write(constants.NR12, 0x00); # 0xF3 - self.write(constants.NR13, 0xFF); - self.write(constants.NR14, 0xBF); + self.write(constants.NR13, 0xFF) + self.write(constants.NR14, 0xBF) - self.write(constants.NR21, 0x3F); - self.write(constants.NR22, 0x00); - self.write(constants.NR23, 0xFF); - self.write(constants.NR24, 0xBF); - - self.write(constants.NR30, 0x7F); - self.write(constants.NR31, 0xFF); - self.write(constants.NR32, 0x9F); - self.write(constants.NR33, 0xFF); - self.write(constants.NR34, 0xBF); - - self.write(constants.NR41, 0xFF); - self.write(constants.NR42, 0x00); - self.write(constants.NR43, 0x00); - self.write(constants.NR44, 0xBF); + self.write(constants.NR21, 0x3F) + self.write(constants.NR22, 0x00) + self.write(constants.NR23, 0xFF) + self.write(constants.NR24, 0xBF) + + self.write(constants.NR30, 0x7F) + self.write(constants.NR31, 0xFF) + self.write(constants.NR32, 0x9F) + self.write(constants.NR33, 0xFF) + self.write(constants.NR34, 0xBF) + + self.write(constants.NR41, 0xFF) + self.write(constants.NR42, 0x00) + self.write(constants.NR43, 0x00) + self.write(constants.NR44, 0xBF) self.write(constants.NR50, 0x00); # 0x77 - self.write(constants.NR51, 0xF0); + self.write(constants.NR51, 0xF0) self.write(constants.NR52, 0xFF); # 0xF0 for address in range(0xFF30, 0xFF3F): write = 0xFF if (address & 1) == 0: write = 0x00 - self.write(address, write); + self.write(address, write) def read(self, address): if address==constants.NR10: - return self.getAudio1Sweep(); + return self.getAudio1Sweep() elif address == constants.NR11: - return self.getAudio1Length(); + return self.getAudio1Length() elif address == constants.NR12: - return self.getAudio1Envelope(); + return self.getAudio1Envelope() elif address == constants.NR13: - return self.getAudio1Frequency(); + return self.getAudio1Frequency() elif address == constants.NR14: - return self.getAudio1Playback(); + return self.getAudio1Playback() elif address == constants.NR21: - return self.getAudio2Length(); + return self.getAudio2Length() elif address == constants.NR22: - return self.getAudio2Envelope(); + return self.getAudio2Envelope() elif address==constants.NR23: - return self.getAudio2Frequency(); + return self.getAudio2Frequency() elif address==constants.NR24: - return self.getAudio2Playback(); + return self.getAudio2Playback() elif address==constants.NR30: - return self.getAudio3Enable(); + return self.getAudio3Enable() elif address==constants.NR31: - return self.getAudio3Length(); + return self.getAudio3Length() elif address==constants.NR32: - return self.getAudio3Level(); + return self.getAudio3Level() elif address==constants.NR33: - return self.getAudio4Frequency(); + return self.getAudio4Frequency() elif address==constants.NR34: - return self.getAudio3Playback(); + return self.getAudio3Playback() elif address==constants.NR41: - return self.getAudio4Length(); + return self.getAudio4Length() elif address==constants.NR42: - return self.getAudio4Envelope(); + return self.getAudio4Envelope() elif address==constants.NR43: - return self.getAudio4Polynomial(); + return self.getAudio4Polynomial() elif address==constants.NR44: - return self.getAudio4Playback(); + return self.getAudio4Playback() elif address==constants.NR50: - return self.getOutputLevel(); + return self.getOutputLevel() elif address==constants.NR51: - return self.getOutputTerminal(); + return self.getOutputTerminal() elif address==constants.NR52: - return self.getOutputEnable(); + return self.getOutputEnable() elif (address >= constants.AUD3WAVERAM and address <= constants.AUD3WAVERAM + 0x3F): - return self.getAudio3WavePattern(address); + return self.getAudio3WavePattern(address) - return 0xFF; + return 0xFF def write(self, address, data): if address==constants.NR10: - self.setAudio1Sweep(data); + self.setAudio1Sweep(data) elif address == constants.NR11: - self.setAudio1Length(data); + self.setAudio1Length(data) elif address == constants.NR12: - self.setAudio1Envelope(data); + self.setAudio1Envelope(data) elif address == constants.NR13: - self.setAudio1Frequency(data); + self.setAudio1Frequency(data) elif address == constants.NR14: - self.setAudio1Playback(data); + self.setAudio1Playback(data) elif address == constants.NR21: - self.setAudio2Length(data); + self.setAudio2Length(data) elif address == constants.NR22: - self.setAudio2Envelope(data); + self.setAudio2Envelope(data) elif address == constants.NR23: - self.setAudio2Frequency(data); + self.setAudio2Frequency(data) elif address == constants.NR24: - self.setAudio2Playback(data); + self.setAudio2Playback(data) elif address == constants.NR30: - self.setAudio3Enable(data); + self.setAudio3Enable(data) elif address == constants.NR31: - self.setAudio3Length(data); + self.setAudio3Length(data) elif address == constants.NR32: - self.setAudio3Level(data); + self.setAudio3Level(data) elif address == constants.NR33: - self.setAudio3Frequency(data); + self.setAudio3Frequency(data) elif address == constants.NR34: - self.setAudio3Playback(data); + self.setAudio3Playback(data) elif address == constants.NR41: - self.setAudio4Length(data); + self.setAudio4Length(data) elif address == constants.NR42: - self.setAudio4Envelope(data); + self.setAudio4Envelope(data) elif address == constants.NR43: - self.setAudio4Polynomial(data); + self.setAudio4Polynomial(data) elif address == constants.NR44: - self.setAudio4Playback(data); + self.setAudio4Playback(data) elif address == constants.NR50: - self.setOutputLevel(data); + self.setOutputLevel(data) elif address == constants.NR51: - self.setOutputTerminal(data); + self.setOutputTerminal(data) elif address == constants.NR52: - self.setOutputEnable(data); + self.setOutputEnable(data) elif (address >= constants.AUD3WAVERAM and address <= constants.AUD3WAVERAM + 0x3F): - self.setAudio3WavePattern(address, data); + self.setAudio3WavePattern(address, data) def updateAudio(self): if ((self.nr52 & 0x80) == 0): return if ((self.nr52 & 0x01) != 0): - self.updateAudio1(); + self.updateAudio1() if ((self.nr52 & 0x02) != 0): - self.updateAudio2(); + self.updateAudio2() if ((self.nr52 & 0x04) != 0): - self.updateAudio3(); + self.updateAudio3() if ((self.nr52 & 0x08) != 0): - self.updateAudio4(); + self.updateAudio4() def mixAudio(self,buffer, length): for index in range(0, length): - buffer[index] = 0; + buffer[index] = 0 if ((self.nr52 & 0x80) == 0): return if ((self.nr52 & 0x01) != 0): - self.mixAudio1(buffer, length); + self.mixAudio1(buffer, length) if ((self.nr52 & 0x02) != 0): - self.mixAudio2(buffer, length); + self.mixAudio2(buffer, length) if ((self.nr52 & 0x04) != 0): - self.mixAudio3(buffer, length); + self.mixAudio3(buffer, length) if ((self.nr52 & 0x08) != 0): - self.mixAudio4(buffer, length); + self.mixAudio4(buffer, length) # Audio Channel 1 def getAudio1Sweep(self): - return self.nr10; + return self.nr10 def getAudio1Length(self): - return self.nr11; + return self.nr11 def getAudio1Envelope(self): - return self.nr12; + return self.nr12 def getAudio1Frequency(self): - return self.nr13; + return self.nr13 def getAudio1Playback(self): - return self.nr14; + return self.nr14 def setAudio1Sweep(self, data): - self.nr10 = data; - self.audio1SweepLength = (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); + self.nr10 = data + self.audio1SweepLength = (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07) def setAudio1Length(self, data): - self.nr11 = data; - self.audio1Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)); + self.nr11 = data + self.audio1Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)) def setAudio1Envelope(self, data): - self.nr12 = data; + self.nr12 = data if ((self.nr14 & 0x40) != 0): return if ((self.nr12 >> 4) == 0): - self.audio1Volume = 0; + self.audio1Volume = 0 elif (self.audio1EnvelopeLength == 0 and (self.nr12 & 0x07) == 0): - self.audio1Volume = (self.audio1Volume + 1) & 0x0F; + self.audio1Volume = (self.audio1Volume + 1) & 0x0F else: - self.audio1Volume = (self.audio1Volume + 2) & 0x0F; + self.audio1Volume = (self.audio1Volume + 2) & 0x0F def setAudio1Frequency(self, data): - self.nr13 = data; - self.audio1Frequency = self.frequencyTable[self.nr13 + ((self.nr14 & 0x07) << 8)]; + self.nr13 = data + self.audio1Frequency = self.frequencyTable[self.nr13 + ((self.nr14 & 0x07) << 8)] def setAudio1Playback(self, data): - self.nr14 = data; + self.nr14 = data self.audio1Frequency = self.frequencyTable[self.nr13 - + ((self.nr14 & 0x07) << 8)]; + + ((self.nr14 & 0x07) << 8)] if ((self.nr14 & 0x80) != 0): - self.nr52 |= 0x01; + self.nr52 |= 0x01 if ((self.nr14 & 0x40) != 0 and self.audio1Length == 0): - self.audio1Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)); - self.audio1SweepLength = (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); - self.audio1Volume = self.nr12 >> 4; - self.audio1EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr12 & 0x07); + self.audio1Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr11 & 0x3F)) + self.audio1SweepLength = (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07) + self.audio1Volume = self.nr12 >> 4 + self.audio1EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr12 & 0x07) def updateAudio1(self): if ((self.nr14 & 0x40) != 0 and self.audio1Length > 0): - self.audio1Length-=1; + self.audio1Length-=1 if (self.audio1Length <= 0): - self.nr52 &= ~0x01; + self.nr52 &= ~0x01 if (self.audio1EnvelopeLength > 0): - self.audio1EnvelopeLength-=1; + self.audio1EnvelopeLength-=1 if (self.audio1EnvelopeLength <= 0): if ((self.nr12 & 0x08) != 0): if (self.audio1Volume < 15): - self.audio1Volume+=1; + self.audio1Volume+=1 elif (self.audio1Volume > 0): - self.audio1Volume-=1; - self.audio1EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr12 & 0x07); + self.audio1Volume-=1 + self.audio1EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr12 & 0x07) if (self.audio1SweepLength > 0): - self.audio1SweepLength-=1; + self.audio1SweepLength-=1 if (self.audio1SweepLength <= 0): - sweepSteps = (self.nr10 & 0x07); + sweepSteps = (self.nr10 & 0x07) if (sweepSteps != 0): - frequency = ((self.nr14 & 0x07) << 8) + self.nr13; + frequency = ((self.nr14 & 0x07) << 8) + self.nr13 if ((self.nr10 & 0x08) != 0): - frequency -= frequency >> sweepSteps; + frequency -= frequency >> sweepSteps else: - frequency += frequency >> sweepSteps; + frequency += frequency >> sweepSteps if (frequency < 2048): - self.audio1Frequency = self.frequencyTable[frequency]; - self.nr13 = frequency & 0xFF; - self.nr14 = (self.nr14 & 0xF8) + ((frequency >> 8) & 0x07); + self.audio1Frequency = self.frequencyTable[frequency] + self.nr13 = frequency & 0xFF + self.nr14 = (self.nr14 & 0xF8) + ((frequency >> 8) & 0x07) else: - self.audio1Frequency = 0; - self.nr52 &= ~0x01; + self.audio1Frequency = 0 + self.nr52 &= ~0x01 - self.audio1SweepLength += (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07); + self.audio1SweepLength += (constants.SOUND_CLOCK / 128) * ((self.nr10 >> 4) & 0x07) def mixAudio1(self, buffer, length): @@ -385,88 +385,88 @@ wavePattern = 0x08 elif (self.nr11 & 0xC0) == 0x80: wavePattern = 0x10 - wavePattern << 22; + wavePattern << 22 for index in range(0, length, 3): - self.audio1Index += self.audio1Frequency; + self.audio1Index += self.audio1Frequency if ((self.audio1Index & (0x1F << 22)) >= wavePattern): if ((self.nr51 & 0x10) != 0): - buffer[index + 0] -= self.audio1Volume; + buffer[index + 0] -= self.audio1Volume if ((self.nr51 & 0x01) != 0): - buffer[index + 1] -= self.audio1Volume; + buffer[index + 1] -= self.audio1Volume else: if ((self.nr51 & 0x10) != 0): - buffer[index + 0] += self.audio1Volume; + buffer[index + 0] += self.audio1Volume if ((self.nr51 & 0x01) != 0): - buffer[index + 1] += self.audio1Volume; + buffer[index + 1] += self.audio1Volume # Audio Channel 2 def getAudio2Length(self): - return self.nr21; + return self.nr21 def getAudio2Envelope(self): - return self.nr22; + return self.nr22 def getAudio2Frequency(self): - return self.nr23; + return self.nr23 def getAudio2Playback(self): - return self.nr24; + return self.nr24 def setAudio2Length(self, data): - self.nr21 = data; - self.audio2Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); + self.nr21 = data + self.audio2Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)) def setAudio2Envelope(self, data): - self.nr22 = data; + self.nr22 = data if ((self.nr24 & 0x40) == 0): if ((self.nr22 >> 4) == 0): - self.audio2Volume = 0; + self.audio2Volume = 0 elif (self.audio2EnvelopeLength == 0 and (self.nr22 & 0x07) == 0): - self.audio2Volume = (self.audio2Volume + 1) & 0x0F; + self.audio2Volume = (self.audio2Volume + 1) & 0x0F else: - self.audio2Volume = (self.audio2Volume + 2) & 0x0F; + self.audio2Volume = (self.audio2Volume + 2) & 0x0F def setAudio2Frequency(self, data): - self.nr23 = data; + self.nr23 = data self.audio2Frequency = self.frequencyTable[self.nr23\ - + ((self.nr24 & 0x07) << 8)]; + + ((self.nr24 & 0x07) << 8)] def setAudio2Playback(self, data): - self.nr24 = data; + self.nr24 = data self.audio2Frequency = self.frequencyTable[self.nr23\ - + ((self.nr24 & 0x07) << 8)]; + + ((self.nr24 & 0x07) << 8)] if ((self.nr24 & 0x80) != 0): - self.nr52 |= 0x02; + self.nr52 |= 0x02 if ((self.nr24 & 0x40) != 0 and self.audio2Length == 0): - self.audio2Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)); - self.audio2Volume = self.nr22 >> 4; - self.audio2EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr22 & 0x07); + self.audio2Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr21 & 0x3F)) + self.audio2Volume = self.nr22 >> 4 + self.audio2EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr22 & 0x07) def updateAudio2(self): if ((self.nr24 & 0x40) != 0 and self.audio2Length > 0): - self.audio2Length-=1; + self.audio2Length-=1 if (self.audio2Length <= 0): - self.nr52 &= ~0x02; + self.nr52 &= ~0x02 if (self.audio2EnvelopeLength > 0): - self.audio2EnvelopeLength-=1; + self.audio2EnvelopeLength-=1 if (self.audio2EnvelopeLength <= 0): if ((self.nr22 & 0x08) != 0): if (self.audio2Volume < 15): - self.audio2Volume+=1; + self.audio2Volume+=1 elif (self.audio2Volume > 0): - self.audio2Volume-=1; - self.audio2EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr22 & 0x07); + self.audio2Volume-=1 + self.audio2EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr22 & 0x07) def mixAudio2(self, buffer, length): @@ -477,86 +477,86 @@ wavePattern = 0x08 elif (self.nr21 & 0xC0) == 0x80: wavePattern = 0x10 - wavePattern << 22; + wavePattern << 22 for index in range(0, length): - self.audio2Index += self.audio2Frequency; + self.audio2Index += self.audio2Frequency if ((self.audio2Index & (0x1F << 22)) >= wavePattern): if ((self.nr51 & 0x20) != 0): - buffer[index + 0] -= self.audio2Volume; + buffer[index + 0] -= self.audio2Volume if ((self.nr51 & 0x02) != 0): - buffer[index + 1] -= self.audio2Volume; + buffer[index + 1] -= self.audio2Volume else: if ((self.nr51 & 0x20) != 0): - buffer[index + 0] += self.audio2Volume; + buffer[index + 0] += self.audio2Volume if ((self.nr51 & 0x02) != 0): - buffer[index + 1] += self.audio2Volume; + buffer[index + 1] += self.audio2Volume # Audio Channel 3 def getAudio3Enable(self): - return self.nr30; + return self.nr30 def getAudio3Length(self): - return self.nr31; + return self.nr31 def getAudio3Level(self): - return self.nr32; + return self.nr32 def getAudio4Frequency(self): - return self.nr33; + return self.nr33 def getAudio3Playback(self): - return self.nr34; + return self.nr34 def setAudio3Enable(self, data): - self.nr30 = data & 0x80; + self.nr30 = data & 0x80 if ((self.nr30 & 0x80) == 0): - self.nr52 &= ~0x04; + self.nr52 &= ~0x04 def setAudio3Length(self, data): - self.nr31 = data; - self.audio3Length = (constants.SOUND_CLOCK / 256) * (256 - self.nr31); + self.nr31 = data + self.audio3Length = (constants.SOUND_CLOCK / 256) * (256 - self.nr31) def setAudio3Level(self, data): - self.nr32 = data; + self.nr32 = data def setAudio3Frequency(self, data): - self.nr33 = data; - self.audio3Frequency = self.frequencyTable[((self.nr34 & 0x07) << 8) + self.nr33] >> 1; + self.nr33 = data + self.audio3Frequency = self.frequencyTable[((self.nr34 & 0x07) << 8) + self.nr33] >> 1 def setAudio3Playback(self, data): - self.nr34 = data; - self.audio3Frequency = self.frequencyTable[((self.nr34 & 0x07) << 8) + self.nr33] >> 1; + self.nr34 = data + self.audio3Frequency = self.frequencyTable[((self.nr34 & 0x07) << 8) + self.nr33] >> 1 if ((self.nr34 & 0x80) != 0 and (self.nr30 & 0x80) != 0): - self.nr52 |= 0x04; + self.nr52 |= 0x04 if ((self.nr34 & 0x40) != 0 and self.audio3Length == 0): - self.audio3Length = (constants.SOUND_CLOCK / 256) * (256 - self.nr31); + self.audio3Length = (constants.SOUND_CLOCK / 256) * (256 - self.nr31) def setAudio3WavePattern(self, address, data): #TODO convert to byte - self.audio3WavePattern[address & 0x0F] = data; + self.audio3WavePattern[address & 0x0F] = data def getAudio3WavePattern(self, address): - return self.audio3WavePattern[address & 0x0F] & 0xFF; + return self.audio3WavePattern[address & 0x0F] & 0xFF def updateAudio3(self): if ((self.nr34 & 0x40) != 0 and self.audio3Length > 0): - self.audio3Length-=1; + self.audio3Length-=1 if (self.audio3Length <= 0): - self.nr52 &= ~0x04; + self.nr52 &= ~0x04 def mixAudio3(self, buffer, length): @@ -569,151 +569,151 @@ wavePattern = 1 for index in range(0, length, 2): - self.audio3Index += self.audio3Frequency; - sample = self.audio3WavePattern[(self.audio3Index >> 23) & 0x0F]; + self.audio3Index += self.audio3Frequency + sample = self.audio3WavePattern[(self.audio3Index >> 23) & 0x0F] if ((self.audio3Index & (1 << 22)) != 0): - sample = (sample >> 0) & 0x0F; + sample = (sample >> 0) & 0x0F else: - sample = (sample >> 4) & 0x0F; + sample = (sample >> 4) & 0x0F - sample = ((sample - 8) << 1) >> level; + sample = ((sample - 8) << 1) >> level if ((self.nr51 & 0x40) != 0): - buffer[index + 0] += sample; + buffer[index + 0] += sample if ((self.nr51 & 0x04) != 0): - buffer[index + 1] += sample; + buffer[index + 1] += sample # Audio Channel 4 def getAudio4Length(self): - return self.nr41; + return self.nr41 def getAudio4Envelope(self): - return self.nr42; + return self.nr42 def getAudio4Polynomial(self): - return self.nr43; + return self.nr43 def getAudio4Playback(self): - return self.nr44; + return self.nr44 def setAudio4Length(self, data): - self.nr41 = data; - self.audio4Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); + self.nr41 = data + self.audio4Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)) def setAudio4Envelope(self, data): - self.nr42 = data; + self.nr42 = data if ((self.nr44 & 0x40) == 0): if ((self.nr42 >> 4) == 0): - self.audio4Volume = 0; + self.audio4Volume = 0 elif (self.audio4EnvelopeLength == 0 and (self.nr42 & 0x07) == 0): - self.audio4Volume = (self.audio4Volume + 1) & 0x0F; + self.audio4Volume = (self.audio4Volume + 1) & 0x0F else: - self.audio4Volume = (self.audio4Volume + 2) & 0x0F; + self.audio4Volume = (self.audio4Volume + 2) & 0x0F def setAudio4Polynomial(self, data): - self.nr43 = data; + self.nr43 = data if ((self.nr43 >> 4) <= 12): - self.audio4Frequency = self.noiseFreqRatioTable[self.nr43 & 0x07] >> ((self.nr43 >> 4) + 1); + self.audio4Frequency = self.noiseFreqRatioTable[self.nr43 & 0x07] >> ((self.nr43 >> 4) + 1) else: - self.audio4Frequency = 0; + self.audio4Frequency = 0 def setAudio4Playback(self, data): - self.nr44 = data; + self.nr44 = data if ((self.nr44 & 0x80) != 0): - self.nr52 |= 0x08; + self.nr52 |= 0x08 if ((self.nr44 & 0x40) != 0 and self.audio4Length == 0): - self.audio4Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)); - self.audio4Volume = self.nr42 >> 4; - self.audio4EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr42 & 0x07); - self.audio4Index = 0; + self.audio4Length = (constants.SOUND_CLOCK / 256) * (64 - (self.nr41 & 0x3F)) + self.audio4Volume = self.nr42 >> 4 + self.audio4EnvelopeLength = (constants.SOUND_CLOCK / 64) * (self.nr42 & 0x07) + self.audio4Index = 0 def updateAudio4(self): if ((self.nr44 & 0x40) != 0 and self.audio4Length > 0): - self.audio4Length-=1; + self.audio4Length-=1 if (self.audio4Length <= 0): - self.nr52 &= ~0x08; + self.nr52 &= ~0x08 if (self.audio4EnvelopeLength > 0): - self.audio4EnvelopeLength-=1; + self.audio4EnvelopeLength-=1 if (self.audio4EnvelopeLength <= 0): if ((self.nr42 & 0x08) != 0): if (self.audio4Volume < 15): - self.audio4Volume+=1; + self.audio4Volume+=1 elif (self.audio4Volume > 0): - self.audio4Volume-=1; - self.audio4EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr42 & 0x07); + self.audio4Volume-=1 + self.audio4EnvelopeLength += (constants.SOUND_CLOCK / 64) * (self.nr42 & 0x07) def mixAudio4(self, buffer, length): for index in range(0, length, 2): - self.audio4Index += self.audio4Frequency; - polynomial; + self.audio4Index += self.audio4Frequency + polynomial if ((self.nr43 & 0x08) != 0): # 7 steps - self.audio4Index &= 0x7FFFFF; - polynomial = self.noiseStep7Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31); + self.audio4Index &= 0x7FFFFF + polynomial = self.noiseStep7Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31) else: # 15 steps - self.audio4Index &= 0x7FFFFFFF; - polynomial = self.noiseStep15Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31); + self.audio4Index &= 0x7FFFFFFF + polynomial = self.noiseStep15Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31) if ((polynomial & 1) != 0): if ((self.nr51 & 0x80) != 0): - buffer[index + 0] -= self.audio4Volume; + buffer[index + 0] -= self.audio4Volume if ((self.nr51 & 0x08) != 0): - buffer[index + 1] -= self.audio4Volume; + buffer[index + 1] -= self.audio4Volume else: if ((self.nr51 & 0x80) != 0): - buffer[index + 0] += self.audio4Volume; + buffer[index + 0] += self.audio4Volume if ((self.nr51 & 0x08) != 0): - buffer[index + 1] += self.audio4Volume; + buffer[index + 1] += self.audio4Volume # Output Control def getOutputLevel(self): - return self.nr50; + return self.nr50 def getOutputTerminal(self): - return self.nr51; + return self.nr51 def getOutputEnable(self): - return self.nr52; + return self.nr52 def setOutputLevel(self, data): - self.nr50 = data; + self.nr50 = data def setOutputTerminal(self, data): - self.nr51 = data; + self.nr51 = data def setOutputEnable(self, data): - self.nr52 = (self.nr52 & 0x7F) | (data & 0x80); + self.nr52 = (self.nr52 & 0x7F) | (data & 0x80) if ((self.nr52 & 0x80) == 0x00): - self.nr52 &= 0xF0; + self.nr52 &= 0xF0 # Frequency Table Generation def generateFrequencyTables(self): - sampleRate = self.driver.getSampleRate(); + sampleRate = self.driver.getSampleRate() # frequency = (4194304 / 32) / (2048 - period) Hz for period in range(0, 2048): - skip = (((constants.GAMEBOY_CLOCK << 10) / sampleRate) << (22 - 8)) / (2048 - period); + skip = (((constants.GAMEBOY_CLOCK << 10) / sampleRate) << (22 - 8)) / (2048 - period) if (skip >= (32 << 22)): - self.frequencyTable[period] = 0; + self.frequencyTable[period] = 0 else: - self.frequencyTable[period] = skip; + self.frequencyTable[period] = skip # Polynomial Noise Frequency Ratios # # 4194304 Hz * 1/2^3 * 2 4194304 Hz * 1/2^3 * 1 4194304 Hz * 1/2^3 * @@ -723,7 +723,7 @@ divider = 1 if ratio != 0: divider = 2 * ratio - self.noiseFreqRatioTable[ratio] = (constants.GAMEBOY_CLOCK / divider) * ((1 << 16) / sampleRate); + self.noiseFreqRatioTable[ratio] = (constants.GAMEBOY_CLOCK / divider) * ((1 << 16) / sampleRate) @@ -732,14 +732,14 @@ polynomial = 0x7F # 7 steps for index in range(0, 0x7F): - polynomial = (((polynomial << 6) ^ (polynomial << 5)) & 0x40) | (polynomial >> 1); + polynomial = (((polynomial << 6) ^ (polynomial << 5)) & 0x40) | (polynomial >> 1) if ((index & 31) == 0): - self.noiseStep7Table[index >> 5] = 0; - self.noiseStep7Table[index >> 5] |= (polynomial & 1) << (index & 31); + self.noiseStep7Table[index >> 5] = 0 + self.noiseStep7Table[index >> 5] |= (polynomial & 1) << (index & 31) # 15 steps& polynomial = 0x7FFF for index in range(0, 0x7FFF): - polynomial = (((polynomial << 14) ^ (polynomial << 13)) & 0x4000) | (polynomial >> 1); + polynomial = (((polynomial << 14) ^ (polynomial << 13)) & 0x4000) | (polynomial >> 1) if ((index & 31) == 0): - self.noiseStep15Table[index >> 5] = 0; - self.noiseStep15Table[index >> 5] |= (polynomial & 1) << (index & 31); + self.noiseStep15Table[index >> 5] = 0 + self.noiseStep15Table[index >> 5] |= (polynomial & 1) << (index & 31) Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Mon Mar 24 17:33:39 2008 @@ -3,8 +3,18 @@ from pypy.lang.gameboy.ram import * from pypy.lang.gameboy import * +class Memory(object): + def __init__(self): + self.memory = [0xFF]*0xFFFFF + + def write(self, address, data): + self.memory[address] = data + + def read(self, address): + return self.memory[address] + def get_cpu(): - cpu = CPU(None, RAM()) + cpu = CPU(None, Memory()) cpu.setROM([0]*0xFFFF); return cpu @@ -295,11 +305,20 @@ assert cpu.pc.get() == pc, "Register pc is %s but should be %s" % (hex(cpu.pc.get()), hex(pc)) def prepare_for_fetch(cpu, value, valueLo=None): - cpu.rom[cpu.pc.get()] = value - cpu.memory.write(cpu.pc.get(), value & 0xFF) + pc = cpu.pc.get() if valueLo is not None: - cpu.rom[cpu.pc.get()+1] = valueLo & 0xFF - cpu.memory.write(cpu.pc.get(), valueLo & 0xFF) + cpu.rom[pc] = valueLo & 0xFF + cpu.memory.write(pc, valueLo & 0xFF) + pc += 1 + cpu.rom[pc] = value & 0xFF + cpu.memory.write(pc, value & 0xFF) + +def prepare_for_pop(cpu, value, valueLo=None): + sp = cpu.sp.get() + if valueLo is not None: + cpu.memory.write(sp, valueLo & 0xFF) + sp += 1 + cpu.memory.write(sp, value & 0xFF) def set_registers(registers, value): #if registers is not list: @@ -307,6 +326,23 @@ for register in registers: register.set(value); + +# test helper methods --------------------------------------------------------- + +def test_prepare_for_pop(): + cpu = get_cpu() + value = 0x12 + prepare_for_pop(cpu, value, value+1) + assert cpu.pop() == value+1 + assert cpu.pop() == value + +def test_prepare_for_fetch(): + cpu = get_cpu() + value = 0x12 + prepare_for_fetch(cpu, value, value+1) + assert cpu.fetch() == value+1 + assert cpu.fetch() == value + # ------------------------------------------------------------ # opCode Testing @@ -376,8 +412,8 @@ for index in range(0, len(registers)): prepare_for_fetch(cpu, value, value+1) cycle_test(cpu, opCode, 3) - assert registers[index].getLo() == value - assert registers[index].getHi() == value+1 + assert registers[index].getLo() == value+1 + assert registers[index].getHi() == value value += 3 opCode += 0x10 @@ -733,10 +769,10 @@ value = 0x12 valueA = 0x11 registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] - for add in registers: + for register in registers: cpu.reset() cpu.a.set(valueA) - add.set(value) + register.set(value) numCycles= 1 if add == cpu.getHLi: numCycles = 2 @@ -756,10 +792,10 @@ value = 0x12 valueA = 0x11 registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] - for add in registers: + for register in registers: cpu.reset() cpu.a.set(valueA) - add.set(value) + register.set(value) numCycles= 1 if add == cpu.getHLi: numCycles = 2 @@ -779,10 +815,10 @@ value = 0x12 valueA = 0x11 registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] - for add in registers: + for register in registers: cpu.reset() cpu.a.set(valueA) - add.set(value) + register.set(value) numCycles= 1 if add == cpu.getHLi: numCycles = 2 @@ -795,80 +831,125 @@ value += 1 opCode += 0x01 -# cp_A_B +# cp_A_B to cp_A_A def test_0xB8(): - pass -# cp_A_C -def test_0xB9(): - pass -# cp_A_D -def test_0xBA(): - pass -# cp_A_E -def test_0xBB(): - pass -# cp_A_H -def test_0xBC(): - pass -# cp_A_L -def test_0xBD(): - pass -# cp_A_HLi -def test_0xBE(): - pass -# cp_A_A -def test_0xBF(): - pass + cpu = get_cpu() + opCode = 0xB8 + value = 0x12 + valueA = 0x11 + registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] + for register in registers: + cpu.reset() + cpu.a.set(valueA) + cpu.set(value) + numCycles= 1 + if add == cpu.getHLi: + numCycles = 2 + cycle_test(cpu, opCode, numCycles) + #(s == 0 ? Z_FLAG : 0) + (s > this.a ? C_FLAG : 0) + # + ((s & 0x0F) > (this.a & 0x0F) ? H_FLAG : 0) + N_FLAG; + if cpu.a.get() == 0: + assert cpu.f.get() == constants.Z_FLAG + else: + assert cpu.f.get() == 0 + value += 1 + opCode += 0x01 -# ret_NZ +# ret_NZ to ret_C def test_0xC0(): - pass -# ret_Z -def test_0xC8(): - pass -# ret_NC -def test_0xD0(): - pass -# ret_C -def test_0xD8(): - pass + cpu = get_cpu() + flags = [~constants.Z_FLAG, constants.Z_FLAG, ~constants.C_FLAG, constants.C_FLAG] + opCode = 0xC0 + value = 0x1234 + for i in range(0, 4): + cpu.reset() + prepare_for_pop(cpu, value) + pc = cpu.pc.get() + cpu.f.set(flags[i]) + cycle_test(cpu, opCode, 5) + assert cpu.pc.get() == pc+value+1 + + cpu.reset() + prepare_for_pop(cpu, value) + cpu.f.set(~flags[i]) + cycle_test(cpu, opCode, 2) + assert_default_registers(cpu) + value += 3 + opCode += 0x08 # ldh_mem_A def test_0xE0(): - pass + cpu = get_cpu() + valueA = 0x11 + value = 0x12 + prepare_for_fetch(cpu, value, 0x34) + cpu.a.set(valueA) + cycle_test(cpu, 0xE0, 3) + assert cpu.read(0xFF00+value) == valueA + # add_SP_nn def test_0xE8(): - pass + cpu = get_cpu() + value = 0x12 + prepare_for_fetch(cpu, value, 0x34) + sp = cpu.sp.get() + cycle_test(cpu, 0xE8, 4) + assert_default_registers(cpu, sp=sp+value) # ldh_A_mem def test_0xF0(): - pass + cpu = get_cpu() + valueA = 0x11 + valueAdd = 0x12 + address = 0x13 + cpu.a.set(valueA) + prepare_for_fetch(cpu, address, 0x34) + cpu.write(0xFF00+address, valueAdd) + cycle_test(cpu, 0xF0, 3) + assert_default_registers(cpu, a=valueA + valueAdd) # ld_HL_SP_nn def test_0xF8(): - pass + cpu = get_cpu() + value = 0x12 + prepare_for_fetch(cpu, value, 0x34) + sp = cpu.hl.get() + cycle_test(cpu, 0xF8, 3) + assert_default_registers(cpu, hl=sp + value) -# pop_BC -def test_0xC1(): - pass -# pop_DE -def test_0xD1(): - pass -# pop_HL -def test_0xE1(): - pass -# pop_AF -def test_0xF1(): - pass +# pop_BC to pop_AF +def test_0xC1_to_0xF1(): + cpu = get_cpu() + registers = [cpu.bc, cpu.de, cpu.hl, cpu.af] + opCode = 0xC1 + value = 0x1234 + for register in registers: + cpu.reset() + prepare_for_pop(cpu, value >> 8, value & 0xFF) + cycle_test(cpu, opCode, 3) + assert register.get() == value + value += 3 + opCode += 0x10 # ret def test_0xC9(): - pass + cpu = get_cpu() + value = 0x1234 + prepare_for_pop(cpu, value >> 8, value & 0xFF) + pc = cpu.pc.get() + cycle_test(cpu, 0xC9, 4) + assert_default_registers(cpu, pc=cp+value) + # reti def test_0xD9(): - pass + cpu = get_cpu() + value = 0x1234 + prepare_for_pop(cpu, value >> 8, value & 0xFF) + pc = cpu.pc.get() + cycle_test(cpu, 0xD9, 4) + assert_default_registers(cpu, pc=cp+value) # ld_PC_HL def test_0xE9(): Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py Mon Mar 24 17:33:39 2008 @@ -0,0 +1,75 @@ +import py +from pypy.lang.gameboy.timer import * +from pypy.lang.gameboy.interrupt import * +from pypy.lang.gameboy import constants + + +def get_timer(): + return Timer(get_timer_interrupt()) + +def get_timer_interrupt(): + return Interrupt() + + + +# ------------------------------------------------------------------------------ + + +def test_reset(timer=None): + py.test.skip("Timer Class not working") + if timer == None: + timer = get_timer() + assert timer.div == 0 + assert timer.dividerCycles == constants.DIV_CLOCK + assert timer.tima == 0 + assert timer.tma == 0 + assert timer.tac == 0 + assert timer.timerCycles == constants.TIMER_CLOCK[0] + assert timer.timerClock == constants.TIMER_CLOCK[0] + + +def test_read_write(): + py.test.skip("Timer Class not working") + timer = get_timer() + timer.div = 10 + value = 0x11 + timer.write(constants.DIV, value) + assert timer.getDivider() == 0 + assert timer.read(constants.DIV) == 0 + + timer.reset() + timer.write(constants.TIMA, value) + assert timer.getTimerCounter() == value + assert timer.read(constants.TIMA) == value + timer.reset() + + timer.write(constants.TMA, value) + assert timer.getTimerModulo() == value + assert timer.read(constants.TMA) == value + timer.reset() + + + + +def test_setTimerControl(): + py.test.skip("Timer Class not working") + timer = get_timer() + value = 0x12 + timer.write(constants.TAC, value) + assert timer.getTimerControl() == value + assert timer.read(constants.TAC) == value + + +def test_cycles(): + py.test.skip("Timer Class not working") + timer = get_timer() + + +def test_emulateDivider(): + py.test.skip("Timer Class not working") + timer = get_timer() + + +def test_emulateTimer(): + py.test.skip("Timer Class not working") + timer = get_timer() \ No newline at end of file Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py Mon Mar 24 17:33:39 2008 @@ -1,125 +1,101 @@ """ -Mario GameBoy (TM) Emulator +PyBoy GameBoy (TM) Emulator Timer and Divider """ class Timer(object): - # Registers - #int - div = 0; - tima = 0; - tma = 0; - tac = 0; - - dividerCycles = 0; - timerCycles = 0; - timerClock = 0; - - - # Interrupt Controller Interrupt - interrupt = None; - def __init__(self, interrupt): - self.interrupt = interrupt; - self.reset(); + self.interrupt = interrupt + self.reset() def reset(self): - self.div = 0; - self.dividerCycles = constants.DIV_CLOCK; - self.tima = self.tma = self.tac = 0x00; - self.timerCycles = self.timerClock = constants.TIMER_CLOCK[self.tac & 0x03]; + self.div = 0 + self.dividerCycles = constants.DIV_CLOCK + self.tima = self.tma = self.tac = 0x00 + self.timerCycles = self.timerClock = constants.TIMER_CLOCK[self.tac & 0x03] def write(self, address, data): if address==constants.DIV: - self.setDivider(data); + self.setDivider(data) elif address==constants.TIMA: - self.setTimerCounter(data); + self.setTimerCounter(data) elif address==constants.TMA: - self.setTimerModulo(data); + self.setTimerModulo(data) elif address==constants.TAC: - self.setTimerControl(data); + self.setTimerControl(data) def read(self, address): if address==constants.DIV: - return self.getDivider(); + return self.getDivider() elif address==constants.TIMA: - return self.getTimerCounter(); + return self.getTimerCounter() elif address==constants.TMA: - return self.getTimerModulo(); + return self.getTimerModulo() elif address==constants.TAC: - return self.getTimerControl(); - return 0xFF; - - - def setDivider(self, data): - #DIV register resets on write - self.div = 0; + return self.getTimerControl() + return 0xFF + def getDivider(self): + return self.div + + def setDivider(self, data): #DIV register resets on write + self.div = 0 + def getTimerCounter(self): + return self.tima + def setTimerCounter(self, data): - self.tima = data; - + self.tima = data + def getTimerModulo(self): + return self.tma + def setTimerModulo(self, data): - self.tma = data; + self.tma = data + def getTimerControl(self): + return 0xF8 | self.tac def setTimerControl(self, data): if ((self.tac & 0x03) != (data & 0x03)): - self.timerCycles = self.timerClock = constants.TIMER_CLOCK[data & 0x03]; - self.tac = data; - - - def getDivider(self): - return self.div; - - - def getTimerCounter(self): - return self.tima; - - - def getTimerModulo(self): - return self.tma; - - - def getTimerControl(self): - return 0xF8 | self.tac; + self.timerCycles = self.timerClock = constants.TIMER_CLOCK[data & 0x03] + self.tac = data def cycles(self): if ((self.tac & 0x04) != 0 and self.timerCycles < self.dividerCycles): - return self.timerCycles; - return self.dividerCycles; + return self.timerCycles + return self.dividerCycles def emulate(self, ticks): - self.emulateDivider(ticks); - self.emulateTimer(ticks); + self.emulateDivider(ticks) + self.emulateTimer(ticks) def emulateDivider(self, ticks): - self.dividerCycles -= ticks; + self.dividerCycles -= ticks while (self.dividerCycles <= 0): - self.div = (self.div + 1) & 0xFF; - self.dividerCycles += constants.DIV_CLOCK; + self.div = (self.div + 1) & 0xFF + self.dividerCycles += constants.DIV_CLOCK def emulateTimer(self, ticks): if ((self.tac & 0x04) != 0): - self.timerCycles -= ticks; + self.timerCycles -= ticks while (self.timerCycles <= 0): - self.tima = (self.tima + 1) & 0xFF; - self.timerCycles += self.timerClock; + self.tima = (self.tima + 1) & 0xFF + self.timerCycles += self.timerClock if (self.tima == 0x00): - self.tima = self.tma; - self.interrupt.raiseInterrupt(constants.TIMER); + self.tima = self.tma + self.interrupt.raiseInterrupt(constants.TIMER) Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Mon Mar 24 17:33:39 2008 @@ -1,5 +1,5 @@ """ - Mario GameBoy (TM) Emulator + PyBoy GameBoy (TM) Emulator constants.LCD Video Display Processor """ From cami at codespeak.net Mon Mar 24 17:44:27 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Mon, 24 Mar 2008 17:44:27 +0100 (CET) Subject: [pypy-svn] r52887 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080324164427.29B39168452@codespeak.net> Author: cami Date: Mon Mar 24 17:44:26 2008 New Revision: 52887 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py Log: added timer test fixed missing import in timer.py Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Mon Mar 24 17:44:26 2008 @@ -1,8 +1,3 @@ -""" -PyBoy GameBoy (TM) Emulator - -Central Unit ProcessOR (Sharp LR35902 CPU) -""" from pypy.lang.gameboy import constants @@ -89,6 +84,12 @@ # ___________________________________________________________________________ class CPU(object): + """ + PyBoy GameBoy (TM) Emulator + + Central Unit ProcessOR (Sharp LR35902 CPU) + """ + def __init__(self, interrupt, memory): self.interrupt = interrupt self.memory = memory @@ -288,7 +289,6 @@ register.set(a, b) # 2 cycles self.cycles += 1 - # 4 cycles def call(self, address): self.push(self.pc.getHi()) # 2 cycles @@ -300,7 +300,6 @@ def ld(self, getter, setter): setter(getter()) # 1 cycle - # LD PC,HL, 1 cycle def ld_pc_hl(self): self.ld(self.hl, self.pc) @@ -308,7 +307,6 @@ def fetchLoad(self, register): self.ld(self.fetch, register.set) - # ALU, 1 cycle def addA(self, data): s = (self.a.get() + data) & 0xFF @@ -330,7 +328,6 @@ self.f.add(constants.C_FLAG, False) self.cycles -= 1 - # 1 cycle def adc(self, getter): s = self.a.get() + getter() + ((self.f.get() & constants.C_FLAG) >> 4) @@ -510,7 +507,6 @@ def res(self, getter, setter, n): setter(getter() & (~(1 << n))) # 1 cycle - # LD A,(nnnn), 4 cycles def ld_A_mem(self): lo = self.fetch() # 1 cycle @@ -796,7 +792,6 @@ return lambda s: function(s, registerGetter(s).get, registerGetter(s).set) else: return lambda s: function(s, registerGetter(s).get, registerGetter(s).set, value) - def create_register_op_codes(table): opCodes = [] @@ -815,7 +810,6 @@ else: return lambda s: function(s, registerOrGetter) - def initialize_op_code_table(table): print "" result = [None] * (0xFF+1) Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py Mon Mar 24 17:44:26 2008 @@ -1,49 +1,37 @@ -""" -PyBoy GameBoy (TM) Emulator - -Interrupt Controller -""" - from pypy.lang.gameboy import constants class Interrupt(object): - - # Registers - enable = 0 - flag = 0 + """ + PyBoy GameBoy (TM) Emulator + + Interrupt Controller + """ def __init__(self): self.reset() - def reset(self): self.enable = 0 self.flag = constants.VBLANK - def isPending(self): return (self.enable & self.flag) != 0 - def isPending(self, mask): return (self.enable & self.flag & mask) != 0 - def raiseInterrupt(self, mask): self.flag |= mask - def lower(self, mask): self.flag &= ~mask - def write(self, address, data): if address == constants.IE: self.setInterruptEnable(data) elif address == constants.IF: self.setInterruptFlag(data) - def read(self, address): if address == constants.IE: return self.getInterruptEnable() @@ -51,15 +39,12 @@ return self.getInterruptFlag() return 0xFF - def getInterruptEnable(self): return self.enable - def getInterruptFlag(self): return 0xE0 | self.flag - def setInterruptEnable(self, data): self.enable = data Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py Mon Mar 24 17:44:26 2008 @@ -16,7 +16,6 @@ def test_reset(timer=None): - py.test.skip("Timer Class not working") if timer == None: timer = get_timer() assert timer.div == 0 @@ -29,7 +28,6 @@ def test_read_write(): - py.test.skip("Timer Class not working") timer = get_timer() timer.div = 10 value = 0x11 @@ -52,7 +50,7 @@ def test_setTimerControl(): - py.test.skip("Timer Class not working") + py.test.skip("need to use more information about the timer") timer = get_timer() value = 0x12 timer.write(constants.TAC, value) @@ -61,15 +59,12 @@ def test_cycles(): - py.test.skip("Timer Class not working") timer = get_timer() def test_emulateDivider(): - py.test.skip("Timer Class not working") timer = get_timer() def test_emulateTimer(): - py.test.skip("Timer Class not working") timer = get_timer() \ No newline at end of file Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py Mon Mar 24 17:44:26 2008 @@ -3,6 +3,7 @@ Timer and Divider """ +from pypy.lang.gameboy import constants class Timer(object): From cfbolz at codespeak.net Tue Mar 25 00:11:30 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 00:11:30 +0100 (CET) Subject: [pypy-svn] r52888 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080324231130.8C3E41683DA@codespeak.net> Author: cfbolz Date: Tue Mar 25 00:11:29 2008 New Revision: 52888 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py Log: probably premature optimization: use a variable-width encoding for all the integers encoded into the bytecode Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Tue Mar 25 00:11:29 2008 @@ -1771,23 +1771,32 @@ def __repr__(self): return "tlabel(%r)" % (self.name, ) +def encode_int(index): + assert index >= 0 + result = [] + while True: + byte = index & 0x7F + index >>= 7 + result.append(chr(byte + 0x80 * bool(index))) + if not index: + break + return result + def assemble_labelpos(labelpos, interpreter, *args): result = [] - def emit_2byte(index): - assert -32768 <= index < 32768 - result.append(chr((index >> 8) & 0xff)) - result.append(chr(index & 0xff)) + def emit(index): + result.extend(encode_int(index)) for arg in args: if isinstance(arg, str): if arg.startswith('#'): # skip comments continue opcode = interpreter.find_opcode(arg) assert opcode >= 0, "unknown opcode %s" % (arg, ) - emit_2byte(opcode) + emit(opcode) elif isinstance(arg, bool): result.append(chr(int(arg))) elif isinstance(arg, int): - emit_2byte(arg) + emit(arg) elif isinstance(arg, label): labelpos[arg.name] = len(result) elif isinstance(arg, tlabel): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py Tue Mar 25 00:11:29 2008 @@ -25,42 +25,47 @@ return arg def get_opname(self): - return self.get(str, 2) + result = self.get(str, 0) + self.pc += len( + codewriter.encode_int(self.interpreter.find_opcode(result))) + return result def getjitcode(self): return self.jitcode - def load_2byte(self): - return self.get(int, 2) + def load_int(self): + result = self.get(int, 0) + self.pc += len(codewriter.encode_int(result)) + return result def load_bool(self): return self.get(bool, 1) def get_greenarg(self): - i = self.load_2byte() + i = self.load_int() if i % 2: return self.jitcode.constants[i // 2] return CustomRepr('g%d' % (i // 2)) def get_green_varargs(self): greenargs = [] - num = self.load_2byte() + num = self.load_int() for i in range(num): greenargs.append(self.get_greenarg()) return greenargs def get_red_varargs(self): redargs = [] - num = self.load_2byte() + num = self.load_int() for i in range(num): redargs.append(self.get_redarg()) return redargs def get_redarg(self): - return CustomRepr('r%d' % self.get(int, 2)) + return CustomRepr('r%d' % self.load_int()) def get_greenkey(self): - keydescnum = self.load_2byte() + keydescnum = self.load_int() if keydescnum == 0: return None else: @@ -135,4 +140,5 @@ assert 0, "unexpected object: %r" % (arg,) if src.pc != len(jitcode.code): + import pdb; pdb.set_trace() print >> file, 'WARNING: the pc column is bogus! fix dump.py!' Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Tue Mar 25 00:11:29 2008 @@ -195,7 +195,7 @@ def bytecode_loop(self): while 1: - bytecode = self.load_2byte() + bytecode = self.load_int() assert bytecode >= 0 result = self.fbrunnerdesc.opcode_implementations[bytecode](self) @@ -210,13 +210,19 @@ self.pc = pc + 1 return result - def load_2byte(self): + def load_int(self): + result = 0 + shift = 0 pc = self.pc - assert pc >= 0 - result = ((ord(self.bytecode.code[pc]) << 8) | - ord(self.bytecode.code[pc + 1])) - self.pc = pc + 2 - return intmask((result ^ SIGN_EXTEND2) - SIGN_EXTEND2) + while 1: + byte = ord(self.bytecode.code[pc]) + pc += 1 + result += (byte & 0x7F) << shift + shift += 7 + if not byte & 0x80: + break + self.pc = pc + return intmask(result) def load_4byte(self): pc = self.pc @@ -232,30 +238,30 @@ return bool(self.load_byte()) def get_greenarg(self): - i = self.load_2byte() + i = self.load_int() if i % 2: return self.bytecode.constants[i // 2] return self.local_green[i // 2] def get_green_varargs(self): greenargs = [] - num = self.load_2byte() + num = self.load_int() for i in range(num): greenargs.append(self.get_greenarg()) return greenargs def get_red_varargs(self): redargs = [] - num = self.load_2byte() + num = self.load_int() for i in range(num): redargs.append(self.get_redarg()) return redargs def get_redarg(self): - return self.local_red[self.load_2byte()] + return self.local_red[self.load_int()] def get_greenkey(self): - keydescnum = self.load_2byte() + keydescnum = self.load_int() if keydescnum == 0: return empty_key else: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Tue Mar 25 00:11:29 2008 @@ -130,22 +130,22 @@ elif argspec == "green": args += (self.get_greenarg(), ) elif argspec == "kind": - args += (self.getjitcode().typekinds[self.load_2byte()], ) + args += (self.getjitcode().typekinds[self.load_int()], ) elif argspec == "jumptarget": args += (self.load_4byte(), ) elif argspec == "jumptargets": - num = self.load_2byte() + num = self.load_int() args += ([self.load_4byte() for i in range(num)], ) elif argspec == "bool": args += (self.load_bool(), ) elif argspec == "redboxcls": - args += (self.getjitcode().redboxclasses[self.load_2byte()], ) + args += (self.getjitcode().redboxclasses[self.load_int()], ) elif argspec == "2byte": - args += (self.load_2byte(), ) + args += (self.load_int(), ) elif argspec == "greenkey": args += (self.get_greenkey(), ) elif argspec == "promotiondesc": - promotiondescnum = self.load_2byte() + promotiondescnum = self.load_int() promotiondesc = self.getjitcode().promotiondescs[promotiondescnum] args += (promotiondesc, ) elif argspec == "green_varargs": @@ -153,38 +153,38 @@ elif argspec == "red_varargs": args += (self.get_red_varargs(), ) elif argspec == "bytecode": - bytecodenum = self.load_2byte() + bytecodenum = self.load_int() args += (self.getjitcode().called_bytecodes[bytecodenum], ) elif argspec == "calldesc": - index = self.load_2byte() + index = self.load_int() function = self.getjitcode().calldescs[index] args += (function, ) elif argspec == "metacalldesc": - index = self.load_2byte() + index = self.load_int() function = self.getjitcode().metacalldescs[index] args += (function, ) elif argspec == "indirectcalldesc": - index = self.load_2byte() + index = self.load_int() function = self.getjitcode().indirectcalldescs[index] args += (function, ) elif argspec == "oopspec": - oopspecindex = self.load_2byte() + oopspecindex = self.load_int() oopspec = self.getjitcode().oopspecdescs[oopspecindex] args += (oopspec, ) elif argspec == "structtypedesc": - td = self.getjitcode().structtypedescs[self.load_2byte()] + td = self.getjitcode().structtypedescs[self.load_int()] args += (td, ) elif argspec == "arraydesc": - td = self.getjitcode().arrayfielddescs[self.load_2byte()] + td = self.getjitcode().arrayfielddescs[self.load_int()] args += (td, ) elif argspec == "fielddesc": - d = self.getjitcode().fielddescs[self.load_2byte()] + d = self.getjitcode().fielddescs[self.load_int()] args += (d, ) elif argspec == "interiordesc": - d = self.getjitcode().interiordescs[self.load_2byte()] + d = self.getjitcode().interiordescs[self.load_int()] args += (d, ) elif argspec == "exception": - d = self.getjitcode().exceptioninstances[self.load_2byte()] + d = self.getjitcode().exceptioninstances[self.load_int()] args += (d, ) else: assert 0, "unknown argtype declaration" @@ -305,7 +305,7 @@ def bytecode_loop(self): while 1: - bytecode = self.load_2byte() + bytecode = self.load_int() assert bytecode >= 0 result = self.opcode_implementations[bytecode](self) assert (self.frame is None or not self.frame.local_boxes or @@ -361,20 +361,19 @@ def getjitcode(self): return self.frame.bytecode - def load_byte(self): + def load_int(self): + result = 0 + shift = 0 pc = self.frame.pc - assert pc >= 0 - result = ord(self.frame.bytecode.code[pc]) - self.frame.pc = pc + 1 - return result - - def load_2byte(self): - pc = self.frame.pc - assert pc >= 0 - result = ((ord(self.frame.bytecode.code[pc]) << 8) | - ord(self.frame.bytecode.code[pc + 1])) - self.frame.pc = pc + 2 - return intmask((result ^ SIGN_EXTEND2) - SIGN_EXTEND2) + while 1: + byte = ord(self.frame.bytecode.code[pc]) + pc += 1 + result += (byte & 0x7F) << shift + shift += 7 + if not byte & 0x80: + break + self.frame.pc = pc + return intmask(result) def load_4byte(self): pc = self.frame.pc @@ -387,33 +386,37 @@ return intmask(result) def load_bool(self): - return bool(self.load_byte()) + pc = self.frame.pc + assert pc >= 0 + result = ord(self.frame.bytecode.code[pc]) + self.frame.pc = pc + 1 + return bool(result) def get_greenarg(self): - i = self.load_2byte() + i = self.load_int() if i % 2: return self.frame.bytecode.constants[i // 2] return self.frame.local_green[i // 2] def get_green_varargs(self): greenargs = [] - num = self.load_2byte() + num = self.load_int() for i in range(num): greenargs.append(self.get_greenarg()) return greenargs def get_red_varargs(self): redargs = [] - num = self.load_2byte() + num = self.load_int() for i in range(num): redargs.append(self.get_redarg()) return redargs def get_redarg(self): - return self.frame.local_boxes[self.load_2byte()] + return self.frame.local_boxes[self.load_int()] def get_greenkey(self): - keydescnum = self.load_2byte() + keydescnum = self.load_int() if keydescnum == 0: return empty_key else: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_serializegraph.py Tue Mar 25 00:11:29 2008 @@ -221,22 +221,22 @@ expected = """\ JITCODE 'f' pc: 0 | make_redbox (0), 0 => r1 - 6 | make_new_redvars [r0, r1] + 3 | make_new_redvars [r0, r1] | - 14 | local_merge 0, None - 20 | red_int_is_true r0 => r2 - 24 | red_goto_iftrue r2, pc: 40 - 32 | make_new_redvars [r1] + 7 | local_merge 0, None + 10 | red_int_is_true r0 => r2 + 12 | red_goto_iftrue r2, pc: 22 + 18 | make_new_redvars [r1] | - 38 | red_return + 21 | red_return | - 40 | make_new_redvars [r0, r1] + 22 | make_new_redvars [r0, r1] | - 48 | red_int_add r1, r0 => r2 - 54 | make_redbox (1), 0 => r3 - 60 | red_int_sub r0, r3 => r4 - 66 | make_new_redvars [r4, r2] - 74 | goto pc: 14 + 26 | red_int_add r1, r0 => r2 + 29 | make_redbox (1), 0 => r3 + 32 | red_int_sub r0, r3 => r4 + 35 | make_new_redvars [r4, r2] + 39 | goto pc: 7 """.rstrip() assert result == expected From cami at codespeak.net Tue Mar 25 00:12:23 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Tue, 25 Mar 2008 00:12:23 +0100 (CET) Subject: [pypy-svn] r52889 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080324231223.CEF3316802B@codespeak.net> Author: cami Date: Tue Mar 25 00:12:23 2008 New Revision: 52889 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py Log: due to nice changes in the cpu, most of the tests had to be fixed. half part done. added useCycles statement to all registers methods created load registers opCodeMappings made register functions more similar Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Tue Mar 25 00:12:23 2008 @@ -16,8 +16,11 @@ def get(self, useCycles=True): return self.value - def add(self, value, useCycles=False): - self.set(self.get()+1, useCycles) + def add(self, value, useCycles=True): + self.set(self.get(useCycles)+value, useCycles) + + def sub(self, value, useCycles=True): + self.set(self.get(useCycles)-value, useCycles) # ___________________________________________________________________________ @@ -33,14 +36,15 @@ else: self.lo = lo - def set(self, hi=0, lo=None): + def set(self, hi=0, lo=None, useCycles=True): if (lo is None): - self.setHi(hi >> 8) - self.setLo(hi & 0xFF) - self.cpu.cycles += 1 + self.setHi(hi >> 8, useCycles) + self.setLo(hi & 0xFF, useCycles) + if useCycles: + self.cpu.cycles += 1 else: - self.setHi(hi) - self.setLo(lo) + self.setHi(hi, useCycles) + self.setLo(lo, useCycles) def setHi(self, hi=0, useCycles=True): self.hi.set(hi, useCycles) @@ -48,24 +52,24 @@ def setLo(self, lo=0, useCycles=True): self.lo.set(lo, useCycles) - def get(self): + def get(self, useCycles=True): return (self.hi.get()<<8) + self.lo.get() - def getHi(self): + def getHi(self, useCycles=True): return self.hi.get() - def getLo(self): + def getLo(self, useCycles=True): return self.lo.get() - def inc(self): + def inc(self, useCycles=True): self.set(self.get() +1) self.cpu.cycles -= 1 - def dec(self): + def dec(self, useCycles=True): self.set(self.get() - 1) self.cpu.cycles -= 1 - def add(self, n=2): + def add(self, n=2, useCycles=True): self.set(self.get() + n) self.cpu.cycles -= 2 @@ -75,12 +79,15 @@ self.cpu = cpu self.hl = hl - def set(self, value): - self.cpu.write(self.get(), value) - self.cpu.cycles += 1 - - def get(self): - return self.cpu.read(self.hl.get()) + def set(self, value, useCycles=True): + self.cpu.write(self.hl.get(useCycles), value) + if not useCycles: + self.cpu.cycles += 2 + + def get(self, useCycles=True): + if not useCycles: + self.cpu.cycles += 1 + return self.cpu.read(self.hl.get(useCycles)) # ___________________________________________________________________________ class CPU(object): @@ -131,7 +138,7 @@ def getA(self): return self.a - def getA(self): + def getF(self): return self.f def getBC(self): @@ -178,7 +185,7 @@ def setROM(self, banks): self.rom = banks - def zFlagAdd(self, s, resetF=False): + def zeroFlagAdd(self, s, resetF=False): if (resetF): self.f.set(0, False) if s == 0: @@ -300,17 +307,21 @@ def ld(self, getter, setter): setter(getter()) # 1 cycle + def loadFetchRegister(self, register): + self.ld(self.fetch, register.set) + # LD PC,HL, 1 cycle def ld_pc_hl(self): self.ld(self.hl, self.pc) - def fetchLoad(self, register): - self.ld(self.fetch, register.set) + def fetchLoad(self, getter, setter): + self.ld(self.fetch, setter) # ALU, 1 cycle - def addA(self, data): + def addA(self, getter, setter=None): + data = getter() s = (self.a.get() + data) & 0xFF - self.zFlagAdd(s, resetF=True) + self.zeroFlagAdd(s, resetF=True) if s < self.a.get(): self.f.add(constants.C_FLAG, False) if (s & 0x0F) < (self.a.get() & 0x0F): @@ -329,11 +340,10 @@ self.cycles -= 1 # 1 cycle - def adc(self, getter): + def adc(self, getter, setter=None): s = self.a.get() + getter() + ((self.f.get() & constants.C_FLAG) >> 4) self.f.set(0, False) - if (s & 0xFF) == 0: - self.f.add(constants.Z_FLAG , False) + self.zeroFlagAdd(s) if s >= 0x100: self.f.add(constants.C_FLAG, False) if ((s ^ self.a.get() ^ getter()) & 0x10) != 0: @@ -341,11 +351,10 @@ self.a.set(s & 0xFF) # 1 cycle # 1 cycle - def sbc(self, getter): + def sbc(self, getter, setter=None): s = self.a.get() - getter() - ((self.f.get() & constants.C_FLAG) >> 4) self.f.set(constants.N_FLAG, False) - if (s & 0xFF) == 0: - self.f.add(constants.Z_FLAG , False) + self.zeroFlagAdd(s) if (s & 0xFF00) != 0: self.f.add(constants.C_FLAG, False) if ((s ^ self.a.get() ^ getter()) & 0x10) != 0: @@ -353,40 +362,37 @@ self.a.set(s & 0xFF) # 1 cycle # 1 cycle - def sub(self, getter): - s = (self.a.get() - getter()) & 0xFF - self.f.set(constants.N_FLAG, False) - self.zFlagAdd(s) - if s > self.a: - self.f.add(constants.C_FLAG, False) - if (s & 0x0F) > (self.a.get() & 0x0F): - self.f.add(constants.H_FLAG, False) - self.a.set(s) # 1 cycle + def sub(self, getter, setter=None): + self.compareA(getter, setter) # 1 cycle + self.a.sub(getter(useCycles=False), False) # 1 cycle - def cpA(self, getter): + def compareA(self, getter, setter=None): s = (self.a.get() - getter()) & 0xFF self.f.set(constants.N_FLAG) # 1 cycle - self.zFlagAdd(self.a) - if s > self.a: + self.zeroFlagAdd(s) + self.hcFlagFinish(s) + + def hcFlagFinish(self, data): + if data > self.a.get(): self.f.add(constants.C_FLAG, False) - if (s & 0x0F) > (self.a.get() & 0x0F): + if (data & 0x0F) > (self.a.get() & 0x0F): self.f.add(constants.H_FLAG, False) - + # 1 cycle - def AND(self, getter): + def AND(self, getter, setter=None): self.a.set(self.a.get() & getter()) # 1 cycle - self.zFlagAdd(self.a, resetF=True) + self.zeroFlagAdd(self.a.get(), resetF=True) # 1 cycle - def XOR(self, getter): + def XOR(self, getter, setter=None): self.a.set( self.a.get() ^ getter()) # 1 cycle - self.zFlagAdd(self.a, resetF=True) + self.zeroFlagAdd(self.a.get(), resetF=True) # 1 cycle - def OR(self, getter): + def OR(self, getter, setter=None): self.a.set(self.a.get() | getter()) # 1 cycle - self.zFlagAdd(self.a, resetF=True) + self.zeroFlagAdd(self.a.get(), resetF=True) def incDoubleRegister(self, doubleRegister): doubleRegister.inc() @@ -407,7 +413,7 @@ def decIncFlagFinish(self, data, setter): self.f.set(0, False) - self.zFlagAdd(data) + self.zeroFlagAdd(data) if (data & 0x0F) == 0x0F: self.f.add(constants.H_FLAG, False) self.f.add((self.f.get() & constants.C_FLAG), False) @@ -416,44 +422,44 @@ # 1 cycle def rlc(self, getter, setter): s = ((getter() & 0x7F) << 1) + ((getter() & 0x80) >> 7) - flagsAndSetterFinish(s, getter, 0x80) + flagsAndSetterFinish(s, setter, 0x80) # 1 cycle def rl(self, getter, setter): s = ((getter() & 0x7F) << 1) if (self.f.get() & constants.C_FLAG) != 0: s += 0x01 - flagsAndSetterFinish(s, getter, 0x80) # 1 cycle + flagsAndSetterFinish(s, setter, 0x80) # 1 cycle # 1 cycle def rrc(self, getter, setter): s = (getter() >> 1) + ((getter() & 0x01) << 7) - flagsAndSetterFinish(s, getter) # 1 cycle + flagsAndSetterFinish(s, setter) # 1 cycle # 1 cycle def rr(self, getter, setter): s = (getter() >> 1) + ((self.f.get() & constants.C_FLAG) << 3) - flagsAndSetterFinish(s, getter) # 1 cycle + flagsAndSetterFinish(s, setter) # 1 cycle # 2 cycles def sla(self, getter, setter): s = (getter() << 1) & 0xFF - flagsAndSetterFinish(s, getter, 0x80) # 1 cycle + flagsAndSetterFinish(s, setter, 0x80) # 1 cycle # 1 cycle def sra(self, getter, setter): s = (getter() >> 1) + (getter() & 0x80) - flagsAndSetterFinish(s, getter) # 1 cycle + flagsAndSetterFinish(s, setter) # 1 cycle # 1 cycle def srl(self, getter, setter): s = (getter() >> 1) - flagsAndSetterFinish(s, getter) # 1 cycle + flagsAndSetterFinish(s, setter) # 1 cycle # 1 cycle def flagsAndSetterFinish(self, s, setter, compareAnd=0x01): self.f.set(0) # 1 cycle - self.zFlagAdd(s) + self.zeroFlagAdd(s) # XXX where does "getter" come from here? should be "setter"? self.cFlagAdd(getter(), compareAnd) setter(s) @@ -462,7 +468,7 @@ def swap(self, getter, setter): s = ((getter() << 4) & 0xF0) + ((getter() >> 4) & 0x0F) self.f.set(0) # 1 cycle - self.zFlagAdd(s) + self.zeroFlagAdd(s) setter(s) # 2 cycles @@ -474,7 +480,7 @@ # RLCA 1 cycle def rlca(self): - self.cFlagAdd(self.a, 0x80, resetF=True) + self.cFlagAdd(self.a.get(), 0x80, resetF=True) self.a.set(((self.a.get() & 0x7F) << 1) + ((self.a.get() & 0x80) >> 7)) # RLA 1 cycle @@ -487,7 +493,7 @@ # RRCA 1 cycle def rrca(self): - self.cFlagAdd(self.a, resetF=True) + self.cFlagAdd(self.a.get(), resetF=True) self.a.set(((self.a.get() >> 1) & 0x7F) + ((self.a.get() << 7) & 0x80)) #1 cycle # RRA 1 cycle @@ -555,15 +561,15 @@ # LDI A,(HL) 2 cycles def ldi_A_HLi(self): - self.a.set(self.read(self.hl.get())) # 1 cycle + self.a.set(self.read(self.hl.get())) # 2 cycles self.hl.inc()# 2 cycles - self.cycles += 1 + self.cycles += 2 # LDD A,(HL) 2 cycles def ldd_A_HLi(self): - self.a.set(self.read(self.hl.get())) # 1 cycle + self.a.set(self.read(self.hl.get())) # 2 cycles self.hl.dec() # 2 cycles - self.cycles += 1 + self.cycles += 2 # LDH (nn),A 3 cycles def ldh_mem_A(self): @@ -581,7 +587,7 @@ # LDD (HL),A 2 cycles def ldd_HLi_A(self): - self.write(self.hl.get(), self.a) # 2 cycles + self.write(self.hl.get(), self.a.get()) # 2 cycles self.hl.dec() # 2 cycles self.cycles += 2 @@ -610,7 +616,7 @@ self.f.set((self.f.get() & constants.N_FLAG), False) if delta >= 0x60: self.f.add(constants.C_FLAG, False) - self.zFlagAdd(self.a.get()) + self.zeroFlagAdd(self.a.get()) # INC rr def incDoubleRegister(self, register): @@ -645,6 +651,7 @@ self.f.add(constants.C_FLAG, False) if (s & 0x0F00) > (self.sp.get() & 0x0F00): self.f.add(constants.H_FLAG, False) + return s # CCF/SCF def ccf(self): @@ -714,7 +721,7 @@ self.pc.set(hi, lo) # 2 cycles # RET cc 2,5 cycles - def ret_cc(cc): + def ret_cc(self, cc): if cc: self.ret() # 4 cycles # FIXME maybe this should be the same @@ -770,7 +777,6 @@ GROUPED_REGISTERS = (CPU.getB, CPU.getC, CPU.getD, CPU.getE, CPU.getH, CPU.getL, CPU.getHLi, CPU.getA) def create_group_op_codes(table): - print "" opCodes =[] for entry in table: opCode = entry[0] @@ -793,6 +799,18 @@ else: return lambda s: function(s, registerGetter(s).get, registerGetter(s).set, value) +def create_load_group_op_codes(): + opCodes = [] + opCode = 0x40 + for storeRegister in GROUPED_REGISTERS: + for loadRegister in GROUPED_REGISTERS: + opCodes.append((opCode, load_group_lambda(storeRegister, loadRegister))) + opCode += 1 + return opCodes + +def load_group_lambda(storeRegister, loadRegister): + return lambda s: CPU.ld(s, loadRegister(s).get, storeRegister(s).set) + def create_register_op_codes(table): opCodes = [] for entry in table: @@ -865,14 +883,14 @@ (0xF8, CPU.ld_HL_SP_nn), (0xCB, CPU.fetchExecute), (0xCD, CPU.call_nnnn), - (0xC6, lambda s: CPU.addA(s, CPU.fetch(s))), - (0xCE, lambda s: CPU.adc(s, CPU.fetch(s))), - (0xD6, lambda s: CPU.sub(s, CPU.fetch(s))), - (0xDE, lambda s: CPU.sbc(s, CPU.fetch(s))), - (0xE6, lambda s: CPU.AND(s, CPU.fetch(s))), - (0xEE, lambda s: CPU.XOR(s, CPU.fetch(s))), - (0xF6, lambda s: CPU.OR(s, CPU.fetch(s))), - (0xFE, lambda s: CPU.cpA(s, CPU.fetch(s))), + (0xC6, lambda s: CPU.addA(s, s.fetch)), + (0xCE, lambda s: CPU.adc(s, s.fetch)), + (0xD6, lambda s: CPU.sub(s, s.fetch)), + (0xDE, lambda s: CPU.sbc(s, s.fetch)), + (0xE6, lambda s: CPU.AND(s, s.fetch)), + (0xEE, lambda s: CPU.XOR(s, s.fetch)), + (0xF6, lambda s: CPU.OR(s, s.fetch)), + (0xFE, lambda s: CPU.compareA(s, s.fetch)), (0xC7, lambda s: CPU.rst(s, 0x00)), (0xCF, lambda s: CPU.rst(s, 0x08)), (0xD7, lambda s: CPU.rst(s, 0x10)), @@ -886,6 +904,7 @@ REGISTER_GROUP_OP_CODES = [ (0x04, 0x08, CPU.inc), (0x05, 0x08, CPU.dec), + (0x06, 0x08, CPU.loadFetchRegister), (0x80, 0x01, CPU.addA), (0x88, 0x01, CPU.adc), (0x90, 0x01, CPU.sub), @@ -893,7 +912,7 @@ (0xA0, 0x01, CPU.AND), (0xA8, 0x01, CPU.XOR), (0xB0, 0x01, CPU.OR), - (0xB8, 0x01, CPU.cpA), + (0xB8, 0x01, CPU.compareA), (0x06, 0x08, CPU.fetchLoad), (0x40, 0x01, CPU.res, range(0, 8)) ] @@ -912,7 +931,7 @@ (0xC4, 0x08, CPU.call_cc_nnnn, REGISTER_SET_B), (0x20, 0x08, CPU.jr_cc_nn, REGISTER_SET_B), (0xC1, 0x10, CPU.popDoubleRegister, REGISTER_SET_C), - (0xC5, 0x10, CPU.push, REGISTER_SET_C) + (0xC5, 0x10, CPU.pushDoubleRegister, REGISTER_SET_C) ] SECOND_ORDER_REGISTER_GROUP_OP_CODES = [ @@ -933,6 +952,7 @@ FIRST_ORDER_OP_CODES += create_register_op_codes(REGISTER_OP_CODES) FIRST_ORDER_OP_CODES += create_group_op_codes(REGISTER_GROUP_OP_CODES) +FIRST_ORDER_OP_CODES += create_load_group_op_codes() SECOND_ORDER_OP_CODES = create_group_op_codes(SECOND_ORDER_REGISTER_GROUP_OP_CODES) Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Tue Mar 25 00:12:23 2008 @@ -241,7 +241,7 @@ assert cpuUsedCycles == cycles,\ "Cycles for opCode %s [CPU.%s] should be %i not %i" %\ (hex(opCode).ljust(2),\ - OP_CODES[opCode].func_closure[0].cell_contents.func_name,\ + OP_CODES[opCode],\ cycles, cpuUsedCycles) @@ -292,7 +292,7 @@ if a is not None: assert cpu.a.get() == a, "Register a is %s but should be %s" % (hex(cpu.a.get()), hex(a)) if bc is not None: - assert cpu.bc.get() == bc, "Register bc is %s but should be %s" % (hex(cpu.bc.get(), hex(bc))) + assert cpu.bc.get() == bc, "Register bc is %s but should be %s" % (hex(cpu.bc.get()), hex(bc)) if de is not None: assert cpu.de.get() == de, "Register de is %s but should be %s" % (hex(cpu.de.get()),hex(de)) if f is not None: @@ -357,13 +357,12 @@ cpu = get_cpu() assert_default_registers(cpu) startPC = cpu.pc.get() + prepare_for_fetch(cpu, 0xCD, 0xEF) cpu.sp.set(0x1234) - cpu.rom[startPC] = 0xD0 - cpu.rom[startPC+1] = 0xC0 cycle_test(cpu, 0x08, 5) - assert_default_registers(cpu, pc=startPC+2) - assert cpu.memory.read(0xC0D0) == cpu.sp.getLo() - assert cpu.memory.read(0xC0D0+1) == cpu.sp.getHi() + assert_default_registers(cpu, pc=startPC+2, sp=0x1234) + assert cpu.memory.read(0xCDEF) == cpu.sp.getLo() + assert cpu.memory.read(0xCDEF+1) == cpu.sp.getHi() # stop def test_0x10(): @@ -449,7 +448,7 @@ cpu.write(address, value) assert cpu.read(address) == value cycle_test(cpu, 0x0A, 2) - assert_default_registers(cpu, a=value) + assert_default_registers(cpu, a=value, bc=address) # ld_DEi_A @@ -457,7 +456,7 @@ cpu = get_cpu(); cpu.de.set(0xC2, 0x23); cpu.a.set(0x12); - cycle_test(cpu, 0x02, 2); + cycle_test(cpu, 0x12, 2); assert cpu.read(cpu.de.get()) == cpu.a.get() # load_a_DEi @@ -469,47 +468,48 @@ cpu.write(address, value) assert cpu.read(address) == value cycle_test(cpu, 0x1A, 2) - assert_default_registers(cpu, a=value) + assert_default_registers(cpu, a=value, de=address) # ldi_HLi_A def test_0x22(): cpu = get_cpu(); - cpu.hl.set(0xC2, 0x23); + cpu.hl.set(0xCD, 0xEF); cpu.a.set(0x12); - cycle_test(cpu, 0x02, 2); - assert cpu.read(cpu.hl.get()) == cpu.a.get()+1 + cycle_test(cpu, 0x22, 2); + assert cpu.read(0xCDEF) == cpu.a.get() + assert cpu.hl.get() == 0xCDEF+1 +# ldd_HLi_A +def test_0x32(): + cpu = get_cpu(); + cpu.hl.set(0xCD, 0xEF); + cpu.a.set(0x12); + cycle_test(cpu, 0x32, 2); + assert cpu.read(0xCDEF) == cpu.a.get() + assert cpu.hl.get() == 0xCDEF-1 + + # ldi_A_HLi def test_0x2A(): cpu = get_cpu() value = 0x12 - address = 0xC020 - hlValue = cpu.hl.get() + address = 0xCDEF cpu.hl.set(address) cpu.write(address, value) assert cpu.read(address) == value - cycle_test(cpu, 0x0A, 2) - assert_default_registers(cpu, a=value, hl=hlValue+1) + cycle_test(cpu, 0x2A, 2) + assert_default_registers(cpu, a=value, hl=address+1) -# ldd_HLi_A -def test_0x32(): - cpu = get_cpu(); - cpu.hl.set(0xC2, 0x23); - cpu.a.set(0x12); - cycle_test(cpu, 0x02, 2); - assert cpu.read(cpu.hl.get()) == cpu.a.get()-1 - # ldd_A_HLi def test_0x3A(): cpu = get_cpu() value = 0x12 - address = 0xC020 - hlValue = cpu.hl.get() + address = 0xCDEF cpu.hl.set(address) cpu.write(address, value) assert cpu.read(address) == value - cycle_test(cpu, 0x0A, 2) - assert_default_registers(cpu, a=value, hl=hlValue-1) + cycle_test(cpu, 0x3A, 2) + assert_default_registers(cpu, a=value, hl=address-1) # inc_BC DE HL SP def test_0x03_to_0x33_inc_double_registers(): @@ -544,19 +544,18 @@ # inc_B C D E H L A def test_0x04_to_0x3C_inc_registers(): - py.test.skip("Op Code Mapping not fully implemented") cpu = get_cpu() - registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hl, cpu.a] + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hli, cpu.a] opCode = 0x04 value = 0x12 - for i in range(0, len(registers)): + for register in registers: + if register == cpu.hli: + opCode += 0x08 + continue set_registers(registers, 0) - registers[i].set(value) - if registers[i] == cpu.hl: - cycle_test(cpu, opCode, 3) - else: - cycle_test(cpu, opCode, 1) - assert registers[i].get() == value+1 + register.set(value) + cycle_test(cpu, opCode, 1) + assert register.get() == value+1 cpu.reset() opCode += 0x08 value += 3 @@ -564,47 +563,50 @@ # inc_HLi def test_0x34(): cpu = get_cpu() - value = 0x1234 - cpu.hl.set(0xC003) + value = 0x12 + cpu.hl.set(0xCDEF) cpu.write(cpu.hl.get(), value) + assert cpu.read(cpu.hl.get()) == value cycle_test(cpu, 0x34, 3) assert cpu.read(cpu.hl.get()) == value +1 # dec_B C D E H L A def test_0x05_to_0x3D_dec_registers(): - py.test.skip("Op Code Mapping not fully implemented") cpu = get_cpu() - registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hl, cpu.a] + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hli, cpu.a] opCode = 0x05 value = 0x12 - for i in range(0, len(registers)): - if registers[i] == cpu.hl: + for register in registers: + if register == cpu.hli: + opCode += 0x08 continue + cpu.reset() set_registers(registers, 0) + register.set(value) cycle_test(cpu, opCode, 1) - assert registers[i].get() == value-1 - cpu.reset() + assert register.get() == value-1 opCode += 0x08 value += 3 # dec_HLi def test_0x35(): cpu = get_cpu() - value = 0x1234 - cpu.hl.set(0xC003) + value = 0x12 + cpu.hl.set(0xCDEF) cpu.write(cpu.hl.get(), value) + assert cpu.read(cpu.hl.get()) == value cycle_test(cpu, 0x35, 3) assert cpu.read(cpu.hl.get()) == value -1 # ld_B_nn C D E H L A ) def test_0x06_to_0x3A(): - py.test.skip("Op Code Mapping not fully implemented") cpu = get_cpu() - registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hl, cpu.a] + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hli, cpu.a] opCode = 0x06 value = 0x12 for i in range(0, len(registers)): - if registers[i] == cpu.hl: + if registers[i] == cpu.hli: + opCode += 0x08 continue oldPC = cpu.pc.get() set_registers(registers, 0) @@ -619,8 +621,10 @@ # ld_HLi_nn def test_0x36(): cpu = get_cpu() - value = 0x1234 + value = 0x12 + address = 0xCDEF prepare_for_fetch(cpu, value) + cpu.hl.set(address) oldPC = cpu.pc.get() cycle_test(cpu, 0x36, 3) assert cpu.read(cpu.hl.get()) == value @@ -657,7 +661,7 @@ value = 0x12 cpu.a.set(value) cpu.f.set(value) - cycle_test(cpu, 0x07, 1) + cycle_test(cpu, 0x2F, 1) assert_default_registers(cpu, a=value^0xFF, f=value|constants.N_FLAG+constants.H_FLAG) # scf @@ -678,24 +682,29 @@ # halt def test_0x76(): + py.test.skip("test not completed yet") cpu = get_cpu() assert cpu.halted == False cycle_test(cpu, 0x76, 0) assert cpu.halted == True -# ld_B_B -def test_0x40(): +# ld_B_B to ld_A_A +def test_load_registers(): cpu = get_cpu() - opCode = 0x04 + opCode = 0x40 value = 0x12 - registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hli, cpu.a] for store in registers: for load in registers: + if store == cpu.hli and load == cpu.hli: + opCode += 0x01 + continue cpu.reset() + set_registers(registers, 0) load.set(value) numCycles= 1 - if store == cpu.getHLi or load == cpu.getHLi: + if store == cpu.hli or load == cpu.hli: numCycles = 2 cycle_test(cpu, opCode, numCycles) assert store.get() == value @@ -703,37 +712,40 @@ # add_A_B to add_A_A -def test_0x80(): +def test_0x80_to_0x87(): cpu = get_cpu() opCode = 0x80 valueA = 0x11 value = 0x12 - registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] - for add in registers: + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hli, cpu.a] + for register in registers: cpu.reset() cpu.a.set(valueA) - add.set(value) + register.set(value) numCycles= 1 - if add == cpu.getHLi: + if register == cpu.hli: numCycles = 2 cycle_test(cpu, opCode, numCycles) - assert cpu.a.get() == valueA+value + if register == cpu.a: + assert cpu.a.get() == 2*value + else: + assert cpu.a.get() == valueA+value value += 3 opCode += 0x01 # adc_A_B to adx_A_A -def test_0x88(): +def test_0x88_to_0x8F(): py.test.skip("need a full flag checker imlementation") cpu = get_cpu() opCode = 0x88 value = 0x12 - registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] - for add in registers: + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hli, cpu.a] + for register in registers: cpu.reset() cpu.a.set(value) - add.set(value) + register.set(value) numCycles= 1 - if add == cpu.getHLi: + if add == cpu.hli: numCycles = 2 cycle_test(cpu, opCode, numCycles) assert cpu.a.get() == 2*value @@ -741,17 +753,17 @@ opCode += 0x01 # sub_A_B to sub_A_A -def test_0x90(): +def test_0x90_to_0x98(): cpu = get_cpu() opCode = 0x90 value = 0x12 - registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] - for add in registers: + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hli, cpu.a] + for register in registers: cpu.reset() cpu.a.set(value) - add.set(value) + register.set(value) numCycles= 1 - if add == cpu.getHLi: + if register == cpu.hli: numCycles = 2 cycle_test(cpu, opCode, numCycles) assert cpu.a.get() == 0 @@ -763,21 +775,24 @@ pass # and_A_B to and_A_A -def test_0xA0(): +def test_0xA0_to_0xA7(): cpu = get_cpu() opCode = 0xA0 value = 0x12 valueA = 0x11 - registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hli, cpu.a] for register in registers: cpu.reset() cpu.a.set(valueA) register.set(value) numCycles= 1 - if add == cpu.getHLi: + if register == cpu.hli: numCycles = 2 cycle_test(cpu, opCode, numCycles) - assert cpu.a.get() == (valueA & value) + if register == cpu.a: + assert cpu.a.get() == (value & value) + else: + assert cpu.a.get() == (valueA & value) if cpu.a.get() == 0: assert cpu.f.get() == constants.Z_FLAG else: @@ -786,21 +801,24 @@ opCode += 0x01 # xor_A_B to xor_A_A -def test_0xA0(): +def test_0xA8_to_0xAF(): cpu = get_cpu() - opCode = 0xA0 + opCode = 0xA8 value = 0x12 valueA = 0x11 - registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hli, cpu.a] for register in registers: cpu.reset() cpu.a.set(valueA) register.set(value) numCycles= 1 - if add == cpu.getHLi: + if register == cpu.hli: numCycles = 2 cycle_test(cpu, opCode, numCycles) - assert cpu.a.get() == (valueA ^ value) + if register == cpu.a: + assert cpu.a.get() == (value ^ value) + else: + assert cpu.a.get() == (valueA ^ value) if cpu.a.get() == 0: assert cpu.f.get() == constants.Z_FLAG else: @@ -809,21 +827,24 @@ opCode += 0x01 # or_A_B to or_A_A -def test_0xB0(): +def test_0xB0_to_0xB7(): cpu = get_cpu() - opCode = 0xA0 + opCode = 0xB0 value = 0x12 valueA = 0x11 - registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hli, cpu.a] for register in registers: cpu.reset() cpu.a.set(valueA) register.set(value) numCycles= 1 - if add == cpu.getHLi: + if register == cpu.hli: numCycles = 2 cycle_test(cpu, opCode, numCycles) - assert cpu.a.get() == (valueA | value) + if register == cpu.a: + assert cpu.a.get() == (value | value) + else: + assert cpu.a.get() == (valueA | value) if cpu.a.get() == 0: assert cpu.f.get() == constants.Z_FLAG else: @@ -832,26 +853,29 @@ opCode += 0x01 # cp_A_B to cp_A_A -def test_0xB8(): +def test_0xB8_to_0xBF(): cpu = get_cpu() opCode = 0xB8 value = 0x12 valueA = 0x11 - registers = [cpu.getB, cpu.getC, cpu.getD, cpu.getE, cpu.getH, cpu.getL, cpu.getHLi, cpu.getA] + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hli, cpu.a] for register in registers: cpu.reset() cpu.a.set(valueA) - cpu.set(value) + register.set(value) numCycles= 1 - if add == cpu.getHLi: + if register == cpu.hli: numCycles = 2 cycle_test(cpu, opCode, numCycles) - #(s == 0 ? Z_FLAG : 0) + (s > this.a ? C_FLAG : 0) - # + ((s & 0x0F) > (this.a & 0x0F) ? H_FLAG : 0) + N_FLAG; - if cpu.a.get() == 0: - assert cpu.f.get() == constants.Z_FLAG - else: - assert cpu.f.get() == 0 + if register == cpu.a: + valueA = value + assert cpu.f.get() & constants.N_FLAG != 0 + if valueA == value: + assert cpu.f.get() & constants.Z_FLAG != 0 + if value < 0: + assert cpu.f.get() & constants.C_FLAG != 0 + if ((valueA-value) & 0x0F) > (valueA & 0x0F): + assert cpu.f.get() & constants.H_FLAG != 0 value += 1 opCode += 0x01 @@ -863,17 +887,16 @@ value = 0x1234 for i in range(0, 4): cpu.reset() - prepare_for_pop(cpu, value) - pc = cpu.pc.get() + prepare_for_pop(cpu, value >> 8, value & 0xFF) cpu.f.set(flags[i]) cycle_test(cpu, opCode, 5) - assert cpu.pc.get() == pc+value+1 + assert cpu.pc.get() == value cpu.reset() - prepare_for_pop(cpu, value) + prepare_for_pop(cpu, value >> 8, value & 0xFF) cpu.f.set(~flags[i]) cycle_test(cpu, opCode, 2) - assert_default_registers(cpu) + assert_default_registers(cpu, f=~flags[i] & 0xFF) value += 3 opCode += 0x08 @@ -882,7 +905,7 @@ cpu = get_cpu() valueA = 0x11 value = 0x12 - prepare_for_fetch(cpu, value, 0x34) + prepare_for_fetch(cpu, value) cpu.a.set(valueA) cycle_test(cpu, 0xE0, 3) assert cpu.read(0xFF00+value) == valueA @@ -892,25 +915,50 @@ def test_0xE8(): cpu = get_cpu() value = 0x12 - prepare_for_fetch(cpu, value, 0x34) - sp = cpu.sp.get() + spValue = 0xCDEF + prepare_for_fetch(cpu, value) + cpu.sp.set(spValue) cycle_test(cpu, 0xE8, 4) - assert_default_registers(cpu, sp=sp+value) + assert cpu.sp.get() == spValue+value # ldh_A_mem def test_0xF0(): cpu = get_cpu() valueA = 0x11 - valueAdd = 0x12 + value= 0x12 address = 0x13 cpu.a.set(valueA) - prepare_for_fetch(cpu, address, 0x34) - cpu.write(0xFF00+address, valueAdd) + prepare_for_fetch(cpu, address) + cpu.write(0xFF00+address, value) cycle_test(cpu, 0xF0, 3) - assert_default_registers(cpu, a=valueA + valueAdd) + assert cpu.a.get() == value +# ld_A_mem +def test_0xFA(): + py.test.skip("changements to the cpu class") + cpu = get_cpu() + value = 0x11 + valueA = 0x12 + cpu.a.set(valueA) + prepare_for_fetch(cpu, 0x12, 0x34) + cpu.write(0x1234, value) + cycle_test(cpu, 0xFA, 4) + assert_default_registers(cpu, a=value) + +# ld_mem_A +def test_0xEA(): + py.test.skip("changements to the cpu class") + cpu = get_cpu() + valueA = 0x56 + prepare_for_fetch(cpu, 0x12, 0x34) + cpu.c.set(value) + cycle_test(cpu, 0xEA, 4) + assert cpu.read(0x1234) == valueA + + # ld_HL_SP_nn def test_0xF8(): + py.test.skip("changements to the cpu class") cpu = get_cpu() value = 0x12 prepare_for_fetch(cpu, value, 0x34) @@ -934,6 +982,7 @@ # ret def test_0xC9(): + py.test.skip("changements to the cpu class") cpu = get_cpu() value = 0x1234 prepare_for_pop(cpu, value >> 8, value & 0xFF) @@ -944,6 +993,7 @@ # reti def test_0xD9(): + py.test.skip("changements to the cpu class") cpu = get_cpu() value = 0x1234 prepare_for_pop(cpu, value >> 8, value & 0xFF) @@ -953,11 +1003,21 @@ # ld_PC_HL def test_0xE9(): - pass + py.test.skip("changements to the cpu class") + cpu = get_cpu() + value = 0x1234 + cpu.hl.set(value) + cycle_test(cpu, 0xE9, 1) + assert_default_registers(cpu, pc=value) # ld_SP_HL def test_0xF9(): - pass + py.test.skip("changements to the cpu class") + cpu = get_cpu() + value = 0x1234 + cpu.hl.set(value) + cycle_test(cpu, 0xF9, 2) + assert_default_registers(cpu, sp=value) # jp_NZ_nnnn def test_0xC2(): @@ -974,32 +1034,51 @@ # ldh_Ci_A def test_0xE2(): - pass - -# ld_mem_A -def test_0xEA(): - pass + py.test.skip("changements to the cpu class") + cpu = get_cpu() + value = 0x12 + valueA = value+1 + cpu.c.set(value) + cpu.a.set(valueA) + cycle_test(cpu, 0xE2, 2) + assert cpu.read.get(0xFF00+value) == valueA # ldh_A_Ci def test_0xF2(): - pass + py.test.skip("changements to the cpu class") + cpu = get_cpu() + valueC = 0x12 + valeu = 0x11 + cpu.c.set(valueC) + cpu.write.set(0xFF00+valueC, valueA) + cycle_test(cpu, 0xF2, 2) + assert_default_regsiters(cpu, a=value) + + -# ld_A_mem -def test_0xFA(): - pass # jp_nnnn def test_0xC3(): - pass + cpu = get_cpu() + prepare_for_fetch(cpu, 0x12, 0x34) + cycle_test(cpu, 0xC3, 4) + assert_default_registers(cpu, pc=0x1234) # di def test_0xF3(): - pass + cpu = get_cpu() + cpu.ime == True + cycle_test(cpu, 0xF3, 1) + assert cpu.ime == False # ei def test_0xFB(): - pass + py.test.skip("changements to the cpu class") + cpu = get_cpu() + cpu.ime == False + cycle_test(cpu, 0xF3, 1) + assert cpu.ime == True # call_NZ_nnnn def test_0xC4(): @@ -1014,18 +1093,20 @@ def test_0xDC(): pass -# push_BC +# push_BC to push_AF def test_0xC5(): - pass -# push_DE -def test_0xD5(): - pass -# push_HL -def test_0xE5(): - pass -# push_AF -def test_0xF5(): - pass + py.test.skip("changements to the cpu class") + cpu = get_cpu() + registers = [cpu.bc, cpu.de, cpu.hl, cpu.af] + opCode = 0xC4 + value = 0x1234 + for register in registers: + cycle_test(cpu, opCode, 4) + assert cpu.memory.read(cpu.sp.get()) == value >> 8 + assert cpu.memory.read(cpu.sp.get()-1) == value & 0xFF + opCode += 0x10 + value += 0x0101 + # call_nnnn def test_0xCD(): @@ -1063,837 +1144,81 @@ def test_0xFE(): pass -# rst -def test_0xC7(): - pass -# rst -def test_0xCF(): - pass -# rst -def test_0xD7(): - pass -# rst -def test_0xDF(): - pass -# rst -def test_0xE7(): - pass -# rst -def test_0xEF(): - pass -# rst -def test_0xF7(): - pass -# rst -def test_0xFF(): +# rst(0x00) to rst(0x38) +def test_0xC7_to_0xFF(): + cpu = get_cpu() + opCode = 0xC7 + rstValue = 0x00 + for i in range(0,8): + cpu.reset() + cpu.pc.set(0x1234) + cycle_test(cpu, opCode, 4) + assert cpu.pop() == 0x34 + assert cpu.pop() == 0x12 + assert cpu.pc.get() == rstValue + opCode += 0x08 + rstValue += 0x08 pass - - # switching to other opcode set def test_0xCB(): pass +# rlc_B to rlc_A +def test_0x00_to_0x07(): + cpu = get_cpu() + registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hli, cpu.a] + opCode = 0x00 + for register in registers: + opCode += 0x01 -# rlc_B -def test_0x00(): - pass -# rlc_C -def test_0x01(): - pass -# rlc_D -def test_0x02(): - pass -# rlc_E -def test_0x03(): - pass -# rlc_H -def test_0x04(): - pass -# rlc_L -def test_0x05(): - pass -# rlc_HLi -def test_0x06(): - pass -# rlc_A -def test_0x07(): - pass - -# rrc_B -def test_0x08(): - pass -# rrc_C -def test_0x09(): - pass -# rrc_D -def test_0x0A(): - pass -# rrc_E -def test_0x0B(): - pass -# rrc_H -def test_0x0C(): - pass -# rrc_L -def test_0x0D(): - pass -# rrc_HLi -def test_0x0E(): - pass -# rrc_A -def test_0x0F(): - pass - -# rl_B -def test_0x10(): - pass -# rl_C -def test_0x11(): - pass -# rl_D -def test_0x12(): - pass -# rl_E -def test_0x13(): - pass -# rl_H -def test_0x14(): - pass -# rl_L -def test_0x15(): - pass -# rl_HLi -def test_0x16(): - pass -# rl_A -def test_0x17(): - pass - -# rr_B -def test_0x18(): - pass -# rr_C -def test_0x19(): - pass -# rr_D -def test_0x1A(): - pass -# rr_E -def test_0x1B(): - pass -# rr_H -def test_0x1C(): - pass -# rr_L -def test_0x1D(): - pass -# rr_HLi -def test_0x1E(): - pass -# rr_A -def test_0x1F(): - pass - -# sla_B -def test_0x20(): - pass -# sla_C -def test_0x21(): - pass -# sla_D -def test_0x22(): - pass -# sla_E -def test_0x23(): - pass -# sla_H -def test_0x24(): - pass -# sla_L -def test_0x25(): - pass -# sla_HLi -def test_0x26(): - pass -# sla_A -def test_0x27(): - pass - -# sra_B -def test_0x28(): - pass -# sra_C -def test_0x29(): - pass -# sra_D -def test_0x2A(): - pass -# sra_E -def test_0x2B(): - pass -# sra_H -def test_0x2C(): - pass -# sra_L -def test_0x2D(): - pass -# sra_HLi -def test_0x2E(): - pass -# sra_A -def test_0x2F(): - pass - -# swap_B -def test_0x30(): - pass -# swap_C -def test_0x31(): - pass -# swap_D -def test_0x32(): - pass -# swap_E -def test_0x33(): - pass -# swap_H -def test_0x34(): - pass -# swap_L -def test_0x35(): - pass -# swap_HLi -def test_0x36(): - pass -# swap_A -def test_0x37(): - pass - -# srl_B -def test_0x38(): - pass -# srl_C -def test_0x39(): - pass -# srl_D -def test_0x3A(): - pass -# srl_E -def test_0x3B(): - pass -# srl_H -def test_0x3C(): - pass -# srl_L -def test_0x3D(): - pass -# srl_HLi -def test_0x3E(): - pass -# srl_A -def test_0x3F(): - pass - -# bit_B -def test_0x40(): - pass -# bit_C -def test_0x41(): - pass -# bit_D -def test_0x42(): - pass -# bit_E -def test_0x43(): - pass -# bit_H -def test_0x44(): - pass -# bit_L -def test_0x45(): - pass -# bit_HLi -def test_0x46(): - pass -# bit_A -def test_0x47(): - pass - -# bit_B -def test_0x48(): - pass -# bit_C -def test_0x49(): - pass -# bit_D -def test_0x4A(): - pass -# bit_E -def test_0x4B(): - pass -# bit_H -def test_0x4C(): - pass -# bit_L -def test_0x4D(): - pass -# bit_HLi -def test_0x4E(): - pass -# bit_A -def test_0x4F(): - pass - -# bit_B -def test_0x50(): - pass -# bit_C -def test_0x51(): - pass -# bit_D -def test_0x52(): - pass -# bit_E -def test_0x53(): - pass -# bit_H -def test_0x54(): - pass -# bit_L -def test_0x55(): - pass -# bit_HLi -def test_0x56(): - pass -# bit_A -def test_0x57(): - pass - -# bit_B -def test_0x58(): - pass -# bit_C -def test_0x59(): - pass -# bit_D -def test_0x5A(): - pass -# bit_E -def test_0x5B(): - pass -# bit_H -def test_0x5C(): - pass -# bit_L -def test_0x5D(): - pass -# bit_HLi -def test_0x5E(): - pass -# bit_A -def test_0x5F(): - pass - -# bit_B -def test_0x60(): - pass -# bit_C -def test_0x61(): - pass -# bit_D -def test_0x62(): - pass -# bit_E -def test_0x63(): - pass -# bit_H -def test_0x64(): - pass -# bit_L -def test_0x65(): - pass -# bit_HLi -def test_0x66(): - pass -# bit_A -def test_0x67(): - pass - -# bit_B -def test_0x68(): - pass -# bit_C -def test_0x69(): - pass -# bit_D -def test_0x6A(): - pass -# bit_E -def test_0x6B(): - pass -# bit_H -def test_0x6C(): - pass -# bit_L -def test_0x6D(): - pass -# bit_HLi -def test_0x6E(): - pass -# bit_A -def test_0x6F(): - pass - -# bit_B -def test_0x70(): - pass -# bit_C -def test_0x71(): - pass -# bit_D -def test_0x72(): - pass -# bit_E -def test_0x73(): - pass -# bit_H -def test_0x74(): - pass -# bit_L -def test_0x75(): - pass -# bit_HLi -def test_0x76(): - pass -# bit_A -def test_0x77(): - pass - -# bit_B -def test_0x78(): - pass -# bit_C -def test_0x79(): - pass -# bit_D -def test_0x7A(): - pass -# bit_E -def test_0x7B(): - pass -# bit_H -def test_0x7C(): - pass -# bit_L -def test_0x7D(): - pass -# bit_HLi -def test_0x7E(): - pass -# bit_A -def test_0x7F(): - pass - -# set_B -def test_0xC0(): - pass -# set_C -def test_0xC1(): - pass -# set_D -def test_0xC2(): - pass -# set_E -def test_0xC3(): - pass -# set_H -def test_0xC4(): - pass -# set_L -def test_0xC5(): - pass -# set_HLi -def test_0xC6(): - pass -# set_A -def test_0xC7(): - pass - -# set_B -def test_0xC8(): - pass -# set_C -def test_0xC9(): - pass -# set_D -def test_0xCA(): - pass -# set_E -def test_0xCB(): - pass -# set_H -def test_0xCC(): - pass -# set_L -def test_0xCD(): - pass -# set_HLi -def test_0xCE(): - pass -# set_A -def test_0xCF(): - pass - -# set_B -def test_0xD0(): - pass -# set_C -def test_0xD1(): - pass -# set_D -def test_0xD2(): - pass -# set_E -def test_0xD3(): - pass -# set_H -def test_0xD4(): - pass -# set_L -def test_0xD5(): - pass -# set_HLi -def test_0xD6(): - pass -# set_A -def test_0xD7(): - pass - -# set_B -def test_0xD8(): - pass -# set_C -def test_0xD9(): - pass -# set_D -def test_0xDA(): - pass -# set_E -def test_0xDB(): - pass -# set_H -def test_0xDC(): - pass -# set_L -def test_0xDD(): - pass -# set_HLi -def test_0xDE(): - pass -# set_A -def test_0xDF(): - pass - -# set_B -def test_0xE0(): - pass -# set_C -def test_0xE1(): - pass -# set_D -def test_0xE2(): - pass -# set_E -def test_0xE3(): - pass -# set_H -def test_0xE4(): - pass -# set_L -def test_0xE5(): - pass -# set_HLi -def test_0xE6(): - pass -# set_A -def test_0xE7(): - pass - -# set_B -def test_0xE8(): - pass -# set_C -def test_0xE9(): - pass -# set_D -def test_0xEA(): - pass -# set_E -def test_0xEB(): - pass -# set_H -def test_0xEC(): - pass -# set_L -def test_0xED(): - pass -# set_HLi -def test_0xEE(): - pass -# set_A -def test_0xEF(): - pass - -# set_B -def test_0xF0(): - pass -# set_C -def test_0xF1(): - pass -# set_D -def test_0xF2(): - pass -# set_E -def test_0xF3(): - pass -# set_H -def test_0xF4(): - pass -# set_L -def test_0xF5(): - pass -# set_HLi -def test_0xF6(): - pass -# set_A -def test_0xF7(): - pass - -# set_B -def test_0xF8(): - pass -# set_C -def test_0xF9(): - pass -# set_D -def test_0xFA(): - pass -# set_E -def test_0xFB(): - pass -# set_H -def test_0xFC(): - pass -# set_L -def test_0xFD(): - pass -# set_HLi -def test_0xFE(): - pass -# set_A -def test_0xFF(): - pass +# rrc_B to rrc_F +def test_0x08_to_0x0F(): + cpu = get_cpu() + opCode = 0x38 -# res_B -def test_0x80(): - pass -# res_C -def test_0x81(): - pass -# res_D -def test_0x82(): - pass -# res_E -def test_0x83(): - pass -# res_H -def test_0x84(): - pass -# res_L -def test_0x85(): - pass -# res_HLi -def test_0x86(): - pass -# res_A -def test_0x87(): - pass +# rl_B to rl_A +def test_0x10_to_0x17(): + cpu = get_cpu() + opCode = 0x38 -# res_B -def test_0x88(): - pass -# res_C -def test_0x89(): - pass -# res_D -def test_0x8A(): - pass -# res_E -def test_0x8B(): - pass -# res_H -def test_0x8C(): - pass -# res_L -def test_0x8D(): - pass -# res_HLi -def test_0x8E(): - pass -# res_A -def test_0x8F(): - pass +# rr_B to rr_A +def test_0x18_to_0x1F(): + cpu = get_cpu() + opCode = 0x38 -# res_B -def test_0x90(): - pass -# res_C -def test_0x91(): - pass -# res_D -def test_0x92(): - pass -# res_E -def test_0x93(): - pass -# res_H -def test_0x94(): - pass -# res_L -def test_0x95(): - pass -# res_HLi -def test_0x96(): - pass -# res_A -def test_0x97(): - pass +# sla_B to sla_A +def test_0x20_to_0x27(): + cpu = get_cpu() + opCode = 0x38 -# res_B -def test_0x98(): - pass -# res_C -def test_0x99(): - pass -# res_D -def test_0x9A(): - pass -# res_E -def test_0x9B(): - pass -# res_H -def test_0x9C(): - pass -# res_L -def test_0x9D(): - pass -# res_HLi -def test_0x9E(): - pass -# res_A -def test_0x9F(): - pass +# sra_B to sra_A +def test_0x28_to_0x2F(): + cpu = get_cpu() + opCode = 0x38 -# res_B -def test_0xA0(): - pass -# res_C -def test_0xA1(): - pass -# res_D -def test_0xA2(): - pass -# res_E -def test_0xA3(): - pass -# res_H -def test_0xA4(): - pass -# res_L -def test_0xA5(): - pass -# res_HLi -def test_0xA6(): - pass -# res_A -def test_0xA7(): - pass +# swap_B to swap_A +def test_0x30_to_0x37(): + cpu = get_cpu() + opCode = 0x38 -# res_B -def test_0xA8(): - pass -# res_C -def test_0xA9(): - pass -# res_D -def test_0xAA(): - pass -# res_E -def test_0xAB(): - pass -# res_H -def test_0xAC(): - pass -# res_L -def test_0xAD(): - pass -# res_HLi -def test_0xAE(): - pass -# res_A -def test_0xAF(): - pass +# srl_B to srl_A +def test_0x38_to_0x3F(): + cpu = get_cpu() + opCode = 0x38 -# res_B -def test_0xB0(): - pass -# res_C -def test_0xB1(): - pass -# res_D -def test_0xB2(): - pass -# res_E -def test_0xB3(): - pass -# res_H -def test_0xB4(): - pass -# res_L -def test_0xB5(): - pass -# res_HLi -def test_0xB6(): - pass -# res_A -def test_0xB7(): - pass +# bit_B to bit_A +def test_bit_opCodes(): + opCode = 0x40 + +# set_B to set_C +def test_set_opCodes(): + opCode = 0xC0 -# res_B -def test_0xB8(): - pass -# res_C -def test_0xB9(): - pass -# res_D -def test_0xBA(): - pass -# res_E -def test_0xBB(): - pass -# res_H -def test_0xBC(): - pass -# res_L -def test_0xBD(): - pass -# res_HLi -def test_0xBE(): - pass -# res_A -def test_0xBF(): - pass +# res_B to res_A +def test_res_opCodes(): + opCode = 0x80 + Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_timer.py Tue Mar 25 00:12:23 2008 @@ -50,21 +50,23 @@ def test_setTimerControl(): - py.test.skip("need to use more information about the timer") timer = get_timer() value = 0x12 timer.write(constants.TAC, value) - assert timer.getTimerControl() == value - assert timer.read(constants.TAC) == value + assert timer.getTimerControl() == 0xF8 | value + assert timer.read(constants.TAC) == 0xF8 |value def test_cycles(): + py.test.skip("not yet implemented") timer = get_timer() def test_emulateDivider(): + py.test.skip("not yet implemented") timer = get_timer() def test_emulateTimer(): + py.test.skip("not yet implemented") timer = get_timer() \ No newline at end of file From cfbolz at codespeak.net Tue Mar 25 01:12:54 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 01:12:54 +0100 (CET) Subject: [pypy-svn] r52890 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080325001254.AE847168417@codespeak.net> Author: cfbolz Date: Tue Mar 25 01:12:53 2008 New Revision: 52890 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Log: don't allocate a GreenKey every time we hit may_enter_jit Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 25 01:12:53 2008 @@ -5,13 +5,13 @@ from pypy.rpython.annlowlevel import llhelper from pypy.rpython.lltypesystem import lltype, lloperation from pypy.rpython.llinterp import LLInterpreter -from pypy.rlib.unroll import unrolling_iterable from pypy.rlib.objectmodel import we_are_translated +from pypy.rlib.rarithmetic import intmask +from pypy.rlib.unroll import unrolling_iterable +from pypy.jit.codegen.i386.rgenop import cast_whatever_to_int from pypy.jit.hintannotator.model import originalconcretetype from pypy.jit.timeshifter import rvalue from pypy.jit.timeshifter.oop import maybe_on_top_of_llinterp -from pypy.jit.timeshifter.greenkey import KeyDesc, empty_key -from pypy.jit.timeshifter.greenkey import GreenKey, newgreendict from pypy.jit.rainbow import rhotpath, fallback from pypy.jit.rainbow.portal import getjitenterargdesc @@ -78,7 +78,8 @@ num_green_args = len(self.green_args_spec) def maybe_enter_jit(*args): - key = state.getkey(*args[:num_green_args]) + greenargs = args[:num_green_args] + key = state.getkey(*greenargs) counter = state.counters.get(key, 0) if counter >= 0: counter += 1 @@ -87,7 +88,7 @@ state.counters[key] = counter return interpreter.debug_trace("jit_compile", *args[:num_green_args]) - if not state.compile(key): + if not state.compile(key, *greenargs): return interpreter.debug_trace("run_machine_code", *args) mc = state.machine_codes[key] @@ -291,53 +292,54 @@ # very minimal, just to make the first test pass green_args_spec = unrolling_iterable(hotrunnerdesc.green_args_spec) red_args_spec = unrolling_iterable(hotrunnerdesc.red_args_spec) - if hotrunnerdesc.green_args_spec: - keydesc = KeyDesc(hotrunnerdesc.RGenOp, *hotrunnerdesc.green_args_spec) - else: - keydesc = None class HotEnterState: def __init__(self): - self.machine_codes = newgreendict() - self.counters = newgreendict() # -1 means "compiled" + self.machine_codes = {} + self.counters = {} # value of -1 means "compiled" - # XXX XXX be more clever and find a way where we don't need - # to allocate a GreenKey object for each call to - # maybe_enter_jit(). One way would be to replace the - # 'counters' with some hand-written fixed-sized hash table. + # Only use the hash of the arguments as the key. # Indeed, this is all a heuristic, so if things are designed # correctly, the occasional mistake due to hash collision is - # not too bad. The fixed-size-ness would also let old - # recorded counters gradually disappear as they get replaced - # by more recent ones. - - def getkey(self, *greenvalues): - if keydesc is None: - return empty_key - rgenop = hotrunnerdesc.interpreter.rgenop - lst_gv = [None] * len(greenvalues) + # not too bad. + + # Another idea would be to replace the 'counters' with some + # hand-written fixed-sized hash table. The fixed-size-ness would + # also let old recorded counters gradually disappear as they get + # replaced by more recent ones. + + def getkey(self, *greenargs): + result = 0x345678 i = 0 - for _ in green_args_spec: - lst_gv[i] = rgenop.genconst(greenvalues[i]) + mult = 1000003 + for TYPE in green_args_spec: + item = greenargs[i] + retval = intmask((result ^ cast_whatever_to_int(TYPE, item)) * + intmask(mult)) + mult = mult + 82520 + 2*len(greenargs) i += 1 - return GreenKey(lst_gv, keydesc) + return result - def compile(self, greenkey): + def compile(self, key, *greenargs): try: - self._compile(greenkey) + self._compile(key, *greenargs) return True except Exception, e: rhotpath.report_compile_time_exception( hotrunnerdesc.interpreter, e) return False - def _compile(self, greenkey): + def _compile(self, key, *greenargs): interp = hotrunnerdesc.interpreter rgenop = interp.rgenop builder, gv_generated, inputargs_gv = rgenop.newgraph( hotrunnerdesc.sigtoken, "residual") - greenargs = list(greenkey.values) + gv_greenargs = [None] * len(greenargs) + i = 0 + for _ in green_args_spec: + gv_greenargs[i] = rgenop.genconst(greenargs[i]) + i += 1 jitstate = interp.fresh_jitstate(builder) redargs = () @@ -349,7 +351,7 @@ red_i += make_arg_redbox.consumes redargs = list(redargs) - rhotpath.setup_jitstate(interp, jitstate, greenargs, redargs, + rhotpath.setup_jitstate(interp, jitstate, gv_greenargs, redargs, hotrunnerdesc.entryjitcode, hotrunnerdesc.sigtoken) builder.start_writing() @@ -358,8 +360,8 @@ FUNCPTR = lltype.Ptr(hotrunnerdesc.RESIDUAL_FUNCTYPE) generated = gv_generated.revealconst(FUNCPTR) - self.machine_codes[greenkey] = generated - self.counters[greenkey] = -1 # compiled + self.machine_codes[key] = generated + self.counters[key] = -1 # compiled if not we_are_translated(): hotrunnerdesc.residual_graph = generated._obj.graph #for tests From cfbolz at codespeak.net Tue Mar 25 03:33:00 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 03:33:00 +0100 (CET) Subject: [pypy-svn] r52893 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080325023300.45AB01683FA@codespeak.net> Author: cfbolz Date: Tue Mar 25 03:32:59 2008 New Revision: 52893 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Log: typo Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 25 03:32:59 2008 @@ -314,7 +314,7 @@ mult = 1000003 for TYPE in green_args_spec: item = greenargs[i] - retval = intmask((result ^ cast_whatever_to_int(TYPE, item)) * + result = intmask((result ^ cast_whatever_to_int(TYPE, item)) * intmask(mult)) mult = mult + 82520 + 2*len(greenargs) i += 1 From arigo at codespeak.net Tue Mar 25 10:02:47 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 10:02:47 +0100 (CET) Subject: [pypy-svn] r52894 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080325090247.C6503168415@codespeak.net> Author: arigo Date: Tue Mar 25 10:02:43 2008 New Revision: 52894 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Log: A collision-prone mapping is fine for 'counters' but not for 'machine_codes'! Revert r52890 and r52893 until this is fixed. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 25 10:02:43 2008 @@ -5,13 +5,13 @@ from pypy.rpython.annlowlevel import llhelper from pypy.rpython.lltypesystem import lltype, lloperation from pypy.rpython.llinterp import LLInterpreter -from pypy.rlib.objectmodel import we_are_translated -from pypy.rlib.rarithmetic import intmask from pypy.rlib.unroll import unrolling_iterable -from pypy.jit.codegen.i386.rgenop import cast_whatever_to_int +from pypy.rlib.objectmodel import we_are_translated from pypy.jit.hintannotator.model import originalconcretetype from pypy.jit.timeshifter import rvalue from pypy.jit.timeshifter.oop import maybe_on_top_of_llinterp +from pypy.jit.timeshifter.greenkey import KeyDesc, empty_key +from pypy.jit.timeshifter.greenkey import GreenKey, newgreendict from pypy.jit.rainbow import rhotpath, fallback from pypy.jit.rainbow.portal import getjitenterargdesc @@ -78,8 +78,7 @@ num_green_args = len(self.green_args_spec) def maybe_enter_jit(*args): - greenargs = args[:num_green_args] - key = state.getkey(*greenargs) + key = state.getkey(*args[:num_green_args]) counter = state.counters.get(key, 0) if counter >= 0: counter += 1 @@ -88,7 +87,7 @@ state.counters[key] = counter return interpreter.debug_trace("jit_compile", *args[:num_green_args]) - if not state.compile(key, *greenargs): + if not state.compile(key): return interpreter.debug_trace("run_machine_code", *args) mc = state.machine_codes[key] @@ -292,54 +291,53 @@ # very minimal, just to make the first test pass green_args_spec = unrolling_iterable(hotrunnerdesc.green_args_spec) red_args_spec = unrolling_iterable(hotrunnerdesc.red_args_spec) + if hotrunnerdesc.green_args_spec: + keydesc = KeyDesc(hotrunnerdesc.RGenOp, *hotrunnerdesc.green_args_spec) + else: + keydesc = None class HotEnterState: def __init__(self): - self.machine_codes = {} - self.counters = {} # value of -1 means "compiled" + self.machine_codes = newgreendict() + self.counters = newgreendict() # -1 means "compiled" - # Only use the hash of the arguments as the key. + # XXX XXX be more clever and find a way where we don't need + # to allocate a GreenKey object for each call to + # maybe_enter_jit(). One way would be to replace the + # 'counters' with some hand-written fixed-sized hash table. # Indeed, this is all a heuristic, so if things are designed # correctly, the occasional mistake due to hash collision is - # not too bad. - - # Another idea would be to replace the 'counters' with some - # hand-written fixed-sized hash table. The fixed-size-ness would - # also let old recorded counters gradually disappear as they get - # replaced by more recent ones. - - def getkey(self, *greenargs): - result = 0x345678 + # not too bad. The fixed-size-ness would also let old + # recorded counters gradually disappear as they get replaced + # by more recent ones. + + def getkey(self, *greenvalues): + if keydesc is None: + return empty_key + rgenop = hotrunnerdesc.interpreter.rgenop + lst_gv = [None] * len(greenvalues) i = 0 - mult = 1000003 - for TYPE in green_args_spec: - item = greenargs[i] - result = intmask((result ^ cast_whatever_to_int(TYPE, item)) * - intmask(mult)) - mult = mult + 82520 + 2*len(greenargs) + for _ in green_args_spec: + lst_gv[i] = rgenop.genconst(greenvalues[i]) i += 1 - return result + return GreenKey(lst_gv, keydesc) - def compile(self, key, *greenargs): + def compile(self, greenkey): try: - self._compile(key, *greenargs) + self._compile(greenkey) return True except Exception, e: rhotpath.report_compile_time_exception( hotrunnerdesc.interpreter, e) return False - def _compile(self, key, *greenargs): + def _compile(self, greenkey): interp = hotrunnerdesc.interpreter rgenop = interp.rgenop builder, gv_generated, inputargs_gv = rgenop.newgraph( hotrunnerdesc.sigtoken, "residual") - gv_greenargs = [None] * len(greenargs) - i = 0 - for _ in green_args_spec: - gv_greenargs[i] = rgenop.genconst(greenargs[i]) - i += 1 + greenargs = list(greenkey.values) jitstate = interp.fresh_jitstate(builder) redargs = () @@ -351,7 +349,7 @@ red_i += make_arg_redbox.consumes redargs = list(redargs) - rhotpath.setup_jitstate(interp, jitstate, gv_greenargs, redargs, + rhotpath.setup_jitstate(interp, jitstate, greenargs, redargs, hotrunnerdesc.entryjitcode, hotrunnerdesc.sigtoken) builder.start_writing() @@ -360,8 +358,8 @@ FUNCPTR = lltype.Ptr(hotrunnerdesc.RESIDUAL_FUNCTYPE) generated = gv_generated.revealconst(FUNCPTR) - self.machine_codes[key] = generated - self.counters[key] = -1 # compiled + self.machine_codes[greenkey] = generated + self.counters[greenkey] = -1 # compiled if not we_are_translated(): hotrunnerdesc.residual_graph = generated._obj.graph #for tests From antocuni at codespeak.net Tue Mar 25 10:57:27 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Tue, 25 Mar 2008 10:57:27 +0100 (CET) Subject: [pypy-svn] r52895 - in pypy/branch/jit-hotpath/pypy/jit: codegen/llgraph rainbow rainbow/test timeshifter Message-ID: <20080325095727.CBB98168420@codespeak.net> Author: antocuni Date: Tue Mar 25 10:57:25 2008 New Revision: 52895 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py Log: finish porting of exception.py to ootype. Three more tests pass Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py Tue Mar 25 10:57:25 2008 @@ -342,6 +342,21 @@ vars_gv = [gv_ptr, gv_fieldname] return genop(block, "getfield", vars_gv, RESULTTYPE) +def genoosetfield(block, gv_obj, gv_OBJTYPE, gv_fieldname, gv_value): + v_obj = _from_opaque(gv_obj) + gv_obj = cast(block, gv_OBJTYPE, gv_obj) + vars_gv = [gv_obj, gv_fieldname, gv_value] + genop(block, "oosetfield", vars_gv, lltype.Void) + +def genoogetfield(block, gv_obj, gv_OBJTYPE, gv_fieldname): + OBJTYPE = _from_opaque(gv_OBJTYPE).value + c_fieldname = _from_opaque(gv_fieldname) + RESULTTYPE = getattr(OBJTYPE.TO, c_fieldname.value) #XXX + v_obj = _from_opaque(gv_obj) + gv_obj = cast(block, gv_OBJTYPE, gv_obj) + vars_gv = [gv_obj, gv_fieldname] + return genop(block, "oogetfield", vars_gv, RESULTTYPE) + def gensetarrayitem(block, gv_ptr, gv_index, gv_value): v_ptr = _from_opaque(gv_ptr) if isinstance(v_ptr, InteriorPtrVariable): Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py Tue Mar 25 10:57:25 2008 @@ -178,7 +178,20 @@ # llimpl.cast(self.b, gv_FIELDTYPE.v, gv_value.v)] #return LLVar(llimpl.genop(self.b, 'setfield', vars_gv, # gv_Void.v)) + + def genop_oogetfield(self, (gv_name, gv_OBJTYPE, gv_FIELDTYPE), gv_obj): + ll_assert(self.rgenop.currently_writing is self, + "genop_oogetfield: bad currently_writing") + return LLVar(llimpl.genoogetfield(self.b, gv_obj.v, + gv_OBJTYPE.v, gv_name.v)) + def genop_oosetfield(self, (gv_name, gv_OBJTYPE, gv_FIELDTYPE), gv_obj, + gv_value): + ll_assert(self.rgenop.currently_writing is self, + "genop_setfield: bad currently_writing") + v_value = llimpl.cast(self.b, gv_FIELDTYPE.v, gv_value.v) + llimpl.genoosetfield(self.b, gv_obj.v, gv_OBJTYPE.v, gv_name.v, v_value) + def genop_getsubstruct(self, (gv_name, gv_PTRTYPE, gv_FIELDTYPE), gv_ptr): ll_assert(self.rgenop.currently_writing is self, "genop_getsubstruct: bad currently_writing") Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Tue Mar 25 10:57:25 2008 @@ -1920,8 +1920,6 @@ def _skip(self): py.test.skip('in progress') - test_green_call = _skip - test_green_call_void_return = _skip test_degenerated_before_return = _skip test_degenerated_before_return_2 = _skip test_degenerated_at_return = _skip @@ -1963,5 +1961,4 @@ test_red_int_add_ovf = _skip test_nonzeroness_assert_while_compiling = _skip test_segfault_while_compiling = _skip - test_substitute_graph_void = _skip test_void_args = _skip Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py Tue Mar 25 10:57:25 2008 @@ -19,8 +19,7 @@ class OOTypeHelper(TypeSystemHelper): name = 'ootype' - ROOT_TYPE = llmemory.Address # XXX: should be ootype.ROOT - #ROOT_TYPE = ootype.ROOT + ROOT_TYPE = ootype.ROOT def get_typeptr(self, obj): return obj.meta Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py Tue Mar 25 10:57:25 2008 @@ -31,18 +31,6 @@ def _freeze_(self): return True - def genop_get_exc_type(self, builder): - return builder.genop_getfield(self.exc_type_token, self.gv_excdata) - - def genop_get_exc_value(self, builder): - return builder.genop_getfield(self.exc_value_token, self.gv_excdata) - - def genop_set_exc_type(self, builder, gv_value): - builder.genop_setfield(self.exc_type_token, self.gv_excdata, gv_value) - - def genop_set_exc_value(self, builder, gv_value): - builder.genop_setfield(self.exc_value_token, self.gv_excdata, gv_value) - def fetch_global_excdata(self, jitstate, known_occurred=False): builder = jitstate.curbuilder gv_etype = self.genop_get_exc_type (builder) @@ -82,12 +70,35 @@ self.null_exc_value_box = rvalue.PtrRedBox(self.exc_value_kind, self.gv_null_exc_value) + def genop_get_exc_type(self, builder): + return builder.genop_getfield(self.exc_type_token, self.gv_excdata) + + def genop_get_exc_value(self, builder): + return builder.genop_getfield(self.exc_value_token, self.gv_excdata) + + def genop_set_exc_type(self, builder, gv_value): + builder.genop_setfield(self.exc_type_token, self.gv_excdata, gv_value) + + def genop_set_exc_value(self, builder, gv_value): + builder.genop_setfield(self.exc_value_token, self.gv_excdata, gv_value) + class OOTypeExceptionDesc(AbstractExceptionDesc): def _create_boxes(self, RGenOp): # XXX: think more about exceptions - self.null_exc_type_box = rvalue.PtrRedBox(self.exc_type_kind, - RGenOp.constPrebuiltGlobal(llmemory.NULL)) - self.null_exc_value_box = rvalue.PtrRedBox(self.exc_value_kind, - RGenOp.constPrebuiltGlobal(llmemory.NULL)) + self.null_exc_type_box = rvalue.InstanceRedBox(self.exc_type_kind, + self.gv_null_exc_type) + self.null_exc_value_box = rvalue.InstanceRedBox(self.exc_value_kind, + self.gv_null_exc_value) + + def genop_get_exc_type(self, builder): + return builder.genop_oogetfield(self.exc_type_token, self.gv_excdata) + + def genop_get_exc_value(self, builder): + return builder.genop_oogetfield(self.exc_value_token, self.gv_excdata) + + def genop_set_exc_type(self, builder, gv_value): + builder.genop_oosetfield(self.exc_type_token, self.gv_excdata, gv_value) + def genop_set_exc_value(self, builder, gv_value): + builder.genop_oosetfield(self.exc_value_token, self.gv_excdata, gv_value) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py Tue Mar 25 10:57:25 2008 @@ -7,7 +7,7 @@ from pypy.rpython.lltypesystem import lltype from pypy.tool.sourcetools import func_with_new_name from pypy.translator import exceptiontransform - +from pypy.translator.simplify import get_funcobj, get_functype class Index: def __init__(self, n): @@ -232,7 +232,7 @@ assert exceptiondesc.rtyper is not None llinterp = LLInterpreter(exceptiondesc.rtyper, exc_data_ptr=exc_data_ptr) def on_top_of_llinterp(*args): - return llinterp.eval_graph(fnptr._obj.graph, list(args)) + return llinterp.eval_graph(get_funcobj(fnptr).graph, list(args)) return on_top_of_llinterp class Entry(ExtRegistryEntry): From cfbolz at codespeak.net Tue Mar 25 12:03:00 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 12:03:00 +0100 (CET) Subject: [pypy-svn] r52896 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080325110300.1CEDB168442@codespeak.net> Author: cfbolz Date: Tue Mar 25 12:02:57 2008 New Revision: 52896 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Log: re-introduce the different hashing on maybe_enter_jit, but still use green keys for the actual machine code. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 25 12:02:57 2008 @@ -5,13 +5,15 @@ from pypy.rpython.annlowlevel import llhelper from pypy.rpython.lltypesystem import lltype, lloperation from pypy.rpython.llinterp import LLInterpreter -from pypy.rlib.unroll import unrolling_iterable from pypy.rlib.objectmodel import we_are_translated +from pypy.rlib.rarithmetic import intmask +from pypy.rlib.unroll import unrolling_iterable +from pypy.jit.codegen.i386.rgenop import cast_whatever_to_int from pypy.jit.hintannotator.model import originalconcretetype from pypy.jit.timeshifter import rvalue -from pypy.jit.timeshifter.oop import maybe_on_top_of_llinterp from pypy.jit.timeshifter.greenkey import KeyDesc, empty_key from pypy.jit.timeshifter.greenkey import GreenKey, newgreendict +from pypy.jit.timeshifter.oop import maybe_on_top_of_llinterp from pypy.jit.rainbow import rhotpath, fallback from pypy.jit.rainbow.portal import getjitenterargdesc @@ -78,19 +80,23 @@ num_green_args = len(self.green_args_spec) def maybe_enter_jit(*args): - key = state.getkey(*args[:num_green_args]) - counter = state.counters.get(key, 0) + greenargs = args[:num_green_args] + argshash = state.getkey(*greenargs) + counter = state.counters.get(argshash, 0) if counter >= 0: counter += 1 if counter < self.jitdrivercls.getcurrentthreshold(): interpreter.debug_trace("jit_not_entered", *args) - state.counters[key] = counter + state.counters[argshash] = counter return interpreter.debug_trace("jit_compile", *args[:num_green_args]) - if not state.compile(key): + mc = state.compile(argshash, *greenargs) + if mc is None: return + else: + greenkey = state.getgreenkey(*greenargs) + mc = state.machine_codes[greenkey] interpreter.debug_trace("run_machine_code", *args) - mc = state.machine_codes[key] run = maybe_on_top_of_llinterp(exceptiondesc, mc) residualargs = state.make_residualargs(*args[num_green_args:]) run(*residualargs) @@ -299,19 +305,31 @@ class HotEnterState: def __init__(self): self.machine_codes = newgreendict() - self.counters = newgreendict() # -1 means "compiled" + self.counters = {} # value of -1 means "compiled" - # XXX XXX be more clever and find a way where we don't need - # to allocate a GreenKey object for each call to - # maybe_enter_jit(). One way would be to replace the - # 'counters' with some hand-written fixed-sized hash table. + # Only use the hash of the arguments as the key. # Indeed, this is all a heuristic, so if things are designed # correctly, the occasional mistake due to hash collision is - # not too bad. The fixed-size-ness would also let old - # recorded counters gradually disappear as they get replaced - # by more recent ones. + # not too bad. + + # Another idea would be to replace the 'counters' with some + # hand-written fixed-sized hash table. The fixed-size-ness would + # also let old recorded counters gradually disappear as they get + # replaced by more recent ones. - def getkey(self, *greenvalues): + def getkey(self, *greenargs): + result = 0x345678 + i = 0 + mult = 1000003 + for TYPE in green_args_spec: + item = greenargs[i] + result = intmask((result ^ cast_whatever_to_int(TYPE, item)) * + intmask(mult)) + mult = mult + 82520 + 2*len(greenargs) + i += 1 + return result + + def getgreenkey(self, *greenvalues): if keydesc is None: return empty_key rgenop = hotrunnerdesc.interpreter.rgenop @@ -322,22 +340,25 @@ i += 1 return GreenKey(lst_gv, keydesc) - def compile(self, greenkey): + def compile(self, argshash, *greenargs): try: - self._compile(greenkey) - return True + return self._compile(argshash, *greenargs) except Exception, e: rhotpath.report_compile_time_exception( hotrunnerdesc.interpreter, e) - return False + return None - def _compile(self, greenkey): + def _compile(self, argshash, *greenargs): interp = hotrunnerdesc.interpreter rgenop = interp.rgenop builder, gv_generated, inputargs_gv = rgenop.newgraph( hotrunnerdesc.sigtoken, "residual") - greenargs = list(greenkey.values) + gv_greenargs = [None] * len(greenargs) + i = 0 + for _ in green_args_spec: + gv_greenargs[i] = rgenop.genconst(greenargs[i]) + i += 1 jitstate = interp.fresh_jitstate(builder) redargs = () @@ -349,7 +370,7 @@ red_i += make_arg_redbox.consumes redargs = list(redargs) - rhotpath.setup_jitstate(interp, jitstate, greenargs, redargs, + rhotpath.setup_jitstate(interp, jitstate, gv_greenargs, redargs, hotrunnerdesc.entryjitcode, hotrunnerdesc.sigtoken) builder.start_writing() @@ -358,11 +379,13 @@ FUNCPTR = lltype.Ptr(hotrunnerdesc.RESIDUAL_FUNCTYPE) generated = gv_generated.revealconst(FUNCPTR) + greenkey = self.getgreenkey(*greenargs) self.machine_codes[greenkey] = generated - self.counters[greenkey] = -1 # compiled + self.counters[argshash] = -1 # compiled if not we_are_translated(): hotrunnerdesc.residual_graph = generated._obj.graph #for tests + return generated def make_residualargs(self, *redargs): residualargs = () From cfbolz at codespeak.net Tue Mar 25 12:15:38 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 12:15:38 +0100 (CET) Subject: [pypy-svn] r52897 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080325111538.495B4168429@codespeak.net> Author: cfbolz Date: Tue Mar 25 12:15:37 2008 New Revision: 52897 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Log: reduce code duplication (thanks for spotting, armin) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 25 12:15:37 2008 @@ -354,12 +354,6 @@ builder, gv_generated, inputargs_gv = rgenop.newgraph( hotrunnerdesc.sigtoken, "residual") - gv_greenargs = [None] * len(greenargs) - i = 0 - for _ in green_args_spec: - gv_greenargs[i] = rgenop.genconst(greenargs[i]) - i += 1 - jitstate = interp.fresh_jitstate(builder) redargs = () red_i = 0 @@ -370,7 +364,9 @@ red_i += make_arg_redbox.consumes redargs = list(redargs) - rhotpath.setup_jitstate(interp, jitstate, gv_greenargs, redargs, + greenkey = self.getgreenkey(*greenargs) + greenargs = list(greenkey.values) + rhotpath.setup_jitstate(interp, jitstate, greenargs, redargs, hotrunnerdesc.entryjitcode, hotrunnerdesc.sigtoken) builder.start_writing() @@ -379,7 +375,6 @@ FUNCPTR = lltype.Ptr(hotrunnerdesc.RESIDUAL_FUNCTYPE) generated = gv_generated.revealconst(FUNCPTR) - greenkey = self.getgreenkey(*greenargs) self.machine_codes[greenkey] = generated self.counters[argshash] = -1 # compiled From arigo at codespeak.net Tue Mar 25 12:52:53 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 12:52:53 +0100 (CET) Subject: [pypy-svn] r52898 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080325115253.D9E3916842B@codespeak.net> Author: arigo Date: Tue Mar 25 12:52:52 2008 New Revision: 52898 Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py (contents, props changed) pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py (contents, props changed) Log: Trying to implement the virtualizable access simplification approach described in rainbow.txt. Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py Tue Mar 25 12:52:52 2008 @@ -0,0 +1,153 @@ +from pypy.objspace.flow.model import Constant +from pypy.rpython.lltypesystem import lltype + + +def _getoopspec(op): + if op.opname == 'direct_call': + fnobj = op.args[0].value._obj + if hasattr(fnobj._callable, 'oopspec'): + oopspec = fnobj._callable.oopspec + if '(' in oopspec: + return oopspec[:oopspec.index('(')] + return '' + +def is_vable_setter(op): + return _getoopspec(op).startswith('vable.set_') + +def is_vable_getter(op): + return _getoopspec(op).startswith('vable.get_') + +def vable_fieldname(op): + oopspec = _getoopspec(op) + assert oopspec.startswith('vable.get_') or oopspec.startswith('vable.set_') + return oopspec[len('vable.get_'):] + +def is_vableptr(TYPE): + return (isinstance(TYPE, lltype.Ptr) and + isinstance(TYPE.TO, lltype.Struct) and + TYPE.TO._hints.get('virtualizable')) + + +class VirtualizableAccessTracker(object): + """Tracks which accesses to fields of virtualizable structures + are safe to replace with direct getfield or setfield. + """ + + def __init__(self): + self.safe_variables = set() + # set of graphs left to analyze: + self.pending_graphs = set() + # for each graph with virtualizable input args, if we have seen + # at least one call to it, we record in 'graph2safeargs[graph]' the + # set of input args that are safe through all possible calls + self.graph2safeargs = {} + # for all operations that are setters or getters: True if safe + self.safe_operations = {} + + def find_safe_points(self, graphlist): + for graph in graphlist: + for block in graph.iterblocks(): + for op in block.operations: + if op.opname == 'malloc': + self.add_safe_variable(graph, op.result) + elif op.opname == 'jit_merge_point': + for v in op.args[1:]: + self.add_safe_variable(graph, v) + + def add_safe_variable(self, graph, v): + if is_vableptr(v.concretetype): + self.safe_variables.add(v) + self.pending_graphs.add(graph) + + def seeing_call(self, graph, safe_args): + prevset = self.graph2safeargs.get(graph) + if prevset is None: + self.graph2safeargs[graph] = set(safe_args) + else: + self.graph2safeargs[graph] &= set(safe_args) + if self.graph2safeargs[graph] != prevset: + self.pending_graphs.add(graph) + + def follow_call(self, args, graph, unsafe_vars): + safe_args = None + assert len(args) == len(graph.getargs()) + for v1, v2 in zip(args, graph.getargs()): + if is_vableptr(v2.concretetype): + if safe_args is None: + safe_args = [] + if v1 not in unsafe_vars: + safe_args.append(v2) + if safe_args is not None: + self.seeing_call(graph, safe_args) + + def track_in_graph(self, graph): + # inside a graph, we propagate 'unsafety': we start from all + # operations that produce a virtualizable pointer and that are + # not explicitly marked as safe, and propagate forward. + unsafe = set(graph.getargs()) + if graph in self.graph2safeargs: + unsafe -= self.graph2safeargs[graph] + unsafe -= self.safe_variables + + pending_blocks = set([graph.startblock]) + while pending_blocks: + block = pending_blocks.pop() + for op in block.operations: + if is_vableptr(op.result.concretetype): + if op.opname == 'cast_pointer': + if op.args[0] in unsafe: + unsafe.add(op.result) + else: + unsafe.add(op.result) + unsafe -= self.safe_variables + for link in block.exits: + for v1, v2 in zip(link.args, link.target.inputargs): + if v1 in unsafe and v2 not in unsafe: + unsafe.add(v2) + pending_blocks.add(link.target) + + # done following, now find and record all calls + for block in graph.iterblocks(): + for op in block.operations: + if op.opname == 'direct_call': + if is_vable_setter(op) or is_vable_getter(op): + v = op.args[1] + self.safe_operations[op] = v not in unsafe + elif hasattr(op.args[0].value._obj, 'graph'): + callargs = op.args[1:] + calltarget = op.args[0].value._obj.graph + self.follow_call(callargs, calltarget, unsafe) + elif op.opname == 'indirect_call': + callargs = op.args[1:-1] + calltargets = op.args[-1].value + if calltargets is not None: + for calltarget in calltargets: + self.follow_call(callargs, calltarget, unsafe) + + def propagate(self): + while self.pending_graphs: + graph = self.pending_graphs.pop() + self.track_in_graph(graph) + + def replace_safe_operations(self): + for op, safe in self.safe_operations.items(): + if safe: + name = vable_fieldname(op) + c_name = Constant(name, lltype.Void) + if is_vable_setter(op): + c_setterfn, v_ptr, v_value = op.args + op.opname = 'setfield' + op.args = [v_ptr, c_name, v_value] + elif is_vable_getter(op): + c_getterfn, v_ptr = op.args + op.opname = 'getfield' + op.args = [v_ptr, c_name] + else: + assert 0 + + +def simplify_virtualizable_accesses(codewriter): + tracker = VirtualizableAccessTracker() + tracker.find_safe_points(codewriter.rtyper.annotator.translator.graphs) + tracker.propagate() + tracker.replace_safe_operations() Added: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py Tue Mar 25 12:52:52 2008 @@ -0,0 +1,56 @@ +from pypy.rlib.jit import JitDriver, hint +from pypy.jit.rainbow.test.test_hotpath import HotPathTest +from pypy.jit.rainbow.graphopt import simplify_virtualizable_accesses +from pypy.jit.rainbow.graphopt import is_vable_setter, is_vable_getter + + +class XY(object): + _virtualizable_ = True + + def __init__(self, x, y): + self.x = x + self.y = y + + +class TestGraphOpt(HotPathTest): + + def _run(self, main, main_args): + # don't execute the tests. Instead we apply graphopt and count the + # remaining non-optimized accesses. + simplify_virtualizable_accesses(self.writer) + self.setters = {} + self.getters = {} + for graph in self.rtyper.annotator.translator.graphs: + settercount = 0 + gettercount = 0 + for block in graph.iterblocks(): + for op in block.operations: + if is_vable_setter(op): + settercount += 1 + elif is_vable_getter(op): + gettercount += 1 + func = graph.func + self.setters[func] = self.setters.get(func, 0) + settercount + self.getters[func] = self.getters.get(func, 0) + gettercount + + def test_simple_case(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['xy', 'i', 'res'] + + def f(xy): + i = 1024 + while i > 0: + i >>= 1 + res = xy.x+xy.y + MyJitDriver.jit_merge_point(xy=xy, res=res, i=i) + MyJitDriver.can_enter_jit(xy=xy, res=res, i=i) + return res + + def main(x, y): + xy = XY(x, y) + return f(xy) + + self.run(main, [20, 30], 2) + assert self.setters[XY.__init__.im_func] == 0 + assert self.getters[f] == 0 From cfbolz at codespeak.net Tue Mar 25 12:55:40 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 12:55:40 +0100 (CET) Subject: [pypy-svn] r52899 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080325115540.E52AC16842B@codespeak.net> Author: cfbolz Date: Tue Mar 25 12:55:39 2008 New Revision: 52899 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: this doesn't make sense as a hotpath tes Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Tue Mar 25 12:55:39 2008 @@ -2175,15 +2175,6 @@ self.check_insns({'int_eq': 2}) assert res == f(0) - def test_misplaced_global_merge_point(self): - def g(n): - hint(None, global_merge_point=True) - return n+1 - def f(n): - hint(None, global_merge_point=True) - return g(n) - py.test.raises(AssertionError, self.interpret, f, [7], []) - # void tests def test_void_args(self): class Space(object): From arigo at codespeak.net Tue Mar 25 13:10:19 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 13:10:19 +0100 (CET) Subject: [pypy-svn] r52900 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080325121019.8505B16842B@codespeak.net> Author: arigo Date: Tue Mar 25 13:10:19 2008 New Revision: 52900 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py Log: Add the detection of residual call. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Tue Mar 25 13:10:19 2008 @@ -165,6 +165,8 @@ self.ptr_to_jitcode = {} self.transformer = GraphTransformer(hannotator) self._listcache = {} + if self.hannotator.policy.hotpath: + self.residual_call_targets = {} def create_interpreter(self, RGenOp): raise NotImplementedError @@ -1118,17 +1120,21 @@ self.register_greenvar(op.result) def handle_residual_call(self, op, withexc): + graphs, args_v = self.decompose_call_op(op) fnptr = op.args[0] pos = self.calldesc_position(fnptr.concretetype) has_result = (self.varcolor(op.result) != "gray" and op.result.concretetype != lltype.Void) func = self.serialize_oparg("red", fnptr) emitted_args = [] - for v in op.args[1:]: - if v.concretetype == lltype.Void: # for indirect_call, this also - continue # skips the last argument + for v in args_v: + if v.concretetype == lltype.Void: + continue emitted_args.append(self.serialize_oparg("red", v)) if self.hannotator.policy.hotpath: + if graphs is not None: + for graph in graphs: + self.residual_call_targets[graph] = True self.emit("hp_residual_call") else: self.emit("red_residual_call") @@ -1433,7 +1439,7 @@ # call handling - def graphs_from(self, spaceop): + def decompose_call_op(self, spaceop): if spaceop.opname == 'direct_call': c_func = spaceop.args[0] fnobj = get_funcobj(c_func.value) @@ -1441,11 +1447,15 @@ args_v = spaceop.args[1:] elif spaceop.opname == 'indirect_call': graphs = spaceop.args[-1].value - if graphs is None: - return # cannot follow at all args_v = spaceop.args[1:-1] else: raise AssertionError(spaceop.opname) + return graphs, args_v + + def graphs_from(self, spaceop): + graphs, args_v = self.decompose_call_op(spaceop) + if graphs is None: # cannot follow at all + return # if the graph - or all the called graphs - are marked as "don't # follow", directly return None as a special case. (This is only # an optimization for the indirect_call case.) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py Tue Mar 25 13:10:19 2008 @@ -33,7 +33,8 @@ are safe to replace with direct getfield or setfield. """ - def __init__(self): + def __init__(self, residual_call_targets): + self.residual_call_targets = residual_call_targets self.safe_variables = set() # set of graphs left to analyze: self.pending_graphs = set() @@ -60,6 +61,8 @@ self.pending_graphs.add(graph) def seeing_call(self, graph, safe_args): + if graph in self.residual_call_targets: + return # don't follow that call prevset = self.graph2safeargs.get(graph) if prevset is None: self.graph2safeargs[graph] = set(safe_args) @@ -147,7 +150,9 @@ def simplify_virtualizable_accesses(codewriter): - tracker = VirtualizableAccessTracker() + assert codewriter.hannotator.policy.hotpath, ( + "too many potential residual calls in the non-hotpath policy") + tracker = VirtualizableAccessTracker(codewriter.residual_call_targets) tracker.find_safe_points(codewriter.rtyper.annotator.translator.graphs) tracker.propagate() tracker.replace_safe_operations() Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py Tue Mar 25 13:10:19 2008 @@ -1,4 +1,5 @@ from pypy.rlib.jit import JitDriver, hint +from pypy.jit.hintannotator.policy import StopAtXPolicy from pypy.jit.rainbow.test.test_hotpath import HotPathTest from pypy.jit.rainbow.graphopt import simplify_virtualizable_accesses from pypy.jit.rainbow.graphopt import is_vable_setter, is_vable_getter @@ -54,3 +55,32 @@ self.run(main, [20, 30], 2) assert self.setters[XY.__init__.im_func] == 0 assert self.getters[f] == 0 + + def test_through_residual(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['xy', 'i', 'res'] + + def debug(xy): + xy.x = 5 + return xy.y + + def f(xy): + i = 1024 + while i > 0: + i >>= 1 + res = xy.x+xy.y + debug(xy) + MyJitDriver.jit_merge_point(xy=xy, res=res, i=i) + MyJitDriver.can_enter_jit(xy=xy, res=res, i=i) + return res + + def main(x, y): + xy = XY(x, y) + return f(xy) + + self.run(main, [20, 30], 2, policy=StopAtXPolicy(debug)) + assert self.setters[XY.__init__.im_func] == 0 + assert self.getters[f] == 0 + assert self.setters[debug] == 1 + assert self.getters[debug] == 1 From arigo at codespeak.net Tue Mar 25 13:15:12 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 13:15:12 +0100 (CET) Subject: [pypy-svn] r52901 - in pypy/branch/jit-hotpath/pypy: jit/rainbow/test translator Message-ID: <20080325121512.ECC3A16843E@codespeak.net> Author: arigo Date: Tue Mar 25 13:15:12 2008 New Revision: 52901 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py pypy/branch/jit-hotpath/pypy/translator/driver.py Log: fwiw the tests still pass when applying graphopt.simplify_virtualizable_accesses(). Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Tue Mar 25 13:15:12 2008 @@ -55,7 +55,7 @@ class HotPathTest(test_interpreter.InterpretationTest): type_system = 'lltype' - + simplify_virtualizable_accesses = False def interpret(self, main, ll_values, opt_consts=[], **kwds): py.test.skip("old-style test, port me") @@ -78,6 +78,9 @@ jitdrivercls, self.translate_support_code) self.hotrunnerdesc.rewrite_all() + if self.simplify_virtualizable_accesses: + from pypy.jit.rainbow import graphopt + graphopt.simplify_virtualizable_accesses(self.writer) if small and conftest.option.view: self.rtyper.annotator.translator.view() Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Tue Mar 25 13:15:12 2008 @@ -1093,6 +1093,7 @@ class TestVirtualizableImplicit(test_hotpath.HotPathTest): type_system = "lltype" + simplify_virtualizable_accesses = True def timeshift_from_portal(self, *args, **kwargs): py.test.skip("port me") Modified: pypy/branch/jit-hotpath/pypy/translator/driver.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/driver.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/driver.py Tue Mar 25 13:15:12 2008 @@ -444,6 +444,8 @@ writer, jitdrivercls, translate_support_code=True) hotrunnerdesc.rewrite_all() + from pypy.jit.rainbow import graphopt + graphopt.simplify_virtualizable_accesses(writer) else: from pypy.jit.rainbow.portal import PortalRewriter rewriter = PortalRewriter(self.hannotator, rtyper, RGenOp, From arigo at codespeak.net Tue Mar 25 13:22:04 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 13:22:04 +0100 (CET) Subject: [pypy-svn] r52902 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080325122204.1DD5916842A@codespeak.net> Author: arigo Date: Tue Mar 25 13:22:03 2008 New Revision: 52902 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py Log: More tests. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py Tue Mar 25 13:22:03 2008 @@ -62,8 +62,10 @@ reds = ['xy', 'i', 'res'] def debug(xy): + unrelated = XY(7, 8) xy.x = 5 - return xy.y + unrelated.y *= 2 + return xy.y + unrelated.x def f(xy): i = 1024 @@ -84,3 +86,27 @@ assert self.getters[f] == 0 assert self.setters[debug] == 1 assert self.getters[debug] == 1 + + def test_from_heap(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['lst', 'i', 'res'] + + def f(lst): + i = 1024 + while i > 0: + i >>= 1 + xy = lst[0] + res = xy.x+xy.y + MyJitDriver.jit_merge_point(lst=lst, res=res, i=i) + MyJitDriver.can_enter_jit(lst=lst, res=res, i=i) + return res + + def main(x, y): + xy = XY(x, y) + return f([xy]) + + self.run(main, [20, 30], 2) + assert self.setters[XY.__init__.im_func] == 0 + assert self.getters[f] == 4 # 2 in the copy before the portal, + # 2 in the portal itself From cfbolz at codespeak.net Tue Mar 25 13:24:51 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 13:24:51 +0100 (CET) Subject: [pypy-svn] r52903 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080325122451.464D316842A@codespeak.net> Author: cfbolz Date: Tue Mar 25 13:24:50 2008 New Revision: 52903 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Log: tests for learning the boolvalue and the nonzeroness of stuff Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Tue Mar 25 13:24:50 2008 @@ -1863,6 +1863,50 @@ return g(n) py.test.raises(AssertionError, self.interpret, f, [7], []) + def test_learn_boolvalue(self): + class A(object): + pass + def f(b, x): + a = A() + a.b = b + if a.b: + if a.b: + return 1 + x + return -1 + x + else: + if not a.b: + return 2 + x + return -2 + x + res = self.interpret(f, [False, 5]) + assert res == 7 + self.check_insns({'int_add': 2}) + + def test_learn_nonzeroness(self): + class A: + pass + class B: + pass + def g(isnotnone): + if isnotnone: + return A() + return None + def f(isnotnone, x): + hint(None, global_merge_point=True) + a = g(isnotnone) + b = B() + b.a = a + if b.a: + if b.a: + return 1 + x + return -1 + x + else: + if not b.a: + return 2 + x + return -2 + x + res = self.interpret(f, [False, 5], policy=StopAtXPolicy(g)) + assert res == 7 + self.check_insns(int_add=2) + # void tests def test_void_args(self): class Space(object): @@ -1961,4 +2005,6 @@ test_red_int_add_ovf = _skip test_nonzeroness_assert_while_compiling = _skip test_segfault_while_compiling = _skip + test_learn_boolvalue = _skip + test_learn_nonzeroness = _skip test_void_args = _skip From arigo at codespeak.net Tue Mar 25 13:25:05 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 13:25:05 +0100 (CET) Subject: [pypy-svn] r52904 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080325122505.C7E3916843E@codespeak.net> Author: arigo Date: Tue Mar 25 13:25:05 2008 New Revision: 52904 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Log: Translation fix. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 25 13:25:05 2008 @@ -91,7 +91,7 @@ return interpreter.debug_trace("jit_compile", *args[:num_green_args]) mc = state.compile(argshash, *greenargs) - if mc is None: + if not mc: return else: greenkey = state.getgreenkey(*greenargs) @@ -346,7 +346,7 @@ except Exception, e: rhotpath.report_compile_time_exception( hotrunnerdesc.interpreter, e) - return None + return lltype.nullptr(hotrunnerdesc.RESIDUAL_FUNCTYPE) def _compile(self, argshash, *greenargs): interp = hotrunnerdesc.interpreter From cfbolz at codespeak.net Tue Mar 25 13:40:24 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 13:40:24 +0100 (CET) Subject: [pypy-svn] r52905 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080325124024.1821B16842A@codespeak.net> Author: cfbolz Date: Tue Mar 25 13:40:23 2008 New Revision: 52905 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Log: Port learn_boolvalue test to hotpath. passes Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Tue Mar 25 13:40:23 2008 @@ -2175,6 +2175,63 @@ self.check_insns({'int_eq': 2}) assert res == f(0) + def test_learn_boolvalue(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['n', 'i', 'tot', 'b'] + class A(object): + pass + def f(b, n): + i = 1024 * 1024 + tot = 0 + while i > 0: + i >>= 1 + + a = A() + a.b = b + if a.b: + if a.b: + tot += 1 + n + else: + tot += -1 + n + else: + if not a.b: + tot += 2 + n + else: + tot += -2 + n + MyJitDriver.jit_merge_point(tot=tot, i=i, n=n, b=b) + MyJitDriver.can_enter_jit(tot=tot, i=i, n=n, b=b) + return tot + res = self.run(f, [False, 5], threshold=2) + assert res == f(False, 5) + self.check_insns_in_loops({'int_add': 2, 'int_gt': 1, 'int_rshift': 1}) + + def test_learn_nonzeroness(self): + class A: + pass + class B: + pass + def g(isnotnone): + if isnotnone: + return A() + return None + def f(isnotnone, x): + hint(None, global_merge_point=True) + a = g(isnotnone) + b = B() + b.a = a + if b.a: + if b.a: + return 1 + x + return -1 + x + else: + if not b.a: + return 2 + x + return -2 + x + res = self.interpret(f, [False, 5], policy=StopAtXPolicy(g)) + assert res == 7 + self.check_insns(int_add=2) + # void tests def test_void_args(self): class Space(object): From arigo at codespeak.net Tue Mar 25 14:03:26 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 14:03:26 +0100 (CET) Subject: [pypy-svn] r52908 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080325130326.85FFA168438@codespeak.net> Author: arigo Date: Tue Mar 25 14:03:25 2008 New Revision: 52908 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Log: A minor comment. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 25 14:03:25 2008 @@ -91,8 +91,8 @@ return interpreter.debug_trace("jit_compile", *args[:num_green_args]) mc = state.compile(argshash, *greenargs) - if not mc: - return + if not mc: # xxx check if compile() could raise + return # ContinueRunningNormally to avoid this check else: greenkey = state.getgreenkey(*greenargs) mc = state.machine_codes[greenkey] From arigo at codespeak.net Tue Mar 25 14:03:41 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 14:03:41 +0100 (CET) Subject: [pypy-svn] r52909 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080325130341.23249168442@codespeak.net> Author: arigo Date: Tue Mar 25 14:03:40 2008 New Revision: 52909 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py Log: Bug, test and fix. Another coming soon... Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py Tue Mar 25 14:03:40 2008 @@ -92,21 +92,23 @@ unsafe -= self.graph2safeargs[graph] unsafe -= self.safe_variables - pending_blocks = set([graph.startblock]) + def notsafe(v): + if v not in self.safe_variables: + unsafe.add(v) + + pending_blocks = set(graph.iterblocks()) while pending_blocks: block = pending_blocks.pop() for op in block.operations: - if is_vableptr(op.result.concretetype): - if op.opname == 'cast_pointer': - if op.args[0] in unsafe: - unsafe.add(op.result) - else: - unsafe.add(op.result) - unsafe -= self.safe_variables + if op.opname == 'cast_pointer': + if op.args[0] in unsafe: + notsafe(op.result) + else: + notsafe(op.result) for link in block.exits: for v1, v2 in zip(link.args, link.target.inputargs): if v1 in unsafe and v2 not in unsafe: - unsafe.add(v2) + notsafe(v2) pending_blocks.add(link.target) # done following, now find and record all calls Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py Tue Mar 25 14:03:40 2008 @@ -110,3 +110,33 @@ assert self.setters[XY.__init__.im_func] == 0 assert self.getters[f] == 4 # 2 in the copy before the portal, # 2 in the portal itself + + def test_track_in_graph_bug(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i'] + + class State: + pass + state = State() + state.lst = [XY(6, 7), XY(8, 9)] + + def operate(xy): + xy.y = 27 + + def debug1(n): + if n: + xy = XY(4, 5) + else: + operate(state.lst[0]) + + def f(): + i = 1024 + while i > 0: + i >>= 1 + debug1(i) + MyJitDriver.jit_merge_point(i=i) + MyJitDriver.can_enter_jit(i=i) + + self.run(f, [], 2) + assert self.setters[operate] == 1 From arigo at codespeak.net Tue Mar 25 14:11:05 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 14:11:05 +0100 (CET) Subject: [pypy-svn] r52911 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080325131105.5B1841683D9@codespeak.net> Author: arigo Date: Tue Mar 25 14:11:05 2008 New Revision: 52911 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py Log: Bug, test and fix. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py Tue Mar 25 14:11:05 2008 @@ -71,14 +71,14 @@ if self.graph2safeargs[graph] != prevset: self.pending_graphs.add(graph) - def follow_call(self, args, graph, unsafe_vars): + def follow_call(self, args, graph, is_unsafe): safe_args = None assert len(args) == len(graph.getargs()) for v1, v2 in zip(args, graph.getargs()): if is_vableptr(v2.concretetype): if safe_args is None: safe_args = [] - if v1 not in unsafe_vars: + if not is_unsafe(v1): safe_args.append(v2) if safe_args is not None: self.seeing_call(graph, safe_args) @@ -90,25 +90,24 @@ unsafe = set(graph.getargs()) if graph in self.graph2safeargs: unsafe -= self.graph2safeargs[graph] - unsafe -= self.safe_variables - def notsafe(v): - if v not in self.safe_variables: - unsafe.add(v) + def is_unsafe(v): + return (isinstance(v, Constant) or + (v in unsafe and v not in self.safe_variables)) pending_blocks = set(graph.iterblocks()) while pending_blocks: block = pending_blocks.pop() for op in block.operations: if op.opname == 'cast_pointer': - if op.args[0] in unsafe: - notsafe(op.result) + if is_unsafe(op.args[0]): + unsafe.add(op.result) else: - notsafe(op.result) + unsafe.add(op.result) for link in block.exits: for v1, v2 in zip(link.args, link.target.inputargs): - if v1 in unsafe and v2 not in unsafe: - notsafe(v2) + if is_unsafe(v1) and v2 not in unsafe: + unsafe.add(v2) pending_blocks.add(link.target) # done following, now find and record all calls @@ -117,17 +116,17 @@ if op.opname == 'direct_call': if is_vable_setter(op) or is_vable_getter(op): v = op.args[1] - self.safe_operations[op] = v not in unsafe + self.safe_operations[op] = not is_unsafe(v) elif hasattr(op.args[0].value._obj, 'graph'): callargs = op.args[1:] calltarget = op.args[0].value._obj.graph - self.follow_call(callargs, calltarget, unsafe) + self.follow_call(callargs, calltarget, is_unsafe) elif op.opname == 'indirect_call': callargs = op.args[1:-1] calltargets = op.args[-1].value if calltargets is not None: for calltarget in calltargets: - self.follow_call(callargs, calltarget, unsafe) + self.follow_call(callargs, calltarget, is_unsafe) def propagate(self): while self.pending_graphs: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py Tue Mar 25 14:11:05 2008 @@ -140,3 +140,31 @@ self.run(f, [], 2) assert self.setters[operate] == 1 + + def test_prebuilt_vable(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i'] + + class State: + pass + state = State() + state.prebuilt = XY(6, 7) + + def operate(xy): + xy.y = 27 + + def debug1(n): + XY(3, 4) + operate(state.prebuilt) + + def f(): + i = 1024 + while i > 0: + i >>= 1 + debug1(i) + MyJitDriver.jit_merge_point(i=i) + MyJitDriver.can_enter_jit(i=i) + + self.run(f, [], 2) + assert self.setters[operate] == 1 From cfbolz at codespeak.net Tue Mar 25 14:38:03 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 14:38:03 +0100 (CET) Subject: [pypy-svn] r52912 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080325133803.8060B16843C@codespeak.net> Author: cfbolz Date: Tue Mar 25 14:38:02 2008 New Revision: 52912 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py Log: remove pdb Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/dump.py Tue Mar 25 14:38:02 2008 @@ -140,5 +140,4 @@ assert 0, "unexpected object: %r" % (arg,) if src.pc != len(jitcode.code): - import pdb; pdb.set_trace() print >> file, 'WARNING: the pc column is bogus! fix dump.py!' From cfbolz at codespeak.net Tue Mar 25 14:40:01 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 14:40:01 +0100 (CET) Subject: [pypy-svn] r52913 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080325134001.302ED168413@codespeak.net> Author: cfbolz Date: Tue Mar 25 14:40:00 2008 New Revision: 52913 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Log: use learn_boolvalue with hotpath to prepare for red_goto_ifptrnonzero Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Tue Mar 25 14:40:00 2008 @@ -219,29 +219,29 @@ pc = self.truepath_pc else: pc = self.falsepath_pc - gv_value = self.hotrunnerdesc.interpreter.rgenop.genconst(value) - self._compile_hot_path(gv_value, pc) + self._compile_hot_path(value, pc) if value: self.truepath_counter = -1 # means "compiled" else: self.falsepath_counter = -1 # means "compiled" - def _compile_hot_path(self, gv_case, pc): + def _compile_hot_path(self, case, pc): if self.falsepath_counter == -1 or self.truepath_counter == -1: # the other path was already compiled, we can reuse the jitstate jitstate = self.saved_jitstate self.saved_jitstate = None - promotebox = self.promotebox + switchbox = self.promotebox else: # clone the jitstate memo = rvalue.copy_memo() jitstate = self.saved_jitstate.clone(memo) - promotebox = memo.boxes[self.promotebox] - promotebox.setgenvar(gv_case) + switchbox = memo.boxes[self.promotebox] interpreter = self.hotrunnerdesc.interpreter interpreter.newjitstate(jitstate) interpreter.frame.pc = pc + gv_case = self.hotrunnerdesc.interpreter.rgenop.genconst(case) jitstate.curbuilder = self.flexswitch.add_case(gv_case) + switchbox.learn_boolvalue(jitstate, case) compile(interpreter) From arigo at codespeak.net Tue Mar 25 15:47:50 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 15:47:50 +0100 (CET) Subject: [pypy-svn] r52914 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080325144750.281301683D7@codespeak.net> Author: arigo Date: Tue Mar 25 15:47:50 2008 New Revision: 52914 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Log: Am I confused? This cannot possibly be reached if hotpath is True... Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Tue Mar 25 15:47:50 2008 @@ -471,8 +471,7 @@ if self.hannotator.policy.hotpath and color == "red": self.emit("hp_red_goto_iftrue") elif reverse is not None: - assert not self.hannotator.policy.hotpath, ( - """XXX reimplement me for the hotpath policy""") + assert not self.hannotator.policy.hotpath, "unreachable" self.emit("red_goto_ifptrnonzero") self.emit(reverse) self.emit(ptrindex) From arigo at codespeak.net Tue Mar 25 15:52:25 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 15:52:25 +0100 (CET) Subject: [pypy-svn] r52915 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080325145225.5B2AC168417@codespeak.net> Author: arigo Date: Tue Mar 25 15:52:24 2008 New Revision: 52915 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Log: Fix: a hash collision would have produced a KeyError in maybe_enter_jit() Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 25 15:52:24 2008 @@ -91,11 +91,11 @@ return interpreter.debug_trace("jit_compile", *args[:num_green_args]) mc = state.compile(argshash, *greenargs) - if not mc: # xxx check if compile() could raise - return # ContinueRunningNormally to avoid this check else: greenkey = state.getgreenkey(*greenargs) - mc = state.machine_codes[greenkey] + mc = state.machine_codes.get(greenkey, state.NULL_MC) + if not mc: + return interpreter.debug_trace("run_machine_code", *args) run = maybe_on_top_of_llinterp(exceptiondesc, mc) residualargs = state.make_residualargs(*args[num_green_args:]) @@ -303,6 +303,8 @@ keydesc = None class HotEnterState: + NULL_MC = lltype.nullptr(hotrunnerdesc.RESIDUAL_FUNCTYPE) + def __init__(self): self.machine_codes = newgreendict() self.counters = {} # value of -1 means "compiled" @@ -346,7 +348,7 @@ except Exception, e: rhotpath.report_compile_time_exception( hotrunnerdesc.interpreter, e) - return lltype.nullptr(hotrunnerdesc.RESIDUAL_FUNCTYPE) + return self.NULL_MC def _compile(self, argshash, *greenargs): interp = hotrunnerdesc.interpreter From arigo at codespeak.net Tue Mar 25 16:16:20 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 16:16:20 +0100 (CET) Subject: [pypy-svn] r52916 - pypy/branch/jit-hotpath/pypy/module/pypyjit Message-ID: <20080325151620.E578216841F@codespeak.net> Author: arigo Date: Tue Mar 25 16:16:19 2008 New Revision: 52916 Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Log: Need to hack more to end up with the correct sys.executable in the machine code log file... Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Tue Mar 25 16:16:19 2008 @@ -139,15 +139,25 @@ pypyjitconfig = PyPyJITConfig() -def startup(space): +def ensure_sys_executable(space): # save the app-level sys.executable in JITInfo, where the machine # code backend can fish for it. A bit hackish. from pypy.jit.codegen.hlinfo import highleveljitinfo highleveljitinfo.sys_executable = space.str_w( space.sys.get('executable')) + +def startup(space): # -- for now, we start disabled and you have to use pypyjit.enable() #pypyjitconfig.enable() + # -- the next line would be nice, but the app-level sys.executable is not + # initialized yet :-( What we need is a hook called by app_main.py + # after things have really been initialized... For now we work around + # this problem by calling ensure_sys_executable() from pypyjit.enable(). + + #ensure_sys_executable(space) + pass + def setthreshold(space, threshold): pypyjitconfig.setthreshold(threshold) @@ -157,6 +167,7 @@ return space.wrap(pypyjitconfig.getthreshold()) def enable(space): + ensure_sys_executable(space) pypyjitconfig.enable() def disable(space): From arigo at codespeak.net Tue Mar 25 16:21:01 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 16:21:01 +0100 (CET) Subject: [pypy-svn] r52917 - in pypy/branch/jit-hotpath/pypy: jit/rainbow translator Message-ID: <20080325152101.2336F168417@codespeak.net> Author: arigo Date: Tue Mar 25 16:20:59 2008 New Revision: 52917 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/translator/driver.py Log: Be slightly less verbose by default in --jit translated interpreters. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Tue Mar 25 16:20:59 2008 @@ -21,7 +21,8 @@ class HotRunnerDesc: def __init__(self, hintannotator, rtyper, entryjitcode, RGenOp, - codewriter, jitdrivercls, translate_support_code = True): + codewriter, jitdrivercls, translate_support_code = True, + verbose_level=3): self.hintannotator = hintannotator self.entryjitcode = entryjitcode self.rtyper = rtyper @@ -32,6 +33,7 @@ self.codewriter = codewriter self.jitdrivercls = jitdrivercls self.translate_support_code = translate_support_code + self.verbose_level = verbose_level def _freeze_(self): return True @@ -86,7 +88,8 @@ if counter >= 0: counter += 1 if counter < self.jitdrivercls.getcurrentthreshold(): - interpreter.debug_trace("jit_not_entered", *args) + if self.verbose_level >= 3: + interpreter.debug_trace("jit_not_entered", *args) state.counters[argshash] = counter return interpreter.debug_trace("jit_compile", *args[:num_green_args]) @@ -96,7 +99,8 @@ mc = state.machine_codes.get(greenkey, state.NULL_MC) if not mc: return - interpreter.debug_trace("run_machine_code", *args) + if self.verbose_level >= 2: + interpreter.debug_trace("run_machine_code", *args) run = maybe_on_top_of_llinterp(exceptiondesc, mc) residualargs = state.make_residualargs(*args[num_green_args:]) run(*residualargs) Modified: pypy/branch/jit-hotpath/pypy/translator/driver.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/driver.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/driver.py Tue Mar 25 16:20:59 2008 @@ -442,7 +442,8 @@ jitdrivercls = ha.jitdriverclasses.keys()[0] # hack hotrunnerdesc = HotRunnerDesc(ha, rtyper, jitcode, RGenOp, writer, jitdrivercls, - translate_support_code=True) + translate_support_code=True, + verbose_level=1) hotrunnerdesc.rewrite_all() from pypy.jit.rainbow import graphopt graphopt.simplify_virtualizable_accesses(writer) From arigo at codespeak.net Tue Mar 25 16:25:25 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 16:25:25 +0100 (CET) Subject: [pypy-svn] r52919 - pypy/branch/jit-hotpath/demo/jit Message-ID: <20080325152525.E31F5168417@codespeak.net> Author: arigo Date: Tue Mar 25 16:25:25 2008 New Revision: 52919 Modified: pypy/branch/jit-hotpath/demo/jit/f1.py Log: Fix demo for the hotpath policy. Modified: pypy/branch/jit-hotpath/demo/jit/f1.py ============================================================================== --- pypy/branch/jit-hotpath/demo/jit/f1.py (original) +++ pypy/branch/jit-hotpath/demo/jit/f1.py Tue Mar 25 16:25:25 2008 @@ -1,3 +1,4 @@ +import sys import time @@ -21,7 +22,9 @@ except ImportError: print "No jit" else: - pypyjit.enable(f1.func_code) + if len(sys.argv) > 1: + pypyjit.setthreshold(int(sys.argv[1])) + pypyjit.enable() res = f1(2117) print res From cfbolz at codespeak.net Tue Mar 25 17:07:22 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 17:07:22 +0100 (CET) Subject: [pypy-svn] r52932 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080325160722.F342B168419@codespeak.net> Author: cfbolz Date: Tue Mar 25 17:07:22 2008 New Revision: 52932 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: cleanup learn_nonzeroness handling: don't abuse learn_boolvalue for it Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Tue Mar 25 17:07:22 2008 @@ -470,23 +470,17 @@ truerenaming = self.insert_renaming(linktrue) if self.hannotator.policy.hotpath and color == "red": self.emit("hp_red_goto_iftrue") - elif reverse is not None: - assert not self.hannotator.policy.hotpath, "unreachable" - self.emit("red_goto_ifptrnonzero") - self.emit(reverse) - self.emit(ptrindex) - reverse = None else: self.emit("%s_goto_iftrue" % color) self.emit(index) self.emit(tlabel(linktrue)) if reverse is not None: - self.emit("learn_boolvalue", ptrindex, reverse) + self.emit("learn_nonzeroness", ptrindex, reverse) self.emit(*falserenaming) self.make_bytecode_block(linkfalse.target, insert_goto=True) self.emit(label(linktrue)) if reverse is not None: - self.emit("learn_boolvalue", ptrindex, not reverse) + self.emit("learn_nonzeroness", ptrindex, not reverse) self.emit(*truerenaming) self.make_bytecode_block(linktrue.target, insert_goto=True) else: @@ -962,7 +956,7 @@ srcopname, srcargs = self.trace_back_bool_var(self.current_block, v) if srcopname in ('ptr_iszero', 'ptr_nonzero'): arg = self.serialize_oparg("red", srcargs[0]) - self.emit("learn_boolvalue", arg, srcopname == "ptr_nonzero") + self.emit("learn_nonzeroness", arg, srcopname == "ptr_nonzero") def serialize_op_direct_call(self, op): kind, withexc = self.guess_call_kind(op) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Tue Mar 25 17:07:22 2008 @@ -352,10 +352,9 @@ return self.rgenop.genconst(addr1 != addr2) @arguments("red", "bool") - def opimpl_learn_boolvalue(self, gv_value, boolval): + def opimpl_learn_nonzeroness(self, gv_value, boolval): pass - @arguments("red_varargs") def opimpl_make_new_redvars(self, local_red): self.local_red = local_red Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Tue Mar 25 17:07:22 2008 @@ -506,14 +506,6 @@ if decision: self.frame.pc = target - @arguments("bool", "red", "red", "jumptarget") - def opimpl_red_goto_ifptrnonzero(self, reverse, ptrbox, switchbox, target): - # XXX not sure about passing no green vars - decision = rtimeshift.split_ptr_nonzero(self.jitstate, switchbox, - self.frame.pc, ptrbox, reverse) - if decision: - self.frame.pc = target - @arguments("red", "jumptarget") def opimpl_goto_if_constant(self, valuebox, target): if valuebox.is_constant(): @@ -549,8 +541,9 @@ ptrbox2, True) @arguments("red", "bool") - def opimpl_learn_boolvalue(self, redbox, boolval): - redbox.learn_boolvalue(self.jitstate, boolval) + def opimpl_learn_nonzeroness(self, redbox, boolval): + assert isinstance(redbox, rvalue.PtrRedBox) + redbox.learn_nonzeroness(self.jitstate, boolval) @arguments() def opimpl_red_return(self): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Tue Mar 25 17:07:22 2008 @@ -2207,6 +2207,9 @@ self.check_insns_in_loops({'int_add': 2, 'int_gt': 1, 'int_rshift': 1}) def test_learn_nonzeroness(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['a', 'i', 'tot', 'x'] class A: pass class B: @@ -2216,21 +2219,29 @@ return A() return None def f(isnotnone, x): - hint(None, global_merge_point=True) a = g(isnotnone) - b = B() - b.a = a - if b.a: + i = 1024 * 1024 + tot = 0 + while i > 0: + i >>= 1 + b = B() + b.a = a if b.a: - return 1 + x - return -1 + x - else: - if not b.a: - return 2 + x - return -2 + x - res = self.interpret(f, [False, 5], policy=StopAtXPolicy(g)) - assert res == 7 - self.check_insns(int_add=2) + if b.a: + tot += 1 + x + else: + tot += -1 + x + else: + if not b.a: + tot += 2 + x + else: + tot += -2 + x + MyJitDriver.jit_merge_point(tot=tot, i=i, a=a, x=x) + MyJitDriver.can_enter_jit(tot=tot, i=i, a=a, x=x) + return tot + res = self.run(f, [False, 5], threshold=2, policy=StopAtXPolicy(g)) + assert res == f(False, 5) + self.check_insns_in_loops(int_add=2) # void tests def test_void_args(self): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Tue Mar 25 17:07:22 2008 @@ -237,9 +237,6 @@ argbox.getgenvar(jitstate)) return rvalue.IntRedBox(fielddesc.indexkind, genvar) - - - def genptrnonzero(jitstate, argbox, reverse): assert isinstance(argbox, rvalue.PtrRedBox) if argbox.is_constant(): @@ -417,16 +414,6 @@ return split_nonconstantcase(jitstate, exitgvar, resumepoint, switchredbox, False, list(greens_gv)) -def split_ptr_nonzero(jitstate, switchredbox, resumepoint, - ptrbox, reverse, *greens_gv): - assert isinstance(ptrbox, rvalue.PtrRedBox) - exitgvar = switchredbox.getgenvar(jitstate) - if exitgvar.is_const: - return exitgvar.revealconst(lltype.Bool) - else: - return split_nonconstantcase(jitstate, exitgvar, resumepoint, - ptrbox, reverse, list(greens_gv)) - def split_nonconstantcase(jitstate, exitgvar, resumepoint, condbox, reverse, greens_gv, ll_evalue=NULL_OBJECT): resuming = jitstate.get_resuming() From cfbolz at codespeak.net Tue Mar 25 18:13:37 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 18:13:37 +0100 (CET) Subject: [pypy-svn] r52933 - in pypy/branch/jit-hotpath/pypy/jit: rainbow timeshifter Message-ID: <20080325171337.CB363168419@codespeak.net> Author: cfbolz Date: Tue Mar 25 18:13:35 2008 New Revision: 52933 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Log: introduce an extra attribute for a green return value on the jitstate. this should make jitstate.greens essentially without task Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Tue Mar 25 18:13:35 2008 @@ -341,8 +341,7 @@ self.newjitstate(newjitstate) if self.frame is not None: newjitstate = rtimeshift.collect_split( - self.jitstate, self.frame.pc, - self.frame.local_green) + self.jitstate, self.frame.pc) assert newjitstate.frame.bytecode is self.frame.bytecode assert newjitstate.frame.pc == self.frame.pc self.newjitstate(newjitstate) @@ -501,7 +500,6 @@ @arguments("red", "jumptarget") def opimpl_red_goto_iftrue(self, switchbox, target): - # XXX not sure about passing no green vars decision = rtimeshift.split(self.jitstate, switchbox, self.frame.pc) if decision: self.frame.pc = target @@ -513,7 +511,6 @@ @arguments("exception") def opimpl_split_raisingop(self, ll_evalue): - # XXX not sure about passing no green vars rtimeshift.split_raisingop(self.jitstate, self.frame.pc, ll_evalue) @@ -557,8 +554,7 @@ @arguments() def opimpl_yellow_return(self): - # save the greens to make the return value findable by collect_split - rtimeshift.save_greens(self.jitstate, self.frame.local_green) + self.jitstate.save_green_return_value(self.frame.local_green[0]) rtimeshift.save_return(self.jitstate) return self.dispatch() @@ -615,8 +611,7 @@ def opimpl_portal_call(self, greenargs, redargs): self.portalstate.portal_reentry(greenargs, redargs) newjitstate = rtimeshift.collect_split( - self.jitstate, self.frame.pc, - self.frame.local_green) + self.jitstate, self.frame.pc) assert newjitstate.frame.bytecode is self.frame.bytecode assert newjitstate.frame.pc == self.frame.pc self.newjitstate(newjitstate) @@ -641,15 +636,13 @@ @arguments(returns="green") def opimpl_yellow_retrieve_result(self): - # XXX all this jitstate.greens business is a bit messy - return self.jitstate.greens[0] + return self.jitstate.get_gv_return_value() @arguments("2byte", returns="red") def opimpl_yellow_retrieve_result_as_red(self, typeid): - # XXX all this jitstate.greens business is a bit messy redboxcls = self.frame.bytecode.redboxclasses[typeid] kind = self.frame.bytecode.typekinds[typeid] - return redboxcls(kind, self.jitstate.greens[0]) + return redboxcls(kind, self.jitstate.get_gv_return_value()) @arguments("oopspec", "bool", returns="red") def opimpl_red_oopspec_call_0(self, oopspec, deepfrozen): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Tue Mar 25 18:13:35 2008 @@ -407,6 +407,7 @@ jitstate.resumepoint = resumepoint def split(jitstate, switchredbox, resumepoint, *greens_gv): + assert not greens_gv exitgvar = switchredbox.getgenvar(jitstate) if exitgvar.is_const: return exitgvar.revealconst(lltype.Bool) @@ -416,6 +417,7 @@ def split_nonconstantcase(jitstate, exitgvar, resumepoint, condbox, reverse, greens_gv, ll_evalue=NULL_OBJECT): + assert not greens_gv resuming = jitstate.get_resuming() if resuming is not None and resuming.mergesleft == 0: node = resuming.path.pop() @@ -450,6 +452,7 @@ return True def split_raisingop(jitstate, resumepoint, ll_evalue, *greens_gv): + assert not greens_gv exitgvar = jitstate.get_gv_op_raised() if exitgvar.is_const: gotexc = exitgvar.revealconst(lltype.Bool) @@ -460,7 +463,7 @@ if gotexc: jitstate.residual_ll_exception(ll_evalue) -def collect_split(jitstate_chain, resumepoint, greens_gv): +def collect_split(jitstate_chain, resumepoint): # YYY split to avoid over-specialization # assumes that the head of the jitstate_chain is ready for writing, # and all the other jitstates in the chain are paused @@ -471,7 +474,7 @@ assert isinstance(node, PromotionPathCollectSplit) for i in range(node.n): pending = pending.next - pending.greens.extend(greens_gv) + #pending.greens.extend(greens_gv) if pending.returnbox is not None: pending.frame.local_boxes.append(getreturnbox(pending)) pending.next = None @@ -482,7 +485,7 @@ while True: jitstate = pending pending = pending.next - jitstate.greens.extend(greens_gv) # item 0 is the return value + #jitstate.greens.extend(greens_gv) # item 0 is the return value if jitstate.returnbox is not None: jitstate.frame.local_boxes.append(getreturnbox(jitstate)) jitstate.resumepoint = resumepoint @@ -535,14 +538,12 @@ jitstate.frame.local_boxes = redboxes def save_greens(jitstate, greens_gv): + assert not greens_gv jitstate.greens = list(greens_gv) def getlocalbox(jitstate, i): return jitstate.frame.local_boxes[i] -def ll_getgreenbox(jitstate, i, T): - return jitstate.greens[i].revealconst(T) - def getreturnbox(jitstate): retbox = jitstate.returnbox jitstate.returnbox = None @@ -1040,7 +1041,7 @@ class JITState(object): _attrs_ = """curbuilder frame exc_type_box exc_value_box - greens + gv_return_value gv_op_raised returnbox promotion_path @@ -1069,6 +1070,7 @@ if newgreens is None: newgreens = [] self.greens = newgreens + self.gv_return_value = None self.gv_op_raised = None # XXX can not be a dictionary @@ -1288,6 +1290,13 @@ self.gv_op_raised = None return result + def save_green_return_value(self, gv_result): + self.gv_return_value = gv_result + + def get_gv_return_value(self): + result = self.gv_return_value + self.gv_return_value = None + return result def start_writing(jitstate=None, prevopen=None): if jitstate is not prevopen: Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Tue Mar 25 18:13:35 2008 @@ -239,8 +239,6 @@ self.setgenvar_hint(gv_null, known_nonzero=False) return ok - learn_boolvalue = learn_nonzeroness - def __repr__(self): if not self.genvar and self.content is not None: return '' % (self.content,) From cfbolz at codespeak.net Tue Mar 25 18:34:07 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 18:34:07 +0100 (CET) Subject: [pypy-svn] r52934 - in pypy/branch/jit-hotpath/pypy/jit: rainbow timeshifter Message-ID: <20080325173407.BA46E168416@codespeak.net> Author: cfbolz Date: Tue Mar 25 18:34:07 2008 New Revision: 52934 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Log: backing out revision 52933. there are failing tests that I overlooked Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Tue Mar 25 18:34:07 2008 @@ -341,7 +341,8 @@ self.newjitstate(newjitstate) if self.frame is not None: newjitstate = rtimeshift.collect_split( - self.jitstate, self.frame.pc) + self.jitstate, self.frame.pc, + self.frame.local_green) assert newjitstate.frame.bytecode is self.frame.bytecode assert newjitstate.frame.pc == self.frame.pc self.newjitstate(newjitstate) @@ -500,6 +501,7 @@ @arguments("red", "jumptarget") def opimpl_red_goto_iftrue(self, switchbox, target): + # XXX not sure about passing no green vars decision = rtimeshift.split(self.jitstate, switchbox, self.frame.pc) if decision: self.frame.pc = target @@ -511,6 +513,7 @@ @arguments("exception") def opimpl_split_raisingop(self, ll_evalue): + # XXX not sure about passing no green vars rtimeshift.split_raisingop(self.jitstate, self.frame.pc, ll_evalue) @@ -554,7 +557,8 @@ @arguments() def opimpl_yellow_return(self): - self.jitstate.save_green_return_value(self.frame.local_green[0]) + # save the greens to make the return value findable by collect_split + rtimeshift.save_greens(self.jitstate, self.frame.local_green) rtimeshift.save_return(self.jitstate) return self.dispatch() @@ -611,7 +615,8 @@ def opimpl_portal_call(self, greenargs, redargs): self.portalstate.portal_reentry(greenargs, redargs) newjitstate = rtimeshift.collect_split( - self.jitstate, self.frame.pc) + self.jitstate, self.frame.pc, + self.frame.local_green) assert newjitstate.frame.bytecode is self.frame.bytecode assert newjitstate.frame.pc == self.frame.pc self.newjitstate(newjitstate) @@ -636,13 +641,15 @@ @arguments(returns="green") def opimpl_yellow_retrieve_result(self): - return self.jitstate.get_gv_return_value() + # XXX all this jitstate.greens business is a bit messy + return self.jitstate.greens[0] @arguments("2byte", returns="red") def opimpl_yellow_retrieve_result_as_red(self, typeid): + # XXX all this jitstate.greens business is a bit messy redboxcls = self.frame.bytecode.redboxclasses[typeid] kind = self.frame.bytecode.typekinds[typeid] - return redboxcls(kind, self.jitstate.get_gv_return_value()) + return redboxcls(kind, self.jitstate.greens[0]) @arguments("oopspec", "bool", returns="red") def opimpl_red_oopspec_call_0(self, oopspec, deepfrozen): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Tue Mar 25 18:34:07 2008 @@ -407,7 +407,6 @@ jitstate.resumepoint = resumepoint def split(jitstate, switchredbox, resumepoint, *greens_gv): - assert not greens_gv exitgvar = switchredbox.getgenvar(jitstate) if exitgvar.is_const: return exitgvar.revealconst(lltype.Bool) @@ -417,7 +416,6 @@ def split_nonconstantcase(jitstate, exitgvar, resumepoint, condbox, reverse, greens_gv, ll_evalue=NULL_OBJECT): - assert not greens_gv resuming = jitstate.get_resuming() if resuming is not None and resuming.mergesleft == 0: node = resuming.path.pop() @@ -452,7 +450,6 @@ return True def split_raisingop(jitstate, resumepoint, ll_evalue, *greens_gv): - assert not greens_gv exitgvar = jitstate.get_gv_op_raised() if exitgvar.is_const: gotexc = exitgvar.revealconst(lltype.Bool) @@ -463,7 +460,7 @@ if gotexc: jitstate.residual_ll_exception(ll_evalue) -def collect_split(jitstate_chain, resumepoint): +def collect_split(jitstate_chain, resumepoint, greens_gv): # YYY split to avoid over-specialization # assumes that the head of the jitstate_chain is ready for writing, # and all the other jitstates in the chain are paused @@ -474,7 +471,7 @@ assert isinstance(node, PromotionPathCollectSplit) for i in range(node.n): pending = pending.next - #pending.greens.extend(greens_gv) + pending.greens.extend(greens_gv) if pending.returnbox is not None: pending.frame.local_boxes.append(getreturnbox(pending)) pending.next = None @@ -485,7 +482,7 @@ while True: jitstate = pending pending = pending.next - #jitstate.greens.extend(greens_gv) # item 0 is the return value + jitstate.greens.extend(greens_gv) # item 0 is the return value if jitstate.returnbox is not None: jitstate.frame.local_boxes.append(getreturnbox(jitstate)) jitstate.resumepoint = resumepoint @@ -538,12 +535,14 @@ jitstate.frame.local_boxes = redboxes def save_greens(jitstate, greens_gv): - assert not greens_gv jitstate.greens = list(greens_gv) def getlocalbox(jitstate, i): return jitstate.frame.local_boxes[i] +def ll_getgreenbox(jitstate, i, T): + return jitstate.greens[i].revealconst(T) + def getreturnbox(jitstate): retbox = jitstate.returnbox jitstate.returnbox = None @@ -1041,7 +1040,7 @@ class JITState(object): _attrs_ = """curbuilder frame exc_type_box exc_value_box - gv_return_value + greens gv_op_raised returnbox promotion_path @@ -1070,7 +1069,6 @@ if newgreens is None: newgreens = [] self.greens = newgreens - self.gv_return_value = None self.gv_op_raised = None # XXX can not be a dictionary @@ -1290,13 +1288,6 @@ self.gv_op_raised = None return result - def save_green_return_value(self, gv_result): - self.gv_return_value = gv_result - - def get_gv_return_value(self): - result = self.gv_return_value - self.gv_return_value = None - return result def start_writing(jitstate=None, prevopen=None): if jitstate is not prevopen: Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Tue Mar 25 18:34:07 2008 @@ -239,6 +239,8 @@ self.setgenvar_hint(gv_null, known_nonzero=False) return ok + learn_boolvalue = learn_nonzeroness + def __repr__(self): if not self.genvar and self.content is not None: return '' % (self.content,) From arigo at codespeak.net Tue Mar 25 19:14:00 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 19:14:00 +0100 (CET) Subject: [pypy-svn] r52935 - pypy/branch/jit-hotpath/pypy/objspace/std Message-ID: <20080325181400.17A4A168435@codespeak.net> Author: arigo Date: Tue Mar 25 19:13:59 2008 New Revision: 52935 Modified: pypy/branch/jit-hotpath/pypy/objspace/std/boolobject.py pypy/branch/jit-hotpath/pypy/objspace/std/complexobject.py pypy/branch/jit-hotpath/pypy/objspace/std/floatobject.py pypy/branch/jit-hotpath/pypy/objspace/std/intobject.py pypy/branch/jit-hotpath/pypy/objspace/std/longobject.py pypy/branch/jit-hotpath/pypy/objspace/std/sliceobject.py pypy/branch/jit-hotpath/pypy/objspace/std/stringobject.py pypy/branch/jit-hotpath/pypy/objspace/std/tupleobject.py pypy/branch/jit-hotpath/pypy/objspace/std/unicodeobject.py Log: Sprinkle some _immutable_ hints in the stdobjspace. Modified: pypy/branch/jit-hotpath/pypy/objspace/std/boolobject.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/objspace/std/boolobject.py (original) +++ pypy/branch/jit-hotpath/pypy/objspace/std/boolobject.py Tue Mar 25 19:13:59 2008 @@ -5,6 +5,8 @@ class W_BoolObject(W_Object): from pypy.objspace.std.booltype import bool_typedef as typedef + _immutable_ = True # JIT hint + def __init__(w_self, boolval): w_self.boolval = not not boolval Modified: pypy/branch/jit-hotpath/pypy/objspace/std/complexobject.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/objspace/std/complexobject.py (original) +++ pypy/branch/jit-hotpath/pypy/objspace/std/complexobject.py Tue Mar 25 19:13:59 2008 @@ -12,6 +12,8 @@ from pypy.objspace.std.complextype import complex_typedef as typedef + _immutable_ = True # JIT hint + def __init__(w_self, realval=0.0, imgval=0.0): w_self.realval = float(realval) w_self.imagval = float(imgval) Modified: pypy/branch/jit-hotpath/pypy/objspace/std/floatobject.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/objspace/std/floatobject.py (original) +++ pypy/branch/jit-hotpath/pypy/objspace/std/floatobject.py Tue Mar 25 19:13:59 2008 @@ -13,7 +13,9 @@ it is assumed that the constructor takes a real Python float as an argument""" from pypy.objspace.std.floattype import float_typedef as typedef - + + _immutable_ = True # JIT hint + def __init__(w_self, floatval): w_self.floatval = floatval Modified: pypy/branch/jit-hotpath/pypy/objspace/std/intobject.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/objspace/std/intobject.py (original) +++ pypy/branch/jit-hotpath/pypy/objspace/std/intobject.py Tue Mar 25 19:13:59 2008 @@ -13,7 +13,9 @@ class W_IntObject(W_Object): from pypy.objspace.std.inttype import int_typedef as typedef - + + _immutable_ = True # JIT hint + def __init__(w_self, intval): w_self.intval = intval Modified: pypy/branch/jit-hotpath/pypy/objspace/std/longobject.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/objspace/std/longobject.py (original) +++ pypy/branch/jit-hotpath/pypy/objspace/std/longobject.py Tue Mar 25 19:13:59 2008 @@ -7,7 +7,9 @@ class W_LongObject(W_Object): """This is a wrapper of rbigint.""" from pypy.objspace.std.longtype import long_typedef as typedef - + + _immutable_ = True # JIT hint + def __init__(w_self, l): w_self.num = l # instance of rbigint Modified: pypy/branch/jit-hotpath/pypy/objspace/std/sliceobject.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/objspace/std/sliceobject.py (original) +++ pypy/branch/jit-hotpath/pypy/objspace/std/sliceobject.py Tue Mar 25 19:13:59 2008 @@ -12,7 +12,9 @@ class W_SliceObject(W_Object): from pypy.objspace.std.slicetype import slice_typedef as typedef - + + _immutable_ = True # JIT hint + def __init__(w_self, w_start, w_stop, w_step): assert w_start is not None assert w_stop is not None Modified: pypy/branch/jit-hotpath/pypy/objspace/std/stringobject.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/objspace/std/stringobject.py (original) +++ pypy/branch/jit-hotpath/pypy/objspace/std/stringobject.py Tue Mar 25 19:13:59 2008 @@ -19,7 +19,8 @@ class W_StringObject(W_Object): from pypy.objspace.std.stringtype import str_typedef as typedef - _immutable_ = True + _immutable_ = True # JIT hint + def __init__(w_self, str): w_self._value = str Modified: pypy/branch/jit-hotpath/pypy/objspace/std/tupleobject.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/objspace/std/tupleobject.py (original) +++ pypy/branch/jit-hotpath/pypy/objspace/std/tupleobject.py Tue Mar 25 19:13:59 2008 @@ -6,7 +6,9 @@ class W_TupleObject(W_Object): from pypy.objspace.std.tupletype import tuple_typedef as typedef - + + _immutable_ = True # JIT hint + def __init__(w_self, wrappeditems): w_self.wrappeditems = wrappeditems # a list of wrapped values Modified: pypy/branch/jit-hotpath/pypy/objspace/std/unicodeobject.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/objspace/std/unicodeobject.py (original) +++ pypy/branch/jit-hotpath/pypy/objspace/std/unicodeobject.py Tue Mar 25 19:13:59 2008 @@ -15,6 +15,8 @@ class W_UnicodeObject(W_Object): from pypy.objspace.std.unicodetype import unicode_typedef as typedef + _immutable_ = True # JIT hint + def __init__(w_self, unistr): assert isinstance(unistr, unicode) w_self._value = unistr From arigo at codespeak.net Tue Mar 25 19:15:22 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Tue, 25 Mar 2008 19:15:22 +0100 (CET) Subject: [pypy-svn] r52936 - pypy/branch/jit-hotpath/pypy/translator/goal Message-ID: <20080325181522.1562216843D@codespeak.net> Author: arigo Date: Tue Mar 25 19:15:21 2008 New Revision: 52936 Modified: pypy/branch/jit-hotpath/pypy/translator/goal/richards.py Log: Fix richards.py's jit enabling code. Modified: pypy/branch/jit-hotpath/pypy/translator/goal/richards.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/goal/richards.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/goal/richards.py Tue Mar 25 19:15:21 2008 @@ -423,15 +423,10 @@ except ImportError: pass else: - import types - for item in globals().values(): - if isinstance(item, types.FunctionType): - pypyjit.enable(item.func_code) - elif isinstance(item, type): - for it in item.__dict__.values(): - if isinstance(it, types.FunctionType): - pypyjit.enable(it.func_code) - + if len(sys.argv) >= 3: + pypyjit.setthreshold(int(sys.argv[2])) + pypyjit.enable() + if __name__ == '__main__': import sys if len(sys.argv) >= 2: From cfbolz at codespeak.net Tue Mar 25 20:29:20 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Tue, 25 Mar 2008 20:29:20 +0100 (CET) Subject: [pypy-svn] r52939 - pypy/dist/pypy/doc/discussion Message-ID: <20080325192920.C7E491683EF@codespeak.net> Author: cfbolz Date: Tue Mar 25 20:29:19 2008 New Revision: 52939 Added: pypy/dist/pypy/doc/discussion/paper-wishlist.txt Log: (arigo, cfbolz): writing some ideas about papers we would like to write Added: pypy/dist/pypy/doc/discussion/paper-wishlist.txt ============================================================================== --- (empty file) +++ pypy/dist/pypy/doc/discussion/paper-wishlist.txt Tue Mar 25 20:29:19 2008 @@ -0,0 +1,27 @@ +Things we would like to write papers about +========================================== + +- object space architecture + reflective space +- stackless transformation +- composable coroutines +- jit: + - overview paper + - putting our jit into the context of classical partial evaluation + - a jit technical paper too, probably + +- sandboxing + +Things about which writing a paper would be nice, which need more work first +============================================================================ + +- taint object space +- logic object space + +- jit + + - with some more work: how to deal in a JIT backend with less-that- + full-function compilation unit + + - work in progress (Anto?): our JIT on the JVM + - (later) removing the overhead of features not used, e.g. thunk space or + another special space From antocuni at codespeak.net Tue Mar 25 20:58:46 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Tue, 25 Mar 2008 20:58:46 +0100 (CET) Subject: [pypy-svn] r52940 - in pypy/branch/jit-hotpath/pypy/jit: codegen/llgraph rainbow rainbow/test timeshifter Message-ID: <20080325195846.83AE01684C8@codespeak.net> Author: antocuni Date: Tue Mar 25 20:58:44 2008 New Revision: 52940 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Log: Implement InstanceTypeDesc & co., which share a lof of code with StructTypeDesc & co. test_struct_simple passes for ootype too. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py Tue Mar 25 20:58:44 2008 @@ -14,6 +14,7 @@ from pypy.rpython.llinterp import LLInterpreter from pypy.rpython.rclass import fishllattr from pypy.rpython.lltypesystem.lloperation import llop +from pypy.jit.rainbow.typesystem import fieldType def _from_opaque(opq): return opq._obj.externalobj @@ -351,7 +352,7 @@ def genoogetfield(block, gv_obj, gv_OBJTYPE, gv_fieldname): OBJTYPE = _from_opaque(gv_OBJTYPE).value c_fieldname = _from_opaque(gv_fieldname) - RESULTTYPE = getattr(OBJTYPE.TO, c_fieldname.value) #XXX + RESULTTYPE = fieldType(OBJTYPE, c_fieldname.value) v_obj = _from_opaque(gv_obj) gv_obj = cast(block, gv_OBJTYPE, gv_obj) vars_gv = [gv_obj, gv_fieldname] Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Tue Mar 25 20:58:44 2008 @@ -13,6 +13,7 @@ from pypy.jit.timeshifter.greenkey import KeyDesc from pypy.jit.rainbow.interpreter import JitCode, LLTypeJitInterpreter, OOTypeJitInterpreter from pypy.jit.rainbow.interpreter import DEBUG_JITCODES, log +from pypy.jit.rainbow.typesystem import deref from pypy.translator.backendopt.removenoops import remove_same_as from pypy.translator.backendopt.ssa import SSA_to_SSI from pypy.translator.unsimplify import varoftype @@ -146,6 +147,9 @@ class BytecodeWriter(object): + + StructTypeDesc = None + def __init__(self, t, hannotator, RGenOp, verbose=True): self.translator = t self.rtyper = hannotator.base_translator.rtyper @@ -699,7 +703,7 @@ if TYPE in self.structtypedesc_positions: return self.structtypedesc_positions[TYPE] self.structtypedescs.append( - rcontainer.StructTypeDesc(self.RGenOp, TYPE)) + self.StructTypeDesc(self.RGenOp, TYPE)) result = len(self.structtypedesc_positions) self.structtypedesc_positions[TYPE] = result return result @@ -707,7 +711,7 @@ def fielddesc_position(self, TYPE, fieldname): if (fieldname, TYPE) in self.fielddesc_positions: return self.fielddesc_positions[fieldname, TYPE] - structtypedesc = rcontainer.StructTypeDesc(self.RGenOp, TYPE) + structtypedesc = self.StructTypeDesc(self.RGenOp, TYPE) fielddesc = structtypedesc.getfielddesc(fieldname) if fielddesc is None: self.fielddesc_positions[fieldname, TYPE] = -1 @@ -1242,8 +1246,9 @@ def serialize_op_keepalive(self, op): pass - def serialize_op_getfield(self, op): + def serialize_op_getfield_impl(self, op): color = self.opcolor(op) + opname = op.opname args = op.args if args[0] == self.exceptiondesc.cexcdata: # reading one of the exception boxes (exc_type or exc_value) @@ -1253,13 +1258,13 @@ elif fieldname == 'exc_value': self.emit("read_excvalue") else: - raise Exception("getfield(exc_data, %r)" % (fieldname,)) + raise Exception("%s(exc_data, %r)" % (opname, fieldname,)) self.register_redvar(op.result) return # virtualizable access read PTRTYPE = args[0].concretetype - if PTRTYPE.TO._hints.get('virtualizable', False): + if deref(PTRTYPE)._hints.get('virtualizable', False): assert op.args[1].value != 'vable_access' # non virtual case @@ -1268,18 +1273,19 @@ s_struct = self.hannotator.binding(args[0]) deepfrozen = s_struct.deepfrozen - fielddescindex = self.fielddesc_position(PTRTYPE.TO, fieldname) + fielddescindex = self.fielddesc_position(deref(PTRTYPE), fieldname) if fielddescindex == -1: # Void field return - self.emit("%s_getfield" % (color, ), index, fielddescindex) + self.emit("%s_%s" % (color, opname), index, fielddescindex) if color == "red": self.emit(deepfrozen) self.register_redvar(op.result) else: self.register_greenvar(op.result) - def serialize_op_setfield(self, op): + def serialize_op_setfield_impl(self, op): args = op.args + opname = op.opname PTRTYPE = args[0].concretetype VALUETYPE = args[2].concretetype if VALUETYPE is lltype.Void: @@ -1293,16 +1299,16 @@ elif fieldname == 'exc_value': self.emit("write_excvalue", val) else: - raise Exception("getfield(exc_data, %r)" % (fieldname,)) + raise Exception("%s(exc_data, %r)" % (opname, fieldname,)) return # non virtual case destboxindex = self.serialize_oparg("red", args[0]) valboxindex = self.serialize_oparg("red", args[2]) fieldname = args[1].value - fielddescindex = self.fielddesc_position(PTRTYPE.TO, fieldname) + fielddescindex = self.fielddesc_position(deref(PTRTYPE), fieldname) if fielddescindex == -1: # Void field return - self.emit("red_setfield", destboxindex, fielddescindex, valboxindex) + self.emit("red_%s" % opname, destboxindex, fielddescindex, valboxindex) def serialize_op_getarrayitem(self, op): color = self.opcolor(op) @@ -1587,18 +1593,31 @@ class LLTypeBytecodeWriter(BytecodeWriter): ExceptionDesc = exception.LLTypeExceptionDesc + StructTypeDesc = rcontainer.StructTypeDesc def create_interpreter(self, RGenOp): return LLTypeJitInterpreter(self.exceptiondesc, RGenOp) + def serialize_op_getfield(self, op): + return self.serialize_op_getfield_impl(op) + + def serialize_op_setfield(self, op): + return self.serialize_op_setfield_impl(op) + class OOTypeBytecodeWriter(BytecodeWriter): ExceptionDesc = exception.OOTypeExceptionDesc + StructTypeDesc = rcontainer.InstanceTypeDesc def create_interpreter(self, RGenOp): return OOTypeJitInterpreter(self.exceptiondesc, RGenOp) + def serialize_op_oogetfield(self, op): + return self.serialize_op_getfield_impl(op) + + def serialize_op_oosetfield(self, op): + return self.serialize_op_setfield_impl(op) class GraphTransformer(object): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Tue Mar 25 20:58:44 2008 @@ -1028,6 +1028,11 @@ class OOTypeJitInterpreter(JitInterpreter): ts = typesystem.oohelper + @arguments("red", "fielddesc", "bool", returns="red") + def opimpl_red_oogetfield(self, structbox, fielddesc, deepfrozen): + return rtimeshift.gengetfield(self.jitstate, deepfrozen, fielddesc, + structbox) + class DebugTrace(object): def __init__(self, *args): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Tue Mar 25 20:58:44 2008 @@ -11,6 +11,7 @@ from pypy.jit.rainbow.test.test_serializegraph import AbstractSerializationTest from pypy.jit.timeshifter import rtimeshift, rvalue from pypy.rpython.lltypesystem import lltype, rstr +from pypy.rpython.ootypesystem import ootype from pypy.rpython.llinterp import LLInterpreter, LLException from pypy.rpython.module.support import LLSupport from pypy.annotation import model as annmodel @@ -83,12 +84,30 @@ hannotator.translator.view() return hs, hannotator, rtyper + class InterpretationTest(object): RGenOp = LLRGenOp small = False translate_support_code = False # only works for portal tests for now + # these staticmethods should go to TestLLType, they are here only + # for compatibility with other tests that inherit from + # InterpretationTest + + @staticmethod + def Ptr(T): + return lltype.Ptr(T) + + @staticmethod + def Struct(name, *fields, **kwds): + S = lltype.GcStruct(name, *fields, **kwds) + return S + + @staticmethod + def malloc(S): + return lltype.malloc(S) + def setup_class(cls): cls.on_llgraph = cls.RGenOp is LLRGenOp cls._cache = {} @@ -247,10 +266,15 @@ graph = self.get_residual_graph() self.insns = summary(graph) if expected is not None: + expected = self.translate_insns(expected) assert self.insns == expected + counts = self.translate_insns(counts) for opname, count in counts.items(): assert self.insns.get(opname, 0) == count + def translate_insns(self, insns): + return insns + def check_oops(self, expected=None, **counts): if not self.on_llgraph: return @@ -660,9 +684,11 @@ def test_simple_struct(self): - S = lltype.GcStruct('helloworld', ('hello', lltype.Signed), - ('world', lltype.Signed), - hints={'immutable': True}) + S = self.Struct('helloworld', + ('hello', lltype.Signed), + ('world', lltype.Signed), + hints={'immutable': True}) + malloc = self.malloc def ll_function(s): return s.hello * s.world @@ -670,7 +696,7 @@ def struct_S(string): items = string.split(',') assert len(items) == 2 - s1 = lltype.malloc(S) + s1 = malloc(S) s1.hello = int(items[0]) s1.world = int(items[1]) return s1 @@ -1040,8 +1066,8 @@ def test_green_with_side_effects(self): - S = lltype.GcStruct('S', ('flag', lltype.Bool)) - s = lltype.malloc(S) + S = self.Struct('S', ('flag', lltype.Bool)) + s = self.malloc(S) s.flag = False def ll_set_flag(s): s.flag = True @@ -1952,18 +1978,45 @@ res = self.interpret(main2, [5, 6], policy=StopAtXPolicy(g)) assert res == 11 - - -class TestLLType(SimpleTests): - type_system = "lltype" - class TestOOType(SimpleTests): type_system = "ootype" + @staticmethod + def Ptr(T): + return T + + @staticmethod + def Struct(name, *fields, **kwds): + if 'hints' in kwds: + kwds['_hints'] = kwds['hints'] + del kwds['hints'] + I = ootype.Instance(name, ootype.ROOT, dict(fields), **kwds) + return I + + @staticmethod + def malloc(I): + return ootype.new(I) + + def translate_insns(self, insns): + replace = { + 'getfield': 'oogetfield', + 'setfield': 'oosetfield', + } + + insns = insns.copy() + for a, b in replace.iteritems(): + if a in insns: + assert b not in insns + insns[b] = insns[a] + del insns[a] + return insns + def _skip(self): py.test.skip('in progress') + #test_green_with_side_effects = _skip + test_degenerated_before_return = _skip test_degenerated_before_return_2 = _skip test_degenerated_at_return = _skip @@ -2008,3 +2061,9 @@ test_learn_boolvalue = _skip test_learn_nonzeroness = _skip test_void_args = _skip + + +class TestLLType(SimpleTests): + type_system = "lltype" + + Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py Tue Mar 25 20:58:44 2008 @@ -1,6 +1,21 @@ -from pypy.rpython.lltypesystem import llmemory +from pypy.rpython.lltypesystem import lltype, llmemory from pypy.rpython.ootypesystem import ootype +def deref(T): + if isinstance(T, lltype.Ptr): + return T.TO + assert isinstance(T, (ootype.Instance, ootype.Record)) + return T + +def fieldType(T, name): + if isinstance(T, lltype.Struct): + return getattr(T, name) + elif isinstance(T, ootype.Instance): + _, FIELD = T._lookup_field(name) + return FIELD + else: + assert False + class TypeSystemHelper(object): def _freeze_(self): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Tue Mar 25 20:58:44 2008 @@ -1,9 +1,11 @@ import operator from pypy.rpython.lltypesystem import lltype, llmemory +from pypy.rpython.ootypesystem import ootype from pypy.rpython.annlowlevel import cachedtype, cast_base_ptr_to_instance from pypy.rpython.annlowlevel import base_ptr_lltype, cast_instance_to_base_ptr from pypy.rpython.annlowlevel import llhelper from pypy.jit.timeshifter import rvalue, rvirtualizable +from pypy.jit.rainbow.typesystem import deref, fieldType from pypy.rlib.unroll import unrolling_iterable from pypy.rlib.objectmodel import we_are_translated @@ -54,7 +56,7 @@ # ____________________________________________________________ -class StructTypeDesc(object): +class AbstractStructTypeDesc(object): __metaclass__ = cachedtype VirtualStructCls = None # patched later with VirtualStruct @@ -76,16 +78,11 @@ firstsubstructdesc = None materialize = None + StructFieldDesc = None - def __new__(cls, RGenOp, TYPE): - if TYPE._hints.get('virtualizable', False): - return object.__new__(VirtualizableStructTypeDesc) - else: - return object.__new__(StructTypeDesc) - def __init__(self, RGenOp, TYPE): self.TYPE = TYPE - self.PTRTYPE = lltype.Ptr(TYPE) + self.PTRTYPE = self.Ptr(TYPE) self.name = TYPE._name self.ptrkind = RGenOp.kindToken(self.PTRTYPE) @@ -101,22 +98,26 @@ self.gv_null = RGenOp.constPrebuiltGlobal(self.null) self._compute_fielddescs(RGenOp) + self._define_helpers(TYPE, fixsize) - if TYPE._gckind == 'gc': # no 'allocate' for inlined substructs - if self.immutable and self.noidentity: - self._define_materialize() - if fixsize: - self._define_devirtualize() - self._define_allocate(fixsize) - + def Ptr(self, TYPE): + raise NotImplementedError + + def _define_helpers(self, TYPE, fixsize): + raise NotImplementedError + + def _iter_fields(self, TYPE): + for name in TYPE._names: + FIELDTYPE = getattr(TYPE, name) + yield name, FIELDTYPE + def _compute_fielddescs(self, RGenOp): TYPE = self.TYPE innermostdesc = self fielddescs = [] fielddesc_by_name = {} - for name in TYPE._names: - FIELDTYPE = getattr(TYPE, name) + for name, FIELDTYPE in self._iter_fields(TYPE): if isinstance(FIELDTYPE, lltype.ContainerType): if isinstance(FIELDTYPE, lltype.Array): self.arrayfielddesc = ArrayFieldDesc(RGenOp, FIELDTYPE) @@ -133,7 +134,7 @@ if FIELDTYPE is lltype.Void: desc = None else: - desc = StructFieldDesc(RGenOp, self.PTRTYPE, name, index) + desc = self.StructFieldDesc(RGenOp, self.PTRTYPE, name, index) fielddescs.append(desc) fielddesc_by_name[name] = desc @@ -221,6 +222,43 @@ return box +class StructTypeDesc(AbstractStructTypeDesc): + + StructFieldDesc = None # patched later with StructFieldDesc + + def __new__(cls, RGenOp, TYPE): + if TYPE._hints.get('virtualizable', False): + return object.__new__(VirtualizableStructTypeDesc) + else: + return object.__new__(StructTypeDesc) + + def Ptr(self, TYPE): + return lltype.Ptr(TYPE) + + def _define_helpers(self, TYPE, fixsize): + if TYPE._gckind == 'gc': # no 'allocate' for inlined substructs + if self.immutable and self.noidentity: + self._define_materialize() + if fixsize: + self._define_devirtualize() + self._define_allocate(fixsize) + + +class InstanceTypeDesc(AbstractStructTypeDesc): + + StructFieldDesc = None # patched later with InstanceFieldDesc + + def Ptr(self, TYPE): + return TYPE + + def _define_helpers(self, TYPE, fixsize): + pass + + def _iter_fields(self, TYPE): + for name, (FIELDTYPE, defl) in TYPE._fields.iteritems(): + yield name, FIELDTYPE + + def create_varsize(jitstate, contdesc, sizebox): gv_size = sizebox.getgenvar(jitstate) alloctoken = contdesc.varsizealloctoken @@ -579,6 +617,8 @@ else: T = None self.fieldnonnull = PTRTYPE.TO._hints.get('shouldntbenull', False) + elif isinstance(RESTYPE, ootype.OOType): + assert False, 'XXX: TODO' self.RESTYPE = RESTYPE self.ptrkind = RGenOp.kindToken(PTRTYPE) self.kind = RGenOp.kindToken(RESTYPE) @@ -591,7 +631,7 @@ self.structdesc = StructTypeDesc(RGenOp, T) self.redboxcls = rvalue.ll_redboxcls(RESTYPE) - self.immutable = PTRTYPE.TO._hints.get('immutable', False) + self.immutable = deref(PTRTYPE)._hints.get('immutable', False) def _freeze_(self): return True @@ -616,9 +656,9 @@ class NamedFieldDesc(FieldDesc): def __init__(self, RGenOp, PTRTYPE, name): - FIELDTYPE = getattr(PTRTYPE.TO, name) + FIELDTYPE = fieldType(deref(PTRTYPE), name) FieldDesc.__init__(self, RGenOp, PTRTYPE, FIELDTYPE) - T = self.PTRTYPE.TO + T = deref(self.PTRTYPE) self.fieldname = name self.fieldtoken = RGenOp.fieldToken(T, name) def perform_getfield(rgenop, genvar): @@ -663,6 +703,22 @@ NamedFieldDesc.__init__(self, RGenOp, PTRTYPE, name) self.fieldindex = index +class InstanceFieldDesc(NamedFieldDesc): + + def __init__(self, RGenOp, PTRTYPE, name, index): + NamedFieldDesc.__init__(self, RGenOp, PTRTYPE, name) + self.fieldindex = index + + def generate_get(self, jitstate, genvar): + builder = jitstate.curbuilder + gv_item = builder.genop_oogetfield(self.fieldtoken, genvar) + return self.makebox(jitstate, gv_item) + + def generate_set(self, jitstate, genvar, gv_value): + builder = jitstate.curbuilder + builder.genop_oosetfield(self.fieldtoken, genvar, gv_value) + + class ArrayFieldDesc(FieldDesc): allow_void = True @@ -1341,3 +1397,8 @@ return None del data[j:] return self + + + +StructTypeDesc.StructFieldDesc = StructFieldDesc +InstanceTypeDesc.StructFieldDesc = InstanceFieldDesc Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Tue Mar 25 20:58:44 2008 @@ -158,7 +158,7 @@ return rvalue.PtrRedBox(contdesc.ptrkind, genvar, known_nonzero=True) def gengetfield(jitstate, deepfrozen, fielddesc, argbox): - assert isinstance(argbox, rvalue.PtrRedBox) + assert isinstance(argbox, (rvalue.PtrRedBox, rvalue.InstanceRedBox)) if (fielddesc.immutable or deepfrozen) and argbox.is_constant(): try: resgv = fielddesc.perform_getfield( Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Tue Mar 25 20:58:44 2008 @@ -110,7 +110,7 @@ return redboxbuilder_ptr elif TYPE is lltype.Float: return redboxbuilder_dbl - elif isinstance(TYPE, ootype.Instance): + elif isinstance(TYPE, (ootype.Instance, ootype.Record)): return redboxbuilder_inst else: assert isinstance(TYPE, lltype.Primitive) @@ -335,9 +335,6 @@ if self.content: self.content.enter_block(incoming, memo) - -class PtrRedBox(AbstractPtrRedBox, LLTypeMixin): - def op_getfield(self, jitstate, fielddesc): self.learn_nonzeroness(jitstate, True) if self.content is not None: @@ -350,6 +347,17 @@ self.remember_field(fielddesc, box) return box + def remember_field(self, fielddesc, box): + if self.genvar.is_const: + return # no point in remembering field then + if self.content is None: + from pypy.jit.timeshifter import rcontainer + self.content = rcontainer.PartialDataStruct() + self.content.remember_field(fielddesc, box) + + +class PtrRedBox(AbstractPtrRedBox, LLTypeMixin): + def op_setfield(self, jitstate, fielddesc, valuebox): self.learn_nonzeroness(jitstate, True) gv_ptr = self.genvar @@ -369,14 +377,6 @@ assert self.content is not None return self.content.op_getsubstruct(jitstate, fielddesc) - def remember_field(self, fielddesc, box): - if self.genvar.is_const: - return # no point in remembering field then - if self.content is None: - from pypy.jit.timeshifter import rcontainer - self.content = rcontainer.PartialDataStruct() - self.content.remember_field(fielddesc, box) - class InstanceRedBox(AbstractPtrRedBox, OOTypeMixin): From antocuni at codespeak.net Tue Mar 25 21:03:46 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Tue, 25 Mar 2008 21:03:46 +0100 (CET) Subject: [pypy-svn] r52941 - in pypy/branch/jit-hotpath/pypy/jit: rainbow rainbow/test timeshifter Message-ID: <20080325200346.62F36168461@codespeak.net> Author: antocuni Date: Tue Mar 25 21:03:44 2008 New Revision: 52941 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Log: test_green_with_side_effects passes for ootype Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Tue Mar 25 21:03:44 2008 @@ -1033,6 +1033,11 @@ return rtimeshift.gengetfield(self.jitstate, deepfrozen, fielddesc, structbox) + @arguments("red", "fielddesc", "red") + def opimpl_red_oosetfield(self, destbox, fielddesc, valuebox): + rtimeshift.gensetfield(self.jitstate, fielddesc, destbox, + valuebox) + class DebugTrace(object): def __init__(self, *args): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Tue Mar 25 21:03:44 2008 @@ -2015,8 +2015,6 @@ def _skip(self): py.test.skip('in progress') - #test_green_with_side_effects = _skip - test_degenerated_before_return = _skip test_degenerated_before_return_2 = _skip test_degenerated_at_return = _skip Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Tue Mar 25 21:03:44 2008 @@ -170,7 +170,7 @@ return argbox.op_getfield(jitstate, fielddesc) def gensetfield(jitstate, fielddesc, destbox, valuebox): - assert isinstance(destbox, rvalue.PtrRedBox) + assert isinstance(destbox, (rvalue.PtrRedBox, rvalue.InstanceRedBox)) destbox.op_setfield(jitstate, fielddesc, valuebox) def ll_gengetsubstruct(jitstate, fielddesc, argbox): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Tue Mar 25 21:03:44 2008 @@ -347,6 +347,16 @@ self.remember_field(fielddesc, box) return box + def op_setfield(self, jitstate, fielddesc, valuebox): + self.learn_nonzeroness(jitstate, True) + gv_ptr = self.genvar + if gv_ptr: + fielddesc.generate_set(jitstate, gv_ptr, + valuebox.getgenvar(jitstate)) + else: + assert self.content is not None + self.content.op_setfield(jitstate, fielddesc, valuebox) + def remember_field(self, fielddesc, box): if self.genvar.is_const: return # no point in remembering field then @@ -358,16 +368,6 @@ class PtrRedBox(AbstractPtrRedBox, LLTypeMixin): - def op_setfield(self, jitstate, fielddesc, valuebox): - self.learn_nonzeroness(jitstate, True) - gv_ptr = self.genvar - if gv_ptr: - fielddesc.generate_set(jitstate, gv_ptr, - valuebox.getgenvar(jitstate)) - else: - assert self.content is not None - self.content.op_setfield(jitstate, fielddesc, valuebox) - def op_getsubstruct(self, jitstate, fielddesc): self.learn_nonzeroness(jitstate, True) gv_ptr = self.genvar From antocuni at codespeak.net Tue Mar 25 22:19:17 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Tue, 25 Mar 2008 22:19:17 +0100 (CET) Subject: [pypy-svn] r52944 - in pypy/branch/jit-hotpath/pypy/jit: codegen/llgraph rainbow rainbow/test timeshifter Message-ID: <20080325211917.D0932168535@codespeak.net> Author: antocuni Date: Tue Mar 25 22:19:16 2008 New Revision: 52944 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: port VirtualStructure to ootype. test_degenerate_with_voids passes Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py Tue Mar 25 22:19:16 2008 @@ -246,6 +246,13 @@ return LLVar(llimpl.genop(self.b, 'malloc_varsize', vars_gv, gv_PTRTYPE.v)) + def genop_new(self, (gv_TYPE, gv_OBJTYPE)): + ll_assert(self.rgenop.currently_writing is self, + "genop_new: bad currently_writing") + vars_gv = [gv_TYPE.v] + return LLVar(llimpl.genop(self.b, 'new', vars_gv, + gv_OBJTYPE.v)) + def genop_same_as(self, gv_TYPE, gv_value): ll_assert(self.rgenop.currently_writing is self, "genop_same_as: bad currently_writing") Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Tue Mar 25 22:19:16 2008 @@ -187,7 +187,6 @@ def make_bytecode(self, graph, is_portal=True): self.transformer.transform_graph(graph) - #graph.show() if is_portal: bytecode = JitCode.__new__(JitCode) bytecode.name = graph.name # for dump() @@ -1207,25 +1206,6 @@ newop = flowmodel.SpaceOperation(opname, args, op.result) self.serialize_op(newop) - def serialize_op_malloc(self, op): - index = self.structtypedesc_position(op.args[0].value) - self.emit("red_malloc", index) - self.register_redvar(op.result) - - def serialize_op_malloc_varsize(self, op): - PTRTYPE = op.result.concretetype - TYPE = PTRTYPE.TO - v_size = op.args[2] - sizeindex = self.serialize_oparg("red", v_size) - if isinstance(TYPE, lltype.Struct): - index = self.structtypedesc_position(op.args[0].value) - self.emit("red_malloc_varsize_struct") - else: - index = self.arrayfielddesc_position(TYPE) - self.emit("red_malloc_varsize_array") - self.emit(index, sizeindex) - self.register_redvar(op.result) - def serialize_op_zero_gc_pointers_inside(self, op): pass # XXX is that right? @@ -1603,6 +1583,25 @@ def serialize_op_setfield(self, op): return self.serialize_op_setfield_impl(op) + + def serialize_op_malloc(self, op): + index = self.structtypedesc_position(op.args[0].value) + self.emit("red_malloc", index) + self.register_redvar(op.result) + + def serialize_op_malloc_varsize(self, op): + PTRTYPE = op.result.concretetype + TYPE = PTRTYPE.TO + v_size = op.args[2] + sizeindex = self.serialize_oparg("red", v_size) + if isinstance(TYPE, lltype.Struct): + index = self.structtypedesc_position(op.args[0].value) + self.emit("red_malloc_varsize_struct") + else: + index = self.arrayfielddesc_position(TYPE) + self.emit("red_malloc_varsize_array") + self.emit(index, sizeindex) + self.register_redvar(op.result) class OOTypeBytecodeWriter(BytecodeWriter): @@ -1619,6 +1618,11 @@ def serialize_op_oosetfield(self, op): return self.serialize_op_setfield_impl(op) + def serialize_op_new(self, op): + index = self.structtypedesc_position(op.args[0].value) + self.emit("red_new", index) + self.register_redvar(op.result) + class GraphTransformer(object): def __init__(self, hannotator): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Tue Mar 25 22:19:16 2008 @@ -1038,6 +1038,10 @@ rtimeshift.gensetfield(self.jitstate, fielddesc, destbox, valuebox) + @arguments("structtypedesc", returns="red") + def opimpl_red_new(self, structtypedesc): + return structtypedesc.factory() + class DebugTrace(object): def __init__(self, *args): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Tue Mar 25 22:19:16 2008 @@ -100,7 +100,7 @@ return lltype.Ptr(T) @staticmethod - def Struct(name, *fields, **kwds): + def GcStruct(name, *fields, **kwds): S = lltype.GcStruct(name, *fields, **kwds) return S @@ -684,10 +684,10 @@ def test_simple_struct(self): - S = self.Struct('helloworld', - ('hello', lltype.Signed), - ('world', lltype.Signed), - hints={'immutable': True}) + S = self.GcStruct('helloworld', + ('hello', lltype.Signed), + ('world', lltype.Signed), + hints={'immutable': True}) malloc = self.malloc def ll_function(s): @@ -790,6 +790,7 @@ def test_degenerated_before_return(self): S = lltype.GcStruct('S', ('n', lltype.Signed)) T = lltype.GcStruct('T', ('s', S), ('n', lltype.Float)) + malloc = self.malloc def ll_function(flag): t = lltype.malloc(T) @@ -865,10 +866,11 @@ assert res == 4 * 4 def test_degenerate_with_voids(self): - S = lltype.GcStruct('S', ('y', lltype.Void), - ('x', lltype.Signed)) + S = self.GcStruct('S', ('y', lltype.Void), + ('x', lltype.Signed)) + malloc = self.malloc def ll_function(): - s = lltype.malloc(S) + s = malloc(S) s.x = 123 return s res = self.interpret(ll_function, [], []) @@ -1066,7 +1068,7 @@ def test_green_with_side_effects(self): - S = self.Struct('S', ('flag', lltype.Bool)) + S = self.GcStruct('S', ('flag', lltype.Bool)) s = self.malloc(S) s.flag = False def ll_set_flag(s): @@ -1987,7 +1989,7 @@ return T @staticmethod - def Struct(name, *fields, **kwds): + def GcStruct(name, *fields, **kwds): if 'hints' in kwds: kwds['_hints'] = kwds['hints'] del kwds['hints'] @@ -2019,7 +2021,6 @@ test_degenerated_before_return_2 = _skip test_degenerated_at_return = _skip test_degenerated_via_substructure = _skip - test_degenerate_with_voids = _skip test_plus_minus = _skip test_red_virtual_container = _skip test_red_array = _skip Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py Tue Mar 25 22:19:16 2008 @@ -21,7 +21,6 @@ def _freeze_(self): return True - class LLTypeHelper(TypeSystemHelper): name = 'lltype' @@ -30,6 +29,8 @@ def get_typeptr(self, obj): return obj.typeptr + def genop_malloc_fixedsize(self, builder, alloctoken): + return builder.genop_malloc_fixedsize(alloctoken) class OOTypeHelper(TypeSystemHelper): @@ -39,6 +40,9 @@ def get_typeptr(self, obj): return obj.meta + def genop_malloc_fixedsize(self, builder, alloctoken): + return builder.genop_new(alloctoken) + llhelper = LLTypeHelper() oohelper = OOTypeHelper() Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Tue Mar 25 22:19:16 2008 @@ -857,7 +857,7 @@ return debug_print(lltype.Void, "FORCE CONTAINER: "+ typedesc.TYPE._name) #debug_pdb(lltype.Void) - genvar = builder.genop_malloc_fixedsize(typedesc.alloctoken) + genvar = jitstate.ts.genop_malloc_fixedsize(builder, typedesc.alloctoken) # force the box pointing to this VirtualStruct self.setforced(genvar) fielddescs = typedesc.fielddescs @@ -1284,6 +1284,7 @@ # patching VirtualStructCls StructTypeDesc.VirtualStructCls = VirtualStruct +InstanceTypeDesc.VirtualStructCls = VirtualStruct VirtualizableStructTypeDesc.VirtualStructCls = VirtualizableStruct From antocuni at codespeak.net Tue Mar 25 23:11:16 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Tue, 25 Mar 2008 23:11:16 +0100 (CET) Subject: [pypy-svn] r52948 - in pypy/branch/jit-hotpath/pypy/jit: rainbow/test timeshifter Message-ID: <20080325221116.978ED16853E@codespeak.net> Author: antocuni Date: Tue Mar 25 23:11:15 2008 New Revision: 52948 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: test_merge_structures passes on ootype. I'm not sure about the changes to rcontainer.py, reviews are welcome :-) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Tue Mar 25 23:11:15 2008 @@ -104,9 +104,7 @@ S = lltype.GcStruct(name, *fields, **kwds) return S - @staticmethod - def malloc(S): - return lltype.malloc(S) + malloc = staticmethod(lltype.malloc) def setup_class(cls): cls.on_llgraph = cls.RGenOp is LLRGenOp @@ -899,9 +897,10 @@ # this checks that red boxes are able to be virtualized dynamically by # the compiler (the P_NOVIRTUAL policy prevents the hint-annotator from # marking variables in blue) - S = lltype.GcStruct('S', ('n', lltype.Signed)) + S = self.GcStruct('S', ('n', lltype.Signed)) + malloc = self.malloc def ll_function(n): - s = lltype.malloc(S) + s = malloc(S) s.n = n return s.n res = self.interpret(ll_function, [42], []) @@ -996,9 +995,10 @@ assert len(res.item0) == 3 def test_red_propagate(self): - S = lltype.GcStruct('S', ('n', lltype.Signed)) + S = self.GcStruct('S', ('n', lltype.Signed)) + malloc = self.malloc def ll_function(n, k): - s = lltype.malloc(S) + s = malloc(S) s.n = n if k < 0: return -123 @@ -1042,20 +1042,21 @@ def test_merge_structures(self): - S = lltype.GcStruct('S', ('n', lltype.Signed)) - T = lltype.GcStruct('T', ('s', lltype.Ptr(S)), ('n', lltype.Signed)) + S = self.GcStruct('S', ('n', lltype.Signed)) + T = self.GcStruct('T', ('s', self.Ptr(S)), ('n', lltype.Signed)) + malloc = self.malloc def ll_function(flag): if flag: - s = lltype.malloc(S) + s = malloc(S) s.n = 1 - t = lltype.malloc(T) + t = malloc(T) t.s = s t.n = 2 else: - s = lltype.malloc(S) + s = malloc(S) s.n = 5 - t = lltype.malloc(T) + t = malloc(T) t.s = s t.n = 6 return t.n + t.s.n @@ -1996,9 +1997,7 @@ I = ootype.Instance(name, ootype.ROOT, dict(fields), **kwds) return I - @staticmethod - def malloc(I): - return ootype.new(I) + malloc = staticmethod(ootype.new) def translate_insns(self, insns): replace = { @@ -2022,15 +2021,12 @@ test_degenerated_at_return = _skip test_degenerated_via_substructure = _skip test_plus_minus = _skip - test_red_virtual_container = _skip test_red_array = _skip test_red_struct_array = _skip test_red_varsized_struct = _skip test_array_of_voids = _skip - test_red_propagate = _skip test_red_subcontainer = _skip test_red_subcontainer_cast = _skip - test_merge_structures = _skip test_deepfrozen_interior = _skip test_compile_time_const_tuple = _skip test_residual_red_call = _skip Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Tue Mar 25 23:11:15 2008 @@ -605,18 +605,18 @@ RESTYPE = lltype.Ptr(RESTYPE) self.fieldnonnull = True elif isinstance(RESTYPE, lltype.Ptr): + self._set_hints(PTRTYPE, RESTYPE) T = RESTYPE.TO - if hasattr(T, '_hints'): - # xxx hack for simple recursive cases - if not PTRTYPE.TO._hints.get('virtualizable', False): - self.virtualizable = T._hints.get('virtualizable', False) self.gcref = T._gckind == 'gc' if isinstance(T, lltype.ContainerType): if not T._is_varsize() or hasattr(T, 'll_newlist'): self.canbevirtual = True else: T = None - self.fieldnonnull = PTRTYPE.TO._hints.get('shouldntbenull', False) + elif isinstance(RESTYPE, ootype.Instance): + self._set_hints(PTRTYPE, RESTYPE) + self.gcref = True # XXX: is it right? + self.canbevirtual = True # XXX: is it right? elif isinstance(RESTYPE, ootype.OOType): assert False, 'XXX: TODO' self.RESTYPE = RESTYPE @@ -633,6 +633,14 @@ self.immutable = deref(PTRTYPE)._hints.get('immutable', False) + def _set_hints(self, PTRTYPE, RESTYPE): + T = deref(RESTYPE) + if hasattr(T, '_hints'): + # xxx hack for simple recursive cases + if not deref(PTRTYPE)._hints.get('virtualizable', False): + self.virtualizable = T._hints.get('virtualizable', False) + self.fieldnonnull = deref(PTRTYPE)._hints.get('shouldntbenull', False) + def _freeze_(self): return True From antocuni at codespeak.net Tue Mar 25 23:17:04 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Tue, 25 Mar 2008 23:17:04 +0100 (CET) Subject: [pypy-svn] r52949 - in pypy/branch/jit-hotpath/pypy/jit: rainbow timeshifter Message-ID: <20080325221704.3BC671684FE@codespeak.net> Author: antocuni Date: Tue Mar 25 23:17:03 2008 New Revision: 52949 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: some changes to make rcontainer more ootype.Record friendly Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py Tue Mar 25 23:17:03 2008 @@ -10,7 +10,7 @@ def fieldType(T, name): if isinstance(T, lltype.Struct): return getattr(T, name) - elif isinstance(T, ootype.Instance): + elif isinstance(T, (ootype.Instance, ootype.Record)): _, FIELD = T._lookup_field(name) return FIELD else: Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Tue Mar 25 23:17:03 2008 @@ -83,7 +83,7 @@ def __init__(self, RGenOp, TYPE): self.TYPE = TYPE self.PTRTYPE = self.Ptr(TYPE) - self.name = TYPE._name + self.name = self._get_type_name(TYPE) self.ptrkind = RGenOp.kindToken(self.PTRTYPE) self.immutable = TYPE._hints.get('immutable', False) @@ -111,7 +111,10 @@ for name in TYPE._names: FIELDTYPE = getattr(TYPE, name) yield name, FIELDTYPE - + + def _get_type_name(self, TYPE): + return TYPE._name + def _compute_fielddescs(self, RGenOp): TYPE = self.TYPE innermostdesc = self @@ -258,6 +261,11 @@ for name, (FIELDTYPE, defl) in TYPE._fields.iteritems(): yield name, FIELDTYPE + def _get_type_name(self, TYPE): + if isinstance(TYPE, ootype.Record): + return TYPE._short_name() + else: + return TYPE._name def create_varsize(jitstate, contdesc, sizebox): gv_size = sizebox.getgenvar(jitstate) From antocuni at codespeak.net Wed Mar 26 11:28:19 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Wed, 26 Mar 2008 11:28:19 +0100 (CET) Subject: [pypy-svn] r52955 - in pypy/branch/jit-hotpath/pypy: rpython/lltypesystem rpython/ootypesystem translator translator/backendopt translator/cli translator/js translator/jvm Message-ID: <20080326102819.09E0A169E8E@codespeak.net> Author: antocuni Date: Wed Mar 26 11:28:16 2008 New Revision: 52955 Modified: pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ooopimpl.py pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rpbc.py pypy/branch/jit-hotpath/pypy/translator/backendopt/malloc.py pypy/branch/jit-hotpath/pypy/translator/cli/opcodes.py pypy/branch/jit-hotpath/pypy/translator/exceptiontransform.py pypy/branch/jit-hotpath/pypy/translator/js/opcodes.py pypy/branch/jit-hotpath/pypy/translator/jvm/opcodes.py Log: introduce a new opcode ooisnull, in addition to oononnull. This is needed by the rainbow interpreter to correctly emit learn_nonzeroness; moreover, the CLI backend can translate it a bit faster than oononnull+negation Modified: pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py Wed Mar 26 11:28:16 2008 @@ -462,6 +462,7 @@ 'ooupcast': LLOp(oo=True, canfold=True), 'oodowncast': LLOp(oo=True, canfold=True), 'oononnull': LLOp(oo=True, canfold=True), + 'ooisnull': LLOp(oo=True, canfold=True), 'oois': LLOp(oo=True, canfold=True), 'instanceof': LLOp(oo=True, canfold=True), 'classof': LLOp(oo=True, canfold=True), Modified: pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ooopimpl.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ooopimpl.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ooopimpl.py Wed Mar 26 11:28:16 2008 @@ -16,6 +16,10 @@ checkinst(inst) return bool(inst) +def op_ooisnull(inst): + checkinst(inst) + return not bool(inst) + def op_oois(obj1, obj2): if is_inst(obj1): checkinst(obj2) Modified: pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rpbc.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rpbc.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rpbc.py Wed Mar 26 11:28:16 2008 @@ -20,9 +20,8 @@ if robj1 == none_frozen_pbc_repr: return hop.inputconst(ootype.Bool, True) v1 = hop.inputarg(robj1, pos) - v2 = hop.genop('oononnull', [v1], resulttype=ootype.Bool) - v3 = hop.genop('bool_not', [v2], resulttype=ootype.Bool) - return v3 + v2 = hop.genop('ooisnull', [v1], resulttype=ootype.Bool) + return v2 class FunctionsPBCRepr(AbstractFunctionsPBCRepr): Modified: pypy/branch/jit-hotpath/pypy/translator/backendopt/malloc.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/backendopt/malloc.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/backendopt/malloc.py Wed Mar 26 11:28:16 2008 @@ -547,6 +547,7 @@ FIELD_ACCESS = dict.fromkeys(["oogetfield", "oosetfield", "oononnull", + "ooisnull", #"oois", # ??? #"instanceof", # ??? ]) @@ -610,10 +611,10 @@ # equivalent. We can, and indeed must, use the same # flattened list of variables for both, as a "setfield" # via one pointer must be reflected in the other. - elif op.opname == "oononnull": + elif op.opname in ("ooisnull", "oononnull"): # we know the pointer is not NULL if it comes from # a successful malloc - c = Constant(True, lltype.Bool) + c = Constant(op.opname == "oononnull", lltype.Bool) newop = SpaceOperation('same_as', [c], op.result) self.newops.append(newop) else: Modified: pypy/branch/jit-hotpath/pypy/translator/cli/opcodes.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/cli/opcodes.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/cli/opcodes.py Wed Mar 26 11:28:16 2008 @@ -46,6 +46,7 @@ 'cli_eventhandler': [EventHandler], 'cli_getstaticfield': [GetStaticField], 'oois': 'ceq', + 'ooisnull': [PushAllArgs, 'ldnull', 'ceq'], 'oononnull': [PushAllArgs, 'ldnull', 'ceq']+Not, 'instanceof': [CastTo, 'ldnull', 'cgt.un'], 'subclassof': [PushAllArgs, 'call bool [pypylib]pypy.runtime.Utils::SubclassOf(class [mscorlib]System.Type, class[mscorlib]System.Type)'], Modified: pypy/branch/jit-hotpath/pypy/translator/exceptiontransform.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/exceptiontransform.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/exceptiontransform.py Wed Mar 26 11:28:16 2008 @@ -464,9 +464,8 @@ llops.genop('oosetfield', [self.cexcdata, c_name, v_value]) def gen_isnull(self, v, llops): - nonnull = self.gen_nonnull(v, llops) - return llops.genop('bool_not', [nonnull], lltype.Bool) - + return llops.genop('ooisnull', [v], lltype.Bool) + def gen_nonnull(self, v, llops): return llops.genop('oononnull', [v], lltype.Bool) Modified: pypy/branch/jit-hotpath/pypy/translator/js/opcodes.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/js/opcodes.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/js/opcodes.py Wed Mar 26 11:28:16 2008 @@ -131,6 +131,7 @@ 'ooupcast' : CopyName, 'oodowncast' : CopyName, 'oononnull' : [PushAllArgs,_Prefix('!!')], + 'ooisnull' : [PushAllArgs,_Prefix('!')], 'oostring' : [PushArg(0),CastString], 'ooparse_int' : [PushAllArgs,_CastFun("parseInt",2)], 'ooparse_float' : [PushAllArgs,_CastFun("parseFloat",1)], Modified: pypy/branch/jit-hotpath/pypy/translator/jvm/opcodes.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/jvm/opcodes.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/jvm/opcodes.py Wed Mar 26 11:28:16 2008 @@ -70,6 +70,7 @@ 'ooupcast': DoNothing, 'oodowncast': [DownCast, StoreResult], 'oois': 'ref_is_eq', + 'ooisnull': 'is_null', 'oononnull': 'is_not_null', 'instanceof': [CastTo, StoreResult], 'subclassof': [PushAllArgs, jvmgen.SWAP, jvmgen.CLASSISASSIGNABLEFROM, StoreResult], From arigo at codespeak.net Wed Mar 26 12:14:11 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 26 Mar 2008 12:14:11 +0100 (CET) Subject: [pypy-svn] r52956 - in pypy/branch/jit-hotpath/pypy: jit/rainbow jit/rainbow/test module/pypyjit Message-ID: <20080326111411.D1A10169E79@codespeak.net> Author: arigo Date: Wed Mar 26 12:14:09 2008 New Revision: 52956 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Log: Experimental: remove the allocation of the greenkey needed to enter machine code. This uses a fixed-size hash table and it can do something reasonable with collisions, but it's probably slightly too clever for its benefits (and not well tested). Checking in anyway, maybe as an intermediate step to some clever but really good approach (cuckoo hashing?). Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Wed Mar 26 12:14:09 2008 @@ -5,14 +5,12 @@ from pypy.rpython.annlowlevel import llhelper from pypy.rpython.lltypesystem import lltype, lloperation from pypy.rpython.llinterp import LLInterpreter -from pypy.rlib.objectmodel import we_are_translated -from pypy.rlib.rarithmetic import intmask +from pypy.rlib.objectmodel import we_are_translated, UnboxedValue +from pypy.rlib.rarithmetic import r_uint from pypy.rlib.unroll import unrolling_iterable from pypy.jit.codegen.i386.rgenop import cast_whatever_to_int from pypy.jit.hintannotator.model import originalconcretetype from pypy.jit.timeshifter import rvalue -from pypy.jit.timeshifter.greenkey import KeyDesc, empty_key -from pypy.jit.timeshifter.greenkey import GreenKey, newgreendict from pypy.jit.timeshifter.oop import maybe_on_top_of_llinterp from pypy.jit.rainbow import rhotpath, fallback from pypy.jit.rainbow.portal import getjitenterargdesc @@ -83,20 +81,7 @@ def maybe_enter_jit(*args): greenargs = args[:num_green_args] - argshash = state.getkey(*greenargs) - counter = state.counters.get(argshash, 0) - if counter >= 0: - counter += 1 - if counter < self.jitdrivercls.getcurrentthreshold(): - if self.verbose_level >= 3: - interpreter.debug_trace("jit_not_entered", *args) - state.counters[argshash] = counter - return - interpreter.debug_trace("jit_compile", *args[:num_green_args]) - mc = state.compile(argshash, *greenargs) - else: - greenkey = state.getgreenkey(*greenargs) - mc = state.machine_codes.get(greenkey, state.NULL_MC) + mc = state.maybe_compile(*greenargs) if not mc: return if self.verbose_level >= 2: @@ -104,9 +89,8 @@ run = maybe_on_top_of_llinterp(exceptiondesc, mc) residualargs = state.make_residualargs(*args[num_green_args:]) run(*residualargs) - - HotEnterState.compile.im_func._dont_inline_ = True maybe_enter_jit._always_inline_ = True + self.maybe_enter_jit_fn = maybe_enter_jit def make_descs(self): @@ -301,50 +285,111 @@ # very minimal, just to make the first test pass green_args_spec = unrolling_iterable(hotrunnerdesc.green_args_spec) red_args_spec = unrolling_iterable(hotrunnerdesc.red_args_spec) + green_args_names = unrolling_iterable( + ['g%d' % i for i in range(len(hotrunnerdesc.green_args_spec))]) + green_args_range = unrolling_iterable( + range(len(hotrunnerdesc.green_args_spec))) if hotrunnerdesc.green_args_spec: - keydesc = KeyDesc(hotrunnerdesc.RGenOp, *hotrunnerdesc.green_args_spec) + HASH_TABLE_SIZE = 2 ** 14 else: - keydesc = None + HASH_TABLE_SIZE = 1 + + class StateCell(object): + __slots__ = [] + + class Counter(StateCell, UnboxedValue): + __slots__ = 'counter' + + class MachineCodeEntryPoint(StateCell): + def __init__(self, mc, *greenargs): + self.mc = mc + self.next = Counter(0) + i = 0 + for name in green_args_names: + setattr(self, name, greenargs[i]) + i += 1 + def equalkey(self, *greenargs): + i = 0 + for name in green_args_names: + if getattr(self, name) != greenargs[i]: + return False + i += 1 + return True class HotEnterState: NULL_MC = lltype.nullptr(hotrunnerdesc.RESIDUAL_FUNCTYPE) def __init__(self): - self.machine_codes = newgreendict() - self.counters = {} # value of -1 means "compiled" + self.cells = [Counter(0)] * HASH_TABLE_SIZE - # Only use the hash of the arguments as the key. + # Only use the hash of the arguments as the profiling key. # Indeed, this is all a heuristic, so if things are designed # correctly, the occasional mistake due to hash collision is # not too bad. - - # Another idea would be to replace the 'counters' with some - # hand-written fixed-sized hash table. The fixed-size-ness would - # also let old recorded counters gradually disappear as they get - # replaced by more recent ones. - def getkey(self, *greenargs): - result = 0x345678 + def maybe_compile(self, *greenargs): + argshash = self.getkeyhash(*greenargs) + argshash &= (HASH_TABLE_SIZE - 1) + cell = self.cells[argshash] + if isinstance(cell, Counter): + # update the profiling counter + interp = hotrunnerdesc.interpreter + n = cell.counter + 1 + if n < hotrunnerdesc.jitdrivercls.getcurrentthreshold(): + if hotrunnerdesc.verbose_level >= 3: + interp.debug_trace("jit_not_entered", *greenargs) + self.cells[argshash] = Counter(n) + return self.NULL_MC + interp.debug_trace("jit_compile", *greenargs) + return self.compile(argshash, *greenargs) + else: + # machine code was already compiled for these greenargs + # (or we have a hash collision) + assert isinstance(cell, MachineCodeEntryPoint) + if cell.equalkey(*greenargs): + return cell.mc + else: + return self.handle_hash_collision(cell, argshash, + *greenargs) + maybe_compile._dont_inline_ = True + + def handle_hash_collision(self, cell, argshash, *greenargs): + next = cell.next + while not isinstance(next, Counter): + assert isinstance(next, MachineCodeEntryPoint) + if next.equalkey(*greenargs): + # found, move to the front of the linked list + cell.next = next.next + next.next = self.cells[argshash] + self.cells[argshash] = next + return next.mc + cell = next + next = cell.next + # not found at all, do profiling + interp = hotrunnerdesc.interpreter + n = next.counter + 1 + if n < hotrunnerdesc.jitdrivercls.getcurrentthreshold(): + if hotrunnerdesc.verbose_level >= 3: + interp.debug_trace("jit_not_entered", *greenargs) + cell.next = Counter(n) + return self.NULL_MC + interp.debug_trace("jit_compile", *greenargs) + return self.compile(argshash, *greenargs) + handle_hash_collision._dont_inline_ = True + + def getkeyhash(self, *greenargs): + result = r_uint(0x345678) i = 0 - mult = 1000003 + mult = r_uint(1000003) for TYPE in green_args_spec: + if i > 0: + result = result * mult + mult = mult + 82520 + 2*len(greenargs) item = greenargs[i] - result = intmask((result ^ cast_whatever_to_int(TYPE, item)) * - intmask(mult)) - mult = mult + 82520 + 2*len(greenargs) + result = result ^ cast_whatever_to_int(TYPE, item) i += 1 return result - - def getgreenkey(self, *greenvalues): - if keydesc is None: - return empty_key - rgenop = hotrunnerdesc.interpreter.rgenop - lst_gv = [None] * len(greenvalues) - i = 0 - for _ in green_args_spec: - lst_gv[i] = rgenop.genconst(greenvalues[i]) - i += 1 - return GreenKey(lst_gv, keydesc) + getkeyhash._always_inline_ = True def compile(self, argshash, *greenargs): try: @@ -370,9 +415,9 @@ red_i += make_arg_redbox.consumes redargs = list(redargs) - greenkey = self.getgreenkey(*greenargs) - greenargs = list(greenkey.values) - rhotpath.setup_jitstate(interp, jitstate, greenargs, redargs, + greenargs_gv = [rgenop.genconst(greenargs[i]) + for i in green_args_range] + rhotpath.setup_jitstate(interp, jitstate, greenargs_gv, redargs, hotrunnerdesc.entryjitcode, hotrunnerdesc.sigtoken) builder.start_writing() @@ -381,8 +426,19 @@ FUNCPTR = lltype.Ptr(hotrunnerdesc.RESIDUAL_FUNCTYPE) generated = gv_generated.revealconst(FUNCPTR) - self.machine_codes[greenkey] = generated - self.counters[argshash] = -1 # compiled + + newcell = MachineCodeEntryPoint(generated, *greenargs) + cell = self.cells[argshash] + if not isinstance(cell, Counter): + while True: + assert isinstance(cell, MachineCodeEntryPoint) + next = cell.next + if isinstance(next, Counter): + cell.next = Counter(0) + break + cell = next + newcell.next = self.cells[argshash] + self.cells[argshash] = newcell if not we_are_translated(): hotrunnerdesc.residual_graph = generated._obj.graph #for tests @@ -395,5 +451,6 @@ residualargs = residualargs + collect_residual_args(redargs[i]) i += 1 return residualargs + make_residualargs._always_inline_ = True return HotEnterState Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Wed Mar 26 12:14:09 2008 @@ -177,13 +177,13 @@ self.check_traces([ # running non-JITted leaves the initial profiling traces # recorded by jit_may_enter(). We see the values of n1 and total. - "jit_not_entered 19 20", - "jit_not_entered 18 39", - "jit_not_entered 17 57", - "jit_not_entered 16 74", - "jit_not_entered 15 90", - "jit_not_entered 14 105", - "jit_not_entered 13 119", + "jit_not_entered", # 19 20 + "jit_not_entered", # 18 39 + "jit_not_entered", # 17 57 + "jit_not_entered", # 16 74 + "jit_not_entered", # 15 90 + "jit_not_entered", # 14 105 + "jit_not_entered", # 13 119 # on the start of the next iteration, compile the 'total += n1' "jit_compile", "pause at hotsplit in ll_function", @@ -278,8 +278,8 @@ assert res == main(1, 10) self.check_traces([ # start compiling the 3rd time we loop back - "jit_not_entered * struct rpy_string {...} 5 9 10 10", - "jit_not_entered * struct rpy_string {...} 5 8 90 10", + "jit_not_entered * struct rpy_string {...} 5", # 9 10 10 + "jit_not_entered * struct rpy_string {...} 5", # 8 90 10 "jit_compile * struct rpy_string {...} 5", # stop compiling at the red split ending an extra iteration "pause at hotsplit in ll_function", @@ -331,8 +331,9 @@ res = self.run(ll_function, [3], threshold=3, small=True) assert res == (3*4)/2 - self.check_traces(['jit_not_entered 2 3', - 'jit_not_entered 1 5']) + self.check_traces(['jit_not_entered', # 2 3 + 'jit_not_entered', # 1 5 + ]) res = self.run(ll_function, [50], threshold=3, small=True) assert res == (50*51)/2 @@ -409,8 +410,8 @@ res = self.run(main, [1, 71], threshold=3) assert res == 5041 self.check_traces([ - "jit_not_entered * stru...} 10 70 * array [ 70, 71, 71 ]", - "jit_not_entered * stru...} 10 69 * array [ 69, 71, 142 ]", + "jit_not_entered * stru...} 10", # 70 * array [ 70, 71, 71 ] + "jit_not_entered * stru...} 10", # 69 * array [ 69, 71, 142 ] "jit_compile * stru...} 10", # we first see the promotion of len(regs) in on_enter_jit() "pause at promote in TLRJitDriver.on_enter_jit_Hv", Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Wed Mar 26 12:14:09 2008 @@ -114,21 +114,25 @@ # # Public interface +MAX_THRESHOLD = sys.maxint // 2 + class PyPyJITConfig: def __init__(self): - self.cur_threshold = sys.maxint # disabled until the space is ready + self.cur_threshold = MAX_THRESHOLD # disabled until the space is ready self.configured_threshold = JitDriver.getcurrentthreshold() def isenabled(self): - return self.cur_threshold < sys.maxint + return self.cur_threshold < MAX_THRESHOLD def enable(self): self.cur_threshold = self.configured_threshold def disable(self): - self.cur_threshold = sys.maxint + self.cur_threshold = MAX_THRESHOLD def setthreshold(self, threshold): + if threshold >= MAX_THRESHOLD: + threshold = MAX_THRESHOLD - 1 self.configured_threshold = threshold if self.isenabled(): self.cur_threshold = threshold From arigo at codespeak.net Wed Mar 26 12:47:26 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 26 Mar 2008 12:47:26 +0100 (CET) Subject: [pypy-svn] r52957 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080326114726.06DAE169E8B@codespeak.net> Author: arigo Date: Wed Mar 26 12:47:25 2008 New Revision: 52957 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Log: Translation fixes. Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Wed Mar 26 12:47:25 2008 @@ -229,6 +229,8 @@ StructFieldDesc = None # patched later with StructFieldDesc + _attrs_ = [] + def __new__(cls, RGenOp, TYPE): if TYPE._hints.get('virtualizable', False): return object.__new__(VirtualizableStructTypeDesc) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Wed Mar 26 12:47:25 2008 @@ -158,7 +158,7 @@ return rvalue.PtrRedBox(contdesc.ptrkind, genvar, known_nonzero=True) def gengetfield(jitstate, deepfrozen, fielddesc, argbox): - assert isinstance(argbox, (rvalue.PtrRedBox, rvalue.InstanceRedBox)) + assert isinstance(argbox, rvalue.AbstractPtrRedBox) if (fielddesc.immutable or deepfrozen) and argbox.is_constant(): try: resgv = fielddesc.perform_getfield( @@ -170,7 +170,7 @@ return argbox.op_getfield(jitstate, fielddesc) def gensetfield(jitstate, fielddesc, destbox, valuebox): - assert isinstance(destbox, (rvalue.PtrRedBox, rvalue.InstanceRedBox)) + assert isinstance(destbox, rvalue.AbstractPtrRedBox) destbox.op_setfield(jitstate, fielddesc, valuebox) def ll_gengetsubstruct(jitstate, fielddesc, argbox): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Wed Mar 26 12:47:25 2008 @@ -110,7 +110,7 @@ return redboxbuilder_ptr elif TYPE is lltype.Float: return redboxbuilder_dbl - elif isinstance(TYPE, (ootype.Instance, ootype.Record)): + elif isinstance(TYPE, ootype.Instance) or isinstance(TYPE, ootype.Record): return redboxbuilder_inst else: assert isinstance(TYPE, lltype.Primitive) From arigo at codespeak.net Wed Mar 26 17:08:58 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Wed, 26 Mar 2008 17:08:58 +0100 (CET) Subject: [pypy-svn] r52959 - pypy/branch/jit-hotpath/pypy/jit/codegen/test Message-ID: <20080326160858.47EF3169EC2@codespeak.net> Author: arigo Date: Wed Mar 26 17:08:56 2008 New Revision: 52959 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Log: Add a test that tries to reproduce the calls issued by pypy-c-jit in a simple example. Look at this before attempting to improve the backends :-) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Wed Mar 26 17:08:56 2008 @@ -2198,3 +2198,106 @@ fnptr = self.cast(gv_fn, 1, RESULT=lltype.Void) fnptr(12) # assert did not crash + + def test_demo_f1_direct(self): + """This is similar to the sequence of calls that pypy-c-jit + does to its backend for the inner loop of the example below, + so generating good code for it would be nice: + + def f1(n): + i = 0 + x = 1 + while i Author: cami Date: Wed Mar 26 21:37:17 2008 New Revision: 52967 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Log: more working tests bug fixes in cpu Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Wed Mar 26 21:37:17 2008 @@ -247,7 +247,7 @@ def read(self, hi, lo=None): address = hi if lo != None: - address(hi << 8) + lo + address = (hi << 8) + lo self.cycles -= 1 return self.memory.read(address) @@ -312,7 +312,7 @@ # LD PC,HL, 1 cycle def ld_pc_hl(self): - self.ld(self.hl, self.pc) + self.ld(self.hl.get, self.pc.set) def fetchLoad(self, getter, setter): self.ld(self.fetch, setter) @@ -549,7 +549,7 @@ def ld_mem_A(self): lo = self.fetch() # 1 cycle hi = self.fetch() # 1 cycle - self.write(hi, lo, self.a.get()) # 2 cycles + self.write((hi << 8) + lo, self.a.get()) # 2 cycles # LDH A,(nn) 3 cycles def ldh_A_mem(self): @@ -735,7 +735,7 @@ # enable interrupts self.ime = True # execute next instruction - self.execute() + self.execute(self.fetch()) # check pending interrupts self.interrupt() @@ -755,7 +755,7 @@ self.ime = True self.cycles -= 1 # execute next instruction - self.execute() + self.execute(self.fetch()) # check pending interrupts self.interrupt() Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Wed Mar 26 21:37:17 2008 @@ -935,36 +935,37 @@ # ld_A_mem def test_0xFA(): - py.test.skip("changements to the cpu class") cpu = get_cpu() value = 0x11 valueA = 0x12 cpu.a.set(valueA) + pc = cpu.pc.get(); prepare_for_fetch(cpu, 0x12, 0x34) cpu.write(0x1234, value) cycle_test(cpu, 0xFA, 4) - assert_default_registers(cpu, a=value) + assert_default_registers(cpu, a=value, pc=pc+2) # ld_mem_A def test_0xEA(): - py.test.skip("changements to the cpu class") cpu = get_cpu() valueA = 0x56 prepare_for_fetch(cpu, 0x12, 0x34) - cpu.c.set(value) + cpu.a.set(valueA) cycle_test(cpu, 0xEA, 4) assert cpu.read(0x1234) == valueA # ld_HL_SP_nn def test_0xF8(): - py.test.skip("changements to the cpu class") cpu = get_cpu() value = 0x12 - prepare_for_fetch(cpu, value, 0x34) - sp = cpu.hl.get() + valueSp = 0x1234 + prepare_for_fetch(cpu, value) + cpu.sp.set(valueSp) + pc = cpu.pc.get() cycle_test(cpu, 0xF8, 3) - assert_default_registers(cpu, hl=sp + value) + f = cpu.f.get(); + assert_default_registers(cpu, hl=valueSp+value, f=f, sp=valueSp, pc=pc+1) # pop_BC to pop_AF def test_0xC1_to_0xF1(): @@ -982,77 +983,86 @@ # ret def test_0xC9(): - py.test.skip("changements to the cpu class") cpu = get_cpu() value = 0x1234 + valueSp = 0x5678 + cpu.sp.set(valueSp) prepare_for_pop(cpu, value >> 8, value & 0xFF) - pc = cpu.pc.get() cycle_test(cpu, 0xC9, 4) - assert_default_registers(cpu, pc=cp+value) + assert_default_registers(cpu, pc=value, sp=valueSp+2) # reti def test_0xD9(): - py.test.skip("changements to the cpu class") + py.test.skip("deeper knowledge necessary") cpu = get_cpu() value = 0x1234 prepare_for_pop(cpu, value >> 8, value & 0xFF) + prepare_for_fetch(cpu, 0x00) pc = cpu.pc.get() - cycle_test(cpu, 0xD9, 4) - assert_default_registers(cpu, pc=cp+value) + cycle_test(cpu, 0xD9, 4+1) + assert_default_registers(cpu, pc=pc+value) # ld_PC_HL def test_0xE9(): - py.test.skip("changements to the cpu class") cpu = get_cpu() value = 0x1234 cpu.hl.set(value) cycle_test(cpu, 0xE9, 1) - assert_default_registers(cpu, pc=value) + assert_default_registers(cpu, pc=value, hl=value) # ld_SP_HL def test_0xF9(): - py.test.skip("changements to the cpu class") cpu = get_cpu() value = 0x1234 cpu.hl.set(value) cycle_test(cpu, 0xF9, 2) - assert_default_registers(cpu, sp=value) + assert_default_registers(cpu, sp=value, hl=value) -# jp_NZ_nnnn -def test_0xC2(): - pass -# jp_Z_nnnn -def test_0xCA(): - pass -# jp_NC_nnnn -def test_0xD2(): - pass -# jp_C_nnnn -def test_0xDA(): - pass +# jp_NZ_nnnn to jp_C_nnnn +def test_0xC2_to_0xDA(): + cpu = get_cpu() + flags = [~constants.Z_FLAG, constants.Z_FLAG, ~constants.C_FLAG, constants.C_FLAG] + opCode = 0xC2 + value = 0x1234 + for i in range(0, 4): + cpu.reset() + prepare_for_fetch(cpu, value >> 8, value & 0xFF) + pc = cpu.pc.get() + cpu.f.set(flags[i]) + cycle_test(cpu, opCode, 4) + assert_default_registers(cpu, f=flags[i] & 0xFF, pc=value) + + cpu.reset() + prepare_for_fetch(cpu, value >> 8, value & 0xFF) + cpu.f.set(~flags[i]) + pc = cpu.pc.get() + cycle_test(cpu, opCode, 3) + assert_default_registers(cpu, f=~flags[i] & 0xFF, pc=pc+2) + value += 3 + opCode += 0x08 + # ldh_Ci_A def test_0xE2(): - py.test.skip("changements to the cpu class") cpu = get_cpu() value = 0x12 valueA = value+1 cpu.c.set(value) cpu.a.set(valueA) cycle_test(cpu, 0xE2, 2) - assert cpu.read.get(0xFF00+value) == valueA + assert cpu.read(0xFF00+value) == valueA # ldh_A_Ci def test_0xF2(): - py.test.skip("changements to the cpu class") cpu = get_cpu() valueC = 0x12 - valeu = 0x11 + valueA = 0x11 cpu.c.set(valueC) - cpu.write.set(0xFF00+valueC, valueA) + cpu.b.set(0); + cpu.write(0xFF00+valueC, valueA) cycle_test(cpu, 0xF2, 2) - assert_default_regsiters(cpu, a=value) + assert_default_registers(cpu, a=valueA, bc=valueC) @@ -1074,10 +1084,11 @@ # ei def test_0xFB(): - py.test.skip("changements to the cpu class") + py.test.skip("interupt error") cpu = get_cpu() - cpu.ime == False - cycle_test(cpu, 0xF3, 1) + cpu.ime = False + prepare_for_fetch(cpu, 0x00) + cycle_test(cpu, 0xFB, 1+1) assert cpu.ime == True # call_NZ_nnnn Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Wed Mar 26 21:37:17 2008 @@ -287,7 +287,6 @@ def setDMA(self, data): self.dma = data for index in range(0, constants.OAM_SIZE): - #TODO convert to byte self.oam[index] = self.memory.read((self.dma << 8) + index) From cami at codespeak.net Thu Mar 27 00:42:06 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Thu, 27 Mar 2008 00:42:06 +0100 (CET) Subject: [pypy-svn] r52972 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080326234206.56275169EF5@codespeak.net> Author: cami Date: Thu Mar 27 00:42:04 2008 New Revision: 52972 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_interrupt.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py Log: changed source formattings changed doc strings added test templates for interrupt Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Thu Mar 27 00:42:04 2008 @@ -164,34 +164,29 @@ def write(self, address, data): pass - - -""" -PyBoy GameBoy (TM) Emulator -Memory Bank Controller 1 (2MB constants.ROM, 32KB constants.RAM) - -0000-3FFF ROM Bank 0 (16KB) -4000-7FFF ROM Bank 1-127 (16KB) -A000-BFFF RAM Bank 0-3 (8KB) - """ class MBC1(MBC): + """ + PyBoy GameBoy (TM) Emulator + Memory Bank Controller 1 (2MB constants.ROM, 32KB constants.RAM) + + 0000-3FFF ROM Bank 0 (16KB) + 4000-7FFF ROM Bank 1-127 (16KB) + A000-BFFF RAM Bank 0-3 (8KB) + """ def __init__(self, rom, ram): self.minRamBankSize = 0 self.maxRamBankSize = 4 self.minRomBankSize = 2 self.maxRomBankSize = 128 - self.setRom(rom) self.serRam(ram) - def reset(self): super.reset() self.memoryModel = 0 - def write(self, address, data): if (address <= 0x1FFF): # 0000-1FFF if (self.ramSize > 0): @@ -216,17 +211,17 @@ -""" -PyBoy GameBoy (TM) Emulator - -Memory Bank Controller 2 (256KB constants.ROM, 512x4bit constants.RAM) - -0000-3FFF ROM Bank 0 (16KB) -4000-7FFF ROM Bank 1-15 (16KB) -A000-A1FF RAM Bank (512x4bit) - """ - class MBC2(MBC): + """ + PyBoy GameBoy (TM) Emulator + + Memory Bank Controller 2 (256KB constants.ROM, 512x4bit constants.RAM) + + 0000-3FFF ROM Bank 0 (16KB) + 4000-7FFF ROM Bank 1-15 (16KB) + A000-A1FF RAM Bank (512x4bit) + """ + RAM_BANK_SIZE = 512 def __init__(self, rom, ram): @@ -278,18 +273,20 @@ self.memoryModel = data & 0x01 elif (address >= 0xA000 and address <= 0xBFFF and self.ramEnable): # A000-BFFF self.ram[self.ramBank + (address & 0x1FFF)] = data -""" -PyBoy GameBoy (TM) Emulator -Memory Bank Controller 3 (2MB constants.ROM, 32KB constants.RAM, Real Time Clock) -0000-3FFF ROM Bank 0 (16KB) -4000-7FFF ROM Bank 1-127 (16KB) -A000-BFFF RAM Bank 0-3 (8KB) -""" class MBC3(MBC): - + """ + PyBoy GameBoy (TM) Emulator + + Memory Bank Controller 3 (2MB constants.ROM, 32KB constants.RAM, Real Time Clock) + + 0000-3FFF ROM Bank 0 (16KB) + 4000-7FFF ROM Bank 1-127 (16KB) + A000-BFFF RAM Bank 0-3 (8KB) + """ + clockSeconds = 0 clockMinutes = 0 clockHours = 0 @@ -417,18 +414,16 @@ -""" -PyBoy GameBoy (TM) Emulator - -Memory Bank Controller 5 (8MB constants.ROM, 128KB constants.RAM) - * -0000-3FFF ROM Bank 0 (16KB) -4000-7FFF ROM Bank 1-511 (16KB) -A000-BFFF RAM Bank 0-15 (8KB) -""" - class MBC5(MBC): - + """ + PyBoy GameBoy (TM) Emulator + + Memory Bank Controller 5 (8MB constants.ROM, 128KB constants.RAM) + * + 0000-3FFF ROM Bank 0 (16KB) + 4000-7FFF ROM Bank 1-511 (16KB) + A000-BFFF RAM Bank 0-15 (8KB) + """ def __init__(self, rom, ram, rumble): self.minRamBankSize = 0 self.maxRamBankSize = 16 @@ -464,17 +459,16 @@ super.__init__(self, ram, rom) -""" -PyBoy GameBoy (TM) Emulator - -Hudson Memory Bank Controller 3 (2MB constants.ROM, 128KB constants.RAM, constants.RTC) - -0000-3FFF ROM Bank 0 (16KB) -4000-7FFF ROM Bank 1-127 (16KB) -A000-BFFF RAM Bank 0-15 (8KB) -""" class HuC3(MBC): - + """ + PyBoy GameBoy (TM) Emulator + + Hudson Memory Bank Controller 3 (2MB constants.ROM, 128KB constants.RAM, constants.RTC) + + 0000-3FFF ROM Bank 0 (16KB) + 4000-7FFF ROM Bank 1-127 (16KB) + A000-BFFF RAM Bank 0-15 (8KB) + """ def __init__(self, rom, ram, clock): self.minRamBankSize = 0 self.maxRamBankSize = 4 @@ -528,6 +522,7 @@ pass elif (self.ramFlag == 0x0A and self.ramSize > 0): self.ram[self.ramBank + (address & 0x1FFF)] = data + def writeWithRamFlag0x0B(self, address, data): if ((data & 0xF0) == 0x10): @@ -551,6 +546,7 @@ pass elif ((data & 0xF0) == 0x60): self.ramValue = 0x01 + def updateClock(self): now = self.clock.getTime() Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Thu Mar 27 00:42:04 2008 @@ -96,7 +96,6 @@ Central Unit ProcessOR (Sharp LR35902 CPU) """ - def __init__(self, interrupt, memory): self.interrupt = interrupt self.memory = memory @@ -240,9 +239,6 @@ def execute(self, opCode): OP_CODES[opCode](self) - def reverseArgumentsDoubleRegister(self, register, getter): - pass - # memory Access, 1 cycle def read(self, hi, lo=None): address = hi @@ -340,7 +336,7 @@ self.cycles -= 1 # 1 cycle - def adc(self, getter, setter=None): + def addWithCarry(self, getter, setter=None): s = self.a.get() + getter() + ((self.f.get() & constants.C_FLAG) >> 4) self.f.set(0, False) self.zeroFlagAdd(s) @@ -351,7 +347,7 @@ self.a.set(s & 0xFF) # 1 cycle # 1 cycle - def sbc(self, getter, setter=None): + def subtractWithCarry(self, getter, setter=None): s = self.a.get() - getter() - ((self.f.get() & constants.C_FLAG) >> 4) self.f.set(constants.N_FLAG, False) self.zeroFlagAdd(s) @@ -362,7 +358,7 @@ self.a.set(s & 0xFF) # 1 cycle # 1 cycle - def sub(self, getter, setter=None): + def subtract(self, getter, setter=None): self.compareA(getter, setter) # 1 cycle self.a.sub(getter(useCycles=False), False) @@ -420,49 +416,75 @@ setter(data) # 1 cycle # 1 cycle - def rlc(self, getter, setter): + def rotateLeftCircular(self, getter, setter): s = ((getter() & 0x7F) << 1) + ((getter() & 0x80) >> 7) - flagsAndSetterFinish(s, setter, 0x80) + self.flagsAndSetterFinish(s, setter, 0x80) + + # rotateLeftCircularA 1 cycle + def rotateLeftCircularA(self): + self.cFlagAdd(self.a.get(), 0x80, resetF=True) + self.a.set(((self.a.get() & 0x7F) << 1) + ((self.a.get() & 0x80) >> 7)) + # 1 cycle - def rl(self, getter, setter): + def rotateLeft(self, getter, setter): s = ((getter() & 0x7F) << 1) if (self.f.get() & constants.C_FLAG) != 0: s += 0x01 - flagsAndSetterFinish(s, setter, 0x80) # 1 cycle + self.flagsAndSetterFinish(s, setter, 0x80) # 1 cycle + # RLA 1 cycle + def rotateLeftA(self): + s = ((self.a.get() & 0x7F) << 1) + if (self.f.get() & constants.C_FLAG) != 0: + s += 0x01 + self.cFlagAdd(self.a.get(), 0x80, resetF=True) + self.a.set(s) # 1 cycle + # 1 cycle - def rrc(self, getter, setter): + def rotateRightCircular(self, getter, setter): s = (getter() >> 1) + ((getter() & 0x01) << 7) - flagsAndSetterFinish(s, setter) # 1 cycle + self.flagsAndSetterFinish(s, setter) # 1 cycle + + # RRCA 1 cycle + def rotateRightCircularA(self): + self.cFlagAdd(self.a.get(), resetF=True) + self.a.set(((self.a.get() >> 1) & 0x7F) + ((self.a.get() << 7) & 0x80)) #1 cycle # 1 cycle - def rr(self, getter, setter): + def rotateRight(self, getter, setter): s = (getter() >> 1) + ((self.f.get() & constants.C_FLAG) << 3) - flagsAndSetterFinish(s, setter) # 1 cycle + self.flagsAndSetterFinish(s, setter) # 1 cycle + + # RRA 1 cycle + def rotateRightA(self): + s = ((self.a.get() >> 1) & 0x7F) + if (self.f.get() & constants.C_FLAG) != 0: + s += 0x80 + self.cFlagAdd(self.a.get(), resetF=True) + self.a.set(s) # 1 cycle # 2 cycles - def sla(self, getter, setter): + def shiftLeftArithmetic(self, getter, setter): s = (getter() << 1) & 0xFF - flagsAndSetterFinish(s, setter, 0x80) # 1 cycle + self.flagsAndSetterFinish(s, setter, 0x80) # 1 cycle # 1 cycle - def sra(self, getter, setter): + def shiftRightArithmetic(self, getter, setter): s = (getter() >> 1) + (getter() & 0x80) - flagsAndSetterFinish(s, setter) # 1 cycle + self.flagsAndSetterFinish(s, setter) # 1 cycle - # 1 cycle - def srl(self, getter, setter): + # 2 cycles + def shiftWordRightLogical(self, getter, setter): s = (getter() >> 1) - flagsAndSetterFinish(s, setter) # 1 cycle + self.flagsAndSetterFinish(s, setter) # 2 cycles - # 1 cycle + # 2 cycles def flagsAndSetterFinish(self, s, setter, compareAnd=0x01): self.f.set(0) # 1 cycle self.zeroFlagAdd(s) - # XXX where does "getter" come from here? should be "setter"? - self.cFlagAdd(getter(), compareAnd) - setter(s) + self.cFlagAdd(s, compareAnd) + setter(s) # 1 cycle # 1 cycle def swap(self, getter, setter): @@ -472,45 +494,19 @@ setter(s) # 2 cycles - def bit(self, getter, setter, n): + def testBit(self, getter, setter, n): self.f.set((self.f.get() & constants.C_FLAG) + constants.H_FLAG, False) if (getter() & (1 << n)) == 0: self.f.add(constants.Z_FLAG, False) self.cycles -= 2 - # RLCA 1 cycle - def rlca(self): - self.cFlagAdd(self.a.get(), 0x80, resetF=True) - self.a.set(((self.a.get() & 0x7F) << 1) + ((self.a.get() & 0x80) >> 7)) - - # RLA 1 cycle - def rla(self): - s = ((self.a.get() & 0x7F) << 1) - if (self.f.get() & constants.C_FLAG) != 0: - s += 0x01 - self.cFlagAdd(self.a.get(), 0x80, resetF=True) - self.a.set(s) # 1 cycle - - # RRCA 1 cycle - def rrca(self): - self.cFlagAdd(self.a.get(), resetF=True) - self.a.set(((self.a.get() >> 1) & 0x7F) + ((self.a.get() << 7) & 0x80)) #1 cycle - - # RRA 1 cycle - def rra(self): - s = ((self.a.get() >> 1) & 0x7F) - if (self.f.get() & constants.C_FLAG) != 0: - s += 0x80 - self.cFlagAdd(self.a.get(), resetF=True) - self.a.set(s) # 1 cycle - # 2 cycles - def set(self, getter, setter, n): + def setBit(self, getter, setter, n): self.cycles -= 1 # 1 cycle setter(getter() | (1 << n)) # 1 cycle # 1 cycle - def res(self, getter, setter, n): + def resetBit(self, getter, setter, n): setter(getter() & (~(1 << n))) # 1 cycle # LD A,(nnnn), 4 cycles @@ -559,14 +555,14 @@ def ldh_A_Ci(self): self.a.set(self.read(0xFF00 + self.bc.getLo())) # 1+2 cycles - # LDI A,(HL) 2 cycles - def ldi_A_HLi(self): + # loadAndIncrement A,(HL) 2 cycles + def loadAndIncrement_A_HLi(self): self.a.set(self.read(self.hl.get())) # 2 cycles self.hl.inc()# 2 cycles self.cycles += 2 - # LDD A,(HL) 2 cycles - def ldd_A_HLi(self): + # loadAndDecrement A,(HL) 2 cycles + def loadAndDecrement_A_HLi(self): self.a.set(self.read(self.hl.get())) # 2 cycles self.hl.dec() # 2 cycles self.cycles += 2 @@ -579,14 +575,14 @@ def ldh_Ci_A(self): self.write(0xFF00 + self.bc.getLo(), self.a.get()) # 2 cycles - # LDI (HL),A 2 cycles - def ldi_HLi_A(self): + # loadAndIncrement (HL),A 2 cycles + def loadAndIncrement_HLi_A(self): self.write(self.hl.get(), self.a.get()) # 2 cycles self.hl.inc() # 2 cycles self.cycles += 2 - # LDD (HL),A 2 cycles - def ldd_HLi_A(self): + # loadAndDecrement (HL),A 2 cycles + def loadAndDecrement_HLi_A(self): self.write(self.hl.get(), self.a.get()) # 2 cycles self.hl.dec() # 2 cycles self.cycles += 2 @@ -596,7 +592,7 @@ self.sp.set(self.hl.get()) # 1 cycle self.cycles -= 1 - def cpl(self): + def complementA(self): self.a.set(self.a.get() ^ 0xFF, False) self.f.set(self.f.get() | (constants.N_FLAG + constants.H_FLAG)) @@ -721,7 +717,7 @@ self.pc.set(hi, lo) # 2 cycles # RET cc 2,5 cycles - def ret_cc(self, cc): + def conditionalReturn(self, cc): if cc: self.ret() # 4 cycles # FIXME maybe this should be the same @@ -730,7 +726,7 @@ self.cycles -= 2 # RETI 4 cycles - def reti(self): + def returnFormInterrupt(self): self.ret() # 4 cycles # enable interrupts self.ime = True @@ -744,13 +740,13 @@ self.call(nn) # 4 cycles # DI/EI 1 cycle - def di(self): + def disableInterrupts(self): # disable interrupts self.ime = False self.cycles -= 1; # 1 cycle - def ei(self): + def enableInterrupts(self): # enable interrupts self.ime = True self.cycles -= 1 @@ -851,30 +847,30 @@ (0x18, CPU.jr_nn), (0x02, CPU.ld_BCi_A), (0x12, CPU.ld_DEi_A), - (0x22, CPU.ldi_HLi_A), - (0x32, CPU.ldd_HLi_A), + (0x22, CPU.loadAndIncrement_HLi_A), + (0x32, CPU.loadAndDecrement_HLi_A), (0x0A, CPU.ld_A_BCi), (0x1A, CPU.load_A_DEi), - (0x2A, CPU.ldi_A_HLi), - (0x3A, CPU.ldd_A_HLi), - (0x07, CPU.rlca), - (0x0F, CPU.rrca), - (0x17, CPU.rla), - (0x1F, CPU.rra), + (0x2A, CPU.loadAndIncrement_A_HLi), + (0x3A, CPU.loadAndDecrement_A_HLi), + (0x07, CPU.rotateLeftCircularA), + (0x0F, CPU.rotateRightCircularA), + (0x17, CPU.rotateLeftA), + (0x1F, CPU.rotateRightA), (0x27, CPU.daa), - (0x2F, CPU.cpl), + (0x2F, CPU.complementA), (0x37, CPU.scf), (0x3F, CPU.ccf), (0x76, CPU.halt), - (0xF3, CPU.di), - (0xFB, CPU.ei), + (0xF3, CPU.disableInterrupts), + (0xFB, CPU.enableInterrupts), (0xE2, CPU.ldh_Ci_A), (0xEA, CPU.ld_mem_A), (0xF2, CPU.ldh_A_Ci), (0xFA, CPU.ld_A_mem), (0xC3, CPU.jp_nnnn), (0xC9, CPU.ret), - (0xD9, CPU.reti), + (0xD9, CPU.returnFormInterrupt), (0xE9, CPU.ld_pc_hl), (0xF9, CPU.ld_SP_HL), (0xE0, CPU.ldh_mem_A), @@ -884,9 +880,9 @@ (0xCB, CPU.fetchExecute), (0xCD, CPU.call_nnnn), (0xC6, lambda s: CPU.addA(s, s.fetch)), - (0xCE, lambda s: CPU.adc(s, s.fetch)), - (0xD6, lambda s: CPU.sub(s, s.fetch)), - (0xDE, lambda s: CPU.sbc(s, s.fetch)), + (0xCE, lambda s: CPU.addWithCarry(s, s.fetch)), + (0xD6, lambda s: CPU.subtract(s, s.fetch)), + (0xDE, lambda s: CPU.subtractWithCarry(s, s.fetch)), (0xE6, lambda s: CPU.AND(s, s.fetch)), (0xEE, lambda s: CPU.XOR(s, s.fetch)), (0xF6, lambda s: CPU.OR(s, s.fetch)), @@ -906,15 +902,15 @@ (0x05, 0x08, CPU.dec), (0x06, 0x08, CPU.loadFetchRegister), (0x80, 0x01, CPU.addA), - (0x88, 0x01, CPU.adc), - (0x90, 0x01, CPU.sub), - (0x98, 0x01, CPU.sbc), + (0x88, 0x01, CPU.addWithCarry), + (0x90, 0x01, CPU.subtract), + (0x98, 0x01, CPU.subtractWithCarry), (0xA0, 0x01, CPU.AND), (0xA8, 0x01, CPU.XOR), (0xB0, 0x01, CPU.OR), (0xB8, 0x01, CPU.compareA), (0x06, 0x08, CPU.fetchLoad), - (0x40, 0x01, CPU.res, range(0, 8)) + (0x40, 0x01, CPU.resetBit, range(0, 8)) ] @@ -926,7 +922,7 @@ (0x09, 0x10, CPU.addHL, REGISTER_SET_A), (0x03, 0x10, CPU.incDoubleRegister, REGISTER_SET_A), (0x0B, 0x10, CPU.decDoubleRegister, REGISTER_SET_A), - (0xC0, 0x08, CPU.ret_cc, REGISTER_SET_B), + (0xC0, 0x08, CPU.conditionalReturn, REGISTER_SET_B), (0xC2, 0x08, CPU.jp_cc_nnnn, REGISTER_SET_B), (0xC4, 0x08, CPU.call_cc_nnnn, REGISTER_SET_B), (0x20, 0x08, CPU.jr_cc_nn, REGISTER_SET_B), @@ -935,17 +931,17 @@ ] SECOND_ORDER_REGISTER_GROUP_OP_CODES = [ - (0x00, 0x01, CPU.rlc), - (0x08, 0x01, CPU.rrc), - (0x10, 0x01, CPU.rl), - (0x18, 0x01, CPU.rr), - (0x20, 0x01, CPU.sla), - (0x28, 0x01, CPU.sra), + (0x00, 0x01, CPU.rotateLeftCircular), + (0x08, 0x01, CPU.rotateRightCircular), + (0x10, 0x01, CPU.rotateLeft), + (0x18, 0x01, CPU.rotateRight), + (0x20, 0x01, CPU.shiftLeftArithmetic), + (0x28, 0x01, CPU.shiftRightArithmetic), (0x30, 0x01, CPU.swap), - (0x38, 0x01, CPU.srl), - (0x40, 0x01, CPU.bit, range(0, 8)), - (0xC0, 0x01, CPU.set, range(0, 8)), - (0x80, 0x01, CPU.res, range(0, 8)) + (0x38, 0x01, CPU.shiftWordRightLogical), + (0x40, 0x01, CPU.testBit, range(0, 8)), + (0xC0, 0x01, CPU.setBit, range(0, 8)), + (0x80, 0x01, CPU.resetBit, range(0, 8)) ] # RAW OPCODE TABLE INITIALIZATION ---------------------------------------------- Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py Thu Mar 27 00:42:04 2008 @@ -8,17 +8,6 @@ class GameBoy(object): - # RAM - ram = None - cartridge = None - interrupt = None - cpu = None - serial = None - timer = None - joypad = None - video = None - sound = None - def __init__(self, videoDriver, soundDriver, joypadDriver, storeDriver, clockDriver): self.ram = RAM() self.cartridge = Cartridge(storeDriver, clockDriver) Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/interrupt.py Thu Mar 27 00:42:04 2008 @@ -6,7 +6,7 @@ Interrupt Controller """ - + def __init__(self): self.reset() @@ -14,11 +14,11 @@ self.enable = 0 self.flag = constants.VBLANK - def isPending(self): - return (self.enable & self.flag) != 0 - - def isPending(self, mask): - return (self.enable & self.flag & mask) != 0 + def isPending(self, mask=None): + if mask==None: + return (self.enable & self.flag) != 0 + else: + return (self.enable & self.flag & mask) != 0 def raiseInterrupt(self, mask): self.flag |= mask @@ -48,6 +48,5 @@ def setInterruptEnable(self, data): self.enable = data - def setInterruptFlag(self, data): self.flag = data Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py Thu Mar 27 00:42:04 2008 @@ -1,57 +1,42 @@ -""" -PyBoy GameBoy (TM) Emulator - -Joypad Input -""" -class Joypad(object): - - # Registers - joyp = 0 - cycles = 0 +from pypy.lang.gameboy import constants - # Interrupt Controller - interrupt = None - - # Driver JoypadDriver - driver = None +class Joypad(object): + """ + PyBoy GameBoy (TM) Emulator + + Joypad Input + """ def __init__(self, joypadDriver, interrupt): self.driver = joypadDriver self.interrupt = interrupt self.reset() - - def reset(self): + def reset(self): self.joyp = 0xFF self.cycles = constants.JOYPAD_CLOCK - def cycles(self): return self.cycles - - def emulate(self, ticks): + def emulate(self, ticks): self.cycles -= ticks if (self.cycles <= 0): if (self.driver.isRaised()): self.update() - self.cycles = constants.JOYPAD_CLOCK - - def write(self, address, data): + def write(self, address, data): if (address == constants.JOYP): self.joyp = (self.joyp & 0xCF) + (data & 0x30) self.update() - def read(self, address): if (address == constants.JOYP): return self.joyp return 0xFF - def update(self): data = self.joyp & 0xF0 @@ -68,3 +53,12 @@ self.joyp = data + + +class Driver(object): + + def getButtons(self): + pass + + def getDirections(self): + pass \ No newline at end of file Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/ram.py Thu Mar 27 00:42:04 2008 @@ -7,18 +7,14 @@ from pypy.lang.gameboy import constants class RAM(object): - - # Work RAM - wram = [] - - # High RAM - hram = [] def __init__(self): self.reset() def reset(self): + # Work RAM self.wram = [0x00]*8192 + # High RAM self.hram = [0x00]*128 def write(self, address, data): Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/serial.py Thu Mar 27 00:42:04 2008 @@ -1,18 +1,10 @@ -""" -PyBoy GameBoy (TM) Emulator -Serial Link Controller - """ from pypy.lang.gameboy import constants class Serial(object): - - # Registers - sb = 0 - sc = 0 - cycles = 0 - - # Interrupt Controller #Interrupt - interrupt = None + """ + PyBoy GameBoy (TM) Emulator + Serial Link Controller + """ def __init__(self, interrupt): self.interrupt = interrupt @@ -29,12 +21,10 @@ def emulate(self, ticks): if ((self.sc & 0x81) == 0x81): self.cycles -= ticks - if (self.cycles <= 0): self.sb = 0xFF self.sc &= 0x7F self.cycles = constants.SERIAL_IDLE_CLOCK - self.interrupt.raiseInterrupt(constants.SERIAL) @@ -43,7 +33,6 @@ def setSerialControl(self, data): self.sc = data - # HACK: delay the serial interrupt (Shin Nihon Pro Wrestling) self.cycles = constants.SERIAL_IDLE_CLOCK + constants.SERIAL_CLOCK Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py Thu Mar 27 00:42:04 2008 @@ -485,7 +485,7 @@ buffer[index + 0] -= self.audio2Volume if ((self.nr51 & 0x02) != 0): buffer[index + 1] -= self.audio2Volume - else: + else: if ((self.nr51 & 0x20) != 0): buffer[index + 0] += self.audio2Volume if ((self.nr51 & 0x02) != 0): @@ -661,7 +661,7 @@ # 7 steps self.audio4Index &= 0x7FFFFF polynomial = self.noiseStep7Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31) - else: + else: # 15 steps self.audio4Index &= 0x7FFFFFFF polynomial = self.noiseStep15Table[self.audio4Index >> 21] >> ((self.audio4Index >> 16) & 31) @@ -670,7 +670,7 @@ buffer[index + 0] -= self.audio4Volume if ((self.nr51 & 0x08) != 0): buffer[index + 1] -= self.audio4Volume - else: + else: if ((self.nr51 & 0x80) != 0): buffer[index + 0] += self.audio4Volume if ((self.nr51 & 0x08) != 0): @@ -703,7 +703,6 @@ if ((self.nr52 & 0x80) == 0x00): self.nr52 &= 0xF0 - # Frequency Table Generation def generateFrequencyTables(self): sampleRate = self.driver.getSampleRate() @@ -715,7 +714,6 @@ else: self.frequencyTable[period] = skip # Polynomial Noise Frequency Ratios - # # 4194304 Hz * 1/2^3 * 2 4194304 Hz * 1/2^3 * 1 4194304 Hz * 1/2^3 * # 1/2 4194304 Hz * 1/2^3 * 1/3 4194304 Hz * 1/2^3 * 1/4 4194304 Hz * # 1/2^3 * 1/5 4194304 Hz * 1/2^3 * 1/6 4194304 Hz * 1/2^3 * 1/7 @@ -725,8 +723,6 @@ divider = 2 * ratio self.noiseFreqRatioTable[ratio] = (constants.GAMEBOY_CLOCK / divider) * ((1 << 16) / sampleRate) - - # Noise Generation def generateNoiseTables(self): polynomial = 0x7F Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cpu.py Thu Mar 27 00:42:04 2008 @@ -229,7 +229,11 @@ assert cpu.isZ() == True cpu.rom[0x1234] = 0x12 assert cpu.isZ() == True - + + +def fetch_execute_cycle_test(cpu, opCode, cycles=0): + prepare_for_fetch(cpu, opCode) + cycle_test(cpu, 0xCB, cycles) def cycle_test(cpu, opCode, cycles=0): startCycles = cpu.cycles @@ -1105,16 +1109,16 @@ pass # push_BC to push_AF -def test_0xC5(): - py.test.skip("changements to the cpu class") +def test_0xC5_to_0xF5(): cpu = get_cpu() registers = [cpu.bc, cpu.de, cpu.hl, cpu.af] - opCode = 0xC4 + opCode = 0xC5 value = 0x1234 for register in registers: + register.set(value) cycle_test(cpu, opCode, 4) - assert cpu.memory.read(cpu.sp.get()) == value >> 8 - assert cpu.memory.read(cpu.sp.get()-1) == value & 0xFF + assert cpu.memory.read(cpu.sp.get()+1) == value >> 8 + assert cpu.memory.read(cpu.sp.get()) == value & 0xFF opCode += 0x10 value += 0x0101 @@ -1177,11 +1181,22 @@ # rlc_B to rlc_A def test_0x00_to_0x07(): + py.test.skip("Bug in cpu") cpu = get_cpu() registers = [cpu.b, cpu.c, cpu.d, cpu.e, cpu.h, cpu.l, cpu.hli, cpu.a] opCode = 0x00 + value = 0x12 for register in registers: + cpu.reset() + register.set(value) + cycles = 2 + if register == cpu.hli: + cycles = 4 + fetch_execute_cycle_test(cpu, opCode, cycles) + rlc = ((value & 0x7F) << 1) + ((value & 0x80) >> 7) + assert register.get() == rcl opCode += 0x01 + vaue += 1 # rrc_B to rrc_F def test_0x08_to_0x0F(): Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_interrupt.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_interrupt.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_interrupt.py Thu Mar 27 00:42:04 2008 @@ -0,0 +1,47 @@ + +from pypy.lang.gameboy.interrupt import * +from pypy.lang.gameboy import constants + +def get_interrupt(): + return Interrupt() + + + +def test_rest(): + interrupt = get_interrupt() + assert interrupt.enable == 0 + assert interrupt.flag == constants.VBLANK + interrupt.enable = 1 + interrupt.flag = ~constants.VBLANK + interrupt.reset() + assert interrupt.enable == 0 + assert interrupt.flag == constants.VBLANK + + +def test_is_pending(): + interrupt = get_interrupt() + assert interrupt.isPending() == False + assert interrupt.isPending(0x00) == False + interrupt.setInterruptEnable(True) + assert interrupt.isPending() == True + + +def test_raise_interrupt(): + interrupt = get_interrupt() + +def test_lower(): + interrupt = get_interrupt() + +def test_write(): + interrupt = get_interrupt() + +def test_read(): + interrupt = get_interrupt() + +def test_interrupt_enable(): + interrupt = get_interrupt() + + +def test_interrupt_flag(): + interrupt = get_interrupt() + \ No newline at end of file Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py Thu Mar 27 00:42:04 2008 @@ -11,14 +11,12 @@ self.interrupt = interrupt self.reset() - def reset(self): self.div = 0 self.dividerCycles = constants.DIV_CLOCK self.tima = self.tma = self.tac = 0x00 self.timerCycles = self.timerClock = constants.TIMER_CLOCK[self.tac & 0x03] - def write(self, address, data): if address==constants.DIV: self.setDivider(data) @@ -29,8 +27,6 @@ elif address==constants.TAC: self.setTimerControl(data) - - def read(self, address): if address==constants.DIV: return self.getDivider() @@ -68,34 +64,27 @@ self.timerCycles = self.timerClock = constants.TIMER_CLOCK[data & 0x03] self.tac = data - def cycles(self): if ((self.tac & 0x04) != 0 and self.timerCycles < self.dividerCycles): return self.timerCycles return self.dividerCycles - def emulate(self, ticks): self.emulateDivider(ticks) self.emulateTimer(ticks) - def emulateDivider(self, ticks): self.dividerCycles -= ticks while (self.dividerCycles <= 0): self.div = (self.div + 1) & 0xFF self.dividerCycles += constants.DIV_CLOCK - - def emulateTimer(self, ticks): if ((self.tac & 0x04) != 0): self.timerCycles -= ticks - while (self.timerCycles <= 0): self.tima = (self.tima + 1) & 0xFF self.timerCycles += self.timerClock - if (self.tima == 0x00): self.tima = self.tma self.interrupt.raiseInterrupt(constants.TIMER) From fijal at codespeak.net Thu Mar 27 02:34:40 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 02:34:40 +0100 (CET) Subject: [pypy-svn] r52973 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080327013440.3B19D169EF5@codespeak.net> Author: fijal Date: Thu Mar 27 02:34:38 2008 New Revision: 52973 Modified: pypy/dist/pypy/lib/_ctypes/array.py pypy/dist/pypy/lib/app_test/ctypes/test_slicing.py Log: raise value error when assigning slice of different length. Modified: pypy/dist/pypy/lib/_ctypes/array.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/array.py (original) +++ pypy/dist/pypy/lib/_ctypes/array.py Thu Mar 27 02:34:38 2008 @@ -115,6 +115,8 @@ def array_slice_setitem(self, index, value): start, stop = self._get_slice_params(index) + if stop - start != len(value): + raise ValueError("Can only assign slices of the same length") for i in range(start, stop): self[i] = value[i - start] Modified: pypy/dist/pypy/lib/app_test/ctypes/test_slicing.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_slicing.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_slicing.py Thu Mar 27 02:34:38 2008 @@ -21,7 +21,6 @@ assert a[0:5] == range(5, 10) def test_setslice_cint(self): - py.test.skip("XXX bugs") a = (c_int * 100)(*xrange(1100, 1200)) b = range(1100, 1200) From fijal at codespeak.net Thu Mar 27 02:37:27 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 02:37:27 +0100 (CET) Subject: [pypy-svn] r52974 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080327013727.55B75169EF5@codespeak.net> Author: fijal Date: Thu Mar 27 02:37:26 2008 New Revision: 52974 Modified: pypy/dist/pypy/lib/_ctypes/primitive.py pypy/dist/pypy/lib/app_test/ctypes/test_prototypes.py Log: c_wchar_p instead of c_void_p is supported. Modified: pypy/dist/pypy/lib/_ctypes/primitive.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/primitive.py (original) +++ pypy/dist/pypy/lib/_ctypes/primitive.py Thu Mar 27 02:37:26 2008 @@ -41,7 +41,7 @@ if isinstance(value, basestring): return self(value) if isinstance(value, _SimpleCData) and \ - type(value)._type_ in 'zP': + type(value)._type_ in 'zZP': return value return None # eventually raise Modified: pypy/dist/pypy/lib/app_test/ctypes/test_prototypes.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_prototypes.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_prototypes.py Thu Mar 27 02:37:26 2008 @@ -97,7 +97,6 @@ assert "a" == func(byref(ca))[0] def test_c_void_p_arg(self): - py.test.skip("XXX fails") func = testdll._testfunc_p_p func.restype = c_char_p func.argtypes = c_void_p, From fijal at codespeak.net Thu Mar 27 03:24:15 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 03:24:15 +0100 (CET) Subject: [pypy-svn] r52975 - pypy/dist/pypy/module/_rawffi Message-ID: <20080327022415.19CEB169EA4@codespeak.net> Author: fijal Date: Thu Mar 27 03:24:12 2008 New Revision: 52975 Modified: pypy/dist/pypy/module/_rawffi/callback.py Log: a bit less magic - always pass buffer address to callback. This buffer leaves long enough for callback to finish, later might be bogus. This still does not solve a problem of a return value, next step. Modified: pypy/dist/pypy/module/_rawffi/callback.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/callback.py (original) +++ pypy/dist/pypy/module/_rawffi/callback.py Thu Mar 27 03:24:12 2008 @@ -18,8 +18,7 @@ res = rffi.cast(rffi.VOIDPP, ll_res) argtypes = callback_ptr.args space = callback_ptr.space - w_args = space.newlist([wrap_value(space, get_elem, ll_args[i], 0, - letter2tp(space, argtypes[i])) + w_args = space.newlist([space.wrap(rffi.cast(rffi.UINT, ll_args[i])) for i in range(len(argtypes))]) w_res = space.call(w_callable, w_args) unwrap_value(space, push_elem, ll_res, 0, From fijal at codespeak.net Thu Mar 27 03:53:30 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 03:53:30 +0100 (CET) Subject: [pypy-svn] r52976 - pypy/dist/pypy/lib/_ctypes Message-ID: <20080327025330.CEF1B1683FA@codespeak.net> Author: fijal Date: Thu Mar 27 03:53:29 2008 New Revision: 52976 Modified: pypy/dist/pypy/lib/_ctypes/pointer.py Log: pointer equality Modified: pypy/dist/pypy/lib/_ctypes/pointer.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/pointer.py (original) +++ pypy/dist/pypy/lib/_ctypes/pointer.py Thu Mar 27 03:53:29 2008 @@ -106,6 +106,11 @@ contents = property(getcontents, setcontents) + def __eq__(self, other): + return self._buffer[0] == other + + def __ne__(self, other): + return not self == other def _cast_addr(obj, _, tp): if not (isinstance(tp, _CDataMeta) and tp._is_pointer_like()): From fijal at codespeak.net Thu Mar 27 03:53:55 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 03:53:55 +0100 (CET) Subject: [pypy-svn] r52977 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080327025355.4165D169ECB@codespeak.net> Author: fijal Date: Thu Mar 27 03:53:53 2008 New Revision: 52977 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_parameters.py Log: review those tests. Modified: pypy/dist/pypy/lib/app_test/ctypes/test_parameters.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_parameters.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_parameters.py Thu Mar 27 03:53:53 2008 @@ -22,7 +22,7 @@ def test_subclasses(self): - py.test.skip("subclassing problems") + py.test.skip("XXX subclassing problem") from ctypes import c_void_p, c_char_p # ctypes 0.9.5 and before did overwrite from_param in SimpleType_new class CVOIDP(c_void_p): @@ -52,7 +52,7 @@ # XXX Replace by c_char_p tests def test_cstrings(self): - py.test.skip("XXX fails") + py.test.skip("Implementation specific IMO") from ctypes import c_char_p, byref # c_char_p.from_param on a Python String packs the string @@ -91,7 +91,6 @@ assert type(pa) == c_wchar_p def test_int_pointers(self): - py.test.skip("from_param problems") from ctypes import c_short, c_uint, c_int, c_long, POINTER, pointer LPINT = POINTER(c_int) @@ -152,7 +151,7 @@ ## check_perf() def test_noctypes_argtype(self): - py.test.skip("from_param problems") + py.test.skip("We implement details differently") from ctypes import CDLL, c_void_p, ArgumentError import conftest dll = CDLL(str(conftest.sofile)) From fijal at codespeak.net Thu Mar 27 03:54:50 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 03:54:50 +0100 (CET) Subject: [pypy-svn] r52978 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080327025450.8F337169ECA@codespeak.net> Author: fijal Date: Thu Mar 27 03:54:49 2008 New Revision: 52978 Modified: pypy/dist/pypy/lib/_ctypes/function.py pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py Log: fix callback issues. IMO something is wrong with leak checks (or these tests are leaking). Leave skipped test not to forget. Modified: pypy/dist/pypy/lib/_ctypes/function.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/function.py (original) +++ pypy/dist/pypy/lib/_ctypes/function.py Thu Mar 27 03:54:49 2008 @@ -54,7 +54,8 @@ restype = restype._ffiargshape else: restype = 'O' # void - self._ptr = _rawffi.CallbackPtr(argument, argtypes, restype) + self._ptr = _rawffi.CallbackPtr(self._wrap_callable(argument), + argtypes, restype) self._needs_free = True self._buffer = self._ptr.byptr() elif isinstance(argument, tuple) and len(argument) == 2: @@ -68,6 +69,14 @@ return # needed for test.. else: raise TypeError("Unknown constructor %s" % (argument,)) + + def _wrap_callable(self, to_call): + def f(*args): + if self.argtypes: + args = [argtype._CData_retval(argtype.from_address(arg)._buffer) + for argtype, arg in zip(self.argtypes, args)] + return to_call(*args) + return f def __call__(self, *args): if self.callable is not None: Modified: pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py Thu Mar 27 03:54:49 2008 @@ -2,7 +2,7 @@ import py from support import BaseCTypesTestChecker -class TestCallbacks(BaseCTypesTestChecker): +class TestCallbacks:#(BaseCTypesTestChecker): functype = CFUNCTYPE ## def tearDown(self): @@ -108,7 +108,7 @@ ################################################################ -class TestSampleCallbacks(BaseCTypesTestChecker): +class TestSampleCallbacks:#(BaseCTypesTestChecker): def test_integrate(self): # Derived from some then non-working code, posted by David Foster @@ -134,7 +134,7 @@ ################################################################ -class TestMoreCallbacks(BaseCTypesTestChecker): +class TestMoreCallbacks:#(BaseCTypesTestChecker): def test_callback_with_struct_argument(self): py.test.skip("WIP") @@ -164,7 +164,6 @@ def test_qsort(self): - py.test.skip("WIP") import conftest _ctypes_test = str(conftest.sofile) dll = CDLL(_ctypes_test) @@ -178,7 +177,6 @@ assert a[0] == 5 # sanity def comp(a, b): - print a,b a = a.contents.value b = b.contents.value return cmp(a,b) @@ -192,3 +190,6 @@ res = list(a) assert res == [1,2,3,4,5] + +def test_last(): + py.test.skip("XXX don't forget about leaks") From fijal at codespeak.net Thu Mar 27 04:02:48 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 04:02:48 +0100 (CET) Subject: [pypy-svn] r52979 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080327030248.C2A8F169EF9@codespeak.net> Author: fijal Date: Thu Mar 27 04:02:46 2008 New Revision: 52979 Modified: pypy/dist/pypy/lib/_ctypes/function.py pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py Log: solve keepalive issue. Strange keepalive circle via function closure -> self. Modified: pypy/dist/pypy/lib/_ctypes/function.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/function.py (original) +++ pypy/dist/pypy/lib/_ctypes/function.py Thu Mar 27 04:02:46 2008 @@ -54,7 +54,8 @@ restype = restype._ffiargshape else: restype = 'O' # void - self._ptr = _rawffi.CallbackPtr(self._wrap_callable(argument), + self._ptr = _rawffi.CallbackPtr(self._wrap_callable(argument, + self.argtypes), argtypes, restype) self._needs_free = True self._buffer = self._ptr.byptr() @@ -70,11 +71,11 @@ else: raise TypeError("Unknown constructor %s" % (argument,)) - def _wrap_callable(self, to_call): + def _wrap_callable(self, to_call, argtypes): def f(*args): - if self.argtypes: + if argtypes: args = [argtype._CData_retval(argtype.from_address(arg)._buffer) - for argtype, arg in zip(self.argtypes, args)] + for argtype, arg in zip(argtypes, args)] return to_call(*args) return f Modified: pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_callbacks.py Thu Mar 27 04:02:46 2008 @@ -2,7 +2,7 @@ import py from support import BaseCTypesTestChecker -class TestCallbacks:#(BaseCTypesTestChecker): +class TestCallbacks(BaseCTypesTestChecker): functype = CFUNCTYPE ## def tearDown(self): @@ -108,7 +108,7 @@ ################################################################ -class TestSampleCallbacks:#(BaseCTypesTestChecker): +class TestSampleCallbacks(BaseCTypesTestChecker): def test_integrate(self): # Derived from some then non-working code, posted by David Foster @@ -134,7 +134,7 @@ ################################################################ -class TestMoreCallbacks:#(BaseCTypesTestChecker): +class TestMoreCallbacks(BaseCTypesTestChecker): def test_callback_with_struct_argument(self): py.test.skip("WIP") @@ -191,5 +191,3 @@ assert res == [1,2,3,4,5] -def test_last(): - py.test.skip("XXX don't forget about leaks") From fijal at codespeak.net Thu Mar 27 04:09:27 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 04:09:27 +0100 (CET) Subject: [pypy-svn] r52980 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080327030927.34DF4169EDA@codespeak.net> Author: fijal Date: Thu Mar 27 04:09:26 2008 New Revision: 52980 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_libc.py Log: This test passes. Modified: pypy/dist/pypy/lib/app_test/ctypes/test_libc.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_libc.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_libc.py Thu Mar 27 04:09:26 2008 @@ -16,7 +16,6 @@ assert lib.my_sqrt(2.0) == math.sqrt(2.0) def test_qsort(self): - py.test.skip("broken callback handling") comparefunc = CFUNCTYPE(c_int, POINTER(c_char), POINTER(c_char)) lib.my_qsort.argtypes = c_void_p, c_size_t, c_size_t, comparefunc lib.my_qsort.restype = None From cami at codespeak.net Thu Mar 27 08:09:30 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Thu, 27 Mar 2008 08:09:30 +0100 (CET) Subject: [pypy-svn] r52981 - pypy/branch/gameboy-emulator/pypy/lang/gameboy/test Message-ID: <20080327070930.0D422169F14@codespeak.net> Author: cami Date: Thu Mar 27 08:09:29 2008 New Revision: 52981 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_interrupt.py Log: implemented interrupt tests Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_interrupt.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_interrupt.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_interrupt.py Thu Mar 27 08:09:29 2008 @@ -28,20 +28,29 @@ def test_raise_interrupt(): interrupt = get_interrupt() + value = 0x12 + mask = 0xAA + interrupt.flag = value + assert interrupt.flag == value + interrupt.raiseInterrupt(mask) + assert interrupt.flag == value|mask def test_lower(): interrupt = get_interrupt() - -def test_write(): - interrupt = get_interrupt() - -def test_read(): - interrupt = get_interrupt() - -def test_interrupt_enable(): - interrupt = get_interrupt() - - -def test_interrupt_flag(): - interrupt = get_interrupt() - \ No newline at end of file + value = 0x12 + mask = 0xAA + interrupt.flag = value + assert interrupt.flag == value + interrupt.lower(mask) + assert interrupt.flag == value & (~mask) + +def test_read_write(): + interrupt = get_interrupt() + value = 0x12 + interrupt.write(constants.IE, value) + assert interrupt.enable == value + assert interrupt.read(constants.IE) == value + value+=1 + interrupt.write(constants.IF, value) + assert interrupt.flag == value + assert interrupt.read(constants.IF) == 0xE0 | value From cami at codespeak.net Thu Mar 27 09:47:52 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Thu, 27 Mar 2008 09:47:52 +0100 (CET) Subject: [pypy-svn] r52983 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080327084752.8C911169EFF@codespeak.net> Author: cami Date: Thu Mar 27 09:47:50 2008 New Revision: 52983 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py Log: implemented joypad tests added joypaddriver class made joypad more readable by introducing separate vars for joyp and buttons Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py Thu Mar 27 09:47:50 2008 @@ -157,6 +157,17 @@ JOYPAD_CLOCK = GAMEBOY_CLOCK >> 6 +BUTTON_DOWN = 0x08 +BUTTON_UP = 0x04 +BUTTON_LEFT = 0x02 +BUTTON_RIGHT = 0x01 + +BUTTON_START = 0x08 +BUTTON_SELECT = 0x04 +BUTTON_B = 0x02 +BUTTON_A = 0x01 + + # ___________________________________________________________________________ # SERIAL Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py Thu Mar 27 09:47:50 2008 @@ -14,7 +14,8 @@ self.reset() def reset(self): - self.joyp = 0xFF + self.joyp = 0xF + self.buttons = 0xF self.cycles = constants.JOYPAD_CLOCK def cycles(self): @@ -29,36 +30,42 @@ def write(self, address, data): if (address == constants.JOYP): - self.joyp = (self.joyp & 0xCF) + (data & 0x30) + self.joyp = (self.joyp & 0xC) + (data & 0x3) self.update() def read(self, address): if (address == constants.JOYP): - return self.joyp + return (self.joyp << 4) + self.buttons return 0xFF def update(self): - data = self.joyp & 0xF0 + oldButtons = self.buttons + if self.joyp == 0x1: + self.buttons = self.driver.getButtons() + elif self.joyp == 0x2: + self.buttons = self.driver.getDirections() + else: + self.buttons = 0xF - switch = (data & 0x30) - if switch==0x10: - data |= self.driver.getButtons() - elif switch==0x20: - data |= self.driver.getDirections() - elif switch==0x30: - data |= 0x0F - - if ((self.joyp & ~data & 0x0F) != 0): + if oldButtons != self.buttons: self.interrupt.raiseInterrupt(constants.JOYPAD) - self.joyp = data - -class Driver(object): - +class JoypadDriver(object): + """ + Maps the Input to the Button and Direction Codes + """ + def __init__(self): + self.raised = False + self.buttons = 0xF + self.directions = 0xF + def getButtons(self): - pass + return self.buttons def getDirections(self): - pass \ No newline at end of file + return self.directions + + def isRaised(self): + return self.raised \ No newline at end of file Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py Thu Mar 27 09:47:50 2008 @@ -0,0 +1,81 @@ +from pypy.lang.gameboy.joypad import * +from pypy.lang.gameboy.interrupt import * +from pypy.lang.gameboy import constants + + +def get_joypad(): + return Joypad(get_driver(), Interrupt()) + +def get_driver(): + return JoypadDriver() + + +# ------------------------------------------------------------------------------ + +def test_reset(joypad=None): + if joypad == None: + joypad = get_joypad() + assert joypad.joyp == 0xF + assert joypad.cycles == constants.JOYPAD_CLOCK + +def test_emulate(): + joypad = get_joypad() + ticks = 2 + cycles = joypad.cycles + joypad.emulate(ticks) + assert cycles - joypad.cycles == ticks + +def test_emulate_zero_ticks(): + joypad = get_joypad() + joypad.cycles = 2 + ticks = 2 + joypad.emulate(ticks) + assert joypad.cycles == constants.JOYPAD_CLOCK + +def test_emulate_zero_ticks_update(): + joypad = get_joypad() + value = 0x1 + valueButtons = 0x4 + joypad.joyp = value + joypad.driver.buttons = valueButtons + joypad.driver.raised = True + joypad.cycles = 2 + ticks = 2 + joypad.emulate(ticks) + assert joypad.cycles == constants.JOYPAD_CLOCK + assert joypad.joyp == value + assert joypad.buttons == valueButtons + +def test_read_write(): + joypad = get_joypad() + value = 0x2 + joypad.write(constants.JOYP, value) + joyp = 0xC + (value & 0x3) + assert joypad.joyp == joyp + joyp = (joyp << 4) + 0xF + assert joypad.read(constants.JOYP) == joyp + assert joypad.read(constants.JOYP+1) == 0xFF + # no change on writing the wrong address + joypad.write(constants.JOYP+1, value+1) + assert joypad.read(constants.JOYP) == joyp + + +def test_update(): + joypad = get_joypad() + joypad.driver.buttons = 0x1 + assert joypad.driver.getButtons() == 0x1 + joypad.driver.directions = 0x2 + assert joypad.driver.getDirections() == 0x2 + assert joypad.buttons == 0xF + joypad.joyp = 0x1 + joypad.update() + assert joypad.buttons == joypad.driver.buttons + + joypad.joyp = 0x2 + joypad.update() + assert joypad.buttons == joypad.driver.directions + + joypad.joyp = 0x3 + joypad.update() + assert joypad.buttons == 0xF + \ No newline at end of file From arigo at codespeak.net Thu Mar 27 10:36:19 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 27 Mar 2008 10:36:19 +0100 (CET) Subject: [pypy-svn] r52984 - in pypy/branch/jit-hotpath/pypy: jit/hintannotator jit/rainbow/test jit/tl module/pypyjit rlib Message-ID: <20080327093619.5BC49169ED7@codespeak.net> Author: arigo Date: Thu Mar 27 10:36:17 2008 New Revision: 52984 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py pypy/branch/jit-hotpath/pypy/rlib/jit.py Log: Change the signature of on_enter_jit(). It is more natural this way because the greens arrive directly as greens, and it removes the ambiguity of what occurs if 'self.somegreen' is modified. Add an 'invariants' argument (in-progress). Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Thu Mar 27 10:36:17 2008 @@ -5,6 +5,7 @@ from pypy.jit.hintannotator.annotator import HintAnnotator from pypy.jit.hintannotator.model import SomeLLAbstractConstant, OriginFlags from pypy.annotation import model as annmodel +from pypy.rpython.rmodel import inputconst from pypy.rpython.rtyper import LowLevelOpList from pypy.rpython.lltypesystem import lltype from pypy.rlib.jit import JitHintError @@ -137,14 +138,16 @@ num_greens = len(drivercls.greens) num_reds = len(drivercls.reds) assert len(allvars) == num_greens + num_reds - for name, v_value in zip(drivercls.greens + drivercls.reds, allvars): + for name, v_value in zip(drivercls.reds, allvars[num_greens:]): r_instance.setfield(v_self, name, v_value, llops) - # generate a call to on_enter_jit(self) + # generate a call to on_enter_jit(self, invariants, *greens) on_enter_jit_func = drivercls.on_enter_jit.im_func s_func = rtyper.annotator.bookkeeper.immutablevalue(on_enter_jit_func) r_func = rtyper.getrepr(s_func) c_func = r_func.get_unique_llfn() - llops.genop('direct_call', [c_func, v_self]) + v_invariants = inputconst(lltype.Void, None) + vlist = allvars[:num_greens] + llops.genop('direct_call', [c_func, v_self, v_invariants] + vlist) # generate ops to reload the 'reds' variables from 'self' # XXX Warning! the 'greens' variables are not reloaded. This is # a bit of a mess color-wise, and probably not useful. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Thu Mar 27 10:36:17 2008 @@ -358,7 +358,7 @@ class MyJitDriver(JitDriver): greens = [] reds = ['n'] - def on_enter_jit(self): + def on_enter_jit(self, invariants): self.n += 100 # doesn't make sense, just for testing def ll_function(n): @@ -378,10 +378,8 @@ class MyJitDriver(JitDriver): greens = ['void1', 'm'] reds = ['void2', 'n'] - def on_enter_jit(self): - self.n += self.m # doesn't make sense, just for testing - # note that the green 'self.m' cannot be modified - # (changes would not be reloaded into the 'm' var currently) + def on_enter_jit(self, invariants, void1, m): + self.n += m # doesn't make sense, just for testing def ll_function(n, m): MyJitDriver.jit_merge_point(n=n, m=m, void1=None, void2=None) @@ -397,6 +395,17 @@ "run_machine_code 200 2", ]) + def test_on_enter_jit_args_are_green(self): + class MyJitDriver(JitDriver): + greens = ['m'] + reds = [] + def on_enter_jit(self, invariants, m): + hint(m, concrete=True) + def ll_function(m): + MyJitDriver.jit_merge_point(m=m) + MyJitDriver.can_enter_jit(m=m) + self.run(ll_function, [2], threshold=1, small=True) + def test_hp_tlr(self): from pypy.jit.tl import tlr Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py Thu Mar 27 10:36:17 2008 @@ -103,7 +103,7 @@ reds = ['args', 'loops', 'stack'] greens = ['bytecode', 'pos'] - def on_enter_jit(self): + def on_enter_jit(self, invariants, bytecode, pos): # Now some strange code that makes a copy of the 'args' list in # a complicated way... this is a workaround forcing the whole 'args' # list to be virtual. It is a way to tell the JIT compiler that it Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Thu Mar 27 10:36:17 2008 @@ -23,11 +23,9 @@ class PyPyJitDriver(JitDriver): reds = ['frame', 'ec'] greens = ['next_instr', 'pycode'] - def on_enter_jit(self): + def on_enter_jit(self, invariants, next_instr, pycode): # *loads* of nonsense for now frame = self.frame - pycode = self.pycode - pycode = hint(pycode, promote=True) # xxx workaround pycode = hint(pycode, deepfreeze=True) fastlocals_w = [None] * pycode.co_nlocals Modified: pypy/branch/jit-hotpath/pypy/rlib/jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/jit.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/jit.py Thu Mar 27 10:36:17 2008 @@ -182,20 +182,23 @@ def _emulate_method_calls(cls, bookkeeper, livevars_s): # annotate "cls.on_enter_jit()" if it is defined - # on_enter_jit(self) is called with a copy of the value of the - # red and green variables. The red variables can be modified - # in order to give hints to the JIT about the redboxes. The - # green variables should not be changed. + # on_enter_jit(self, invariants, *greenvars) is called with a copy + # of the value of the red variables on self. The red variables + # can be modified in order to give hints to the JIT about the + # redboxes. from pypy.annotation import model as annmodel if hasattr(cls, 'on_enter_jit'): classdef = bookkeeper.getuniqueclassdef(cls) - s_arg = annmodel.SomeInstance(classdef) - for name, s_value in livevars_s.items(): - assert name.startswith('s_') - name = name[2:] - s_arg.setattr(bookkeeper.immutablevalue(name), s_value) + s_self = annmodel.SomeInstance(classdef) + args_s = [s_self, annmodel.s_None] + for name in cls.greens: + s_value = livevars_s['s_' + name] + args_s.append(s_value) + for name in cls.reds: + s_value = livevars_s['s_' + name] + s_self.setattr(bookkeeper.immutablevalue(name), s_value) key = "rlib.jit.JitDriver.on_enter_jit" s_func = bookkeeper.immutablevalue(cls.on_enter_jit.im_func) - s_result = bookkeeper.emulate_pbc_call(key, s_func, [s_arg]) + s_result = bookkeeper.emulate_pbc_call(key, s_func, args_s) assert annmodel.s_None.contains(s_result) _emulate_method_calls = classmethod(_emulate_method_calls) From arigo at codespeak.net Thu Mar 27 12:37:22 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 27 Mar 2008 12:37:22 +0100 (CET) Subject: [pypy-svn] r52985 - in pypy/branch/jit-hotpath/pypy: jit/hintannotator jit/rainbow jit/rainbow/test jit/tl rlib Message-ID: <20080327113722.261C8169F2A@codespeak.net> Author: arigo Date: Thu Mar 27 12:37:20 2008 New Revision: 52985 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py pypy/branch/jit-hotpath/pypy/rlib/jit.py Log: Support for a compute_invariant() method on the JitDriver. See docstrings in jit.py. Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Thu Mar 27 12:37:20 2008 @@ -128,6 +128,13 @@ i += 1 assert i == len(vars) + compute_invariants_func = drivercls.compute_invariants.im_func + bk = rtyper.annotator.bookkeeper + s_func = bk.immutablevalue(compute_invariants_func) + r_func = rtyper.getrepr(s_func) + c_func = r_func.get_unique_llfn() + INVARIANTS = c_func.concretetype.TO.RESULT + llops = LowLevelOpList(rtyper) # generate ops to make an instance of DriverCls classdef = rtyper.annotator.bookkeeper.getuniqueclassdef(drivercls) @@ -145,7 +152,9 @@ s_func = rtyper.annotator.bookkeeper.immutablevalue(on_enter_jit_func) r_func = rtyper.getrepr(s_func) c_func = r_func.get_unique_llfn() - v_invariants = inputconst(lltype.Void, None) + v_invariants = varoftype(INVARIANTS, 'invariants') + c_hint = inputconst(lltype.Void, {'concrete': True}) + llops.genop('hint', [v_invariants, c_hint], resulttype=INVARIANTS) vlist = allvars[:num_greens] llops.genop('direct_call', [c_func, v_self, v_invariants] + vlist) # generate ops to reload the 'reds' variables from 'self' @@ -157,6 +166,7 @@ newvars.append(v_value) newvars = [v for v in newvars if v.concretetype is not lltype.Void] # done, fill the block and link it to make it the startblock + newblock.inputargs.append(v_invariants) newblock.operations[:] = llops newblock.closeblock(Link(newvars, graph.startblock)) graph.startblock.isstartblock = False Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Thu Mar 27 12:37:20 2008 @@ -55,7 +55,10 @@ RESARGS = [] self.red_args_spec = [] self.green_args_spec = [] - for v in newportalgraph.getargs(): + args = newportalgraph.getargs() + if hasattr(self.jitdrivercls, 'on_enter_jit'): + args = args[:-1] # ignore the final 'invariants' argument + for v in args: TYPE = v.concretetype ALLARGS.append(TYPE) if self.hintannotator.binding(v).is_green(): @@ -80,8 +83,7 @@ num_green_args = len(self.green_args_spec) def maybe_enter_jit(*args): - greenargs = args[:num_green_args] - mc = state.maybe_compile(*greenargs) + mc = state.maybe_compile(*args) if not mc: return if self.verbose_level >= 2: @@ -283,6 +285,7 @@ def make_state_class(hotrunnerdesc): # very minimal, just to make the first test pass + num_green_args = len(hotrunnerdesc.green_args_spec) green_args_spec = unrolling_iterable(hotrunnerdesc.green_args_spec) red_args_spec = unrolling_iterable(hotrunnerdesc.red_args_spec) green_args_names = unrolling_iterable( @@ -294,6 +297,20 @@ else: HASH_TABLE_SIZE = 1 + # ---------- hacks for the 'invariants' argument ---------- + drivercls = hotrunnerdesc.jitdrivercls + if hasattr(drivercls, 'on_enter_jit'): + wrapper = drivercls._get_compute_invariants_wrapper() + bk = hotrunnerdesc.rtyper.annotator.bookkeeper + s_func = bk.immutablevalue(wrapper) + r_func = hotrunnerdesc.rtyper.getrepr(s_func) + ll_compute_invariants_wrapper = r_func.get_unique_llfn().value + INVARIANTS = lltype.typeOf(ll_compute_invariants_wrapper).TO.RESULT + else: + ll_compute_invariants_wrapper = None # for the flow space + INVARIANTS = lltype.Void + # --------------------------------------------------------- + class StateCell(object): __slots__ = [] @@ -327,7 +344,8 @@ # correctly, the occasional mistake due to hash collision is # not too bad. - def maybe_compile(self, *greenargs): + def maybe_compile(self, *args): + greenargs = args[:num_green_args] argshash = self.getkeyhash(*greenargs) argshash &= (HASH_TABLE_SIZE - 1) cell = self.cells[argshash] @@ -337,11 +355,11 @@ n = cell.counter + 1 if n < hotrunnerdesc.jitdrivercls.getcurrentthreshold(): if hotrunnerdesc.verbose_level >= 3: - interp.debug_trace("jit_not_entered", *greenargs) + interp.debug_trace("jit_not_entered", *args) self.cells[argshash] = Counter(n) return self.NULL_MC interp.debug_trace("jit_compile", *greenargs) - return self.compile(argshash, *greenargs) + return self.compile(argshash, *args) else: # machine code was already compiled for these greenargs # (or we have a hash collision) @@ -349,11 +367,11 @@ if cell.equalkey(*greenargs): return cell.mc else: - return self.handle_hash_collision(cell, argshash, - *greenargs) + return self.handle_hash_collision(cell, argshash, *args) maybe_compile._dont_inline_ = True - def handle_hash_collision(self, cell, argshash, *greenargs): + def handle_hash_collision(self, cell, argshash, *args): + greenargs = args[:num_green_args] next = cell.next while not isinstance(next, Counter): assert isinstance(next, MachineCodeEntryPoint) @@ -370,11 +388,11 @@ n = next.counter + 1 if n < hotrunnerdesc.jitdrivercls.getcurrentthreshold(): if hotrunnerdesc.verbose_level >= 3: - interp.debug_trace("jit_not_entered", *greenargs) + interp.debug_trace("jit_not_entered", *args) cell.next = Counter(n) return self.NULL_MC interp.debug_trace("jit_compile", *greenargs) - return self.compile(argshash, *greenargs) + return self.compile(argshash, *args) handle_hash_collision._dont_inline_ = True def getkeyhash(self, *greenargs): @@ -391,15 +409,15 @@ return result getkeyhash._always_inline_ = True - def compile(self, argshash, *greenargs): + def compile(self, argshash, *args): try: - return self._compile(argshash, *greenargs) + return self._compile(argshash, *args) except Exception, e: rhotpath.report_compile_time_exception( hotrunnerdesc.interpreter, e) return self.NULL_MC - def _compile(self, argshash, *greenargs): + def _compile(self, argshash, *args): interp = hotrunnerdesc.interpreter rgenop = interp.rgenop builder, gv_generated, inputargs_gv = rgenop.newgraph( @@ -415,8 +433,18 @@ red_i += make_arg_redbox.consumes redargs = list(redargs) + greenargs = args[:num_green_args] greenargs_gv = [rgenop.genconst(greenargs[i]) for i in green_args_range] + + # ---------- hacks for the 'invariants' argument ---------- + if INVARIANTS is not lltype.Void: + run = maybe_on_top_of_llinterp(hotrunnerdesc.exceptiondesc, + ll_compute_invariants_wrapper) + invariants = run(*args) + greenargs_gv.append(rgenop.genconst(invariants)) + # --------------------------------------------------------- + rhotpath.setup_jitstate(interp, jitstate, greenargs_gv, redargs, hotrunnerdesc.entryjitcode, hotrunnerdesc.sigtoken) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Thu Mar 27 12:37:20 2008 @@ -176,14 +176,14 @@ assert res == main(2, 5) self.check_traces([ # running non-JITted leaves the initial profiling traces - # recorded by jit_may_enter(). We see the values of n1 and total. - "jit_not_entered", # 19 20 - "jit_not_entered", # 18 39 - "jit_not_entered", # 17 57 - "jit_not_entered", # 16 74 - "jit_not_entered", # 15 90 - "jit_not_entered", # 14 105 - "jit_not_entered", # 13 119 + # recorded by maybe_compile(). We see the values of n1 and total. + "jit_not_entered 19 20", + "jit_not_entered 18 39", + "jit_not_entered 17 57", + "jit_not_entered 16 74", + "jit_not_entered 15 90", + "jit_not_entered 14 105", + "jit_not_entered 13 119", # on the start of the next iteration, compile the 'total += n1' "jit_compile", "pause at hotsplit in ll_function", @@ -278,8 +278,8 @@ assert res == main(1, 10) self.check_traces([ # start compiling the 3rd time we loop back - "jit_not_entered * struct rpy_string {...} 5", # 9 10 10 - "jit_not_entered * struct rpy_string {...} 5", # 8 90 10 + "jit_not_entered * struct rpy_string {...} 5 9 10 10", + "jit_not_entered * struct rpy_string {...} 5 8 90 10", "jit_compile * struct rpy_string {...} 5", # stop compiling at the red split ending an extra iteration "pause at hotsplit in ll_function", @@ -331,8 +331,8 @@ res = self.run(ll_function, [3], threshold=3, small=True) assert res == (3*4)/2 - self.check_traces(['jit_not_entered', # 2 3 - 'jit_not_entered', # 1 5 + self.check_traces(['jit_not_entered 2 3', + 'jit_not_entered 1 5', ]) res = self.run(ll_function, [50], threshold=3, small=True) @@ -406,6 +406,22 @@ MyJitDriver.can_enter_jit(m=m) self.run(ll_function, [2], threshold=1, small=True) + def test_compute_invariants(self): + class MyJitDriver(JitDriver): + greens = ['m'] + reds = ['n'] + def compute_invariants(self, m): + return self.n + 10*m # doesn't make sense, just for testing + def on_enter_jit(self, invariants, m): + self.n += invariants * 1000 + def ll_function(n, m): + MyJitDriver.jit_merge_point(m=m, n=n) + MyJitDriver.can_enter_jit(m=m, n=n) + hint(m, concrete=True) + return n + res = self.run(ll_function, [2, 7], threshold=1, small=True) + assert res == 72002 + def test_hp_tlr(self): from pypy.jit.tl import tlr @@ -419,32 +435,21 @@ res = self.run(main, [1, 71], threshold=3) assert res == 5041 self.check_traces([ - "jit_not_entered * stru...} 10", # 70 * array [ 70, 71, 71 ] - "jit_not_entered * stru...} 10", # 69 * array [ 69, 71, 142 ] + "jit_not_entered * stru...} 10 70 * array [ 70, 71, 71 ]", + "jit_not_entered * stru...} 10 69 * array [ 69, 71, 142 ]", "jit_compile * stru...} 10", - # we first see the promotion of len(regs) in on_enter_jit() - "pause at promote in TLRJitDriver.on_enter_jit_Hv", - # followed by two fallback runs - "run_machine_code * stru...} 10 68 * array [ 68, 71, 213 ]", - "fallback_interp", - "fb_leave * stru...} 10 68 * array [ 68, 71, 213 ]", - "run_machine_code * stru...} 10 67 * array [ 67, 71, 284 ]", - "fallback_interp", - "fb_leave * stru...} 10 67 * array [ 67, 71, 284 ]", - # the third time, we resume compiling for len(regs) == 3 - "run_machine_code * stru...} 10 66 * array [ 66, 71, 355 ]", - "jit_resume Signed path 3 in TLRJitDriver.on_enter_jit_Hv", # pause at the "int_is_true" from the JUMP_IF_A opcode "pause at hotsplit in hp_interpret", - # two fallback runs off this hotsplit - "resume_machine_code", + # start the newly produced machine code + "run_machine_code * stru...} 10 68 * array [ 68, 71, 213 ]", + # two fallback interpreter runs off this hotsplit "fallback_interp", - "fb_leave * stru...} 10 65 * array [ 65, 71, 426 ]", - "run_machine_code * stru...} 10 65 * array [ 65, 71, 426 ]", + "fb_leave * stru...} 10 67 * array [ 67, 71, 284 ]", + "run_machine_code * stru...} 10 67 * array [ 67, 71, 284 ]", "fallback_interp", - "fb_leave * stru...} 10 64 * array [ 64, 71, 497 ]", + "fb_leave * stru...} 10 66 * array [ 66, 71, 355 ]", # the third time, compile the path "stay in the loop" - "run_machine_code * stru...} 10 64 * array [ 64, 71, 497 ]", + "run_machine_code * stru...} 10 66 * array [ 66, 71, 355 ]", "jit_resume Bool path True in hp_interpret", "done at jit_merge_point", # the rest is running 100% in machine code Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Thu Mar 27 12:37:20 2008 @@ -1887,7 +1887,7 @@ class MyJitDriver(JitDriver): greens = [] reds = ['n', 'm', 'i', 'result'] - def on_enter_jit(self): + def on_enter_jit(self, invariants): self.n = hint(hint(self.n, promote=True), variable=True) self.m = hint(hint(self.m, promote=True), variable=True) def f(n, m): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Thu Mar 27 12:37:20 2008 @@ -1637,10 +1637,15 @@ greens = ['pc', 's'] reds = ['frame'] - def on_enter_jit(self): + def compute_invariants(self, pc, s): + frame = self.frame + stacklen = len(frame.stack) + return stacklen + + def on_enter_jit(self, invariant, pc, s): frame = self.frame origstack = frame.stack - stacklen = hint(len(origstack), promote=True) + stacklen = invariant curstack = [] i = 0 while i < stacklen: Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py Thu Mar 27 12:37:20 2008 @@ -102,13 +102,23 @@ class TinyJitDriver(JitDriver): reds = ['args', 'loops', 'stack'] greens = ['bytecode', 'pos'] - + + def compute_invariants(self, bytecode, pos): + # Some of the information that we maintain only really depends on + # bytecode and pos: the whole 'loops' list has this property. + # By being a bit careful we could also put len(args) in the + # invariants, but although it doesn't make much sense it is a + # priori possible for the same bytecode to be run with + # different len(args). + return self.loops + def on_enter_jit(self, invariants, bytecode, pos): # Now some strange code that makes a copy of the 'args' list in # a complicated way... this is a workaround forcing the whole 'args' # list to be virtual. It is a way to tell the JIT compiler that it # doesn't have to worry about the 'args' list being unpredictably # modified. + oldloops = invariants oldargs = self.args argcount = hint(len(oldargs), promote=True) args = [] @@ -118,13 +128,13 @@ args.append(oldargs[n]) n += 1 self.args = args - oldloops = self.loops - argcount = hint(len(oldloops), promote=True) + # turn the green 'loops' from 'invariants' into a virtual list + argcount = len(oldloops) loops = [] n = 0 while n < argcount: hint(n, concrete=True) - loops.append(hint(oldloops[n], promote=True)) + loops.append(oldloops[n]) n += 1 self.loops = loops Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py Thu Mar 27 12:37:20 2008 @@ -53,9 +53,12 @@ greens = ['bytecode', 'pc'] reds = ['a', 'regs'] - def on_enter_jit(self): + def compute_invariants(self, bytecode, pc): + return len(self.regs) + + def on_enter_jit(self, invariant, bytecode, pc): # make a copy of the 'regs' list to make it a VirtualList for the JIT - length = hint(len(self.regs), promote=True) + length = invariant newregs = [0] * length i = 0 while i < length: Modified: pypy/branch/jit-hotpath/pypy/rlib/jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/jit.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/jit.py Thu Mar 27 12:37:20 2008 @@ -1,5 +1,6 @@ from pypy.rpython.extregistry import ExtRegistryEntry from pypy.rlib.objectmodel import CDefinedIntSymbolic +from pypy.rlib.unroll import unrolling_iterable def purefunction(func): func._pure_function_ = True @@ -171,6 +172,25 @@ return 10 getcurrentthreshold = staticmethod(getcurrentthreshold) + def compute_invariants(self, *greens): + """This can compute a value or tuple that is passed as a green + argument 'invariants' to on_enter_jit(). It should in theory + only depend on the 'greens', but in practice it can peek at the + reds currently stored in 'self'. This allows the extraction in + an interpreter-specific way of whatever red information that + ultimately depends on the greens only. + """ + + def _on_enter_jit(self, *greens): + """This is what theoretically occurs when we are entering the JIT. + In truth, compute_invariants() is called only once per set of greens + and its result is cached. On the other hand, on_enter_jit() is + compiled into machine code and so it runs every time the execution + jumps from the regular interpreter to the machine code. + """ + invariants = self.compute_invariants(*greens) + return self.on_enter_jit(invariants, *greens) + def _check_class(cls): if cls is JitDriver: raise JitHintError("must subclass JitDriver") @@ -190,15 +210,47 @@ if hasattr(cls, 'on_enter_jit'): classdef = bookkeeper.getuniqueclassdef(cls) s_self = annmodel.SomeInstance(classdef) - args_s = [s_self, annmodel.s_None] + args_s = [s_self] + allargs_s = [] for name in cls.greens: s_value = livevars_s['s_' + name] args_s.append(s_value) + allargs_s.append(s_value) for name in cls.reds: s_value = livevars_s['s_' + name] s_self.setattr(bookkeeper.immutablevalue(name), s_value) - key = "rlib.jit.JitDriver.on_enter_jit" - s_func = bookkeeper.immutablevalue(cls.on_enter_jit.im_func) + allargs_s.append(s_value) + + key = "rlib.jit.JitDriver._on_enter_jit" + s_func = bookkeeper.immutablevalue(cls._on_enter_jit.im_func) s_result = bookkeeper.emulate_pbc_call(key, s_func, args_s) assert annmodel.s_None.contains(s_result) + + wrapper = cls._get_compute_invariants_wrapper() + key = "rlib.jit.JitDriver._compute_invariants_wrapper" + s_func = bookkeeper.immutablevalue(wrapper) + bookkeeper.emulate_pbc_call(key, s_func, allargs_s) _emulate_method_calls = classmethod(_emulate_method_calls) + + def _get_compute_invariants_wrapper(cls): + try: + return cls.__dict__['_compute_invariants_wrapper'] + except KeyError: + num_green_args = len(cls.greens) + unroll_reds = unrolling_iterable(cls.reds) + # make a wrapper around compute_invariants() which takes all + # green and red arguments and puts the red ones in a fresh + # instance of the JitDriver subclass. This logic is here + # in jit.py because it needs to be annotated and rtyped as + # a high-level function. + def _compute_invariants_wrapper(*args): + greenargs = args[:num_green_args] + self = cls() + i = num_green_args + for name in unroll_reds: + setattr(self, name, args[i]) + i += 1 + return self.compute_invariants(*greenargs) + cls._compute_invariants_wrapper = _compute_invariants_wrapper + return _compute_invariants_wrapper + _get_compute_invariants_wrapper = classmethod(_get_compute_invariants_wrapper) From arigo at codespeak.net Thu Mar 27 13:08:24 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 27 Mar 2008 13:08:24 +0100 (CET) Subject: [pypy-svn] r52986 - pypy/branch/jit-hotpath/pypy/jit/tl Message-ID: <20080327120824.1A1EA169F2E@codespeak.net> Author: arigo Date: Thu Mar 27 13:08:24 2008 New Revision: 52986 Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py Log: Forgot this. Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py Thu Mar 27 13:08:24 2008 @@ -129,6 +129,7 @@ n += 1 self.args = args # turn the green 'loops' from 'invariants' into a virtual list + oldloops = hint(oldloops, deepfreeze=True) argcount = len(oldloops) loops = [] n = 0 From arigo at codespeak.net Thu Mar 27 16:33:47 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 27 Mar 2008 16:33:47 +0100 (CET) Subject: [pypy-svn] r52987 - pypy/branch/jit-hotpath/pypy/module/pypyjit Message-ID: <20080327153347.55274169F71@codespeak.net> Author: arigo Date: Thu Mar 27 16:33:45 2008 New Revision: 52987 Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Log: Remove a promotion in pypy-c's on_enter_jit(), using compute_invariants(). Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Thu Mar 27 16:33:45 2008 @@ -23,25 +23,23 @@ class PyPyJitDriver(JitDriver): reds = ['frame', 'ec'] greens = ['next_instr', 'pycode'] + + def compute_invariants(self, next_instr, pycode): + # compute the information that really only depends on next_instr + # and pycode + frame = self.frame + valuestackdepth = frame.valuestackdepth + blockstack = frame.blockstack + return (valuestackdepth, blockstack) + def on_enter_jit(self, invariants, next_instr, pycode): # *loads* of nonsense for now + (depth, oldblockstack) = invariants frame = self.frame pycode = hint(pycode, deepfreeze=True) fastlocals_w = [None] * pycode.co_nlocals - stuff = frame.valuestackdepth - if len(frame.blockstack): - stuff |= (-sys.maxint-1) - - stuff = hint(stuff, promote=True) - if stuff >= 0: - # blockdepth == 0, common case - # XXX or it was at some point but not now, not at all - # XXX as we expect to *be* in a loop... - frame.blockstack = [] - depth = stuff & sys.maxint - i = pycode.co_nlocals while True: i -= 1 @@ -63,6 +61,8 @@ virtualstack_w[depth] = frame.valuestack_w[depth] frame.valuestack_w = virtualstack_w + # XXX we should also make a completely virtual copy of oldblockstack + def getcurrentthreshold(): return pypyjitconfig.cur_threshold getcurrentthreshold = staticmethod(getcurrentthreshold) From arigo at codespeak.net Thu Mar 27 16:37:11 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Thu, 27 Mar 2008 16:37:11 +0100 (CET) Subject: [pypy-svn] r52988 - pypy/branch/jit-hotpath/pypy/module/pypyjit/test Message-ID: <20080327153711.DB182169F7C@codespeak.net> Author: arigo Date: Thu Mar 27 16:37:11 2008 New Revision: 52988 Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_pypy_c.py Log: Fix these tests. They pass :-) Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_pypy_c.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_pypy_c.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_pypy_c.py Thu Mar 27 16:37:11 2008 @@ -14,14 +14,16 @@ # some support code... print >> f, py.code.Source(""" import sys, pypyjit - pypyjit.enable(main.func_code) + pypyjit.enable() + pypyjit.setthreshold(3) def check(args, expected): - print >> sys.stderr, 'trying:', args - result = main(*args) - print >> sys.stderr, 'got:', repr(result) - assert result == expected - assert type(result) is type(expected) + for i in range(3): + print >> sys.stderr, 'trying:', args + result = main(*args) + print >> sys.stderr, 'got:', repr(result) + assert result == expected + assert type(result) is type(expected) """) for testcase in testcases * 2: print >> f, "check(%r, %r)" % testcase From fijal at codespeak.net Thu Mar 27 18:32:49 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 18:32:49 +0100 (CET) Subject: [pypy-svn] r53013 - in pypy/dist/pypy/module/select: . test Message-ID: <20080327173249.89F34169F84@codespeak.net> Author: fijal Date: Thu Mar 27 18:32:47 2008 New Revision: 53013 Modified: pypy/dist/pypy/module/select/app_select.py pypy/dist/pypy/module/select/test/test_select.py Log: make sure that one can mix lists and tuples. Modified: pypy/dist/pypy/module/select/app_select.py ============================================================================== --- pypy/dist/pypy/module/select/app_select.py (original) +++ pypy/dist/pypy/module/select/app_select.py Thu Mar 27 18:32:47 2008 @@ -36,6 +36,9 @@ *** IMPORTANT NOTICE *** On Windows, only sockets are supported; on Unix, all file descriptors. """ + iwtd = tuple(iwtd) + owtd = tuple(owtd) + ewtd = tuple(ewtd) from select import poll, POLLIN, POLLOUT, POLLPRI, POLLERR, POLLHUP fddict = {} polldict = {} Modified: pypy/dist/pypy/module/select/test/test_select.py ============================================================================== --- pypy/dist/pypy/module/select/test/test_select.py (original) +++ pypy/dist/pypy/module/select/test/test_select.py Thu Mar 27 18:32:47 2008 @@ -20,6 +20,15 @@ readend.close() writeend.close() + def test_list_tuple(self): + import time, select + readend, writeend = getpair() + try: + iwtd, owtd, ewtd = select.select([readend], (), (), 0) + finally: + readend.close() + writeend.close() + def test_readable(self): """ select.select returns elements from the "read list" (the first From fijal at codespeak.net Thu Mar 27 19:08:44 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 19:08:44 +0100 (CET) Subject: [pypy-svn] r53014 - pypy/branch/js-refactoring/pypy/lang/js Message-ID: <20080327180844.C14B2168434@codespeak.net> Author: fijal Date: Thu Mar 27 19:08:42 2008 New Revision: 53014 Removed: pypy/branch/js-refactoring/pypy/lang/js/commit Log: this is not needed any more. From fijal at codespeak.net Thu Mar 27 19:54:46 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 19:54:46 +0100 (CET) Subject: [pypy-svn] r53015 - in pypy/dist/pypy/lib: app_test/ctypes ctypes Message-ID: <20080327185446.B5A3D169F8F@codespeak.net> Author: fijal Date: Thu Mar 27 19:54:44 2008 New Revision: 53015 Added: pypy/dist/pypy/lib/app_test/ctypes/test_support.py (contents, props changed) pypy/dist/pypy/lib/ctypes/support.py (contents, props changed) Log: add support for errno and standard_c_lib Added: pypy/dist/pypy/lib/app_test/ctypes/test_support.py ============================================================================== --- (empty file) +++ pypy/dist/pypy/lib/app_test/ctypes/test_support.py Thu Mar 27 19:54:44 2008 @@ -0,0 +1,15 @@ + +from ctypes import * +from ctypes.support import standard_c_lib, get_errno, set_errno + +def test_stdlib_and_errno(): + write = standard_c_lib.write + write.argtypes = [c_int, c_char_p, c_size_t] + write.restype = c_size_t + # clear errno first + set_errno(0) + assert get_errno() == 0 + write(-345, "abc", 3) + assert get_errno() != 0 + set_errno(0) + assert get_errno() == 0 Added: pypy/dist/pypy/lib/ctypes/support.py ============================================================================== --- (empty file) +++ pypy/dist/pypy/lib/ctypes/support.py Thu Mar 27 19:54:44 2008 @@ -0,0 +1,46 @@ + +""" This file provides some support for things like standard_c_lib and +errno access, as portable as possible +""" + +import ctypes +import ctypes.util +import sys + +# __________ the standard C library __________ + +if sys.platform == 'win32': + # trying to guess the correct libc... only a few tests fail if there + # is a mismatch between the one used by python2x.dll and the one + # loaded here + if sys.version_info < (2, 4): + standard_c_lib = ctypes.cdll.LoadLibrary('msvcrt.dll') + else: + standard_c_lib = ctypes.cdll.LoadLibrary('msvcr71.dll') +else: + standard_c_lib = ctypes.cdll.LoadLibrary(ctypes.util.find_library('c')) + +if sys.platform == 'win32': + standard_c_lib._errno.restype = ctypes.POINTER(ctypes.c_int) + def _where_is_errno(): + return standard_c_lib._errno() + +elif sys.platform in ('linux2', 'freebsd6'): + standard_c_lib.__errno_location.restype = ctypes.POINTER(ctypes.c_int) + def _where_is_errno(): + return standard_c_lib.__errno_location() + +elif sys.platform == 'darwin': + standard_c_lib.__error.restype = ctypes.POINTER(ctypes.c_int) + def _where_is_errno(): + return standard_c_lib.__error() + +def get_errno(): + errno_p = _where_is_errno() + return errno_p.contents.value + +def set_errno(value): + errno_p = _where_is_errno() + errno_p.contents.value = value + + From fijal at codespeak.net Thu Mar 27 20:28:09 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 20:28:09 +0100 (CET) Subject: [pypy-svn] r53017 - in pypy/dist/pypy/lib: . app_test/ctypes ctypes Message-ID: <20080327192809.597D3169F8F@codespeak.net> Author: fijal Date: Thu Mar 27 20:28:08 2008 New Revision: 53017 Added: pypy/dist/pypy/lib/ctypes_support.py - copied unchanged from r53015, pypy/dist/pypy/lib/ctypes/support.py Removed: pypy/dist/pypy/lib/ctypes/support.py Modified: pypy/dist/pypy/lib/app_test/ctypes/test_support.py Log: Move this stuff a bit, not to pretend it's a part of ctypes. Modified: pypy/dist/pypy/lib/app_test/ctypes/test_support.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_support.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_support.py Thu Mar 27 20:28:08 2008 @@ -1,6 +1,6 @@ from ctypes import * -from ctypes.support import standard_c_lib, get_errno, set_errno +from ctypes_support import standard_c_lib, get_errno, set_errno def test_stdlib_and_errno(): write = standard_c_lib.write From fijal at codespeak.net Thu Mar 27 20:37:30 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 20:37:30 +0100 (CET) Subject: [pypy-svn] r53018 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080327193730.D7E2B169F84@codespeak.net> Author: fijal Date: Thu Mar 27 20:37:30 2008 New Revision: 53018 Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/ Log: create a new i386 backend. Let's see how far we'll go... From fijal at codespeak.net Thu Mar 27 20:47:00 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 20:47:00 +0100 (CET) Subject: [pypy-svn] r53019 - pypy/dist/pypy/lib Message-ID: <20080327194700.2BB55169F98@codespeak.net> Author: fijal Date: Thu Mar 27 20:47:00 2008 New Revision: 53019 Added: pypy/dist/pypy/lib/_locale.py (contents, props changed) Log: (fijal, haypo) _locale, using ctypes. not very portable, but I'm unsure how to use ctypes_configure here, let's leave it alone for now. Added: pypy/dist/pypy/lib/_locale.py ============================================================================== --- (empty file) +++ pypy/dist/pypy/lib/_locale.py Thu Mar 27 20:47:00 2008 @@ -0,0 +1,387 @@ +"""Support for POSIX locales.""" +from ctypes import (Structure, POINTER, create_string_buffer, + c_ubyte, c_int, c_char_p, c_wchar_p) +from ctypes_support import standard_c_lib as libc +from ctypes_support import get_errno + +size_t = c_int +nl_item = c_int + +# Ubuntu Gusty i386 constants +LC_CTYPE = 0 +LC_NUMERIC = 1 +LC_TIME = 2 +LC_COLLATE = 3 +LC_MONETARY = 4 +LC_MESSAGES = 5 +LC_ALL = 6 +LC_PAPER = 7 +LC_NAME = 8 +LC_ADDRESS = 9 +LC_TELEPHONE = 10 +LC_MEASUREMENT = 11 +LC_IDENTIFICATION = 12 +CHAR_MAX = 127 + +# Ubuntu Gusty i386 structure +class lconv(Structure): + _fields_ = ( + # Numeric (non-monetary) information. + ("decimal_point", c_char_p), # Decimal point character. + ("thousands_sep", c_char_p), # Thousands separator. + + # Each element is the number of digits in each group; + # elements with higher indices are farther left. + # An element with value CHAR_MAX means that no further grouping is done. + # An element with value 0 means that the previous element is used + # for all groups farther left. */ + ("grouping", c_char_p), + + # Monetary information. + + # First three chars are a currency symbol from ISO 4217. + # Fourth char is the separator. Fifth char is '\0'. + ("int_curr_symbol", c_char_p), + ("currency_symbol", c_char_p), # Local currency symbol. + ("mon_decimal_point", c_char_p), # Decimal point character. + ("mon_thousands_sep", c_char_p), # Thousands separator. + ("mon_grouping", c_char_p), # Like `grouping' element (above). + ("positive_sign", c_char_p), # Sign for positive values. + ("negative_sign", c_char_p), # Sign for negative values. + ("int_frac_digits", c_ubyte), # Int'l fractional digits. + ("frac_digits", c_ubyte), # Local fractional digits. + # 1 if currency_symbol precedes a positive value, 0 if succeeds. + ("p_cs_precedes", c_ubyte), + # 1 iff a space separates currency_symbol from a positive value. + ("p_sep_by_space", c_ubyte), + # 1 if currency_symbol precedes a negative value, 0 if succeeds. + ("n_cs_precedes", c_ubyte), + # 1 iff a space separates currency_symbol from a negative value. + ("n_sep_by_space", c_ubyte), + + # Positive and negative sign positions: + # 0 Parentheses surround the quantity and currency_symbol. + # 1 The sign string precedes the quantity and currency_symbol. + # 2 The sign string follows the quantity and currency_symbol. + # 3 The sign string immediately precedes the currency_symbol. + # 4 The sign string immediately follows the currency_symbol. + ("p_sign_posn", c_ubyte), + ("n_sign_posn", c_ubyte), + # 1 if int_curr_symbol precedes a positive value, 0 if succeeds. + ("int_p_cs_precedes", c_ubyte), + # 1 iff a space separates int_curr_symbol from a positive value. + ("int_p_sep_by_space", c_ubyte), + # 1 if int_curr_symbol precedes a negative value, 0 if succeeds. + ("int_n_cs_precedes", c_ubyte), + # 1 iff a space separates int_curr_symbol from a negative value. + ("int_n_sep_by_space", c_ubyte), + # Positive and negative sign positions: + # 0 Parentheses surround the quantity and int_curr_symbol. + # 1 The sign string precedes the quantity and int_curr_symbol. + # 2 The sign string follows the quantity and int_curr_symbol. + # 3 The sign string immediately precedes the int_curr_symbol. + # 4 The sign string immediately follows the int_curr_symbol. + ("int_p_sign_posn", c_ubyte), + ("int_n_sign_posn", c_ubyte), + ) + +_setlocale = libc.setlocale +_setlocale.argtypes = (c_int, c_char_p) +_setlocale.restype = c_char_p + +_localeconv = libc.localeconv +_localeconv.argtypes = None +_localeconv.restype = POINTER(lconv) + +_strcoll = libc.strcoll +_strcoll.argtypes = (c_char_p, c_char_p) +_strcoll.restype = c_int + +_wcscoll = libc.wcscoll +_wcscoll.argtypes = (c_wchar_p, c_wchar_p) +_wcscoll.restype = c_int + +_strxfrm = libc.strxfrm +_strxfrm.argtypes = (c_char_p, c_char_p, size_t) +_strxfrm.restype = size_t + +try: + _nl_langinfo = libc.nl_langinfo + _nl_langinfo.argtypes = (nl_item,) + _nl_langinfo.restype = c_char_p +except AttributeError: + _nl_langinfo = None + +_gettext = libc.gettext +_gettext.argtypes = (c_char_p,) +_gettext.restype = c_char_p + +_dgettext = libc.dgettext +_dgettext.argtypes = (c_char_p, c_char_p) +_dgettext.restype = c_char_p + +_dcgettext = libc.dcgettext +_dcgettext.argtypes = (c_char_p, c_char_p, c_int) +_dcgettext.restype = c_char_p + +_textdomain = libc.textdomain +_textdomain.argtypes = (c_char_p,) +_textdomain.restype = c_char_p + +_bindtextdomain = libc.bindtextdomain +_bindtextdomain.argtypes = (c_char_p, c_char_p) +_bindtextdomain.restype = c_char_p + +try: + _bind_textdomain_codeset = libc.bindtextdomain_codeset + _bind_textdomain_codeset.argtypes = (c_char_p, c_char_p) + _bind_textdomain_codeset.restype = c_char_p +except AttributeError: + _bind_textdomain_codeset = None + +class Error(Exception): + pass + +def fixup_ulcase(): + import string + #import strop + + # create uppercase map string + ul = [] + for c in xrange(256): + c = chr(c) + if c.isupper(): + ul.append(c) + ul = ''.join(ul) + string.uppercase = ul + #strop.uppercase = ul + + # create lowercase string + ul = [] + for c in xrange(256): + c = chr(c) + if c.islower(): + ul.append(c) + ul = ''.join(ul) + string.lowercase = ul + #strop.lowercase = ul + + # create letters string + ul = [] + for c in xrange(256): + c = chr(c) + if c.isalpha(): + ul.append(c) + ul = ''.join(ul) + string.letters = ul + +def setlocale(category, locale=None): + "(integer,string=None) -> string. Activates/queries locale processing." + if locale: + # set locale + result = _setlocale(category, locale) + if not result: + raise Error("unsupported locale setting") + + # record changes to LC_CTYPE + if category in (LC_CTYPE, LC_ALL): + fixup_ulcase() + else: + # get locale + result = _setlocale(category, None) + if not result: + raise Error("locale query failed") + return result + +def _copy_grouping(text): + groups = [ ord(group) for group in text ] + groups.append(0) + return groups + +def localeconv(): + "() -> dict. Returns numeric and monetary locale-specific parameters." + + # if LC_NUMERIC is different in the C library, use saved value + lp = _localeconv() + l = lp.contents + + # hopefully, the localeconv result survives the C library calls + # involved herein + + # Numeric information + result = { + "decimal_point": l.decimal_point, + "thousands_sep": l.thousands_sep, + "grouping": _copy_grouping(l.grouping), + "int_curr_symbol": l.int_curr_symbol, + "currency_symbol": l.currency_symbol, + "mon_decimal_point": l.mon_decimal_point, + "mon_thousands_sep": l.mon_thousands_sep, + "mon_grouping": _copy_grouping(l.mon_grouping), + "positive_sign": l.positive_sign, + "negative_sign": l.negative_sign, + "int_frac_digits": l.int_frac_digits, + "frac_digits": l.frac_digits, + "p_cs_precedes": l.p_cs_precedes, + "p_sep_by_space": l.p_sep_by_space, + "n_cs_precedes": l.n_cs_precedes, + "n_sep_by_space": l.n_sep_by_space, + "p_sign_posn": l.p_sign_posn, + "n_sign_posn": l.n_sign_posn, + } + return result + +def strcoll(s1, s2): + "string,string -> int. Compares two strings according to the locale." + + # If both arguments are byte strings, use strcoll. + if isinstance(s1, str) and isinstance(s2, str): + return _strcoll(s1, s2) + + # If neither argument is unicode, it's an error. + if not isinstance(s1, unicode) and isinstance(s2, unicode): + raise ValueError("strcoll arguments must be strings") + + # Convert the non-unicode argument to unicode. + s1 = unicode(s1) + s2 = unicode(s2) + + # Collate the strings. + return _wcscoll(s1, s2) + +def strxfrm(s): + "string -> string. Returns a string that behaves for cmp locale-aware." + + # assume no change in size, first + n1 = len(s) + 1 + buf = create_string_buffer(n1) + n2 = _strxfrm(buf, s, n1) + 1 + if n2 > n1: + # more space needed + buf = create_string_buffer(n2) + _strxfrm(buf, s, n2) + return buf.value + +def getdefaultlocale(): + # TODO: Port code from CPython for Windows and Mac OS + raise NotImplementedError() + +if _nl_langinfo: + def _NL_ITEM(category, index): + return (category << 16) | index + + langinfo_constants = { + # LC_TIME category: date and time formatting. + + # Abbreviated days of the week. + "ABDAY_1": _NL_ITEM (LC_TIME, 0), + "ABDAY_2": _NL_ITEM (LC_TIME, 1), + "ABDAY_3": _NL_ITEM (LC_TIME, 2), + "ABDAY_4": _NL_ITEM (LC_TIME, 3), + "ABDAY_5": _NL_ITEM (LC_TIME, 4), + "ABDAY_6": _NL_ITEM (LC_TIME, 5), + "ABDAY_7": _NL_ITEM (LC_TIME, 6), + + # Long-named days of the week. + "DAY_1": _NL_ITEM (LC_TIME, 7), + "DAY_2": _NL_ITEM (LC_TIME, 8), + "DAY_3": _NL_ITEM (LC_TIME, 9), + "DAY_4": _NL_ITEM (LC_TIME, 10), + "DAY_5": _NL_ITEM (LC_TIME, 11), + "DAY_6": _NL_ITEM (LC_TIME, 12), + "DAY_7": _NL_ITEM (LC_TIME, 13), + + # Abbreviated month names. + "ABMON_1": _NL_ITEM (LC_TIME, 14), + "ABMON_2": _NL_ITEM (LC_TIME, 15), + "ABMON_3": _NL_ITEM (LC_TIME, 16), + "ABMON_4": _NL_ITEM (LC_TIME, 17), + "ABMON_5": _NL_ITEM (LC_TIME, 18), + "ABMON_6": _NL_ITEM (LC_TIME, 19), + "ABMON_7": _NL_ITEM (LC_TIME, 20), + "ABMON_8": _NL_ITEM (LC_TIME, 21), + "ABMON_9": _NL_ITEM (LC_TIME, 22), + "ABMON_10": _NL_ITEM (LC_TIME, 23), + "ABMON_11": _NL_ITEM (LC_TIME, 24), + "ABMON_12": _NL_ITEM (LC_TIME, 25), + + # Long month names. + "MON_1": _NL_ITEM (LC_TIME, 26), + "MON_2": _NL_ITEM (LC_TIME, 27), + "MON_3": _NL_ITEM (LC_TIME, 28), + "MON_4": _NL_ITEM (LC_TIME, 29), + "MON_5": _NL_ITEM (LC_TIME, 30), + "MON_6": _NL_ITEM (LC_TIME, 31), + "MON_7": _NL_ITEM (LC_TIME, 32), + "MON_8": _NL_ITEM (LC_TIME, 33), + "MON_9": _NL_ITEM (LC_TIME, 34), + "MON_10": _NL_ITEM (LC_TIME, 35), + "MON_11": _NL_ITEM (LC_TIME, 36), + "MON_12": _NL_ITEM (LC_TIME, 37), + + #TODO: .............. + #TODO: .............. this list + #TODO: .............. is really long + #TODO: .............. i'm lazy + #TODO: .............. so if you + #TODO: .............. want the full + #TODO: .............. list you have to + #TODO: .............. write it your own + #TODO: .............. + } + + def nl_langinfo(key): + """nl_langinfo(key) -> string + Return the value for the locale information associated with key.""" + # Check whether this is a supported constant. GNU libc sometimes + # returns numeric values in the char* return value, which would + # crash PyString_FromString. + for name, value in langinfo_constants.iteritems(): + if value == key: + # Check NULL as a workaround for GNU libc's returning NULL + # instead of an empty string for nl_langinfo(ERA). + result = _nl_langinfo(key) + if result is not None: + return result + else: + return "" + raise ValueError("unsupported langinfo constant") + +def gettext(msg): + """gettext(msg) -> string + Return translation of msg.""" + return _gettext(msg) + +def dgettext(domain, msg): + """dgettext(domain, msg) -> string + Return translation of msg in domain.""" + return _dgettext(domain, msg) + +def dcgettext(domain, msg, category): + """dcgettext(domain, msg, category) -> string + Return translation of msg in domain and category.""" + return _dcgettext(domain, msg, category) + +def textdomain(domain): + """textdomain(domain) -> string + Set the C library's textdmain to domain, returning the new domain.""" + return _textdomain(domain) + +def bindtextdomain(domain, dir): + """bindtextdomain(domain, dir) -> string + Bind the C library's domain to dir.""" + dirname = _bindtextdomain(domain, dir) + if not dirname: + errno = get_errno() + raise OSError(errno) + return dirname + +if _bind_textdomain_codeset: + def bind_textdomain_codeset(domain, codeset): + """bind_textdomain_codeset(domain, codeset) -> string + Bind the C library's domain to codeset.""" + codeset = _bind_textdomain_codeset(domain, codeset) + if codeset: + return codeset + return None + From fijal at codespeak.net Thu Mar 27 20:52:42 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 20:52:42 +0100 (CET) Subject: [pypy-svn] r53020 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080327195242.9BCFB169F9B@codespeak.net> Author: fijal Date: Thu Mar 27 20:52:42 2008 New Revision: 53020 Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/__init__.py (contents, props changed) Log: module init Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/__init__.py ============================================================================== From fijal at codespeak.net Thu Mar 27 20:53:12 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 20:53:12 +0100 (CET) Subject: [pypy-svn] r53021 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test Message-ID: <20080327195312.E842B169F9B@codespeak.net> Author: fijal Date: Thu Mar 27 20:53:12 2008 New Revision: 53021 Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/ Log: add a test directory From fijal at codespeak.net Thu Mar 27 20:55:32 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 20:55:32 +0100 (CET) Subject: [pypy-svn] r53022 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test Message-ID: <20080327195532.EBBCC169F9C@codespeak.net> Author: fijal Date: Thu Mar 27 20:55:31 2008 New Revision: 53022 Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/__init__.py (contents, props changed) Log: module init Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/__init__.py ============================================================================== From fijal at codespeak.net Thu Mar 27 21:18:27 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 21:18:27 +0100 (CET) Subject: [pypy-svn] r53023 - pypy/branch/jit-hotpath/pypy/jit/codegen/test Message-ID: <20080327201827.8E126169FA0@codespeak.net> Author: fijal Date: Thu Mar 27 21:18:25 2008 New Revision: 53023 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Log: cpython2.5 tends to return unsigned 32 bit long. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Thu Mar 27 21:18:25 2008 @@ -859,7 +859,7 @@ callback = CFUNCTYPE(c_int, *[c_int]*nb_args)(func) keepalive = self.__dict__.setdefault('_keepalive', []) keepalive.append((callback, func)) - return cast(callback, c_void_p).value + return intmask(cast(callback, c_void_p).value) # NB. returns the address as an integer def test_directtesthelper_direct(self): From antocuni at codespeak.net Thu Mar 27 22:13:43 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Thu, 27 Mar 2008 22:13:43 +0100 (CET) Subject: [pypy-svn] r53024 - pypy/dist/pypy/translator/cli Message-ID: <20080327211343.C4F48169F6F@codespeak.net> Author: antocuni Date: Thu Mar 27 22:13:40 2008 New Revision: 53024 Modified: pypy/dist/pypy/translator/cli/query.py Log: mono 1.9 gives a different string as the assembly name of pypylib, need to put a workaround here. This fixes translation. Modified: pypy/dist/pypy/translator/cli/query.py ============================================================================== --- pypy/dist/pypy/translator/cli/query.py (original) +++ pypy/dist/pypy/translator/cli/query.py Thu Mar 27 22:13:40 2008 @@ -14,6 +14,8 @@ Namespaces = set() mscorlib = 'mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' pypylib = 'pypylib, Version=0.0.0.0, Culture=neutral' +pypylib2 = 'pypylib, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null' # this is for mono 1.9 + #_______________________________________________________________________________ # This is the public interface of query.py @@ -147,7 +149,7 @@ if self.Assembly == mscorlib: assembly = '[mscorlib]' - elif self.Assembly == pypylib: + elif self.Assembly in (pypylib, pypylib2): assembly = '[pypylib]' else: assert False, 'TODO: support external assemblies' From fijal at codespeak.net Thu Mar 27 23:06:24 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Thu, 27 Mar 2008 23:06:24 +0100 (CET) Subject: [pypy-svn] r53025 - pypy/dist/pypy/translator/goal Message-ID: <20080327220624.AF0E2169F78@codespeak.net> Author: fijal Date: Thu Mar 27 23:06:22 2008 New Revision: 53025 Modified: pypy/dist/pypy/translator/goal/app_main.py Log: ignore those two signals by default. Modified: pypy/dist/pypy/translator/goal/app_main.py ============================================================================== --- pypy/dist/pypy/translator/goal/app_main.py (original) +++ pypy/dist/pypy/translator/goal/app_main.py Thu Mar 27 23:06:22 2008 @@ -286,6 +286,10 @@ signal.signal(signal.SIGINT, signal.default_int_handler) if hasattr(signal, "SIGPIPE"): signal.signal(signal.SIGPIPE, signal.SIG_IGN) + if hasattr(signal, 'SIGXFZ'): + signal.signal(signal.SIGXFZ, signal.SIG_IGN) + if hasattr(signal, 'SIGXFZS'): + signal.signal(signal.SIGXFZS, signal.SIG_IGN) def is_interactive(): return go_interactive or os.getenv('PYTHONINSPECT') From fijal at codespeak.net Fri Mar 28 01:01:29 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 28 Mar 2008 01:01:29 +0100 (CET) Subject: [pypy-svn] r53028 - in pypy/branch/jit-hotpath/pypy/jit/codegen/ia32: . test Message-ID: <20080328000129.CEC78169F94@codespeak.net> Author: fijal Date: Fri Mar 28 01:01:26 2008 New Revision: 53028 Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/operation.py (contents, props changed) pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/regalloc.py (contents, props changed) pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (contents, props changed) pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py (contents, props changed) Log: First test passes. Not sure why yet, but will look at it. Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/operation.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/operation.py Fri Mar 28 01:01:26 2008 @@ -0,0 +1,77 @@ + +from pypy.jit.codegen.i386.ri386 import * +from pypy.jit.codegen.model import GenVar +from pypy.rlib.objectmodel import specialize +from pypy.rpython.lltypesystem import lltype + +class Operation(GenVar): + pass + +class Op1(Operation): + def __init__(self, x): + self.x = x + +class Op2(Operation): + def __init__(self, x, y): + self.x = x + self.y = y + +class OpIntAdd(Op2): + opname = "int_add" + + def render(self, allocator, mc): + p1 = allocator.get_position(self.x) + p2 = allocator.get_position(self.y) + mc.ADD(p1, p2) + allocator.set_position(self, p1) + +def setup_opclasses(base): + d = {} + for name, value in globals().items(): + if type(value) is type(base) and issubclass(value, base): + opnames = getattr(value, 'opname', ()) + if isinstance(opnames, str): + opnames = (opnames,) + for opname in opnames: + assert opname not in d + d[opname] = value + return d +OPCLASSES1 = setup_opclasses(Op1) +OPCLASSES2 = setup_opclasses(Op2) +del setup_opclasses + + at specialize.memo() +def getopclass1(opname): + try: + return OPCLASSES1[opname] + except KeyError: + raise MissingBackendOperation(opname) + + at specialize.memo() +def getopclass2(opname): + try: + return OPCLASSES2[opname] + except KeyError: + raise MissingBackendOperation(opname) + +class OpCall(Operation): + def __init__(self, sigtoken, gv_fnptr, args_gv): + self.sigtoken = sigtoken + self.gv_fnptr = gv_fnptr + self.args_gv = args_gv + + def render(self, allocator, mc): + fnptr = self.gv_fnptr + assert fnptr.is_const + stack_pos = 0 + for i in range(len(self.args_gv)): + gv = self.args_gv[i] + src = allocator.get_position(gv) + if not isinstance(src, MODRM): + mc.MOV(mem(esp, stack_pos), src) + else: + mc.MOV(eax, src) + mc.MOV(mem(esp, stack_pos), eax) + stack_pos += gv.SIZE + mc.CALL(rel32(fnptr.value)) + allocator.set_position(self, eax) Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/regalloc.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/regalloc.py Fri Mar 28 01:01:26 2008 @@ -0,0 +1,24 @@ + +from pypy.jit.codegen.i386.ri386 import * + +class RegAlloc(object): + def __init__(self, operations): + self.operations = operations + self.positions = {} + + def set_position(self, var, pos): + self.positions[var] = pos + + def get_position(self, v): + from pypy.jit.codegen.ia32.rgenop import IntConst + if v.is_const: + if type(v) is IntConst: + return imm(v.value) + else: + xxx + else: + return self.positions[v] + + def generate_operations(self, mc): + for operation in self.operations: + operation.render(self, mc) Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Fri Mar 28 01:01:26 2008 @@ -0,0 +1,163 @@ + +from pypy.jit.codegen.model import AbstractRGenOp, GenLabel, GenBuilder +from pypy.jit.codegen.model import GenVar, GenConst, CodeGenSwitch +from pypy.jit.codegen.model import ReplayBuilder, dummy_var +from pypy.rlib.objectmodel import specialize +from pypy.rpython.lltypesystem import lltype, llmemory +from pypy.jit.codegen.ia32.operation import * +from pypy.jit.codegen.ia32.regalloc import RegAlloc +# XXX explain +from pypy.jit.codegen.i386.regalloc import write_stack_reserve + +WORD = 4 +PROLOGUE_FIXED_WORDS = 5 + +class IntConst(GenConst): + def __init__(self, value): + self.value = value + + def repr(self): + return "const=$%s" % (self.value,) + +class IntVar(GenVar): + token = "i" + ll_type = lltype.Signed + SIZE = WORD + +class FloatVar(GenVar): + token = "f" + ll_type = lltype.Float + SIZE = 8 # XXX really? + +LL_TO_GENVAR = {} +TOKEN_TO_GENVAR = {} +for value in locals().values(): + if hasattr(value, 'll_type'): + LL_TO_GENVAR[value.ll_type] = value.token + TOKEN_TO_GENVAR[value.token] = value + +class Builder(GenBuilder): + def __init__(self, rgenop, inputoperands, inputvars): + self.rgenop = rgenop + self.operations = [] + self.inputoperands = inputoperands + self.inputvars = inputvars + + def genop_call(self, sigtoken, gv_fnptr, args_gv): + op = OpCall(sigtoken, gv_fnptr, list(args_gv)) + self.operations.append(op) + return op + + def start_mc(self): + mc = self.rgenop.open_mc() + # XXX we completely ignore additional logic that would generate a jump + # to another block if we run out of space + return mc + + @specialize.arg(1) + def genop2(self, opname, gv_arg1, gv_arg2): + cls = getopclass2(opname) + op = cls(gv_arg1, gv_arg2) + self.operations.append(op) + return op + + def finish_and_return(self, sigtoken, gv_returnvar): + mc = self.start_mc() + regalloc = RegAlloc(self.operations) + for i in range(len(self.inputoperands)): + inp_loc = self.inputoperands[i] + inp_gv = self.inputvars[i] + regalloc.set_position(inp_gv, inp_loc) + regalloc.generate_operations(mc) + # --- epilogue --- + mc.MOV(esp, ebp) + mc.POP(ebp) + mc.POP(edi) + mc.POP(esi) + mc.POP(ebx) + mc.RET() + # ---------------- + mc.done() + self.rgenop.close_mc(mc) + + def end(self): + pass + +class RI386GenOp(AbstractRGenOp): + from pypy.jit.codegen.i386.codebuf import MachineCodeBlock + from pypy.jit.codegen.i386.codebuf import InMemoryCodeBuilder + + MC_SIZE = 65536 * 16 + + def __init__(self): + self.allocated_mc = None + self.keepalive_gc_refs = [] + + def open_mc(self): + # XXX supposed infinite for now + mc = self.allocated_mc + if mc is None: + return self.MachineCodeBlock(self.MC_SIZE) + else: + self.allocated_mc = None + return mc + + def close_mc(self, mc): + assert self.allocated_mc is None + self.allocated_mc = mc + + @specialize.genconst(1) + def genconst(self, llvalue): + T = lltype.typeOf(llvalue) + if T is llmemory.Address: + return AddrConst(llvalue) + elif T is lltype.Signed: + return IntConst(llvalue) + elif isinstance(T, lltype.Ptr): + lladdr = llmemory.cast_ptr_to_adr(llvalue) + if T.TO._gckind == 'gc': + self.keepalive_gc_refs.append(lltype.cast_opaque_ptr(llmemory.GCREF, llvalue)) + return AddrConst(lladdr) + else: + raise NotImplementedError(llvalue) + + def newgraph(self, sigtoken, name): + mc = self.open_mc() + entrypoint = mc.tell() + # push on stack some registers + mc.PUSH(ebx) + mc.PUSH(esi) + mc.PUSH(edi) + mc.PUSH(ebp) + mc.MOV(ebp, esp) + # XXX + write_stack_reserve(mc, 4) + # XXX + inputargs_gv = [TOKEN_TO_GENVAR[i]() for i in sigtoken[0]] + ofs = WORD * PROLOGUE_FIXED_WORDS + inputoperands = [] + for i in range(len(inputargs_gv)): + input_gv = inputargs_gv[i] + inputoperands.append(mem(ebp, ofs)) + ofs += input_gv.SIZE + builder = Builder(self, inputoperands, inputargs_gv) + mc.done() + self.close_mc(mc) + # XXX copy? + return builder, IntConst(entrypoint), inputargs_gv + + @staticmethod + @specialize.memo() + def kindToken(T): + # XXX this will die eventually + return None + + @staticmethod + @specialize.memo() + def sigToken(FUNCTYPE): + # XXX we need to make this RPython probably + return ([LL_TO_GENVAR[arg] for arg in FUNCTYPE.ARGS], + LL_TO_GENVAR[FUNCTYPE.RESULT]) + + def check_no_open_mc(self): + pass Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py Fri Mar 28 01:01:26 2008 @@ -0,0 +1,11 @@ +import py +from pypy.rpython.lltypesystem import lltype +from pypy.jit.codegen.ia32.rgenop import RI386GenOp +from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTests + +class TestRI386Genop(AbstractRGenOpTests): + RGenOp = RI386GenOp + from pypy.jit.codegen.i386.test.test_operation import RGenOpPacked + + # for the individual tests see + # ====> ../../test/rgenop_tests.py From fijal at codespeak.net Fri Mar 28 04:14:30 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 28 Mar 2008 04:14:30 +0100 (CET) Subject: [pypy-svn] r53029 - in pypy/dist/pypy/tool: . test Message-ID: <20080328031430.1B5C1169FA5@codespeak.net> Author: fijal Date: Fri Mar 28 04:14:29 2008 New Revision: 53029 Added: pypy/dist/pypy/tool/test/test_udir.py (contents, props changed) Modified: pypy/dist/pypy/tool/udir.py Log: create usession per-udir. This helps a bit when working on multiple branches with different keep set. Feel free to revert. Added: pypy/dist/pypy/tool/test/test_udir.py ============================================================================== --- (empty file) +++ pypy/dist/pypy/tool/test/test_udir.py Fri Mar 28 04:14:29 2008 @@ -0,0 +1,8 @@ + +from pypy.tool import udir + +def test_udir(): + res = udir.svn_info('http://codespeak.net/svn/pypy/dist/pypy/tool') + assert res == 'dist' + res = udir.svn_info('http://codespeak.net/svn/pypy/branch/stuff/pypy/tool') + assert res == 'stuff' Modified: pypy/dist/pypy/tool/udir.py ============================================================================== --- pypy/dist/pypy/tool/udir.py (original) +++ pypy/dist/pypy/tool/udir.py Fri Mar 28 04:14:29 2008 @@ -9,4 +9,16 @@ from py.path import local -udir = local.make_numbered_dir(prefix='usession-', keep=3) +def svn_info(url): + basename = url[:-len('pypy/tool')] + if basename.endswith('dist/'): + return 'dist' + else: + return basename.split('/')[-2] + +try: + basename = '-' + svn_info(py.path.svnwc.info().url) + '-' +except: + basename = '-' + +udir = local.make_numbered_dir(prefix='usession' + basename, keep=3) From fijal at codespeak.net Fri Mar 28 04:18:39 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 28 Mar 2008 04:18:39 +0100 (CET) Subject: [pypy-svn] r53030 - pypy/branch/jit-hotpath/pypy/tool Message-ID: <20080328031839.819F4168413@codespeak.net> Author: fijal Date: Fri Mar 28 04:18:38 2008 New Revision: 53030 Removed: pypy/branch/jit-hotpath/pypy/tool/udir.py Log: Remove this out of the way From fijal at codespeak.net Fri Mar 28 04:18:55 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 28 Mar 2008 04:18:55 +0100 (CET) Subject: [pypy-svn] r53031 - pypy/branch/jit-hotpath/pypy/tool Message-ID: <20080328031855.B5BF4168480@codespeak.net> Author: fijal Date: Fri Mar 28 04:18:55 2008 New Revision: 53031 Added: pypy/branch/jit-hotpath/pypy/tool/udir.py - copied, changed from r53029, pypy/dist/pypy/tool/udir.py Log: Port 53029 to branch. From fijal at codespeak.net Fri Mar 28 04:34:35 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 28 Mar 2008 04:34:35 +0100 (CET) Subject: [pypy-svn] r53032 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080328033435.5B983169FAC@codespeak.net> Author: fijal Date: Fri Mar 28 04:34:32 2008 New Revision: 53032 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: write better XML tags. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Fri Mar 28 04:34:32 2008 @@ -130,9 +130,6 @@ mc.PUSH(edi) mc.PUSH(ebp) mc.MOV(ebp, esp) - # XXX - write_stack_reserve(mc, 4) - # XXX inputargs_gv = [TOKEN_TO_GENVAR[i]() for i in sigtoken[0]] ofs = WORD * PROLOGUE_FIXED_WORDS inputoperands = [] @@ -140,6 +137,9 @@ input_gv = inputargs_gv[i] inputoperands.append(mem(ebp, ofs)) ofs += input_gv.SIZE + # XXX + write_stack_reserve(mc, len(inputoperands) * WORD) + # XXX builder = Builder(self, inputoperands, inputargs_gv) mc.done() self.close_mc(mc) From fijal at codespeak.net Fri Mar 28 05:51:49 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 28 Mar 2008 05:51:49 +0100 (CET) Subject: [pypy-svn] r53033 - in pypy/branch/jit-hotpath/pypy/jit/codegen/ia32: . test Message-ID: <20080328045149.5543F169F94@codespeak.net> Author: fijal Date: Fri Mar 28 05:51:48 2008 New Revision: 53033 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/ (props changed) pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/operation.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/regalloc.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/ (props changed) Log: * fixeol * another test passing, not sure why still * it does not compile (of course) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/operation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/operation.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/operation.py Fri Mar 28 05:51:48 2008 @@ -1,5 +1,6 @@ from pypy.jit.codegen.i386.ri386 import * +from pypy.jit.codegen.i386.ri386setup import Conditions from pypy.jit.codegen.model import GenVar from pypy.rlib.objectmodel import specialize from pypy.rpython.lltypesystem import lltype @@ -40,6 +41,18 @@ OPCLASSES2 = setup_opclasses(Op2) del setup_opclasses +def setup_conditions(): + result1 = [None] * 16 + result2 = [None] * 16 + for key, value in Conditions.items(): + result1[value] = getattr(I386CodeBuilder, 'J'+key) + result2[value] = getattr(I386CodeBuilder, 'SET'+key) + return result1, result2 +EMIT_JCOND, EMIT_SETCOND = setup_conditions() +INSN_JMP = len(EMIT_JCOND) +EMIT_JCOND.append(I386CodeBuilder.JMP) # not really a conditional jump +del setup_conditions + @specialize.memo() def getopclass1(opname): try: Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/regalloc.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/regalloc.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/regalloc.py Fri Mar 28 05:51:48 2008 @@ -22,3 +22,7 @@ def generate_operations(self, mc): for operation in self.operations: operation.render(self, mc) + + def generate_final_var(self, mc, gv_returnvar, return_loc): + pos = self.get_position(gv_returnvar) + mc.MOV(return_loc, pos) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Fri Mar 28 05:51:48 2008 @@ -6,7 +6,6 @@ from pypy.rpython.lltypesystem import lltype, llmemory from pypy.jit.codegen.ia32.operation import * from pypy.jit.codegen.ia32.regalloc import RegAlloc -# XXX explain from pypy.jit.codegen.i386.regalloc import write_stack_reserve WORD = 4 @@ -42,6 +41,7 @@ self.operations = [] self.inputoperands = inputoperands self.inputvars = inputvars + self.coming_from = None def genop_call(self, sigtoken, gv_fnptr, args_gv): op = OpCall(sigtoken, gv_fnptr, list(args_gv)) @@ -50,10 +50,37 @@ def start_mc(self): mc = self.rgenop.open_mc() - # XXX we completely ignore additional logic that would generate a jump - # to another block if we run out of space + # update the coming_from instruction + start = self.coming_from + if start: + targetaddr = mc.tell() + end = self.coming_from_end + fallthrough = targetaddr == end + #if self.update_defaultcaseaddr_of: # hack for FlexSwitch + # self.update_defaultcaseaddr_of.defaultcaseaddr = targetaddr + # fallthrough = False + if fallthrough: + # the jump would be with an offset 0, i.e. it would go + # exactly after itself, so we don't really need the jump + # instruction at all and we can overwrite it and continue. + mc.seekback(end - start) + targetaddr = start + else: + # normal case: patch the old jump to go to targetaddr + oldmc = self.rgenop.InMemoryCodeBuilder(start, end) + insn = EMIT_JCOND[self.coming_from_cond] + insn(oldmc, rel32(targetaddr)) + oldmc.done() + self.coming_from = 0 return mc + def set_coming_from(self, mc, insncond=INSN_JMP): + self.coming_from_cond = insncond + self.coming_from = mc.tell() + insnemit = EMIT_JCOND[insncond] + insnemit(mc, rel32(-1)) + self.coming_from_end = mc.tell() + @specialize.arg(1) def genop2(self, opname, gv_arg1, gv_arg2): cls = getopclass2(opname) @@ -69,6 +96,8 @@ inp_gv = self.inputvars[i] regalloc.set_position(inp_gv, inp_loc) regalloc.generate_operations(mc) + if gv_returnvar is not None: + regalloc.generate_final_var(mc, gv_returnvar, eax) # --- epilogue --- mc.MOV(esp, ebp) mc.POP(ebp) @@ -133,17 +162,20 @@ inputargs_gv = [TOKEN_TO_GENVAR[i]() for i in sigtoken[0]] ofs = WORD * PROLOGUE_FIXED_WORDS inputoperands = [] + # + # this probably depends on how much we do call from inside + # still, looks quite messy... + write_stack_reserve(mc, 1) + # for i in range(len(inputargs_gv)): input_gv = inputargs_gv[i] inputoperands.append(mem(ebp, ofs)) ofs += input_gv.SIZE - # XXX - write_stack_reserve(mc, len(inputoperands) * WORD) - # XXX builder = Builder(self, inputoperands, inputargs_gv) + builder.set_coming_from(mc) mc.done() self.close_mc(mc) - # XXX copy? + # XXX copy of inputargs_gv? return builder, IntConst(entrypoint), inputargs_gv @staticmethod From fijal at codespeak.net Fri Mar 28 05:59:24 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 28 Mar 2008 05:59:24 +0100 (CET) Subject: [pypy-svn] r53034 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080328045924.905D2169F68@codespeak.net> Author: fijal Date: Fri Mar 28 05:59:23 2008 New Revision: 53034 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/regalloc.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: make it compile (still explodes after compilation) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/regalloc.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/regalloc.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/regalloc.py Fri Mar 28 05:59:23 2008 @@ -15,7 +15,7 @@ if type(v) is IntConst: return imm(v.value) else: - xxx + raise NotImplementedError else: return self.positions[v] Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Fri Mar 28 05:59:23 2008 @@ -7,6 +7,7 @@ from pypy.jit.codegen.ia32.operation import * from pypy.jit.codegen.ia32.regalloc import RegAlloc from pypy.jit.codegen.i386.regalloc import write_stack_reserve +from pypy.rlib.unroll import unrolling_iterable WORD = 4 PROLOGUE_FIXED_WORDS = 5 @@ -35,13 +36,19 @@ LL_TO_GENVAR[value.ll_type] = value.token TOKEN_TO_GENVAR[value.token] = value +UNROLLING_TOKEN_TO_GENVAR = unrolling_iterable(TOKEN_TO_GENVAR.items()) + +def token_to_genvar(i): + for tok, value in UNROLLING_TOKEN_TO_GENVAR: + if tok == i: + return value() + class Builder(GenBuilder): def __init__(self, rgenop, inputoperands, inputvars): self.rgenop = rgenop self.operations = [] self.inputoperands = inputoperands self.inputvars = inputvars - self.coming_from = None def genop_call(self, sigtoken, gv_fnptr, args_gv): op = OpCall(sigtoken, gv_fnptr, list(args_gv)) @@ -116,7 +123,7 @@ from pypy.jit.codegen.i386.codebuf import MachineCodeBlock from pypy.jit.codegen.i386.codebuf import InMemoryCodeBuilder - MC_SIZE = 65536 * 16 + MC_SIZE = 65536 def __init__(self): self.allocated_mc = None @@ -139,10 +146,12 @@ def genconst(self, llvalue): T = lltype.typeOf(llvalue) if T is llmemory.Address: - return AddrConst(llvalue) + raise NotImplementedError + #return AddrConst(llvalue) elif T is lltype.Signed: return IntConst(llvalue) elif isinstance(T, lltype.Ptr): + raise NotImplementedError lladdr = llmemory.cast_ptr_to_adr(llvalue) if T.TO._gckind == 'gc': self.keepalive_gc_refs.append(lltype.cast_opaque_ptr(llmemory.GCREF, llvalue)) @@ -159,7 +168,7 @@ mc.PUSH(edi) mc.PUSH(ebp) mc.MOV(ebp, esp) - inputargs_gv = [TOKEN_TO_GENVAR[i]() for i in sigtoken[0]] + inputargs_gv = [token_to_genvar(i) for i in sigtoken[0]] ofs = WORD * PROLOGUE_FIXED_WORDS inputoperands = [] # From antocuni at codespeak.net Fri Mar 28 10:06:14 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Fri, 28 Mar 2008 10:06:14 +0100 (CET) Subject: [pypy-svn] r53035 - in pypy/branch/jit-hotpath/pypy/rpython/ootypesystem: . test Message-ID: <20080328090614.031A5169FB4@codespeak.net> Author: antocuni Date: Fri Mar 28 10:06:14 2008 New Revision: 53035 Modified: pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ootype.py pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/test/test_ootype.py Log: introduce a new type ootype.Object, which every non-primitive type can be converted to. Backends can be easily map it to System.Object or java.lang.Object etc. Modified: pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ootype.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ootype.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ootype.py Fri Mar 28 10:06:14 2008 @@ -43,6 +43,16 @@ raise TypeError("%r object is not hashable" % self.__class__.__name__) +# warning: the name Object is rebount at the end of file +class Object(OOType): + """ + A type which everything can be casted to. + """ + + def _defl(self): + return self._null + + class Class(OOType): def _defl(self): @@ -691,12 +701,52 @@ # ____________________________________________________________ +class _object(object): + + def __init__(self, obj): + self._TYPE = Object + self.obj = obj or None # null obj ==> None + + def __nonzero__(self): + return self.obj is not None + + def __eq__(self, other): + if not isinstance(other, _object): + raise TypeError("comparing an _object with %r" % other) + return self.obj == other.obj + + def __ne__(self, other): + return not (self == other) + + def __hash__(self): + return hash(self.obj) + + def _cast_to_object(self): + return self + + def _cast_to(self, EXPECTED_TYPE): + if self.obj is None: + return null(EXPECTED_TYPE) + elif isinstance(EXPECTED_TYPE, Instance): + return oodowncast(EXPECTED_TYPE, self.obj) + elif isinstance(EXPECTED_TYPE, SpecializableType): + T = typeOf(self.obj) + if T != EXPECTED_TYPE: + raise RuntimeError("Invalid cast: %s --> %s" % (T, EXPECTED_TYPE)) + return self.obj + else: + assert False, 'to be implemented' + + class _class(object): _TYPE = Class def __init__(self, INSTANCE): self._INSTANCE = INSTANCE + def _cast_to_object(self): + return _object(self) + nullruntimeclass = _class(None) class _instance(object): @@ -766,6 +816,9 @@ else: return 0 # for all null instances + def _cast_to_object(self): + return _object(ooupcast(ROOT, self)) + def _null_mixin(klass): class mixin(object): @@ -876,6 +929,9 @@ def _identityhash(self): return self._inst._identityhash() + def _cast_to_object(self): + return _object(ooupcast(ROOT, self)) + if STATICNESS: instance_impl = _view else: @@ -938,6 +994,9 @@ def __hash__(self): return hash(frozendict(self.__dict__)) + def _cast_to_object(self): + return _object(self) + class _static_meth(_callable): allowed_types = (StaticMethod,) @@ -976,6 +1035,9 @@ callb, checked_args = self.meth._checkargs(args) return callb(self.inst, *checked_args) + def _cast_to_object(self): + return _object(self) + class _meth(_callable): _bound_class = _bound_meth @@ -1101,6 +1163,8 @@ return object.__getattribute__(self, name) + def _cast_to_object(self): + return _object(self) class _string(_builtin_type): @@ -1482,6 +1546,9 @@ def __ne__(self, other): return not (self == other) + def _cast_to_object(self): + return _object(self) + class _null_record(_null_mixin(_record), _record): def __init__(self, RECORD): @@ -1572,6 +1639,15 @@ def oodowncast(INSTANCE, instance): return instance._downcast(INSTANCE) +def cast_to_object(whatever): + TYPE = typeOf(whatever) + assert isinstance(TYPE, OOType) + return whatever._cast_to_object() + +def cast_from_object(EXPECTED_TYPE, obj): + assert typeOf(obj) is Object + return obj._cast_to(EXPECTED_TYPE) + def ooidentityhash(inst): assert isinstance(typeOf(inst), (Instance, Record)) return inst._identityhash() @@ -1640,6 +1716,11 @@ ref.ll_set(obj) return ref + +Object = Object() +NULL = _object(None) +Object._null = NULL + ROOT = Instance('Root', None, _is_root=True) String = String() Unicode = Unicode() Modified: pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/test/test_ootype.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/test/test_ootype.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/test/test_ootype.py Fri Mar 28 10:06:14 2008 @@ -535,3 +535,34 @@ assert len(TYPE_A._lookup_graphs('ofoo')) == 2 assert len(TYPE_B._lookup_graphs('ofoo')) == 1 assert len(TYPE_C._lookup_graphs('ofoo')) == 1 + +def test_cast_object_instance(): + A = Instance("Foo", ROOT) + a = new(A) + obj = cast_to_object(a) + assert typeOf(obj) is Object + assert cast_from_object(A, obj) == a + a2 = cast_from_object(ROOT, obj) + assert typeOf(a2) is ROOT + assert a2 == ooupcast(ROOT, a) + +def test_cast_object_record(): + R = Record({'x': Signed}) + r = new(R) + r.x = 42 + obj = cast_to_object(r) + assert typeOf(obj) is Object + r2 = cast_from_object(R, obj) + assert typeOf(r2) is R + assert r == r2 + +def test_cast_object_null(): + A = Instance("Foo", ROOT) + B = Record({'x': Signed}) + a = null(A) + b = null(B) + obj1 = cast_to_object(a) + obj2 = cast_to_object(b) + assert obj1 == obj2 + assert cast_from_object(A, obj1) == a + assert cast_from_object(B, obj2) == b From cfbolz at codespeak.net Fri Mar 28 10:30:21 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 28 Mar 2008 10:30:21 +0100 (CET) Subject: [pypy-svn] r53036 - pypy/dist/pypy/doc Message-ID: <20080328093021.28DFD169FAF@codespeak.net> Author: cfbolz Date: Fri Mar 28 10:30:20 2008 New Revision: 53036 Modified: pypy/dist/pypy/doc/project-ideas.txt Log: change the project ideas file to add some new ideas. Modified: pypy/dist/pypy/doc/project-ideas.txt ============================================================================== --- pypy/dist/pypy/doc/project-ideas.txt (original) +++ pypy/dist/pypy/doc/project-ideas.txt Fri Mar 28 10:30:20 2008 @@ -15,61 +15,66 @@ .. contents:: -Experiment with optimizations ------------------------------ -Although PyPy's Python interpreter is very compatible with CPython, it is not -yet as fast. There are several approaches to making it faster, including the -on-going Just-In-Time compilation efforts and improving the compilation tool -chain, but probably the most suited to being divided into reasonably sized -chunks is to play with alternate implementations of key data structures or -algorithms used by the interpreter. PyPy's structure is designed to make this -straightforward, so it is easy to provide a different implementation of, say, -dictionaries or lists without disturbing any other code. -As examples, we've got working implementations of things like: - -* lazy string slices (slicing a string gives an object that references a part - of the original string). - -* lazily concatenated strings (repeated additions and joins are done - incrementally). - -* dictionaries specialized for string-only keys. - -* dictionaries which use a different strategy when very small. - -* caching the lookups of builtin names (by special forms of - dictionaries that can invalidate the caches when they are written to) - -Things we've thought about but not yet implemented include: +Improve one of the JIT back-ends +-------------------------------- -* create multiple representations of Unicode string that store the character - data in narrower arrays when they can. +- PyPy's Just-In-Time compiler relies on two assembler backends for actual + code generation, one for PowerPC and the other for i386. A good project + would be to give the 386 backend a good refactoring, simplifying it, then + add support for missing features like floating-point arithmetic. Another + idea would be start a new backend for e.g. AMD64 (Intel IA-64) or even a + mobile device. + +- Another idea in a similar vein (but requiring some more interaction with the + rest of the JIT code) would be to use LLVM to re-compile functions that are + executed particularly frequently (LLVM cannot be used for *all* code + generation, since it can only work on a whole function at a time). + + +CTypes +------ + +- support ctypes on more backends. Right now ctypes is supported only when + compiling PyPy to C. A nice project would be to support it when compiling + to .NET or the JVM. That's not too hard, the only thing needed is to port a + small module that does the actual invocation of external libraries (a + related project would be to port this module to Jython or IronPython to get + support for ctypes there). + +More Interpreter Features +------------------------- + +- support some of the more recent features of CPython. A nice project would be + to support all of the remaining Python 2.5 language features. + +- another thing to do on our Python interpreter would be to port over the + changes to the standard library (which includes re-writing some of the + C-coded modules in RPython or pure Python) that happened in 2.5 or that we + are still missing in 2.4. -Experiments of this kind are really experiments in the sense that we do not know -whether they will work well or not and the only way to find out is to try. A -project of this nature should provide benchmark results (both timing and memory -usage) as much as code. -Some ideas on concrete steps for benchmarking: +.. _distribution: +.. _persistence: -* find a set of real-world applications that can be used as benchmarks - for pypy (ideas: docutils, http://hachoir.org/, moinmoin, ...?) +Experiment with distribution and persistence +-------------------------------------------- -* do benchmark runs to see how much speedup the currently written - optimizations give -* profile pypy-c and its variants with these benchmarks, identify slow areas +One of the advantages of PyPy's implementation is that the Python-level type +of an object and its implementation are completely independent. This should +allow a much more intuitive interface to, for example, objects that are backed +by a persistent store. -* try to come up with optimized implementations for these slow areas +The `transparent proxy`_ objects are a key step in this +direction; now all that remains is to implement the interesting bits :-) -Start or improve a back-end ---------------------------- +An example project might be to implement functionality akin to the `ZODB's +Persistent class`_, without the need for the _p_changed hacks, and in pure +Python code (should be relatively easy on top of transparent proxy). -PyPy has complete, or nearly so, back-ends for C, LLVM, CLI/.NET and -JVM. It would be an interesting project to improve either of these -partial backends, or start one for another platform (Objective C comes -to mind as one that should not be too terribly hard). +Another example would be to implement a multi-CPU extension that internally +uses several processes and uses transparent proxies to share object views. Improve JavaScript backend -------------------------- @@ -91,94 +96,14 @@ * Write down better object layer over DOM in RPython to make writing applications easier -Improve one of the JIT back-ends --------------------------------- - -PyPy's Just-In-Time compiler relies on two assembler backends for actual code -generation, one for PowerPC and the other for i386. Idea would be start a new backend -for ie. mobile device. - -Another idea in a similar vein would be to use LLVM to re-compile functions that -are executed particularly frequently (LLVM cannot be used for *all* code -generation, since it can only work on function at a time). - -Write a new front end ---------------------- - -Write an interpreter for **another dynamic language** in the PyPy framework. -For example, a Scheme interpreter would be suitable (and it would even be -interesting from a semi-academic point of view to see if ``call/cc`` can be -implemented on top of the primitives the stackless transform provides). Ruby -too (though the latter is probably more than two months of work), or Lua, or ... - -We already have a somewhat usable `Prolog interpreter`_ and the beginnings of a -`JavaScript interpreter`_. - -.. _security: - -Investigate restricted execution models ---------------------------------------- - -Revive **rexec**\ : implement security checks, sandboxing, or some similar -model within PyPy (which, if I may venture an opinion, makes more sense and is -more robust than trying to do it in CPython). - -There are multiple approaches that can be discussed and tried. One of them is -about safely executing limited snippets of untrusted RPython code (see -http://codespeak.net/pipermail/pypy-dev/2006q2/003131.html). More general -approaches, to execute general but untrusted Python code on top of PyPy, -require more design. The object space model of PyPy will easily allow -objects to be tagged and tracked. The translation of PyPy would also be a -good place to insert e.g. systematic checks around all system calls. - -.. _distribution: -.. _persistence: - -Experiment with distribution and persistence --------------------------------------------- - -One of the advantages of PyPy's implementation is that the Python-level type -of an object and its implementation are completely independent. This should -allow a much more intuitive interface to, for example, objects that are backed -by a persistent store. - -The `transparent proxy`_ objects are a key step in this -direction; now all that remains is to implement the interesting bits :-) - -An example project might be to implement functionality akin to the `ZODB's -Persistent class`_, without the need for the _p_changed hacks, and in pure -Python code (should be relatively easy on top of transparent proxy). - -Numeric/NumPy/numarray support ------------------------------- - -At the EuroPython sprint, some work was done on making RPython's annotator -recognise Numeric arrays, with the goal of allowing programs using them to be -efficiently translated. It would be a reasonably sized project to finish this -work, i.e. allow RPython programs to use some Numeric facilities. -Additionally, these facilities could be exposed to applications interpreted by -the translated PyPy interpreter. - -Extend py.execnet to a peer-to-peer model ------------------------------------------ - -* Work on a P2P model of distributed execution (extending `py.execnet`_) - that allows `py.test`_ and other upcoming utilities to make use of a - network of computers executing python tasks (e.g. tests or PyPy build tasks). - -* Make a client tool and according libraries to instantiate a (dynamic) network - of computers executing centrally managed tasks (e.g. build or test ones). - (This may make use of a P2P model or not, both is likely feasible). + - Anto proposed to make the javascript backendopt more useful by + turning it into something more frameworkish. I am sceptical of the + viability of the task, it would need a very clever student and + probably a lot of work too. Or else... ---------- -* Constraint programming: `efficient propagators for specialized - finite domains`_ (like numbers, sets, intervals). - -* A `code templating solution`_ for Python code, allowing to extend - the language syntax, control flow operators, etc. - ...or whatever else interests you! Feel free to mention your interest and discuss these ideas on the `pypy-dev From antocuni at codespeak.net Fri Mar 28 10:39:26 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Fri, 28 Mar 2008 10:39:26 +0100 (CET) Subject: [pypy-svn] r53038 - pypy/dist/pypy/doc Message-ID: <20080328093926.5CFD4169FB5@codespeak.net> Author: antocuni Date: Fri Mar 28 10:39:26 2008 New Revision: 53038 Modified: pypy/dist/pypy/doc/project-ideas.txt Log: typo Modified: pypy/dist/pypy/doc/project-ideas.txt ============================================================================== --- pypy/dist/pypy/doc/project-ideas.txt (original) +++ pypy/dist/pypy/doc/project-ideas.txt Fri Mar 28 10:39:26 2008 @@ -96,7 +96,7 @@ * Write down better object layer over DOM in RPython to make writing applications easier - - Anto proposed to make the javascript backendopt more useful by + - Anto proposed to make the javascript backend more useful by turning it into something more frameworkish. I am sceptical of the viability of the task, it would need a very clever student and probably a lot of work too. From arigo at codespeak.net Fri Mar 28 11:00:39 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 28 Mar 2008 11:00:39 +0100 (CET) Subject: [pypy-svn] r53042 - pypy/dist/pypy/translator/goal Message-ID: <20080328100039.C8972169FB2@codespeak.net> Author: arigo Date: Fri Mar 28 11:00:36 2008 New Revision: 53042 Modified: pypy/dist/pypy/translator/goal/app_main.py Log: (haypo) Typo. Modified: pypy/dist/pypy/translator/goal/app_main.py ============================================================================== --- pypy/dist/pypy/translator/goal/app_main.py (original) +++ pypy/dist/pypy/translator/goal/app_main.py Fri Mar 28 11:00:36 2008 @@ -288,8 +288,8 @@ signal.signal(signal.SIGPIPE, signal.SIG_IGN) if hasattr(signal, 'SIGXFZ'): signal.signal(signal.SIGXFZ, signal.SIG_IGN) - if hasattr(signal, 'SIGXFZS'): - signal.signal(signal.SIGXFZS, signal.SIG_IGN) + if hasattr(signal, 'SIGXFSZ'): + signal.signal(signal.SIGXFSZ, signal.SIG_IGN) def is_interactive(): return go_interactive or os.getenv('PYTHONINSPECT') From cfbolz at codespeak.net Fri Mar 28 11:16:53 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Fri, 28 Mar 2008 11:16:53 +0100 (CET) Subject: [pypy-svn] r53045 - pypy/dist/pypy/doc Message-ID: <20080328101653.E6EDD169FA1@codespeak.net> Author: cfbolz Date: Fri Mar 28 11:16:53 2008 New Revision: 53045 Modified: pypy/dist/pypy/doc/project-ideas.txt Log: (antocuni, arigo, cfbolz): more fixes to project-ideas Modified: pypy/dist/pypy/doc/project-ideas.txt ============================================================================== --- pypy/dist/pypy/doc/project-ideas.txt (original) +++ pypy/dist/pypy/doc/project-ideas.txt Fri Mar 28 11:16:53 2008 @@ -76,30 +76,22 @@ Another example would be to implement a multi-CPU extension that internally uses several processes and uses transparent proxies to share object views. -Improve JavaScript backend --------------------------- +Various Ideas +------------- + +- work on and improve the JavaScript backend + +- improve one of the existing interpreters (e.g. the Prolog, the Scheme or + the JavaScript interpreter or the Smalltalk VM) + +- revive the logic object space, which tried to bring unification-like + features to Python + +- a unified testing infrastructure to collect the results of nightly + automated py.test runs in a single summary page, improving on this__ + +.. __: http://wyvern.cs.uni-duesseldorf.de/pypytest/summary.html -The JavaScript backend is somehow different from other pypy's backends because -it does not try to support all of PyPy (where it might be run then?), but rather -to compile RPython programs into code that runs in a browser. Some documents -are in `what is PyPy.js`_ file and `using the JavaScript backend`_. Some project -ideas might be: - -* Write some examples to show different possibilities of using the backend. - -* Improve the facilities for testing RPython intended to be translated to - JavaScript on top of CPython, mostly by improving existing DOM interface. - -* Write down the mochikit bindings (or any other interesting JS effects library), - including tests - -* Write down better object layer over DOM in RPython to make writing applications - easier - - - Anto proposed to make the javascript backend more useful by - turning it into something more frameworkish. I am sceptical of the - viability of the task, it would need a very clever student and - probably a lot of work too. Or else... ---------- @@ -107,7 +99,8 @@ ...or whatever else interests you! Feel free to mention your interest and discuss these ideas on the `pypy-dev -mailing list`_. You can also have a look around our documentation_. +mailing list`_ or on the #pypy channel on irc.freenode.net. +You can also have a look around our documentation_. .. _`efficient propagators for specialized finite domains`: http://codespeak.net/svn/pypy/extradoc/soc-2006/constraints.txt From antocuni at codespeak.net Fri Mar 28 11:37:12 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Fri, 28 Mar 2008 11:37:12 +0100 (CET) Subject: [pypy-svn] r53047 - pypy/dist/pypy/doc Message-ID: <20080328103712.6E593169FA1@codespeak.net> Author: antocuni Date: Fri Mar 28 11:37:12 2008 New Revision: 53047 Modified: pypy/dist/pypy/doc/project-ideas.txt Log: expand this paragraph Modified: pypy/dist/pypy/doc/project-ideas.txt ============================================================================== --- pypy/dist/pypy/doc/project-ideas.txt (original) +++ pypy/dist/pypy/doc/project-ideas.txt Fri Mar 28 11:37:12 2008 @@ -76,6 +76,25 @@ Another example would be to implement a multi-CPU extension that internally uses several processes and uses transparent proxies to share object views. + +Improving the automated test framework +-------------------------------------- + +Every night, various kinds of PyPy tests run automatically on a +variety of different systems. Each set of tests displays its own +result on a different web page; for example, here are the results of +our `unit tests`_, `translation tests and benchmarks`_ and `pypy-c +compliance tests`_. + +.. _`unit tests`: http://wyvern.cs.uni-duesseldorf.de/pypytest/summary.html +.. _`translation tests and benchmarks`: http://tuatara.cs.uni-duesseldorf.de/benchmark.html +.. _`pypy-c compliance tests`: http://www.strakt.com/~pedronis/pypy-c-test/allworkingmodules/summary.html + +A possible project is to improve our testing infrastructure and build +a service that aggregates and displays the results of all the nightly +tests. + + Various Ideas ------------- @@ -87,10 +106,6 @@ - revive the logic object space, which tried to bring unification-like features to Python -- a unified testing infrastructure to collect the results of nightly - automated py.test runs in a single summary page, improving on this__ - -.. __: http://wyvern.cs.uni-duesseldorf.de/pypytest/summary.html Or else... From arigo at codespeak.net Fri Mar 28 13:19:02 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 28 Mar 2008 13:19:02 +0100 (CET) Subject: [pypy-svn] r53052 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080328121902.0F3CE169FC3@codespeak.net> Author: arigo Date: Fri Mar 28 13:19:01 2008 New Revision: 53052 Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/NOTES Log: No fijal on irc, so I'll drop my quick review here... Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/NOTES ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/NOTES Fri Mar 28 13:19:01 2008 @@ -0,0 +1,16 @@ +Hi Fijal :-) + +You're looking too much at the new backend and not enough at the old +one. There is no need to make operation classes at all; instead +method call like genop2("int_add") should render the machine code +directly and return a fresh IntVar. Likewise, I don't know if the +RegAlloc object makes sense for now: we don't need to remember the +list of operations, and the position of each variable should probably +just be stored in the GenVars directly as an attribute, with some +methods to get them (again, as in the old backend). + +Also, don't worry about translation right now (skip the corresponding +tests before you have more tests passing) + + +Armin From niko at codespeak.net Fri Mar 28 13:42:09 2008 From: niko at codespeak.net (niko at codespeak.net) Date: Fri, 28 Mar 2008 13:42:09 +0100 (CET) Subject: [pypy-svn] r53053 - in pypy/branch/fixed-list-ootype/pypy/translator/jvm: . test Message-ID: <20080328124209.DE1E2169FCE@codespeak.net> Author: niko Date: Fri Mar 28 13:42:08 2008 New Revision: 53053 Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/test_list.py pypy/branch/fixed-list-ootype/pypy/translator/jvm/typesystem.py Log: fix bug related to boolean arrays: we used to map them to byte arrays, which caused us to incorrectly try to box their arguments (since byte != boolean), etc Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/database.py Fri Mar 28 13:42:08 2008 @@ -538,7 +538,7 @@ ootype.Signed : jvm.jIntArray, ootype.Unsigned : jvm.jIntArray, ootype.Char : jvm.jCharArray, - ootype.Bool : jvm.jByteArray, + ootype.Bool : jvm.jBoolArray, ootype.UniChar : jvm.jCharArray, ootype.String : jvm.jStringArray, ootype.Float : jvm.jDoubleArray, Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/test_list.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/test_list.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/test/test_list.py Fri Mar 28 13:42:08 2008 @@ -15,4 +15,17 @@ return lst[0] res = self.interpret(fn, []) assert res == 0 + + def test_bool_fixed_list(self): + """ Tests that we handle boolean fixed lists, which do not require + boxing or unboxing """ + def fn(i): + lst = [False, True] + if lst[i]: + return 22 + else: + return 44 + for i in range(0,2): + res = self.interpret(fn, [i]) + assert res == fn(i) Modified: pypy/branch/fixed-list-ootype/pypy/translator/jvm/typesystem.py ============================================================================== --- pypy/branch/fixed-list-ootype/pypy/translator/jvm/typesystem.py (original) +++ pypy/branch/fixed-list-ootype/pypy/translator/jvm/typesystem.py Fri Mar 28 13:42:08 2008 @@ -411,6 +411,7 @@ else: raise KeyError(methodnm) +jBoolArray = JvmArrayType(jBool) jByteArray = JvmArrayType(jByte) jObjectArray = JvmArrayType(jObject) jStringArray = JvmArrayType(jString) @@ -555,6 +556,8 @@ s = "newarray char" elif desc == '[B': s = "newarray byte" + elif desc == '[Z': + s = "newarray boolean" else: s = "anewarray " + arraytype.element_type.descriptor.int_class_name() self.cache[arraytype] = obj = Opcode(s) From fijal at codespeak.net Fri Mar 28 17:19:42 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 28 Mar 2008 17:19:42 +0100 (CET) Subject: [pypy-svn] r53054 - pypy/branch/jit-hotpath/pypy/tool Message-ID: <20080328161942.62254169FF4@codespeak.net> Author: fijal Date: Fri Mar 28 17:19:40 2008 New Revision: 53054 Modified: pypy/branch/jit-hotpath/pypy/tool/udir.py Log: checked in my limit instead. Modified: pypy/branch/jit-hotpath/pypy/tool/udir.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/tool/udir.py (original) +++ pypy/branch/jit-hotpath/pypy/tool/udir.py Fri Mar 28 17:19:40 2008 @@ -21,4 +21,4 @@ except: basename = '-' -udir = local.make_numbered_dir(prefix='usession' + basename, keep=100) +udir = local.make_numbered_dir(prefix='usession' + basename, keep=3) From fijal at codespeak.net Fri Mar 28 17:21:08 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 28 Mar 2008 17:21:08 +0100 (CET) Subject: [pypy-svn] r53055 - pypy/branch/jit-hotpath/pypy/tool Message-ID: <20080328162108.6EB6C169FF4@codespeak.net> Author: fijal Date: Fri Mar 28 17:21:08 2008 New Revision: 53055 Modified: pypy/branch/jit-hotpath/pypy/tool/udir.py Log: fix bugs :-( Modified: pypy/branch/jit-hotpath/pypy/tool/udir.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/tool/udir.py (original) +++ pypy/branch/jit-hotpath/pypy/tool/udir.py Fri Mar 28 17:21:08 2008 @@ -6,6 +6,7 @@ import autopath import os +import py from py.path import local @@ -17,7 +18,7 @@ return basename.split('/')[-2] try: - basename = '-' + svn_info(py.path.svnwc.info().url) + '-' + basename = '-' + svn_info(py.path.svnwc().info().url) + '-' except: basename = '-' From fijal at codespeak.net Fri Mar 28 17:22:25 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Fri, 28 Mar 2008 17:22:25 +0100 (CET) Subject: [pypy-svn] r53056 - pypy/dist/pypy/tool Message-ID: <20080328162225.69A20168450@codespeak.net> Author: fijal Date: Fri Mar 28 17:22:25 2008 New Revision: 53056 Modified: pypy/dist/pypy/tool/udir.py Log: port bugfix from a branch Modified: pypy/dist/pypy/tool/udir.py ============================================================================== --- pypy/dist/pypy/tool/udir.py (original) +++ pypy/dist/pypy/tool/udir.py Fri Mar 28 17:22:25 2008 @@ -6,6 +6,7 @@ import autopath import os +import py from py.path import local @@ -17,7 +18,7 @@ return basename.split('/')[-2] try: - basename = '-' + svn_info(py.path.svnwc.info().url) + '-' + basename = '-' + svn_info(py.path.svnwc().info().url) + '-' except: basename = '-' From antocuni at codespeak.net Fri Mar 28 17:53:34 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Fri, 28 Mar 2008 17:53:34 +0100 (CET) Subject: [pypy-svn] r53057 - in pypy/branch/jit-hotpath/pypy: annotation rpython/lltypesystem rpython/ootypesystem rpython/test Message-ID: <20080328165334.2570F169FE1@codespeak.net> Author: antocuni Date: Fri Mar 28 17:53:32 2008 New Revision: 53057 Modified: pypy/branch/jit-hotpath/pypy/annotation/builtin.py pypy/branch/jit-hotpath/pypy/annotation/model.py pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ooopimpl.py pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rbuiltin.py pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rootype.py pypy/branch/jit-hotpath/pypy/rpython/test/test_rclass.py Log: annotation & rtyping of the new type ootype.Object and the two operations cast_to_object and cast_from_object. Modified: pypy/branch/jit-hotpath/pypy/annotation/builtin.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/annotation/builtin.py (original) +++ pypy/branch/jit-hotpath/pypy/annotation/builtin.py Fri Mar 28 17:53:32 2008 @@ -10,6 +10,7 @@ from pypy.annotation.model import SomePBC, SomeInstance, SomeDict, SomeList from pypy.annotation.model import SomeExternalObject from pypy.annotation.model import SomeWeakRef +from pypy.annotation.model import SomeOOObject from pypy.annotation.model import annotation_to_lltype, lltype_to_annotation, ll_to_annotation from pypy.annotation.model import add_knowntypedata from pypy.annotation.model import s_ImpossibleValue @@ -564,6 +565,21 @@ else: raise AnnotatorError, 'Cannot cast %s to %s' % (i.ootype, I.const) +def cast_to_object(obj): + assert isinstance(obj.ootype, ootype.OOType) + return SomeOOObject() + +def cast_from_object(T, obj): + TYPE = T.const + if isinstance(TYPE, ootype.Instance): + return SomeOOInstance(TYPE) + elif isinstance(TYPE, ootype.Record): + return SomeOOInstance(TYPE) # XXX: SomeOORecord? + elif isinstance(TYPE, ootype.StaticMethod): + return SomeOOStaticMeth(TYPE) + else: + raise AnnotatorError, 'Cannot cast Object to %s' % TYPE + BUILTIN_ANALYZERS[ootype.instanceof] = instanceof BUILTIN_ANALYZERS[ootype.new] = new BUILTIN_ANALYZERS[ootype.null] = null @@ -573,6 +589,8 @@ BUILTIN_ANALYZERS[ootype.ooidentityhash] = ooidentityhash BUILTIN_ANALYZERS[ootype.ooupcast] = ooupcast BUILTIN_ANALYZERS[ootype.oodowncast] = oodowncast +BUILTIN_ANALYZERS[ootype.cast_to_object] = cast_to_object +BUILTIN_ANALYZERS[ootype.cast_from_object] = cast_from_object #________________________________ # weakrefs Modified: pypy/branch/jit-hotpath/pypy/annotation/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/annotation/model.py (original) +++ pypy/branch/jit-hotpath/pypy/annotation/model.py Fri Mar 28 17:53:32 2008 @@ -556,6 +556,10 @@ def can_be_none(self): return False +class SomeOOObject(SomeObject): + def __init__(self): + self.ootype = ootype.Object + class SomeOOClass(SomeObject): def __init__(self, ootype): self.ootype = ootype Modified: pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py Fri Mar 28 17:53:32 2008 @@ -453,14 +453,16 @@ 'instrument_count': LLOp(), # __________ ootype operations __________ - 'new': LLOp(oo=True, canraise=(Exception,)), - 'runtimenew': LLOp(oo=True, canraise=(Exception,)), - 'oonewcustomdict': LLOp(oo=True, canraise=(Exception,)), + 'new': LLOp(oo=True, canraise=(MemoryError,)), + 'runtimenew': LLOp(oo=True, canraise=(MemoryError,)), + 'oonewcustomdict': LLOp(oo=True, canraise=(MemoryError,)), 'oosetfield': LLOp(oo=True), 'oogetfield': LLOp(oo=True, sideeffects=False), 'oosend': LLOp(oo=True, canraise=(Exception,)), 'ooupcast': LLOp(oo=True, canfold=True), 'oodowncast': LLOp(oo=True, canfold=True), + 'cast_to_object': LLOp(oo=True, canfold=True), + 'cast_from_object': LLOp(oo=True, canfold=True), 'oononnull': LLOp(oo=True, canfold=True), 'ooisnull': LLOp(oo=True, canfold=True), 'oois': LLOp(oo=True, canfold=True), Modified: pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ooopimpl.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ooopimpl.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ooopimpl.py Fri Mar 28 17:53:32 2008 @@ -12,6 +12,13 @@ return ootype.oodowncast(INST, inst) op_oodowncast.need_result_type = True +def op_cast_to_object(inst): + return ootype.cast_to_object(inst) + +def op_cast_from_object(TYPE, obj): + return ootype.cast_from_object(TYPE, obj) +op_cast_from_object.need_result_type = True + def op_oononnull(inst): checkinst(inst) return bool(inst) @@ -27,6 +34,9 @@ elif isinstance(obj1, ootype._class): assert isinstance(obj2, ootype._class) return obj1 is obj2 + elif isinstance(obj1, ootype._object): + assert isinstance(obj2, ootype._object) + return obj1 == obj2 else: assert False, "oois on something silly" Modified: pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rbuiltin.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rbuiltin.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rbuiltin.py Fri Mar 28 17:53:32 2008 @@ -52,6 +52,17 @@ v_inst = hop.inputarg(hop.args_r[1], arg=1) return hop.genop('oodowncast', [v_inst], resulttype = hop.r_result.lowleveltype) +def rtype_cast_to_object(hop): + assert isinstance(hop.args_s[0].ootype, ootype.OOType) + v_inst = hop.inputarg(hop.args_r[0], arg=0) + return hop.genop('cast_to_object', [v_inst], resulttype = hop.r_result.lowleveltype) + +def rtype_cast_from_object(hop): + assert isinstance(hop.args_s[0].const, ootype.OOType) + assert isinstance(hop.args_s[1], annmodel.SomeOOObject) + v_inst = hop.inputarg(hop.args_r[1], arg=1) + return hop.genop('cast_from_object', [v_inst], resulttype = hop.r_result.lowleveltype) + def rtype_builtin_isinstance(hop): if hop.s_result.is_constant(): return hop.inputconst(ootype.Bool, hop.s_result.const) @@ -112,6 +123,8 @@ BUILTIN_TYPER[ootype.ooidentityhash] = rtype_ooidentityhash BUILTIN_TYPER[ootype.ooupcast] = rtype_ooupcast BUILTIN_TYPER[ootype.oodowncast] = rtype_oodowncast +BUILTIN_TYPER[ootype.cast_from_object] = rtype_cast_from_object +BUILTIN_TYPER[ootype.cast_to_object] = rtype_cast_to_object BUILTIN_TYPER[isinstance] = rtype_builtin_isinstance BUILTIN_TYPER[objectmodel.r_dict] = rtype_r_dict BUILTIN_TYPER[objectmodel.instantiate] = rtype_instantiate Modified: pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rootype.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rootype.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rootype.py Fri Mar 28 17:53:32 2008 @@ -1,9 +1,15 @@ from pypy.annotation import model as annmodel from pypy.rpython.rmodel import Repr from pypy.rpython.ootypesystem import ootype -from pypy.rpython.ootypesystem.ootype import Void, Class +from pypy.rpython.ootypesystem.ootype import Void, Class, Object from pypy.tool.pairtype import pairtype +class __extend__(annmodel.SomeOOObject): + def rtyper_makerepr(self, rtyper): + return ooobject_repr + def rtyper_makekey(self): + return self.__class__, + class __extend__(annmodel.SomeOOClass): def rtyper_makerepr(self, rtyper): return ooclass_repr @@ -29,6 +35,10 @@ return self.__class__, self.method +class OOObjectRepr(Repr): + lowleveltype = Object + +ooobject_repr = OOObjectRepr() class OOClassRepr(Repr): lowleveltype = Class @@ -81,6 +91,18 @@ v = rpair.rtype_eq(hop) return hop.genop("bool_not", [v], resulttype=ootype.Bool) + +class __extend__(pairtype(OOObjectRepr, OOObjectRepr)): + def rtype_is_((r_obj1, r_obj2), hop): + vlist = hop.inputargs(r_obj1, r_obj2) + return hop.genop('oois', vlist, resulttype=ootype.Bool) + + rtype_eq = rtype_is_ + + def rtype_ne(rpair, hop): + v = rpair.rtype_eq(hop) + return hop.genop("bool_not", [v], resulttype=ootype.Bool) + class OOBoundMethRepr(Repr): def __init__(self, ootype, name): self.lowleveltype = ootype Modified: pypy/branch/jit-hotpath/pypy/rpython/test/test_rclass.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/test/test_rclass.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/test/test_rclass.py Fri Mar 28 17:53:32 2008 @@ -809,3 +809,35 @@ assert destra == destrc assert destrb is not None assert destra is not None + + def test_cast_object(self): + A = ootype.Instance("Foo", ootype.ROOT) + B = ootype.Record({'x': ootype.Signed}) + + def fn_instance(): + a = ootype.new(A) + obj = ootype.cast_to_object(a) + a2 = ootype.cast_from_object(A, obj) + a3 = ootype.cast_from_object(ootype.ROOT, obj) + assert a is a2 + assert a is a3 + self.interpret(fn_instance, []) + + def fn_record(): + b = ootype.new(B) + b.x = 42 + obj = ootype.cast_to_object(b) + b2 = ootype.cast_from_object(B, obj) + assert b2.x == 42 + assert b is b2 + self.interpret(fn_record, []) + + def fn_null(): + a = ootype.null(A) + b = ootype.null(B) + obj1 = ootype.cast_to_object(a) + obj2 = ootype.cast_to_object(b) + assert obj1 == obj2 + assert ootype.cast_from_object(A, obj1) == a + assert ootype.cast_from_object(B, obj2) == b + self.interpret(fn_null, []) From arigo at codespeak.net Fri Mar 28 17:56:00 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Fri, 28 Mar 2008 17:56:00 +0100 (CET) Subject: [pypy-svn] r53058 - in pypy/branch/jit-hotpath/pypy: jit/hintannotator jit/rainbow rlib rpython rpython/lltypesystem translator/c Message-ID: <20080328165600.7AC98169F52@codespeak.net> Author: arigo Date: Fri Mar 28 17:55:59 2008 New Revision: 53058 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/rlib/jit.py pypy/branch/jit-hotpath/pypy/rpython/llinterp.py pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py pypy/branch/jit-hotpath/pypy/translator/c/funcgen.py Log: Use a single "jit_marker" operation for all jit-oriented markers. Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Fri Mar 28 17:55:59 2008 @@ -33,7 +33,7 @@ raise JitHintError("found %d graphs with a jit_merge_point()," " expected 1 (for now)" % len(found_at)) origportalgraph, _, origportalop = found_at[0] - drivercls = origportalop.args[0].value + drivercls = origportalop.args[1].value self.jitdriverclasses[drivercls] = True # # We make a copy of origportalgraph and mutate it to make it @@ -77,7 +77,8 @@ found_at = [] for block in graph.iterblocks(): for op in block.operations: - if op.opname == 'jit_merge_point': + if (op.opname == 'jit_marker' and + op.args[0].value == 'jit_merge_point'): found_at.append((graph, block, op)) if len(found_at) > 1: raise JitHintError("multiple jit_merge_point() not supported") @@ -103,8 +104,9 @@ portalop = portalblock.operations[0] # split again, this time enforcing the order of the live vars # specified by the user in the jit_merge_point() call - assert portalop.opname == 'jit_merge_point' - livevars = [v for v in portalop.args[1:] + assert portalop.opname == 'jit_marker' + assert portalop.args[0].value == 'jit_merge_point' + livevars = [v for v in portalop.args[2:] if v.concretetype is not lltype.Void] link = split_block(hannotator, portalblock, 0, livevars) return link.target @@ -116,11 +118,12 @@ newblock = Block(vars) op = graph.startblock.operations[0] - assert op.opname == 'jit_merge_point' - assert op.args[0].value is drivercls + assert op.opname == 'jit_marker' + assert op.args[0].value == 'jit_merge_point' + assert op.args[1].value is drivercls allvars = [] i = 0 - for v in op.args[1:]: + for v in op.args[2:]: if v.concretetype is lltype.Void: allvars.append(Constant(None, concretetype=lltype.Void)) else: Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py Fri Mar 28 17:55:59 2008 @@ -22,8 +22,7 @@ ptr_nonzero ptr_iszero is_early_constant - jit_merge_point - can_enter_jit + jit_marker oogetfield oosetfield oononnull @@ -505,11 +504,8 @@ # like an indirect_call return hs_c1._call_multiple_graphs(graph_list, METH.RESULT, hs_c1, *args_hs) # prepend hs_c1 to the args - def jit_merge_point(hs_numgreens, hs_numreds, *livevars_hs): - pass # XXX should check colors - - def can_enter_jit(hs_numgreens, hs_numreds, *livevars_hs): - pass # XXX should check colors + def jit_marker(*args_hs): + pass class __extend__(SomeLLAbstractConstant): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Fri Mar 28 17:55:59 2008 @@ -1521,11 +1521,11 @@ def decode_hp_hint_args(self, op): # Returns (list-of-green-vars, list-of-red-vars) without Voids. - drivercls = op.args[0].value + drivercls = op.args[1].value numgreens = len(drivercls.greens) numreds = len(drivercls.reds) - greens_v = op.args[1:1+numgreens] - reds_v = op.args[1+numgreens:] + greens_v = op.args[2:2+numgreens] + reds_v = op.args[2+numgreens:] assert len(reds_v) == numreds return ([v for v in greens_v if v.concretetype is not lltype.Void], [v for v in reds_v if v.concretetype is not lltype.Void]) @@ -1548,7 +1548,10 @@ (v, self.varcolor(v), op.opname)) return greens_v, reds_v - def serialize_op_jit_merge_point(self, op): + def serialize_op_jit_marker(self, op): + getattr(self, 'handle_%s_marker' % (op.args[0].value,))(op) + + def handle_jit_merge_point_marker(self, op): # If jit_merge_point is the first operation of its block, and if # the block's input variables are in the right order, the graph # should have exactly the vars listed in the op as live vars. @@ -1563,7 +1566,7 @@ self.emit('jit_merge_point') self.emit(self.keydesc_position(key)) - def serialize_op_can_enter_jit(self, op): + def handle_can_enter_jit_marker(self, op): # no need to put anything in the bytecode here, except a marker # that is useful for the fallback interpreter self.check_hp_hint_args(op) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Fri Mar 28 17:55:59 2008 @@ -111,13 +111,10 @@ def rewrite_graph(self, graph): for block in graph.iterblocks(): for op in block.operations: - if op.opname == 'can_enter_jit': + if op.opname == 'jit_marker': index = block.operations.index(op) - if self.rewrite_can_enter_jit(graph, block, index): - return True # graph mutated, start over again - elif op.opname == 'jit_merge_point': - index = block.operations.index(op) - if self.rewrite_jit_merge_point(graph, block, index): + meth = getattr(self, 'rewrite_' + op.args[0].value) + if meth(graph, block, index): return True # graph mutated, start over again return False # done @@ -267,7 +264,8 @@ # Now mutate origportalgraph to end with a call to portal_runner_ptr # op = origblock.operations[origindex] - assert op.opname == 'jit_merge_point' + assert op.opname == 'jit_marker' + assert op.args[0].value == 'jit_merge_point' greens_v, reds_v = self.codewriter.decode_hp_hint_args(op) vlist = [Constant(portal_runner_ptr, lltype.Ptr(PORTALFUNC))] vlist += greens_v Modified: pypy/branch/jit-hotpath/pypy/rlib/jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/jit.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/jit.py Fri Mar 28 17:55:59 2008 @@ -146,10 +146,11 @@ v_red = hop.inputarg(r_red, arg=i) reds_v.append(v_red) hop.exception_cannot_occur() - vlist = [hop.inputconst(lltype.Void, drivercls)] + vlist = [hop.inputconst(lltype.Void, self.instance.name), + hop.inputconst(lltype.Void, drivercls)] vlist.extend(greens_v) vlist.extend(reds_v) - return hop.genop(self.instance.name, vlist, + return hop.genop('jit_marker', vlist, resulttype=lltype.Void) # ____________________________________________________________ Modified: pypy/branch/jit-hotpath/pypy/rpython/llinterp.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/llinterp.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/llinterp.py Fri Mar 28 17:55:59 2008 @@ -533,10 +533,7 @@ def op_debug_llinterpcall(self, pythonfunction, *args_ll): return pythonfunction(*args_ll) - def op_can_enter_jit(self, *args): - pass - - def op_jit_merge_point(self, *args): + def op_jit_marker(self, *args): pass def op_instrument_count(self, ll_tag, ll_label): Modified: pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/lloperation.py Fri Mar 28 17:55:59 2008 @@ -376,8 +376,7 @@ # __________ used by the JIT ________ 'call_boehm_gc_alloc': LLOp(canraise=(MemoryError,)), - 'can_enter_jit': LLOp(), - 'jit_merge_point': LLOp(), + 'jit_marker': LLOp(), # __________ GC operations __________ Modified: pypy/branch/jit-hotpath/pypy/translator/c/funcgen.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/c/funcgen.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/c/funcgen.py Fri Mar 28 17:55:59 2008 @@ -721,11 +721,8 @@ def OP_IS_EARLY_CONSTANT(self, op): return self.expr(op.result) + ' = 0;' # Allways false - def OP_JIT_MERGE_POINT(self, op): - return '/* JIT_MERGE_POINT %s */' % op - - def OP_CAN_ENTER_JIT(self, op): - return '/* CAN_ENTER_JIT %s */' % op + def OP_JIT_MARKER(self, op): + return '/* JIT_MARKER %s */' % op assert not USESLOTS or '__dict__' not in dir(FunctionCodeGenerator) From antocuni at codespeak.net Fri Mar 28 18:09:37 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Fri, 28 Mar 2008 18:09:37 +0100 (CET) Subject: [pypy-svn] r53059 - in pypy/branch/jit-hotpath/pypy/jit: hintannotator rainbow rainbow/test timeshifter Message-ID: <20080328170937.510DF169FCC@codespeak.net> Author: antocuni Date: Fri Mar 28 18:09:36 2008 New Revision: 53059 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Log: more ootype operations implemented Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py Fri Mar 28 18:09:36 2008 @@ -26,6 +26,7 @@ oogetfield oosetfield oononnull + ooisnull ooupcast oodowncast oois Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Fri Mar 28 18:09:36 2008 @@ -462,9 +462,9 @@ srcopname, srcargs = self.trace_back_bool_var( block, block.exitswitch) if srcopname is not None: - if srcopname == 'ptr_nonzero': + if srcopname in ('ptr_nonzero', 'oononnull'): reverse = False - elif srcopname == 'ptr_iszero': + elif srcopname in ('ptr_iszero', 'ooisnull'): reverse = True if reverse is not None: ptrindex = self.serialize_oparg("red", srcargs[0]) @@ -960,6 +960,9 @@ if srcopname in ('ptr_iszero', 'ptr_nonzero'): arg = self.serialize_oparg("red", srcargs[0]) self.emit("learn_nonzeroness", arg, srcopname == "ptr_nonzero") + elif srcopname in ('ooisnull', 'oononnull'): + arg = self.serialize_oparg("red", srcargs[0]) + self.emit("learn_nonzeroness", arg, srcopname == "oononnull") def serialize_op_direct_call(self, op): kind, withexc = self.guess_call_kind(op) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Fri Mar 28 18:09:36 2008 @@ -542,7 +542,7 @@ @arguments("red", "bool") def opimpl_learn_nonzeroness(self, redbox, boolval): - assert isinstance(redbox, rvalue.PtrRedBox) + assert isinstance(redbox, rvalue.AbstractPtrRedBox) redbox.learn_nonzeroness(self.jitstate, boolval) @arguments() @@ -1032,6 +1032,9 @@ def opimpl_red_oogetfield(self, structbox, fielddesc, deepfrozen): return rtimeshift.gengetfield(self.jitstate, deepfrozen, fielddesc, structbox) + @arguments("green", "fielddesc", returns="green") + def opimpl_green_oogetfield(self, gv_struct, fielddesc): + return fielddesc.perform_getfield(self.rgenop, gv_struct) @arguments("red", "fielddesc", "red") def opimpl_red_oosetfield(self, destbox, fielddesc, valuebox): @@ -1042,6 +1045,14 @@ def opimpl_red_new(self, structtypedesc): return structtypedesc.factory() + @arguments("red", returns="red") + def opimpl_red_oononnull(self, ptrbox): + return rtimeshift.genptrnonzero(self.jitstate, ptrbox, False) + + @arguments("red", returns="red") + def opimpl_red_ooisnull(self, ptrbox): + return rtimeshift.genptrnonzero(self.jitstate, ptrbox, True) + class DebugTrace(object): def __init__(self, *args): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Fri Mar 28 18:09:36 2008 @@ -105,6 +105,11 @@ return S malloc = staticmethod(lltype.malloc) + nullptr = staticmethod(lltype.nullptr) + + @staticmethod + def malloc_immortal(T): + return lltype.malloc(T, immortal=True) def setup_class(cls): cls.on_llgraph = cls.RGenOp is LLRGenOp @@ -1365,12 +1370,14 @@ assert count_depth(res) == 2 def test_known_nonzero(self): - S = lltype.GcStruct('s', ('x', lltype.Signed)) - global_s = lltype.malloc(S, immortal=True) + S = self.GcStruct('s', ('x', lltype.Signed)) + malloc = self.malloc + nullptr = self.nullptr + global_s = self.malloc_immortal(S) global_s.x = 100 def h(): - s = lltype.malloc(S) + s = malloc(S) s.x = 50 return s def g(s, y): @@ -1382,11 +1389,11 @@ hint(None, global_merge_point=True) x = hint(x, concrete=True) if x == 1: - return g(lltype.nullptr(S), y) + return g(nullptr(S), y) elif x == 2: return g(global_s, y) elif x == 3: - s = lltype.malloc(S) + s = malloc(S) s.x = y return g(s, y) elif x == 4: @@ -1998,6 +2005,11 @@ return I malloc = staticmethod(ootype.new) + nullptr = staticmethod(ootype.null) + + @staticmethod + def malloc_immortal(T): + return ootype.new(T) def translate_insns(self, insns): replace = { Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py Fri Mar 28 18:09:36 2008 @@ -32,6 +32,12 @@ def genop_malloc_fixedsize(self, builder, alloctoken): return builder.genop_malloc_fixedsize(alloctoken) + def genop_ptr_iszero(self, builder, argbox, gv_addr): + return builder.genop_ptr_iszero(argbox.kind, gv_addr) + + def genop_ptr_nonzero(self, builder, argbox, gv_addr): + return builder.genop_ptr_nonzero(argbox.kind, gv_addr) + class OOTypeHelper(TypeSystemHelper): name = 'ootype' @@ -43,6 +49,12 @@ def genop_malloc_fixedsize(self, builder, alloctoken): return builder.genop_new(alloctoken) + def genop_ptr_iszero(self, builder, argbox, gv_addr): + return builder.genop_ooisnull(argbox.kind, gv_addr) + + def genop_ptr_nonzero(self, builder, argbox, gv_addr): + return builder.genop_oononnull(argbox.kind, gv_addr) + llhelper = LLTypeHelper() oohelper = OOTypeHelper() Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Fri Mar 28 18:09:36 2008 @@ -238,9 +238,9 @@ return rvalue.IntRedBox(fielddesc.indexkind, genvar) def genptrnonzero(jitstate, argbox, reverse): - assert isinstance(argbox, rvalue.PtrRedBox) + assert isinstance(argbox, rvalue.AbstractPtrRedBox) if argbox.is_constant(): - addr = rvalue.ll_getvalue(argbox, llmemory.Address) + addr = rvalue.ll_getvalue(argbox, jitstate.ts.ROOT_TYPE) return rvalue.ll_fromvalue(jitstate, bool(addr) ^ reverse) builder = jitstate.curbuilder if argbox.known_nonzero: @@ -248,9 +248,9 @@ else: gv_addr = argbox.getgenvar(jitstate) if reverse: - gv_res = builder.genop_ptr_iszero(argbox.kind, gv_addr) + gv_res = jitstate.ts.genop_ptr_iszero(builder, argbox, gv_addr) else: - gv_res = builder.genop_ptr_nonzero(argbox.kind, gv_addr) + gv_res = jitstate.ts.genop_ptr_nonzero(builder, argbox, gv_addr) return rvalue.IntRedBox(builder.rgenop.kindToken(lltype.Bool), gv_res) def genptreq(jitstate, argbox0, argbox1, reverse): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Fri Mar 28 18:09:36 2008 @@ -110,7 +110,10 @@ return redboxbuilder_ptr elif TYPE is lltype.Float: return redboxbuilder_dbl - elif isinstance(TYPE, ootype.Instance) or isinstance(TYPE, ootype.Record): + elif (isinstance(TYPE, ootype.Instance) or + isinstance(TYPE, ootype.Record) or + isinstance(TYPE, ootype.StaticMethod)): + # XXX: probably it won't translate, because we can't mix these types return redboxbuilder_inst else: assert isinstance(TYPE, lltype.Primitive) From antocuni at codespeak.net Fri Mar 28 21:09:20 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Fri, 28 Mar 2008 21:09:20 +0100 (CET) Subject: [pypy-svn] r53068 - in pypy/branch/jit-hotpath/pypy/jit: codegen/llgraph hintannotator rainbow timeshifter Message-ID: <20080328200920.EA156169FF5@codespeak.net> Author: antocuni Date: Fri Mar 28 21:09:18 2008 New Revision: 53068 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Log: erase all non primitive types to ootype.Object instead of ootype.ROOT. Surprinsingly enough, all tests passes out of the box :-) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py Fri Mar 28 21:09:18 2008 @@ -235,11 +235,10 @@ return lltype.cast_pointer(T, value) elif T == llmemory.Address: return llmemory.cast_ptr_to_adr(value) - elif isinstance(T, ootype.StaticMethod): - fn = value._obj - return ootype._static_meth(T, graph=fn.graph, _callable=fn._callable) - elif isinstance(T, ootype.Instance): - return ootype.ooupcast(T, value) # XXX: oodowncast? + elif T is ootype.Object: + return ootype.cast_to_object(value) + elif isinstance(T, ootype.OOType) and ootype.typeOf(value) is ootype.Object: + return ootype.cast_from_object(T, value) else: T1 = lltype.typeOf(value) if T1 is llmemory.Address: Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py Fri Mar 28 21:09:18 2008 @@ -29,6 +29,8 @@ ooisnull ooupcast oodowncast + cast_to_object + cast_from_object oois subclassof instanceof Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py Fri Mar 28 21:09:18 2008 @@ -41,7 +41,7 @@ class OOTypeHelper(TypeSystemHelper): name = 'ootype' - ROOT_TYPE = ootype.ROOT + ROOT_TYPE = ootype.Object def get_typeptr(self, obj): return obj.meta Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Fri Mar 28 21:09:18 2008 @@ -43,7 +43,7 @@ _mixin_ = True def _revealconst(self, gv): - return gv.revealconst(ootype.ROOT) # ??? + return gv.revealconst(ootype.Object) class RedBox(object): @@ -110,10 +110,7 @@ return redboxbuilder_ptr elif TYPE is lltype.Float: return redboxbuilder_dbl - elif (isinstance(TYPE, ootype.Instance) or - isinstance(TYPE, ootype.Record) or - isinstance(TYPE, ootype.StaticMethod)): - # XXX: probably it won't translate, because we can't mix these types + elif isinstance(TYPE, ootype.OOType): return redboxbuilder_inst else: assert isinstance(TYPE, lltype.Primitive) From fijal at codespeak.net Sat Mar 29 00:36:57 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sat, 29 Mar 2008 00:36:57 +0100 (CET) Subject: [pypy-svn] r53071 - in pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx: . test Message-ID: <20080328233657.C85C4169F21@codespeak.net> Author: fijal Date: Sat Mar 29 00:36:56 2008 New Revision: 53071 Added: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/ pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/__init__.py (contents, props changed) pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/autopath.py (contents, props changed) pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/conftest.py (contents, props changed) pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/rgenop.py (contents, props changed) pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/test/ pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/test/__init__.py (contents, props changed) pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/test/test_rgenop.py (contents, props changed) pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/viewcode.py (contents, props changed) Log: Another approach. Port the old backend (which seems to mostly pass tests) and try to modify it a bit later. Added: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/__init__.py ============================================================================== Added: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/autopath.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/autopath.py Sat Mar 29 00:36:56 2008 @@ -0,0 +1,114 @@ +""" +self cloning, automatic path configuration + +copy this into any subdirectory of pypy from which scripts need +to be run, typically all of the test subdirs. +The idea is that any such script simply issues + + import autopath + +and this will make sure that the parent directory containing "pypy" +is in sys.path. + +If you modify the master "autopath.py" version (in pypy/tool/autopath.py) +you can directly run it which will copy itself on all autopath.py files +it finds under the pypy root directory. + +This module always provides these attributes: + + pypydir pypy root directory path + this_dir directory where this autopath.py resides + +""" + + +def __dirinfo(part): + """ return (partdir, this_dir) and insert parent of partdir + into sys.path. If the parent directories don't have the part + an EnvironmentError is raised.""" + + import sys, os + try: + head = this_dir = os.path.realpath(os.path.dirname(__file__)) + except NameError: + head = this_dir = os.path.realpath(os.path.dirname(sys.argv[0])) + + while head: + partdir = head + head, tail = os.path.split(head) + if tail == part: + break + else: + raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir) + + pypy_root = os.path.join(head, '') + try: + sys.path.remove(head) + except ValueError: + pass + sys.path.insert(0, head) + + munged = {} + for name, mod in sys.modules.items(): + if '.' in name: + continue + fn = getattr(mod, '__file__', None) + if not isinstance(fn, str): + continue + newname = os.path.splitext(os.path.basename(fn))[0] + if not newname.startswith(part + '.'): + continue + path = os.path.join(os.path.dirname(os.path.realpath(fn)), '') + if path.startswith(pypy_root) and newname != part: + modpaths = os.path.normpath(path[len(pypy_root):]).split(os.sep) + if newname != '__init__': + modpaths.append(newname) + modpath = '.'.join(modpaths) + if modpath not in sys.modules: + munged[modpath] = mod + + for name, mod in munged.iteritems(): + if name not in sys.modules: + sys.modules[name] = mod + if '.' in name: + prename = name[:name.rfind('.')] + postname = name[len(prename)+1:] + if prename not in sys.modules: + __import__(prename) + if not hasattr(sys.modules[prename], postname): + setattr(sys.modules[prename], postname, mod) + + return partdir, this_dir + +def __clone(): + """ clone master version of autopath.py into all subdirs """ + from os.path import join, walk + if not this_dir.endswith(join('pypy','tool')): + raise EnvironmentError("can only clone master version " + "'%s'" % join(pypydir, 'tool',_myname)) + + + def sync_walker(arg, dirname, fnames): + if _myname in fnames: + fn = join(dirname, _myname) + f = open(fn, 'rwb+') + try: + if f.read() == arg: + print "checkok", fn + else: + print "syncing", fn + f = open(fn, 'w') + f.write(arg) + finally: + f.close() + s = open(join(pypydir, 'tool', _myname), 'rb').read() + walk(pypydir, sync_walker, s) + +_myname = 'autopath.py' + +# set guaranteed attributes + +pypydir, this_dir = __dirinfo('pypy') + +if __name__ == '__main__': + __clone() Added: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/conftest.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/conftest.py Sat Mar 29 00:36:56 2008 @@ -0,0 +1,16 @@ +import py +from pypy.jit.codegen import detect_cpu + + +class Directory(py.test.collect.Directory): + + def run(self): + try: + processor = detect_cpu.autodetect() + except detect_cpu.ProcessorAutodetectError, e: + py.test.skip(str(e)) + else: + if processor != 'i386': + py.test.skip('detected a %r CPU' % (processor,)) + + return super(Directory, self).run() Added: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/rgenop.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/rgenop.py Sat Mar 29 00:36:56 2008 @@ -0,0 +1,1120 @@ +import sys, py, os +from pypy.rlib.objectmodel import specialize +from pypy.rpython.lltypesystem import lltype, llmemory +from pypy.jit.codegen.i386.ri386 import * +from pypy.jit.codegen.i386.codebuf import CodeBlockOverflow +from pypy.jit.codegen.model import AbstractRGenOp, GenLabel, GenBuilder +from pypy.jit.codegen.model import GenVar, GenConst, CodeGenSwitch +from pypy.rlib import objectmodel +from pypy.rpython.annlowlevel import llhelper + +WORD = 4 +DEBUG_CALL_ALIGN = True +if sys.platform == 'darwin': + CALL_ALIGN = 4 +else: + CALL_ALIGN = 1 + +class Var(GenVar): + + def __init__(self, stackpos): + # 'stackpos' is an index relative to the pushed arguments + # (where N is the number of arguments of the function + # and B is a small integer for stack alignment purposes): + # + # B + 0 = last arg + # = ... + # B +N-1 = 1st arg + # B + N = return address + # B +N+1 = local var + # B +N+2 = ... + # ... <--- esp+4 + # local var <--- esp + # + self.stackpos = stackpos + + def operand(self, builder): + return builder.stack_access(self.stackpos) + + def nonimmoperand(self, builder, tmpregister): + return self.operand(builder) + + def __repr__(self): + return 'var@%d' % (self.stackpos,) + + repr = __repr__ + + +##class Const(GenConst): + +## def revealconst(self, TYPE): +## if isinstance(self, IntConst): +## self.revealconst_int(TYPE) +## elif isinstance(self, PtrConst): +## self.revealconst_ptr(TYPE) + +## if isinstance(TYPE, lltype.Ptr): +## if isinstance(self, PtrConst): +## return self.revealconst_ptr(TYPE) +## el +## return self.revealconst_ptr(TYPE) +## elif TYPE is lltype.Float: +## assert isinstance(self, DoubleConst) +## return self.revealconst_double() +## else: +## assert isinstance(TYPE, lltype.Primitive) +## assert TYPE is not lltype.Void, "cannot make red boxes of voids" +## assert isinstance(self, IntConst) +## return self.revealconst_primitive(TYPE) +## return self.value +## revealconst._annspecialcase_ = 'specialize:arg(1)' + + +class IntConst(GenConst): + + def __init__(self, value): + self.value = value + + def operand(self, builder): + return imm(self.value) + + def nonimmoperand(self, builder, tmpregister): + builder.mc.MOV(tmpregister, self.operand(builder)) + return tmpregister + + @specialize.arg(1) + def revealconst(self, T): + if isinstance(T, lltype.Ptr): + return lltype.cast_int_to_ptr(T, self.value) + elif T is llmemory.Address: + return llmemory.cast_int_to_adr(self.value) + else: + return lltype.cast_primitive(T, self.value) + + def __repr__(self): + "NOT_RPYTHON" + try: + return "const=%s" % (imm(self.value).assembler(),) + except TypeError: # from Symbolics + return "const=%r" % (self.value,) + + def repr(self): + return "const=$%s" % (self.value,) + + +##class FnPtrConst(IntConst): +## def __init__(self, value, mc): +## self.value = value +## self.mc = mc # to keep it alive + + +class AddrConst(GenConst): + + def __init__(self, addr): + self.addr = addr + + def operand(self, builder): + return imm(llmemory.cast_adr_to_int(self.addr)) + + def nonimmoperand(self, builder, tmpregister): + builder.mc.MOV(tmpregister, self.operand(builder)) + return tmpregister + + @specialize.arg(1) + def revealconst(self, T): + if T is llmemory.Address: + return self.addr + elif isinstance(T, lltype.Ptr): + return llmemory.cast_adr_to_ptr(self.addr, T) + elif T is lltype.Signed: + return llmemory.cast_adr_to_int(self.addr) + else: + assert 0, "XXX not implemented" + + def __repr__(self): + "NOT_RPYTHON" + return "const=%r" % (self.addr,) + + def repr(self): + return "const=<0x%x>" % (llmemory.cast_adr_to_int(self.addr),) + + +class Label(GenLabel): + + def __init__(self, startaddr, arg_positions, stackdepth): + self.startaddr = startaddr + self.arg_positions = arg_positions + self.stackdepth = stackdepth + + +class FlexSwitch(CodeGenSwitch): + + def __init__(self, rgenop): + self.rgenop = rgenop + self.default_case_builder = None + self.default_case_key = 0 + self._je_key = 0 + + def initialize(self, builder, gv_exitswitch): + mc = builder.mc + mc.MOV(eax, gv_exitswitch.operand(builder)) + self.saved_state = builder._save_state() + self._reserve(mc) + + def _reserve(self, mc): + RESERVED = 11*4+5 # XXX quite a lot for now :-/ + pos = mc.tell() + mc.UD2() + mc.write('\x00' * (RESERVED-1)) + self.nextfreepos = pos + self.endfreepos = pos + RESERVED + + def _reserve_more(self): + start = self.nextfreepos + end = self.endfreepos + newmc = self.rgenop.open_mc() + self._reserve(newmc) + self.rgenop.close_mc(newmc) + fullmc = self.rgenop.InMemoryCodeBuilder(start, end) + fullmc.JMP(rel32(self.nextfreepos)) + fullmc.done() + + def add_case(self, gv_case): + rgenop = self.rgenop + targetbuilder = Builder._new_from_state(rgenop, self.saved_state) + try: + self._add_case(gv_case, targetbuilder) + except CodeBlockOverflow: + self._reserve_more() + self._add_case(gv_case, targetbuilder) + targetbuilder._open() + return targetbuilder + + def _add_case(self, gv_case, targetbuilder): + # XXX this code needs to be simplified, now that we always + # have a default case + start = self.nextfreepos + end = self.endfreepos + mc = self.rgenop.InMemoryCodeBuilder(start, end) + mc.CMP(eax, gv_case.operand(None)) + self._je_key = targetbuilder.come_from(mc, 'JE', self._je_key) + pos = mc.tell() + if self.default_case_builder: + self.default_case_key = self.default_case_builder.come_from( + mc, 'JMP', self.default_case_key) + else: + illegal_start = mc.tell() + mc.JMP(rel32(0)) + ud2_addr = mc.tell() + mc.UD2() + illegal_mc = self.rgenop.InMemoryCodeBuilder(illegal_start, end) + illegal_mc.JMP(rel32(ud2_addr)) + mc.done() + self._je_key = 0 + self.nextfreepos = pos + + def _add_default(self): + rgenop = self.rgenop + targetbuilder = Builder._new_from_state(rgenop, self.saved_state) + self.default_case_builder = targetbuilder + start = self.nextfreepos + end = self.endfreepos + mc = self.rgenop.InMemoryCodeBuilder(start, end) + self.default_case_key = targetbuilder.come_from(mc, 'JMP') + targetbuilder._open() + return targetbuilder + +class Builder(GenBuilder): + + def __init__(self, rgenop, stackdepth): + self.rgenop = rgenop + self.stackdepth = stackdepth + self.mc = None + self._pending_come_from = {} + self.start = 0 + self.closed = False + self.tail = (0, 0) + + def _open(self): + if self.mc is None and not self.closed: + self.mc = self.rgenop.open_mc() + if not self.start: + # This is the first open. remember the start address + # and patch all come froms. + self.start = self.mc.tell() + come_froms = self._pending_come_from + self._pending_come_from = None + for start, (end, insn) in come_froms.iteritems(): + if end == self.start: + # there was a pending JMP just before self.start, + # so we can as well overwrite the JMP and start writing + # code directly there + self.mc.seekback(end - start) + self.start = start + break + for start, (end, insn) in come_froms.iteritems(): + if start != self.start: + mc = self.rgenop.InMemoryCodeBuilder(start, end) + self._emit_come_from(mc, insn, self.start) + mc.done() + else: + # We have been paused and are being opened again. + # Is the new codeblock immediately after the previous one? + prevstart, prevend = self.tail + curpos = self.mc.tell() + if prevend == curpos: + # Yes. We can overwrite the JMP and just continue writing + # code directly there + self.mc.seekback(prevend - prevstart) + else: + # No. Patch the jump at the end of the previous codeblock. + mc = self.rgenop.InMemoryCodeBuilder(prevstart, prevend) + mc.JMP(rel32(curpos)) + mc.done() + + def pause_writing(self, alive_vars_gv): + if self.mc is not None: + start = self.mc.tell() + self.mc.JMP(rel32(0)) + end = self.mc.tell() + self.tail = (start, end) + self.mc.done() + self.rgenop.close_mc(self.mc) + self.mc = None + return self + + def start_writing(self): + self._open() + + def _emit_come_from(self, mc, insn, addr): + if insn == 'JMP': + mc.JMP(rel32(addr)) + elif insn == 'JE': + mc.JE(rel32(addr)) + elif insn == 'JNE': + mc.JNE(rel32(addr)) + else: + raise ValueError('Unsupported jump') + + def come_from(self, mc, insn, key=0): + start = mc.tell() + if self._pending_come_from is None: + self._emit_come_from(mc, insn, self.start) + else: + self._emit_come_from(mc, insn, 0) + end = mc.tell() + if key != 0: + del self._pending_come_from[key] + self._pending_come_from[start] = (end, insn) + return start + + def end(self): + pass + + def _write_prologue(self, sigtoken): + self._open() + numargs = sigtoken # for now + #self.mc.BREAKPOINT() + # self.stackdepth-1 is the return address; the arguments + # come just before + return [Var(self.stackdepth-2-n) for n in range(numargs)] + + def _close(self): + self.closed = True + self.mc.done() + self.rgenop.close_mc(self.mc) + self.mc = None + + def _fork(self): + return self.rgenop.newbuilder(self.stackdepth) + + def _save_state(self): + return self.stackdepth + + @staticmethod + def _new_from_state(rgenop, stackdepth): + return rgenop.newbuilder(stackdepth) + + @specialize.arg(1) + def genop1(self, opname, gv_arg): + genmethod = getattr(self, 'op_' + opname) + return genmethod(gv_arg) + + @specialize.arg(1) + def genop2(self, opname, gv_arg1, gv_arg2): + genmethod = getattr(self, 'op_' + opname) + return genmethod(gv_arg1, gv_arg2) + + def genop_getfield(self, (offset, fieldsize), gv_ptr): + self.mc.MOV(edx, gv_ptr.operand(self)) + if fieldsize == WORD: + op = mem(edx, offset) + else: + if fieldsize == 1: + op = mem8(edx, offset) + else: + assert fieldsize == 2 + op = mem(edx, offset) + self.mc.MOVZX(eax, op) + op = eax + return self.returnvar(op) + + def genop_setfield(self, (offset, fieldsize), gv_ptr, gv_value): + self.mc.MOV(eax, gv_value.operand(self)) + self.mc.MOV(edx, gv_ptr.operand(self)) + if fieldsize == 1: + self.mc.MOV(mem8(edx, offset), al) + else: + if fieldsize == 2: + self.mc.o16() # followed by the MOV below + else: + assert fieldsize == WORD + self.mc.MOV(mem(edx, offset), eax) + + def genop_getsubstruct(self, (offset, fieldsize), gv_ptr): + self.mc.MOV(edx, gv_ptr.operand(self)) + self.mc.LEA(eax, mem(edx, offset)) + return self.returnvar(eax) + + def itemaddr(self, base, arraytoken, gv_index): + # uses ecx + lengthoffset, startoffset, itemoffset = arraytoken + if itemoffset == 1: + memSIBx = memSIB8 + else: + memSIBx = memSIB + if isinstance(gv_index, IntConst): + startoffset += itemoffset * gv_index.value + op = memSIBx(base, None, 0, startoffset) + elif itemoffset in SIZE2SHIFT: + self.mc.MOV(ecx, gv_index.operand(self)) + op = memSIBx(base, ecx, SIZE2SHIFT[itemoffset], startoffset) + else: + self.mc.IMUL(ecx, gv_index.operand(self), imm(itemoffset)) + op = memSIBx(base, ecx, 0, startoffset) + return op + + def genop_getarrayitem(self, arraytoken, gv_ptr, gv_index): + self.mc.MOV(edx, gv_ptr.operand(self)) + op = self.itemaddr(edx, arraytoken, gv_index) + _, _, itemsize = arraytoken + if itemsize != WORD: + assert itemsize == 1 or itemsize == 2 + self.mc.MOVZX(eax, op) + op = eax + return self.returnvar(op) + + def genop_getarraysubstruct(self, arraytoken, gv_ptr, gv_index): + self.mc.MOV(edx, gv_ptr.operand(self)) + op = self.itemaddr(edx, arraytoken, gv_index) + self.mc.LEA(eax, op) + return self.returnvar(eax) + + def genop_getarraysize(self, arraytoken, gv_ptr): + lengthoffset, startoffset, itemoffset = arraytoken + self.mc.MOV(edx, gv_ptr.operand(self)) + return self.returnvar(mem(edx, lengthoffset)) + + def genop_setarrayitem(self, arraytoken, gv_ptr, gv_index, gv_value): + self.mc.MOV(eax, gv_value.operand(self)) + self.mc.MOV(edx, gv_ptr.operand(self)) + destop = self.itemaddr(edx, arraytoken, gv_index) + _, _, itemsize = arraytoken + if itemsize != WORD: + if itemsize == 1: + self.mc.MOV(destop, al) + return + elif itemsize == 2: + self.mc.o16() # followed by the MOV below + else: + raise AssertionError + self.mc.MOV(destop, eax) + + def genop_malloc_fixedsize(self, size): + # XXX boehm only, no atomic/non atomic distinction for now + self.push(imm(size)) + self.mc.CALL(rel32(gc_malloc_fnaddr())) + return self.returnvar(eax) + + def genop_malloc_varsize(self, varsizealloctoken, gv_size): + # XXX boehm only, no atomic/non atomic distinction for now + # XXX no overflow checking for now + op_size = self.itemaddr(None, varsizealloctoken, gv_size) + self.mc.LEA(edx, op_size) + self.push(edx) + self.mc.CALL(rel32(gc_malloc_fnaddr())) + lengthoffset, _, _ = varsizealloctoken + self.mc.MOV(ecx, gv_size.operand(self)) + self.mc.MOV(mem(eax, lengthoffset), ecx) + return self.returnvar(eax) + + def genop_call(self, sigtoken, gv_fnptr, args_gv): + numargs = sigtoken # for now + MASK = CALL_ALIGN-1 + if MASK: + final_depth = self.stackdepth + numargs + delta = ((final_depth+MASK)&~MASK)-final_depth + if delta: + self.mc.SUB(esp, imm(delta*WORD)) + self.stackdepth += delta + for i in range(numargs-1, -1, -1): + gv_arg = args_gv[i] + self.push(gv_arg.operand(self)) + if DEBUG_CALL_ALIGN: + self.mc.MOV(eax, esp) + self.mc.AND(eax, imm8((WORD*CALL_ALIGN)-1)) + self.mc.ADD(eax, imm32(sys.maxint)) # overflows unless eax == 0 + self.mc.INTO() + if gv_fnptr.is_const: + target = gv_fnptr.revealconst(lltype.Signed) + self.mc.CALL(rel32(target)) + else: + self.mc.CALL(gv_fnptr.operand(self)) + # XXX only for int return_kind, check calling conventions + return self.returnvar(eax) + + def genop_same_as(self, kind, gv_x): + if gv_x.is_const: # must always return a var + return self.returnvar(gv_x.operand(self)) + else: + return gv_x + + def genop_debug_pdb(self): # may take an args_gv later + self.mc.BREAKPOINT() + + def enter_next_block(self, kinds, args_gv): + self._open() + arg_positions = [] + seen = {} + for i in range(len(args_gv)): + gv = args_gv[i] + # turn constants into variables; also make copies of vars that + # are duplicate in args_gv + if not isinstance(gv, Var) or gv.stackpos in seen: + gv = args_gv[i] = self.returnvar(gv.operand(self)) + # remember the var's position in the stack + arg_positions.append(gv.stackpos) + seen[gv.stackpos] = None + return Label(self.mc.tell(), arg_positions, self.stackdepth) + + def jump_if_false(self, gv_condition, args_gv): + targetbuilder = self._fork() + self.mc.CMP(gv_condition.operand(self), imm8(0)) + targetbuilder.come_from(self.mc, 'JE') + return targetbuilder + + def jump_if_true(self, gv_condition, args_gv): + targetbuilder = self._fork() + self.mc.CMP(gv_condition.operand(self), imm8(0)) + targetbuilder.come_from(self.mc, 'JNE') + return targetbuilder + + def finish_and_return(self, sigtoken, gv_returnvar): + self._open() + initialstackdepth = self.rgenop._initial_stack_depth(sigtoken) + self.mc.MOV(eax, gv_returnvar.operand(self)) + self.mc.ADD(esp, imm(WORD * (self.stackdepth - initialstackdepth))) + self.mc.RET() + self._close() + + def finish_and_goto(self, outputargs_gv, target): + self._open() + remap_stack_layout(self, outputargs_gv, target) + self.mc.JMP(rel32(target.startaddr)) + self._close() + + def flexswitch(self, gv_exitswitch, args_gv): + result = FlexSwitch(self.rgenop) + result.initialize(self, gv_exitswitch) + self._close() + return result, result._add_default() + + def show_incremental_progress(self): + pass + + def log(self, msg): + self.mc.log(msg) + + # ____________________________________________________________ + + def stack_access(self, stackpos): + return mem(esp, WORD * (self.stackdepth-1 - stackpos)) + + def push(self, op): + self.mc.PUSH(op) + self.stackdepth += 1 + + def returnvar(self, op): + res = Var(self.stackdepth) + self.push(op) + return res + + @staticmethod + def identity(gv_x): + return gv_x + + op_int_is_true = identity + + def op_int_add(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.ADD(eax, gv_y.operand(self)) + return self.returnvar(eax) + + def op_int_sub(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.SUB(eax, gv_y.operand(self)) + return self.returnvar(eax) + + def op_int_mul(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.IMUL(eax, gv_y.operand(self)) + return self.returnvar(eax) + + def op_int_floordiv(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.CDQ() + self.mc.IDIV(gv_y.nonimmoperand(self, ecx)) + return self.returnvar(eax) + + def op_int_mod(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.CDQ() + self.mc.IDIV(gv_y.nonimmoperand(self, ecx)) + return self.returnvar(edx) + + def op_int_and(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.AND(eax, gv_y.operand(self)) + return self.returnvar(eax) + + def op_int_or(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.OR(eax, gv_y.operand(self)) + return self.returnvar(eax) + + def op_int_xor(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.XOR(eax, gv_y.operand(self)) + return self.returnvar(eax) + + def op_int_lt(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.CMP(eax, gv_y.operand(self)) + self.mc.SETL(al) + self.mc.MOVZX(eax, al) + return self.returnvar(eax) + + def op_int_le(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.CMP(eax, gv_y.operand(self)) + self.mc.SETLE(al) + self.mc.MOVZX(eax, al) + return self.returnvar(eax) + + def op_int_eq(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.CMP(eax, gv_y.operand(self)) + self.mc.SETE(al) + self.mc.MOVZX(eax, al) + return self.returnvar(eax) + + def op_int_ne(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.CMP(eax, gv_y.operand(self)) + self.mc.SETNE(al) + self.mc.MOVZX(eax, al) + return self.returnvar(eax) + + def op_int_gt(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.CMP(eax, gv_y.operand(self)) + self.mc.SETG(al) + self.mc.MOVZX(eax, al) + return self.returnvar(eax) + + def op_int_ge(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.CMP(eax, gv_y.operand(self)) + self.mc.SETGE(al) + self.mc.MOVZX(eax, al) + return self.returnvar(eax) + + def op_int_neg(self, gv_x): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.NEG(eax) + return self.returnvar(eax) + + def op_int_abs(self, gv_x): + self.mc.MOV(eax, gv_x.operand(self)) + # ABS-computing code from Psyco, found by exhaustive search + # on *all* short sequences of operations :-) + self.mc.ADD(eax, eax) + self.mc.SBB(eax, gv_x.operand(self)) + self.mc.SBB(edx, edx) + self.mc.XOR(eax, edx) + return self.returnvar(eax) + + def op_int_invert(self, gv_x): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.NOT(eax) + return self.returnvar(eax) + + def op_int_lshift(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.MOV(ecx, gv_y.operand(self)) # XXX check if ecx >= 32 + self.mc.SHL(eax, cl) + return self.returnvar(eax) + + def op_int_rshift(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.MOV(ecx, gv_y.operand(self)) # XXX check if ecx >= 32 + self.mc.SAR(eax, cl) + return self.returnvar(eax) + + op_uint_is_true = op_int_is_true + op_uint_invert = op_int_invert + op_uint_add = op_int_add + op_uint_sub = op_int_sub + + def op_uint_mul(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.MUL(gv_y.nonimmoperand(self, edx)) + return self.returnvar(eax) + + def op_uint_floordiv(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.XOR(edx, edx) + self.mc.DIV(gv_y.nonimmoperand(self, ecx)) + return self.returnvar(eax) + + def op_uint_mod(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.XOR(edx, edx) + self.mc.DIV(gv_y.nonimmoperand(self, ecx)) + return self.returnvar(edx) + + def op_uint_lt(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.CMP(eax, gv_y.operand(self)) + self.mc.SETB(al) + self.mc.MOVZX(eax, al) + return self.returnvar(eax) + + def op_uint_le(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.CMP(eax, gv_y.operand(self)) + self.mc.SETBE(al) + self.mc.MOVZX(eax, al) + return self.returnvar(eax) + + op_uint_eq = op_int_eq + op_uint_ne = op_int_ne + + def op_uint_gt(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.CMP(eax, gv_y.operand(self)) + self.mc.SETA(al) + self.mc.MOVZX(eax, al) + return self.returnvar(eax) + + def op_uint_ge(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.CMP(eax, gv_y.operand(self)) + self.mc.SETAE(al) + self.mc.MOVZX(eax, al) + return self.returnvar(eax) + + op_uint_and = op_int_and + op_uint_or = op_int_or + op_uint_xor = op_int_xor + op_uint_lshift = op_int_lshift + + def op_uint_rshift(self, gv_x, gv_y): + self.mc.MOV(eax, gv_x.operand(self)) + self.mc.MOV(ecx, gv_y.operand(self)) # XXX check if ecx >= 32 + self.mc.SHR(eax, cl) + return self.returnvar(eax) + + def op_bool_not(self, gv_x): + self.mc.CMP(gv_x.operand(self), imm8(0)) + self.mc.SETE(al) + self.mc.MOVZX(eax, al) + return self.returnvar(eax) + + def op_cast_bool_to_int(self, gv_x): + self.mc.CMP(gv_x.operand(self), imm8(0)) + self.mc.SETNE(al) + self.mc.MOVZX(eax, al) + return self.returnvar(eax) + + op_cast_bool_to_uint = op_cast_bool_to_int + + op_cast_char_to_int = identity + op_cast_unichar_to_int = identity + op_cast_int_to_char = identity + op_cast_int_to_unichar = identity + op_cast_int_to_uint = identity + op_cast_uint_to_int = identity + op_cast_ptr_to_int = identity + op_cast_int_to_ptr = identity + + op_char_lt = op_int_lt + op_char_le = op_int_le + op_char_eq = op_int_eq + op_char_ne = op_int_ne + op_char_gt = op_int_gt + op_char_ge = op_int_ge + + op_unichar_eq = op_int_eq + op_unichar_ne = op_int_ne + + op_ptr_nonzero = op_int_is_true + op_ptr_iszero = op_bool_not # for now + op_ptr_eq = op_int_eq + op_ptr_ne = op_int_ne + + +SIZE2SHIFT = {1: 0, + 2: 1, + 4: 2, + 8: 3} + +GC_MALLOC = lltype.Ptr(lltype.FuncType([lltype.Signed], llmemory.Address)) + +def gc_malloc(size): + from pypy.rpython.lltypesystem.lloperation import llop + return llop.call_boehm_gc_alloc(llmemory.Address, size) + +def gc_malloc_fnaddr(): + """Returns the address of the Boehm 'malloc' function.""" + if objectmodel.we_are_translated(): + gc_malloc_ptr = llhelper(GC_MALLOC, gc_malloc) + return lltype.cast_ptr_to_int(gc_malloc_ptr) + else: + # don't do this at home + import threading + if not isinstance(threading.currentThread(), threading._MainThread): + import py + py.test.skip("must run in the main thread") + try: + from ctypes import cast, c_void_p + from pypy.rpython.rctypes.tool import util + path = util.find_library('gc') + if path is None: + raise ImportError("Boehm (libgc) not found") + boehmlib = util.load_library(path) + except ImportError, e: + import py + py.test.skip(str(e)) + else: + GC_malloc = boehmlib.GC_malloc + return cast(GC_malloc, c_void_p).value + +# ____________________________________________________________ + +def remap_stack_layout(builder, outputargs_gv, target): +## import os +## s = ', '.join([gv.repr() for gv in outputargs_gv]) +## os.write(2, "writing at %d (stack=%d, [%s])\n --> %d (stack=%d, %s)\n" +## % (builder.mc.tell(), +## builder.stackdepth, +## s, +## target.startaddr, +## target.stackdepth, +## target.arg_positions)) + + N = target.stackdepth + if builder.stackdepth < N: + builder.mc.SUB(esp, imm(WORD * (N - builder.stackdepth))) + builder.stackdepth = N + + M = len(outputargs_gv) + arg_positions = target.arg_positions + assert M == len(arg_positions) + targetlayout = [None] * N + srccount = [-N] * N + for i in range(M): + pos = arg_positions[i] + gv = outputargs_gv[i] + assert targetlayout[pos] is None + targetlayout[pos] = gv + srccount[pos] = 0 + pending_dests = M + for i in range(M): + targetpos = arg_positions[i] + gv = outputargs_gv[i] + if isinstance(gv, Var): + p = gv.stackpos + if 0 <= p < N: + if p == targetpos: + srccount[p] = -N # ignore 'v=v' + pending_dests -= 1 + else: + srccount[p] += 1 + + while pending_dests: + progress = False + for i in range(N): + if srccount[i] == 0: + srccount[i] = -1 + pending_dests -= 1 + gv_src = targetlayout[i] + if isinstance(gv_src, Var): + p = gv_src.stackpos + if 0 <= p < N: + srccount[p] -= 1 + builder.mc.MOV(eax, gv_src.operand(builder)) + builder.mc.MOV(builder.stack_access(i), eax) + progress = True + if not progress: + # we are left with only pure disjoint cycles; break them + for i in range(N): + if srccount[i] >= 0: + dst = i + builder.mc.MOV(edx, builder.stack_access(dst)) + while True: + assert srccount[dst] == 1 + srccount[dst] = -1 + pending_dests -= 1 + gv_src = targetlayout[dst] + assert isinstance(gv_src, Var) + src = gv_src.stackpos + assert 0 <= src < N + if src == i: + break + builder.mc.MOV(eax, builder.stack_access(src)) + builder.mc.MOV(builder.stack_access(dst), eax) + dst = src + builder.mc.MOV(builder.stack_access(dst), edx) + assert pending_dests == 0 + + if builder.stackdepth > N: + builder.mc.ADD(esp, imm(WORD * (builder.stackdepth - N))) + builder.stackdepth = N + + +# + +dummy_var = Var(0) + +class ReplayFlexSwitch(CodeGenSwitch): + + def __init__(self, replay_builder): + self.replay_builder = replay_builder + + def add_case(self, gv_case): + return self.replay_builder + +class ReplayBuilder(GenBuilder): + + def __init__(self, rgenop): + self.rgenop = rgenop + + def end(self): + pass + + @specialize.arg(1) + def genop1(self, opname, gv_arg): + return dummy_var + + @specialize.arg(1) + def genop2(self, opname, gv_arg1, gv_arg2): + return dummy_var + + def genop_getfield(self, fieldtoken, gv_ptr): + return dummy_var + + def genop_setfield(self, fieldtoken, gv_ptr, gv_value): + return dummy_var + + def genop_getsubstruct(self, fieldtoken, gv_ptr): + return dummy_var + + def genop_getarrayitem(self, arraytoken, gv_ptr, gv_index): + return dummy_var + + def genop_getarraysubstruct(self, arraytoken, gv_ptr, gv_index): + return dummy_var + + def genop_getarraysize(self, arraytoken, gv_ptr): + return dummy_var + + def genop_setarrayitem(self, arraytoken, gv_ptr, gv_index, gv_value): + return dummy_var + + def genop_malloc_fixedsize(self, size): + return dummy_var + + def genop_malloc_varsize(self, varsizealloctoken, gv_size): + return dummy_var + + def genop_call(self, sigtoken, gv_fnptr, args_gv): + return dummy_var + + def genop_same_as(self, kind, gv_x): + return dummy_var + + def genop_debug_pdb(self): # may take an args_gv later + pass + + def enter_next_block(self, kinds, args_gv): + return None + + def jump_if_false(self, gv_condition, args_gv): + return self + + def jump_if_true(self, gv_condition, args_gv): + return self + + def finish_and_return(self, sigtoken, gv_returnvar): + pass + + def finish_and_goto(self, outputargs_gv, target): + pass + + def flexswitch(self, gv_exitswitch, args_gv): + flexswitch = ReplayFlexSwitch(self) + return flexswitch, self + + def show_incremental_progress(self): + pass + +class RI386GenOp(AbstractRGenOp): + from pypy.jit.codegen.i386.codebuf import MachineCodeBlock + from pypy.jit.codegen.i386.codebuf import InMemoryCodeBuilder + + MC_SIZE = 65536 + + def __init__(self): + self.mcs = [] # machine code blocks where no-one is currently writing + self.keepalive_gc_refs = [] + self.total_code_blocks = 0 + + def open_mc(self): + if self.mcs: + # XXX think about inserting NOPS for alignment + return self.mcs.pop() + else: + # XXX supposed infinite for now + self.total_code_blocks += 1 + return self.MachineCodeBlock(self.MC_SIZE) + + def close_mc(self, mc): + # an open 'mc' is ready for receiving code... but it's also ready + # for being garbage collected, so be sure to close it if you + # want the generated code to stay around :-) + self.mcs.append(mc) + + def check_no_open_mc(self): + assert len(self.mcs) == self.total_code_blocks + + def newbuilder(self, stackdepth): + return Builder(self, stackdepth) + + def newgraph(self, sigtoken, name): + builder = self.newbuilder(self._initial_stack_depth(sigtoken)) + builder._open() # Force builder to have an mc + entrypoint = builder.mc.tell() + inputargs_gv = builder._write_prologue(sigtoken) + return builder, IntConst(entrypoint), inputargs_gv + + def _initial_stack_depth(self, sigtoken): + # If a stack depth is a multiple of CALL_ALIGN then the + # arguments are correctly aligned for a call. We have to + # precompute initialstackdepth to guarantee that. For OS/X the + # convention is that the stack should be aligned just after all + # arguments are pushed, i.e. just before the return address is + # pushed by the CALL instruction. In other words, after + # 'numargs' arguments have been pushed the stack is aligned: + numargs = sigtoken # for now + MASK = CALL_ALIGN - 1 + initialstackdepth = ((numargs+MASK)&~MASK) + 1 + return initialstackdepth + + def replay(self, label, kinds): + return ReplayBuilder(self), [dummy_var] * len(kinds) + + @specialize.genconst(1) + def genconst(self, llvalue): + T = lltype.typeOf(llvalue) + if T is llmemory.Address: + return AddrConst(llvalue) + elif isinstance(T, lltype.Primitive): + return IntConst(lltype.cast_primitive(lltype.Signed, llvalue)) + elif isinstance(T, lltype.Ptr): + lladdr = llmemory.cast_ptr_to_adr(llvalue) + if T.TO._gckind == 'gc': + self.keepalive_gc_refs.append(lltype.cast_opaque_ptr(llmemory.GCREF, llvalue)) + return AddrConst(lladdr) + else: + assert 0, "XXX not implemented" + + # attached later constPrebuiltGlobal = global_rgenop.genconst + + @staticmethod + @specialize.memo() + def fieldToken(T, name): + FIELD = getattr(T, name) + if isinstance(FIELD, lltype.ContainerType): + fieldsize = 0 # not useful for getsubstruct + else: + fieldsize = llmemory.sizeof(FIELD) + return (llmemory.offsetof(T, name), fieldsize) + + @staticmethod + @specialize.memo() + def allocToken(T): + return llmemory.sizeof(T) + + @staticmethod + @specialize.memo() + def varsizeAllocToken(T): + if isinstance(T, lltype.Array): + return RI386GenOp.arrayToken(T) + else: + # var-sized structs + arrayfield = T._arrayfld + ARRAYFIELD = getattr(T, arrayfield) + arraytoken = RI386GenOp.arrayToken(ARRAYFIELD) + length_offset, items_offset, item_size = arraytoken + arrayfield_offset = llmemory.offsetof(T, arrayfield) + return (arrayfield_offset+length_offset, + arrayfield_offset+items_offset, + item_size) + + @staticmethod + @specialize.memo() + def arrayToken(A): + return (llmemory.ArrayLengthOffset(A), + llmemory.ArrayItemsOffset(A), + llmemory.ItemOffset(A.OF)) + + @staticmethod + @specialize.memo() + def kindToken(T): + if T is lltype.Float: + py.test.skip("not implemented: floats in the i386 back-end") + return None # for now + + @staticmethod + @specialize.memo() + def sigToken(FUNCTYPE): + numargs = 0 + for ARG in FUNCTYPE.ARGS: + if ARG is not lltype.Void: + numargs += 1 + return numargs # for now + + @staticmethod + def erasedType(T): + if T is llmemory.Address: + return llmemory.Address + if isinstance(T, lltype.Primitive): + return lltype.Signed + elif isinstance(T, lltype.Ptr): + return llmemory.GCREF + else: + assert 0, "XXX not implemented" + +global_rgenop = RI386GenOp() +RI386GenOp.constPrebuiltGlobal = global_rgenop.genconst Added: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/test/__init__.py ============================================================================== Added: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/test/test_rgenop.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/test/test_rgenop.py Sat Mar 29 00:36:56 2008 @@ -0,0 +1,8 @@ +from pypy.jit.codegen.iaxx.rgenop import RI386GenOp +from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTests + +class TestRI386Genop(AbstractRGenOpTests): + RGenOp = RI386GenOp + + # for the individual tests see + # ====> ../../test/rgenop_tests.py Added: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/viewcode.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/viewcode.py Sat Mar 29 00:36:56 2008 @@ -0,0 +1,339 @@ +#! /usr/bin/env python +""" +Viewer for the CODE_DUMP output of compiled programs generating code. + +Try: + ./viewcode.py dumpfile.txt +or + /tmp/usession-xxx/testing_1/testing_1 -var 4 2>&1 | ./viewcode.py +""" + +import autopath +import operator, sys, os, re, py +from bisect import bisect_left + +# don't use pypy.tool.udir here to avoid removing old usessions which +# might still contain interesting executables +udir = py.path.local.make_numbered_dir(prefix='viewcode-', keep=2) +tmpfile = str(udir.join('dump.tmp')) + +# ____________________________________________________________ +# Some support code from Psyco. There is more over there, +# I am porting it in a lazy fashion... See py-utils/xam.py + +if sys.platform == "win32": + XXX # lots more in Psyco + +def machine_code_dump(data, originaddr): + # the disassembler to use. 'objdump' writes GNU-style instructions. + # 'ndisasm' would use Intel syntax, but you need to fix the output parsing. + objdump = 'objdump -b binary -m i386 --adjust-vma=%(origin)d -D %(file)s' + # + f = open(tmpfile, 'wb') + f.write(data) + f.close() + g = os.popen(objdump % {'file': tmpfile, 'origin': originaddr}, 'r') + result = g.readlines() + g.close() + return result[6:] # drop some objdump cruft + +def load_symbols(filename): + # the program that lists symbols, and the output it gives + symbollister = 'nm %s' + re_symbolentry = re.compile(r'([0-9a-fA-F]+)\s\w\s(.*)') + # + print 'loading symbols from %s...' % (filename,) + symbols = {} + g = os.popen(symbollister % filename, "r") + for line in g: + match = re_symbolentry.match(line) + if match: + addr = long(match.group(1), 16) + name = match.group(2) + if name.startswith('pypy_g_'): + name = '\xb7' + name[7:] + symbols[addr] = name + g.close() + print '%d symbols found' % (len(symbols),) + return symbols + +re_addr = re.compile(r'[\s,$]0x([0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]+)') +re_lineaddr = re.compile(r'\s*0?x?([0-9a-fA-F]+)') + +def lineaddresses(line): + result = [] + i = 0 + while 1: + match = re_addr.search(line, i) + if not match: + break + i = match.end() + addr = long(match.group(1), 16) + result.append(addr) + return result + +# ____________________________________________________________ + +class CodeRange(object): + fallthrough = False + + def __init__(self, world, addr, data): + self.world = world + self.addr = addr + self.data = data + + def __repr__(self): + return '' % (hex(self.addr), len(self.data)) + + def touches(self, other): + return (self .addr < other.addr + len(other.data) and + other.addr < self .addr + len(self.data)) + + def update_from_old(self, other): + if other.addr < self.addr: + delta = self.addr - other.addr + assert delta <= len(other.data) + self.addr -= delta + self.data = other.data[:delta] + self.data + self_end = self .addr + len(self .data) + other_end = other.addr + len(other.data) + if other_end > self_end: + extra = other_end - self_end + assert extra <= len(other.data) + self.data += other.data[-extra:] + + def cmpop(op): + def _cmp(self, other): + if not isinstance(other, CodeRange): + return NotImplemented + return op((self.addr, self.data), (other.addr, other.data)) + return _cmp + __lt__ = cmpop(operator.lt) + __le__ = cmpop(operator.le) + __eq__ = cmpop(operator.eq) + __ne__ = cmpop(operator.ne) + __gt__ = cmpop(operator.gt) + __ge__ = cmpop(operator.ge) + del cmpop + + def disassemble(self): + if not hasattr(self, 'text'): + lines = machine_code_dump(self.data, self.addr) + # instead of adding symbol names in the dumps we could + # also make the 0xNNNNNNNN addresses be red and show the + # symbol name when the mouse is over them + logentries = self.world.logentries + symbols = self.world.symbols + for i, line in enumerate(lines): + match = re_lineaddr.match(line) + if match: + addr = long(match.group(1), 16) + logentry = logentries.get(addr) + if logentry: + lines[i] = '\n%s\n%s' % (logentry, lines[i]) + for addr in lineaddresses(line): + sym = symbols.get(addr) + if sym: + lines[i] = '%s\t%s\n' % (lines[i].rstrip(), sym) + self.text = ''.join(lines) + return self.text + + def findjumps(self): + text = self.disassemble() + lines = text.splitlines() + for i, line in enumerate(lines): + if '\tj' not in line: # poor heuristic to recognize lines that + continue # could be jump instructions + addrs = list(lineaddresses(line)) + if not addrs: + continue + addr = addrs[-1] + final = '\tjmp' in line + yield i, addr, final + if self.fallthrough: + yield len(lines), self.addr + len(self.data), True + + +class World(object): + + def __init__(self): + self.ranges = [] + self.labeltargets = {} + self.jumps = {} + self.symbols = {} + self.logentries = {} + + def parse(self, f): + for line in f: + if line.startswith('CODE_DUMP '): + pieces = line.split() + assert pieces[1].startswith('@') + assert pieces[2].startswith('+') + baseaddr = long(pieces[1][1:], 16) & 0xFFFFFFFFL + offset = int(pieces[2][1:]) + addr = baseaddr + offset + data = pieces[3].replace(':', '').decode('hex') + coderange = CodeRange(self, addr, data) + i = bisect_left(self.ranges, coderange) + j = i + while i>0 and coderange.touches(self.ranges[i-1]): + coderange.update_from_old(self.ranges[i-1]) + i -= 1 + while j= fnext: + sys.stderr.write("%d%%" % int(f*100.0)) + fnext += 0.1 + sys.stderr.write(".") + sys.stderr.write("100%\n") + # split blocks at labeltargets + t = self.labeltargets + #print t + for r in self.ranges: + #print r.addr, r.addr + len(r.data) + for i in range(r.addr + 1, r.addr + len(r.data)): + if i in t: + #print i + ofs = i - r.addr + self.ranges.append(CodeRange(self, i, r.data[ofs:])) + r.data = r.data[:ofs] + r.fallthrough = True + try: + del r.text + except AttributeError: + pass + break + # hack hack hacked + + def show(self): + g1 = Graph('codedump') + for r in self.ranges: + text, width = tab2columns(r.disassemble()) + text = '0x%x\n\n%s' % (r.addr, text) + g1.emit_node('N_%x' % r.addr, shape="box", label=text, + width=str(width*0.1125)) + for lineno, targetaddr, final in r.findjumps(): + if final: + color = "black" + else: + color = "red" + g1.emit_edge('N_%x' % r.addr, 'N_%x' % targetaddr, color=color) + g1.display() + + +def tab2columns(text): + lines = text.split('\n') + columnwidth = [] + for line in lines: + columns = line.split('\t')[:-1] + while len(columnwidth) < len(columns): + columnwidth.append(0) + for i, s in enumerate(columns): + width = len(s.strip()) + if not s.endswith(':'): + width += 2 + columnwidth[i] = max(columnwidth[i], width) + columnwidth.append(1) + result = [] + for line in lines: + columns = line.split('\t') + text = [] + for width, s in zip(columnwidth, columns): + text.append(s.strip().ljust(width)) + result.append(' '.join(text)) + lengths = [len(line) for line in result] + lengths.append(1) + totalwidth = max(lengths) + return '\\l'.join(result), totalwidth + +# ____________________________________________________________ +# XXX pasted from +# http://codespeak.net/svn/user/arigo/hack/misc/graphlib.py +# but needs to be a bit more subtle later + +from pypy.translator.tool.make_dot import DotGen +from pypy.translator.tool.pygame.graphclient import display_layout + +class Graph(DotGen): + + def highlight(self, word, text, linked_to=None): + if not hasattr(self, '_links'): + self._links = {} + self._links_to = {} + self._links[word] = text + if linked_to: + self._links_to[word] = linked_to + + def display(self): + "Display a graph page locally." + display_layout(_Page(self)) + + +class NoGraph(Exception): + pass + +class _Page: + def __init__(self, graph_builder): + if callable(graph_builder): + graph = graph_builder() + else: + graph = graph_builder + if graph is None: + raise NoGraph + self.graph_builder = graph_builder + + def content(self): + return _PageContent(self.graph_builder) + +class _PageContent: + fixedfont = True + + def __init__(self, graph_builder): + if callable(graph_builder): + graph = graph_builder() + else: + graph = graph_builder + assert graph is not None + self.graph_builder = graph_builder + self.graph = graph + self.links = getattr(graph, '_links', {}) + if not hasattr(graph, '_source'): + graph._source = graph.generate(target=None) + self.source = graph._source + + def followlink(self, link): + try: + return _Page(self.graph._links_to[link]) + except NoGraph: + return _Page(self.graph_builder) + +# ____________________________________________________________ + +if __name__ == '__main__': + if len(sys.argv) == 1: + f = sys.stdin + else: + f = open(sys.argv[1], 'r') + world = World() + world.parse(f) + world.show() From fijal at codespeak.net Sat Mar 29 00:39:29 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sat, 29 Mar 2008 00:39:29 +0100 (CET) Subject: [pypy-svn] r53072 - in pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx: . test Message-ID: <20080328233929.C48DF169F21@codespeak.net> Author: fijal Date: Sat Mar 29 00:39:29 2008 New Revision: 53072 Added: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/viewcode.py - copied unchanged from r53068, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/viewcode.py Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/ (props changed) pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/test/ (props changed) Log: * replace viewcode with new version * fixeol From antocuni at codespeak.net Sat Mar 29 10:46:19 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Sat, 29 Mar 2008 10:46:19 +0100 (CET) Subject: [pypy-svn] r53076 - in pypy/branch/jit-hotpath/pypy/rpython: . ootypesystem test Message-ID: <20080329094619.31437169FAA@codespeak.net> Author: antocuni Date: Sat Mar 29 10:46:18 2008 New Revision: 53076 Modified: pypy/branch/jit-hotpath/pypy/rpython/annlowlevel.py pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rootype.py pypy/branch/jit-hotpath/pypy/rpython/test/test_llann.py Log: make llhelper() working also with ootype Modified: pypy/branch/jit-hotpath/pypy/rpython/annlowlevel.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/annlowlevel.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/annlowlevel.py Sat Mar 29 10:46:18 2008 @@ -345,8 +345,12 @@ # implementation for the purpose of direct running only # XXX need more cleverness to support translation of prebuilt llhelper ptr # (see test_prebuilt_llhelper) - return lltype.functionptr(F.TO, f.func_name, _callable=f, - _debugexc = getattr(f, '_debugexc', False)) + if isinstance(F, ootype.OOType): + return ootype.static_meth(F, f.func_name, _callable=f, + _debugexc = getattr(f, '_debugexc', False)) + else: + return lltype.functionptr(F.TO, f.func_name, _callable=f, + _debugexc = getattr(f, '_debugexc', False)) class LLHelperEntry(extregistry.ExtRegistryEntry): _about_ = llhelper @@ -355,11 +359,18 @@ assert s_F.is_constant() assert s_callable.is_constant() F = s_F.const - args_s = [annmodel.lltype_to_annotation(T) for T in F.TO.ARGS] + if isinstance(F, ootype.OOType): + FUNC = F + resultcls = annmodel.SomeOOStaticMeth + else: + FUNC = F.TO + resultcls = annmodel.SomePtr + + args_s = [annmodel.lltype_to_annotation(T) for T in FUNC.ARGS] key = (llhelper, s_callable.const) s_res = self.bookkeeper.emulate_pbc_call(key, s_callable, args_s) - assert annmodel.lltype_to_annotation(F.TO.RESULT).contains(s_res) - return annmodel.SomePtr(F) + assert annmodel.lltype_to_annotation(FUNC.RESULT).contains(s_res) + return resultcls(F) def specialize_call(self, hop): hop.exception_cannot_occur() Modified: pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rootype.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rootype.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rootype.py Sat Mar 29 10:46:18 2008 @@ -1,3 +1,4 @@ +from pypy.objspace.flow import model as flowmodel from pypy.annotation import model as annmodel from pypy.rpython.rmodel import Repr from pypy.rpython.ootypesystem import ootype @@ -127,6 +128,23 @@ def __init__(self, METHODTYPE): self.lowleveltype = METHODTYPE + def rtype_simple_call(self, hop): + vlist = hop.inputargs(*hop.args_r) + nexpected = len(self.lowleveltype.ARGS) + nactual = len(vlist)-1 + if nactual != nexpected: + raise TyperError("argcount mismatch: expected %d got %d" % + (nexpected, nactual)) + if isinstance(vlist[0], flowmodel.Constant): + if hasattr(vlist[0].value, 'graph'): + hop.llops.record_extra_call(vlist[0].value.graph) + opname = 'direct_call' + else: + opname = 'indirect_call' + vlist.append(hop.inputconst(ootype.Void, None)) + hop.exception_is_here() + return hop.genop(opname, vlist, resulttype = self.lowleveltype.RESULT) + class __extend__(pairtype(OOInstanceRepr, OOBoundMethRepr)): Modified: pypy/branch/jit-hotpath/pypy/rpython/test/test_llann.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/test/test_llann.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/test/test_llann.py Sat Mar 29 10:46:18 2008 @@ -1,5 +1,6 @@ import py from pypy.rpython.lltypesystem.lltype import * +from pypy.rpython.ootypesystem import ootype from pypy.rpython.lltypesystem.rclass import OBJECTPTR from pypy.rpython.rclass import fishllattr from pypy.translator.translator import TranslationContext @@ -451,6 +452,33 @@ res = interpret(h, [8, 5, 2]) assert res == 99 +def test_oohelper(): + S = ootype.Instance('S', ootype.ROOT, {'x': Signed, 'y': Signed}) + def f(s,z): + #assert we_are_translated() + return s.x*s.y+z + + def g(s): + #assert we_are_translated() + return s.x+s.y + + F = ootype.StaticMethod([S, Signed], Signed) + G = ootype.StaticMethod([S], Signed) + + def h(x, y, z): + s = ootype.new(S) + s.x = x + s.y = y + fsm = llhelper(F, f) + gsm = llhelper(G, g) + assert typeOf(fsm) == F + return fsm(s, z)+fsm(s, z*2)+gsm(s) + + res = h(8, 5, 2) + assert res == 99 + res = interpret(h, [8, 5, 2], type_system='ootype') + assert res == 99 + def test_prebuilt_llhelper(): py.test.skip("does not work") From antocuni at codespeak.net Sat Mar 29 10:58:07 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Sat, 29 Mar 2008 10:58:07 +0100 (CET) Subject: [pypy-svn] r53077 - in pypy/branch/jit-hotpath/pypy/jit: codegen/llgraph rainbow rainbow/test timeshifter Message-ID: <20080329095807.9CBB3169FAA@codespeak.net> Author: antocuni Date: Sat Mar 29 10:58:05 2008 New Revision: 53077 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Log: test_known_nonzero pass for ootype Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py Sat Mar 29 10:58:05 2008 @@ -270,7 +270,13 @@ "genop_ptr_nonzero: bad currently_writing") gv_ptr = llimpl.cast(self.b, gv_PTRTYPE.v, gv_ptr.v) return LLVar(llimpl.genop(self.b, 'ptr_nonzero', [gv_ptr], gv_Bool.v)) - + + def genop_oononnull(self, gv_OBJTYPE, gv_obj): + ll_assert(self.rgenop.currently_writing is self, + "genop_oononnull: bad currently_writing") + gv_obj = llimpl.cast(self.b, gv_OBJTYPE.v, gv_obj.v) + return LLVar(llimpl.genop(self.b, 'oononnull', [gv_obj], gv_Bool.v)) + def genop_ptr_eq(self, gv_PTRTYPE, gv_ptr1, gv_ptr2): ll_assert(self.rgenop.currently_writing is self, "genop_ptr_eq: bad currently_writing") Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Sat Mar 29 10:58:05 2008 @@ -2051,7 +2051,6 @@ test_normalize_indirect_call_more = _skip test_green_char_at_merge = _skip test_self_referential_structures = _skip - test_known_nonzero = _skip test_debug_assert_ptr_nonzero = _skip test_indirect_red_call = _skip test_indirect_red_call_with_exc = _skip Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py Sat Mar 29 10:58:05 2008 @@ -38,6 +38,11 @@ def genop_ptr_nonzero(self, builder, argbox, gv_addr): return builder.genop_ptr_nonzero(argbox.kind, gv_addr) + def get_FuncType(self, ARGS, RESULT): + FUNCTYPE = lltype.FuncType(ARGS, RESULT) + FUNCPTRTYPE = lltype.Ptr(FUNCTYPE) + return FUNCTYPE, FUNCPTRTYPE + class OOTypeHelper(TypeSystemHelper): name = 'ootype' @@ -55,6 +60,10 @@ def genop_ptr_nonzero(self, builder, argbox, gv_addr): return builder.genop_oononnull(argbox.kind, gv_addr) + def get_FuncType(self, ARGS, RESULT): + FUNCTYPE = ootype.StaticMethod(ARGS, RESULT) + return FUNCTYPE, FUNCTYPE + llhelper = LLTypeHelper() oohelper = OOTypeHelper() Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py Sat Mar 29 10:58:05 2008 @@ -57,10 +57,6 @@ self.genop_set_exc_type (builder, gv_etype ) self.genop_set_exc_value(builder, gv_evalue) - def gen_exc_occurred(self, builder): - gv_etype = self.genop_get_exc_type(builder) - return builder.genop_ptr_nonzero(self.exc_type_kind, gv_etype) - class LLTypeExceptionDesc(AbstractExceptionDesc): @@ -82,6 +78,10 @@ def genop_set_exc_value(self, builder, gv_value): builder.genop_setfield(self.exc_value_token, self.gv_excdata, gv_value) + def gen_exc_occurred(self, builder): + gv_etype = self.genop_get_exc_type(builder) + return builder.genop_ptr_nonzero(self.exc_type_kind, gv_etype) + class OOTypeExceptionDesc(AbstractExceptionDesc): def _create_boxes(self, RGenOp): @@ -102,3 +102,7 @@ def genop_set_exc_value(self, builder, gv_value): builder.genop_oosetfield(self.exc_value_token, self.gv_excdata, gv_value) + + def gen_exc_occurred(self, builder): + gv_etype = self.genop_get_exc_type(builder) + return builder.genop_oononnull(self.exc_type_kind, gv_etype) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Sat Mar 29 10:58:05 2008 @@ -792,14 +792,15 @@ if not we_are_translated(): import sys, pdb print >> sys.stderr, "\n*** Error in ll_continue_compilation ***" + print >> sys.stderr, e pdb.post_mortem(sys.exc_info()[2]) lloperation.llop.debug_fatalerror( lltype.Void, "compilation-time error %s" % e) self.ll_continue_compilation = ll_continue_compilation ll_continue_compilation._debugexc = True - FUNCTYPE = lltype.FuncType([base_ptr_lltype(), ERASED], lltype.Void) - FUNCPTRTYPE = lltype.Ptr(FUNCTYPE) + ts = interpreter.ts + FUNCTYPE, FUNCPTRTYPE = ts.get_FuncType([base_ptr_lltype(), ERASED], lltype.Void) self.FUNCPTRTYPE = FUNCPTRTYPE self.sigtoken = interpreter.rgenop.sigToken(FUNCTYPE) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Sat Mar 29 10:58:05 2008 @@ -379,9 +379,8 @@ class InstanceRedBox(AbstractPtrRedBox, OOTypeMixin): + pass - def forcevar(self, jitstate, memo, forget_nonzeroness): - raise NotImplementedError # ____________________________________________________________ @@ -517,7 +516,7 @@ PtrRedBox = InstanceRedBox -class FrozenPtrVar(FrozenVar): +class AbstractFrozenPtrVar(FrozenVar): def __init__(self, kind, known_nonzero): self.kind = kind @@ -525,7 +524,7 @@ def exactmatch(self, box, outgoingvarboxes, memo): from pypy.jit.timeshifter.rcontainer import VirtualContainer - assert isinstance(box, PtrRedBox) + assert isinstance(box, AbstractPtrRedBox) memo.partialdatamatch[box] = None if not self.known_nonzero: memo.forget_nonzeroness[box] = None @@ -540,13 +539,19 @@ def unfreeze(self, incomingvarboxes, memo): memo = memo.boxes if self not in memo: - newbox = PtrRedBox(self.kind, None, self.known_nonzero) + newbox = self.PtrRedBox(self.kind, None, self.known_nonzero) incomingvarboxes.append(newbox) memo[self] = newbox return newbox else: return memo[self] +class FrozenPtrVar(AbstractFrozenPtrVar, LLTypeMixin): + PtrRedBox = PtrRedBox + +class FrozenInstanceVar(AbstractFrozenPtrVar, OOTypeMixin): + PtrRedBox = InstanceRedBox + class FrozenPtrVarWithPartialData(FrozenPtrVar): @@ -603,5 +608,5 @@ InstanceRedBox.FrozenPtrVirtual = None InstanceRedBox.FrozenPtrConst = FrozenInstanceConst -InstanceRedBox.FrozenPtrVar = None +InstanceRedBox.FrozenPtrVar = FrozenInstanceVar InstanceRedBox.FrozenPtrVarWithPartialData = None From antocuni at codespeak.net Sat Mar 29 11:01:16 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Sat, 29 Mar 2008 11:01:16 +0100 (CET) Subject: [pypy-svn] r53078 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080329100116.6C39A169FAA@codespeak.net> Author: antocuni Date: Sat Mar 29 11:01:14 2008 New Revision: 53078 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Log: test_debug_assert_ptrnonzero passes out of the box Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Sat Mar 29 11:01:14 2008 @@ -1429,9 +1429,10 @@ self.check_insns(int_mul=1, int_add=0) def test_debug_assert_ptr_nonzero(self): - S = lltype.GcStruct('s', ('x', lltype.Signed)) + S = self.GcStruct('s', ('x', lltype.Signed)) + malloc = self.malloc def h(): - s = lltype.malloc(S) + s = malloc(S) s.x = 42 return s def g(s): @@ -2051,7 +2052,6 @@ test_normalize_indirect_call_more = _skip test_green_char_at_merge = _skip test_self_referential_structures = _skip - test_debug_assert_ptr_nonzero = _skip test_indirect_red_call = _skip test_indirect_red_call_with_exc = _skip test_indirect_gray_call = _skip From arigo at codespeak.net Sat Mar 29 14:12:34 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 29 Mar 2008 14:12:34 +0100 (CET) Subject: [pypy-svn] r53091 - in pypy/branch/jit-hotpath/pypy: jit/rainbow jit/rainbow/test rlib rlib/test Message-ID: <20080329131234.31636169ED1@codespeak.net> Author: arigo Date: Sat Mar 29 14:12:33 2008 New Revision: 53091 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/rlib/jit.py pypy/branch/jit-hotpath/pypy/rlib/test/test_jit.py Log: A more flexible way to configure parameters of the JIT from the running program. A bit indirect implementation-wise. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Sat Mar 29 14:12:33 2008 @@ -78,6 +78,8 @@ def make_enter_function(self): HotEnterState = make_state_class(self) state = HotEnterState() + self.state = state + self._set_param_fn_cache = {} exceptiondesc = self.exceptiondesc interpreter = self.interpreter num_green_args = len(self.green_args_spec) @@ -113,12 +115,12 @@ for op in block.operations: if op.opname == 'jit_marker': index = block.operations.index(op) - meth = getattr(self, 'rewrite_' + op.args[0].value) + meth = getattr(self, 'rewrite__' + op.args[0].value) if meth(graph, block, index): return True # graph mutated, start over again return False # done - def rewrite_can_enter_jit(self, graph, block, index): + def rewrite__can_enter_jit(self, graph, block, index): # # In the original graphs, replace the 'can_enter_jit' operations # with a call to the maybe_enter_jit() helper. @@ -151,7 +153,7 @@ block.operations[index] = newop return True - def rewrite_jit_merge_point(self, origportalgraph, origblock, origindex): + def rewrite__jit_merge_point(self, origportalgraph, origblock, origindex): # # Mutate the original portal graph from this: # @@ -280,6 +282,45 @@ checkgraph(origportalgraph) return True + def rewrite__set_param(self, graph, block, index): + # Replace a set_param marker with a call to a helper function + op = block.operations[index] + assert op.opname == 'jit_marker' + assert op.args[0].value == 'set_param' + param_name = op.args[2].value + v_param_value = op.args[3] + SETTERFUNC = lltype.FuncType([lltype.Signed], lltype.Void) + + try: + setter_fnptr = self._set_param_fn_cache[param_name] + except KeyError: + meth = getattr(self.state, 'set_param_' + param_name, None) + if meth is None: + raise Exception("set_param(): no such parameter: %r" % + (param_name,)) + + def ll_setter(value): + meth(value) + ll_setter.__name__ = 'set_' + param_name + + if not self.translate_support_code: + setter_fnptr = llhelper(lltype.Ptr(SETTERFUNC), ll_setter) + else: + args_s = [annmodel.SomeInteger()] + s_result = annmodel.s_None + setter_fnptr = self.annhelper.delayedfunction( + setter, args_s, s_result) + self._set_param_fn_cache[param_name] = setter_fnptr + + vlist = [Constant(setter_fnptr, lltype.Ptr(SETTERFUNC)), + v_param_value] + v_result = Variable() + v_result.concretetype = lltype.Void + newop = SpaceOperation('direct_call', vlist, v_result) + block.operations[index] = newop + +# ____________________________________________________________ + def make_state_class(hotrunnerdesc): # very minimal, just to make the first test pass @@ -336,6 +377,7 @@ def __init__(self): self.cells = [Counter(0)] * HASH_TABLE_SIZE + self.threshold = 10 # Only use the hash of the arguments as the profiling key. # Indeed, this is all a heuristic, so if things are designed @@ -351,7 +393,7 @@ # update the profiling counter interp = hotrunnerdesc.interpreter n = cell.counter + 1 - if n < hotrunnerdesc.jitdrivercls.getcurrentthreshold(): + if n < self.threshold: if hotrunnerdesc.verbose_level >= 3: interp.debug_trace("jit_not_entered", *args) self.cells[argshash] = Counter(n) @@ -384,7 +426,7 @@ # not found at all, do profiling interp = hotrunnerdesc.interpreter n = next.counter + 1 - if n < hotrunnerdesc.jitdrivercls.getcurrentthreshold(): + if n < self.threshold: if hotrunnerdesc.verbose_level >= 3: interp.debug_trace("jit_not_entered", *args) cell.next = Counter(n) @@ -479,4 +521,7 @@ return residualargs make_residualargs._always_inline_ = True + def set_param_threshold(self, threshold): + self.threshold = threshold + return HotEnterState Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Sat Mar 29 14:12:33 2008 @@ -186,7 +186,7 @@ # 'value' should be a Bool, but depending on the backend # it could have been ERASED to about anything else value = bool(value) - threshold = self.hotrunnerdesc.jitdrivercls.getcurrentthreshold() + threshold = self.hotrunnerdesc.state.threshold if value: counter = self.truepath_counter + 1 assert counter > 0, ( @@ -257,7 +257,7 @@ # XXX unsafe with a moving GC hash = cast_whatever_to_int(lltype.typeOf(value), value) counter = self.counters.get(hash, 0) + 1 - threshold = self.hotrunnerdesc.jitdrivercls.getcurrentthreshold() + threshold = self.hotrunnerdesc.state.threshold assert counter > 0, ( "reaching a fallback point for an already-compiled path") if counter >= threshold: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Sat Mar 29 14:12:33 2008 @@ -70,14 +70,14 @@ return self._run(main, main_args) def _rewrite(self, threshold, small): - assert len(self.hintannotator.jitdriverclasses) == 1 - jitdrivercls = self.hintannotator.jitdriverclasses.keys()[0] # hack - jitdrivercls.getcurrentthreshold = staticmethod(lambda : threshold) #.. + assert len(self.hintannotator.jitdriverclasses) == 1 # xxx for now + jitdrivercls = self.hintannotator.jitdriverclasses.keys()[0] self.hotrunnerdesc = HotRunnerDesc(self.hintannotator, self.rtyper, self.jitcode, self.RGenOp, self.writer, jitdrivercls, self.translate_support_code) self.hotrunnerdesc.rewrite_all() + self.hotrunnerdesc.state.set_param_threshold(threshold) if self.simplify_virtualizable_accesses: from pypy.jit.rainbow import graphopt graphopt.simplify_virtualizable_accesses(self.writer) @@ -422,6 +422,36 @@ res = self.run(ll_function, [2, 7], threshold=1, small=True) assert res == 72002 + def test_set_threshold(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'x'] + def ll_function(x): + MyJitDriver.set_param(threshold=x) + i = 1024 + while i > 0: + i >>= 1 + x += i + MyJitDriver.jit_merge_point(i=i, x=x) + MyJitDriver.can_enter_jit(i=i, x=x) + return x + res = self.run(ll_function, [2], threshold=9) + assert res == 1025 + self.check_traces([ + "jit_not_entered 512 514", + "jit_compile", + "pause at hotsplit in ll_function", + "run_machine_code 256 770", + "fallback_interp", + "fb_leave 128 898", + "run_machine_code 128 898", + "jit_resume Bool path True in ll_function", + "done at jit_merge_point", + "resume_machine_code", + "fallback_interp", + "fb_return 1025", + ]) + def test_hp_tlr(self): from pypy.jit.tl import tlr Modified: pypy/branch/jit-hotpath/pypy/rlib/jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/jit.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/jit.py Sat Mar 29 14:12:33 2008 @@ -111,9 +111,18 @@ _type_ = _JitBoundClassMethod def compute_result_annotation(self, **kwds_s): - from pypy.annotation import model as annmodel drivercls = self.instance.drivercls drivercls._check_class() + meth = getattr(self, 'annotate_%s' % self.instance.name) + return meth(drivercls, **kwds_s) + + def specialize_call(self, hop, **kwds_i): + drivercls = self.instance.drivercls + meth = getattr(self, 'specialize_%s' % self.instance.name) + return meth(drivercls, hop, **kwds_i) + + def annotate_jit_merge_point(self, drivercls, **kwds_s): + from pypy.annotation import model as annmodel keys = kwds_s.keys() keys.sort() expected = ['s_' + name for name in drivercls.greens + drivercls.reds] @@ -125,14 +134,15 @@ drivercls._emulate_method_calls(self.bookkeeper, kwds_s) return annmodel.s_None - def specialize_call(self, hop, **kwds_i): + annotate_can_enter_jit = annotate_jit_merge_point + + def specialize_jit_merge_point(self, drivercls, hop, **kwds_i): # replace a call to MyDriverCls.hintname(**livevars) # with an operation 'hintname(MyDriverCls, livevars...)' # XXX to be complete, this could also check that the concretetype # of the variables are the same for each of the calls. from pypy.rpython.error import TyperError from pypy.rpython.lltypesystem import lltype - drivercls = self.instance.drivercls greens_v = [] reds_v = [] for name in drivercls.greens: @@ -153,6 +163,28 @@ return hop.genop('jit_marker', vlist, resulttype=lltype.Void) + specialize_can_enter_jit = specialize_jit_merge_point + + def annotate_set_param(self, drivercls, **kwds_s): + from pypy.annotation import model as annmodel + if len(kwds_s) != 1: + raise Exception("DriverCls.set_param(): must specify exactly " + "one keyword argument") + return annmodel.s_None + + def specialize_set_param(self, drivercls, hop, **kwds_i): + from pypy.rpython.lltypesystem import lltype + [(name, i)] = kwds_i.items() + assert name.startswith('i_') + name = name[2:] + v_value = hop.inputarg(lltype.Signed, arg=i) + vlist = [hop.inputconst(lltype.Void, "set_param"), + hop.inputconst(lltype.Void, drivercls), + hop.inputconst(lltype.Void, name), + v_value] + return hop.genop('jit_marker', vlist, + resulttype=lltype.Void) + # ____________________________________________________________ # User interface for the hotpath JIT policy @@ -168,10 +200,7 @@ jit_merge_point = _JitHintClassMethod("jit_merge_point") can_enter_jit = _JitHintClassMethod("can_enter_jit") - - def getcurrentthreshold(): - return 10 - getcurrentthreshold = staticmethod(getcurrentthreshold) + set_param = _JitHintClassMethod("set_param") def compute_invariants(self, *greens): """This can compute a value or tuple that is passed as a green Modified: pypy/branch/jit-hotpath/pypy/rlib/test/test_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/test/test_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/test/test_jit.py Sat Mar 29 14:12:33 2008 @@ -1,5 +1,5 @@ import py -from pypy.rlib.jit import hint, _is_early_constant +from pypy.rlib.jit import hint, _is_early_constant, JitDriver from pypy.translator.translator import TranslationContext, graphof from pypy.rpython.test.tool import BaseRtypingTest, LLRtypeMixin, OORtypeMixin @@ -27,5 +27,12 @@ res = self.interpret(g, []) assert res == 42 + def test_set_param(self): + class MyJitDriver(JitDriver): + greens = reds = [] + def f(x): + MyJitDriver.set_param(foo=x) - + assert f(4) is None + res = self.interpret(f, [4]) + assert res is None From arigo at codespeak.net Sat Mar 29 14:29:24 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 29 Mar 2008 14:29:24 +0100 (CET) Subject: [pypy-svn] r53092 - in pypy/branch/jit-hotpath/pypy/jit/rainbow: . test Message-ID: <20080329132924.53195169EEF@codespeak.net> Author: arigo Date: Sat Mar 29 14:29:24 2008 New Revision: 53092 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: Add the trace_eagerness and hash_bits parameters. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Sat Mar 29 14:29:24 2008 @@ -1,3 +1,4 @@ +import sys from pypy.objspace.flow.model import Constant, Variable, SpaceOperation from pypy.objspace.flow.model import Link, checkgraph from pypy.annotation import model as annmodel @@ -322,6 +323,8 @@ # ____________________________________________________________ +THRESHOLD_MAX = (sys.maxint-1) / 2 + def make_state_class(hotrunnerdesc): # very minimal, just to make the first test pass num_green_args = len(hotrunnerdesc.green_args_spec) @@ -332,9 +335,11 @@ green_args_range = unrolling_iterable( range(len(hotrunnerdesc.green_args_spec))) if hotrunnerdesc.green_args_spec: - HASH_TABLE_SIZE = 2 ** 14 + INITIAL_HASH_TABLE_BITS = 14 + MAX_HASH_TABLE_BITS = 28 else: - HASH_TABLE_SIZE = 1 + INITIAL_HASH_TABLE_BITS = 0 + MAX_HASH_TABLE_BITS = 0 # ---------- hacks for the 'invariants' argument ---------- drivercls = hotrunnerdesc.jitdrivercls @@ -376,8 +381,29 @@ NULL_MC = lltype.nullptr(hotrunnerdesc.RESIDUAL_FUNCTYPE) def __init__(self): - self.cells = [Counter(0)] * HASH_TABLE_SIZE - self.threshold = 10 + self.set_param_threshold(40) + self.set_param_trace_eagerness(10) + self.set_param_hash_bits(INITIAL_HASH_TABLE_BITS) + + def set_param_threshold(self, threshold): + if threshold > THRESHOLD_MAX: + threshold = THRESHOLD_MAX + self.threshold = threshold + + def set_param_trace_eagerness(self, value): + if value <= 0: + value = 1 + elif value > THRESHOLD_MAX: + value = THRESHOLD_MAX + self.trace_eagerness = value + + def set_param_hash_bits(self, value): + if value < 0: + value = 0 + elif value > MAX_HASH_TABLE_BITS: + value = MAX_HASH_TABLE_BITS + self.cells = [Counter(0)] * (1 << value) + self.hashtablemask = (1 << value) - 1 # Only use the hash of the arguments as the profiling key. # Indeed, this is all a heuristic, so if things are designed @@ -387,7 +413,7 @@ def maybe_compile(self, *args): greenargs = args[:num_green_args] argshash = self.getkeyhash(*greenargs) - argshash &= (HASH_TABLE_SIZE - 1) + argshash &= self.hashtablemask cell = self.cells[argshash] if isinstance(cell, Counter): # update the profiling counter @@ -521,7 +547,4 @@ return residualargs make_residualargs._always_inline_ = True - def set_param_threshold(self, threshold): - self.threshold = threshold - return HotEnterState Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Sat Mar 29 14:29:24 2008 @@ -188,7 +188,11 @@ value = bool(value) threshold = self.hotrunnerdesc.state.threshold if value: - counter = self.truepath_counter + 1 + if self.falsepath_counter >= 0: # if other path not compiled either + bump = self.hotrunnerdesc.state.trace_eagerness + else: + bump = 1 + counter = self.truepath_counter + bump assert counter > 0, ( "reaching a fallback point for an already-compiled path") if counter >= threshold: @@ -196,7 +200,11 @@ self.truepath_counter = counter return False else: - counter = self.falsepath_counter + 1 + if self.truepath_counter >= 0: # if other path not compiled either + bump = self.hotrunnerdesc.state.trace_eagerness + else: + bump = 1 + counter = self.falsepath_counter + bump assert counter > 0, ( "reaching a fallback point for an already-compiled path") if counter >= threshold: @@ -256,7 +264,12 @@ def check_should_compile(self, value): # XXX unsafe with a moving GC hash = cast_whatever_to_int(lltype.typeOf(value), value) - counter = self.counters.get(hash, 0) + 1 + counter = self.counters.setdefault(hash, 0) + if len(self.counters) == 1: # if no other path compiled so far + bump = self.hotrunnerdesc.state.trace_eagerness + else: + bump = 1 + counter = counter + bump threshold = self.hotrunnerdesc.state.threshold assert counter > 0, ( "reaching a fallback point for an already-compiled path") Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Sat Mar 29 14:29:24 2008 @@ -78,6 +78,7 @@ self.translate_support_code) self.hotrunnerdesc.rewrite_all() self.hotrunnerdesc.state.set_param_threshold(threshold) + self.hotrunnerdesc.state.set_param_trace_eagerness(1) # for tests if self.simplify_virtualizable_accesses: from pypy.jit.rainbow import graphopt graphopt.simplify_virtualizable_accesses(self.writer) @@ -452,6 +453,42 @@ "fb_return 1025", ]) + def test_set_trace_eagerness(self): + class MyJitDriver(JitDriver): + greens = [] + reds = ['i', 'x'] + def ll_function(x): + MyJitDriver.set_param(trace_eagerness=x) + i = 1024 + while i > 0: + i >>= 1 + x += i + MyJitDriver.jit_merge_point(i=i, x=x) + MyJitDriver.can_enter_jit(i=i, x=x) + return x + res = self.run(ll_function, [2], threshold=5) + assert res == 1025 + self.check_traces([ + "jit_not_entered 512 514", + "jit_not_entered 256 770", + "jit_not_entered 128 898", + "jit_not_entered 64 962", + "jit_compile", # after the threshold of 5 is reached + "pause at hotsplit in ll_function", + "run_machine_code 32 994", + "fallback_interp", + "fb_leave 16 1010", + "run_machine_code 16 1010", + "fallback_interp", + "fb_leave 8 1018", + "run_machine_code 8 1018", + "jit_resume Bool path True in ll_function", # after 3 times already + "done at jit_merge_point", # 3*(eagerness=2) >= 5 + "resume_machine_code", + "fallback_interp", + "fb_return 1025", + ]) + def test_hp_tlr(self): from pypy.jit.tl import tlr From arigo at codespeak.net Sat Mar 29 16:40:40 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 29 Mar 2008 16:40:40 +0100 (CET) Subject: [pypy-svn] r53094 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080329154040.CF942169F4C@codespeak.net> Author: arigo Date: Sat Mar 29 16:40:40 2008 New Revision: 53094 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: Fix test (probably broken by accident) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Sat Mar 29 16:40:40 2008 @@ -551,8 +551,8 @@ return repr(stack) POLICY = MyHintAnnotatorPolicy() - #res = self.run(main, [1, 11], threshold=2, policy=POLICY) - #assert ''.join(res.chars) == "The factorial of 11 is 39916800" + res = self.run(main, [1, 11], threshold=2, policy=POLICY) + assert ''.join(res.chars) == "The factorial of 11 is 39916800" # nothing is forced self.check_insns_in_loops(malloc=0) From cami at codespeak.net Sat Mar 29 16:42:00 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sat, 29 Mar 2008 16:42:00 +0100 (CET) Subject: [pypy-svn] r53095 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080329154200.91FD6168406@codespeak.net> Author: cami Date: Sat Mar 29 16:41:59 2008 New Revision: 53095 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py Log: implemeted extended joypad driver with button code mapping Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py Sat Mar 29 16:41:59 2008 @@ -15,7 +15,7 @@ def reset(self): self.joyp = 0xF - self.buttons = 0xF + self.buttonCode = 0xF self.cycles = constants.JOYPAD_CLOCK def cycles(self): @@ -35,19 +35,19 @@ def read(self, address): if (address == constants.JOYP): - return (self.joyp << 4) + self.buttons + return (self.joyp << 4) + self.buttonCode return 0xFF def update(self): - oldButtons = self.buttons + oldButtons = self.buttonCode if self.joyp == 0x1: - self.buttons = self.driver.getButtons() + self.buttonCode = self.driver.getButtonCode() elif self.joyp == 0x2: - self.buttons = self.driver.getDirections() + self.buttonCode = self.driver.getDirectionCode() else: - self.buttons = 0xF + self.buttonCode = 0xF - if oldButtons != self.buttons: + if oldButtons != self.buttonCode: self.interrupt.raiseInterrupt(constants.JOYPAD) @@ -58,8 +58,30 @@ """ def __init__(self): self.raised = False - self.buttons = 0xF - self.directions = 0xF + self.createButtons() + self.reset() + + def createButtons(self): + self.up = Button(constants.BUTTON_UP) + self.right = Button(constants.BUTTON_RIGHT) + self.down = Button(constants.BUTTON_DOWN) + self.left = Button(constants.BUTTON_LEFT) + self.start = Button(constants.BUTTON_START) + self.select = Button(constants.BUTTON_SELECT) + self.a = Button(constants.BUTTON_A) + self.b = Button(constants.BUTTON_B) + self.addOppositeButtons() + self.createButtonGroups() + + def addOppositeButtons(self): + self.up.oppositeButton = self.down + self.down.oppositeButton = self.up + self.left.oppositeButton = self.right + self.right.oppositeButton = self.left + + def createButtonGroups(self): + self.directions = [self.up, self.right, self.down, self.left] + self.buttons = [self.start, self.select, self.a, self.b] def getButtons(self): return self.buttons @@ -67,5 +89,104 @@ def getDirections(self): return self.directions + def getButtonCode(self): + code = 0 + for button in self.buttons: + code |= button.getCode() + return code + + def getDirectionCode(self): + code = 0 + for button in self.directions: + code |= button.getCode() + return code + def isRaised(self): - return self.raised \ No newline at end of file + raised = self.raised; + self.raised = False + return raised + + def reset(self): + self.raised = False + self.releaseAllButtons() + + def releaseAllButtons(self): + self.releaseButtons() + self.releaseDirections() + + def releaseButtons(self): + self.up.release() + self.right.release() + self.down.release() + self.left.release() + + def releaseDirections(self): + self.start.release() + self.select.release() + self.a.release() + self.b.release() + + def buttonUp(self, pressed=True): + self.up.toggleButton(pressed) + self.raised = True + + def buttonRight(self, pressed=True): + self.right.toggleButton(pressed) + self.raised = True + + def buttonDown(self, pressed=True): + self.down.toggleButton(pressed) + self.raised = True + + def buttonLeft(self, pressed=True): + self.left.toggleButton(pressed) + self.raised = True + + def buttonStart(self, pressed=True): + self.start.toggleButton(pressed) + self.raised = True + + def buttonSelect(self, pressed=True): + self.select.toggleButton(pressed) + self.raised = True + + def buttonA(self, pressed=True): + self.a.toggleButton(pressed) + self.raised = True + + def buttonB(self, pressed=True): + self.b.toggleButton(pressed) + self.raised = True + + + + +class Button(object): + + def __init__(self, codeValue, oppositeButton=None): + self.codeValue = codeValue + self.oppositeButton = oppositeButton + self.pressed = False + + def getCode(self): + if self.pressed: + return self.codeValue + else: + return 0 + + def toggleButton(self, pressed=True): + if pressed: + self.press() + else: + self.release() + + def release(self): + self.pressed = False + + def press(self): + if self.oppositeButton is not None: + self.oppositeButton.release() + self.pressed = True + + def isPressed(self): + return self.pressed \ No newline at end of file Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py Sat Mar 29 16:41:59 2008 @@ -2,6 +2,7 @@ from pypy.lang.gameboy.interrupt import * from pypy.lang.gameboy import constants +BUTTON_CODE = 0x3 def get_joypad(): return Joypad(get_driver(), Interrupt()) @@ -9,8 +10,128 @@ def get_driver(): return JoypadDriver() +def get_button(): + return Button(BUTTON_CODE) -# ------------------------------------------------------------------------------ +# TEST BUTTON ------------------------------------------------------------------ + +def test_ini(): + value = 0xf + button = Button(value) + assert button.oppositeButton == None + assert button.codeValue == value + assert button.isPressed() == False + + button2 = Button(value, button) + assert button2.oppositeButton == button + assert button2.codeValue == value + +def test_getCode(): + button = get_button() + assert button.getCode() == 0 + button.press() + assert button.getCode() == button.codeValue + +def test_press_release(): + button = get_button() + button2 = get_button() + button.oppositeButton = button2; + button2.press() + assert button2.isPressed() == True + button.press() + assert button.isPressed() == True + assert button2.isPressed() == False + button.release() + assert button.isPressed() == False + assert button2.isPressed() == False + +# TEST JOYPAD DRIVER ----------------------------------------------------------- + +def test_ini(): + driver = get_driver() + assert driver.raised == False + assert driver.getButtonCode() == 0 + assert driver.getDirectionCode() == 0 + +def test_isRaised(): + driver = get_driver() + driver.raised = True + assert driver.raised == True + assert driver.isRaised() == True + assert driver.raised == False + +def test_button_code_values(): + driver = get_driver() + assert driver.up.codeValue == constants.BUTTON_UP + assert driver.right.codeValue == constants.BUTTON_RIGHT + assert driver.down.codeValue == constants.BUTTON_DOWN + assert driver.left.codeValue == constants.BUTTON_LEFT + assert driver.select.codeValue == constants.BUTTON_SELECT + assert driver.start.codeValue == constants.BUTTON_START + assert driver.a.codeValue == constants.BUTTON_A + assert driver.b.codeValue == constants.BUTTON_B + + +def test_toggle_opposite_directions(): + driver = get_driver() + directions = [(driver.buttonUp, driver.up, driver.down), + (driver.buttonDown, driver.down, driver.up), + (driver.buttonLeft, driver.left, driver.right), + (driver.buttonRight, driver.right, driver.left)] + for dir in directions: + toggleFunction = dir[0] + button = dir[1] + oppositeButton = dir[2] + driver.reset() + + oppositeButton.press() + assert driver.raised == False + assert button.isPressed() == False + assert oppositeButton.isPressed() == True + assert driver.getDirectionCode() == oppositeButton.codeValue + assert driver.getButtonCode() == 0 + + toggleFunction() + assert driver.raised == True + assert button.isPressed() == True + assert oppositeButton.isPressed() == False + assert driver.getDirectionCode() == button.codeValue + assert driver.getButtonCode() == 0 + + toggleFunction(False) + assert button.isPressed() == False + assert oppositeButton.isPressed() == False + assert driver.getDirectionCode() == 0 + assert driver.getButtonCode() == 0 + + +def test_toggle_buttons(): + driver = get_driver() + buttons = [(driver.buttonSelect, driver.select), + (driver.buttonStart, driver.start), + (driver.buttonA, driver.a), + (driver.buttonB, driver.b)] + for button in buttons: + toggleFunction = button[0] + button = button[1] + driver.reset() + + assert button.isPressed() == False + assert driver.getButtonCode() == 0 + assert driver.getDirectionCode() == 0 + + toggleFunction() + assert driver.raised == True + assert button.isPressed() == True + assert driver.getButtonCode() == button.codeValue + assert driver.getDirectionCode() == 0 + + toggleFunction(False) + assert button.isPressed() == False + assert driver.getButtonCode() == 0 + assert driver.getDirectionCode() == 0 + +# TEST JOYPAD ------------------------------------------------------------------ def test_reset(joypad=None): if joypad == None: @@ -35,16 +156,15 @@ def test_emulate_zero_ticks_update(): joypad = get_joypad() value = 0x1 - valueButtons = 0x4 joypad.joyp = value - joypad.driver.buttons = valueButtons + joypad.driver.buttonCode = 0x4 joypad.driver.raised = True joypad.cycles = 2 ticks = 2 joypad.emulate(ticks) assert joypad.cycles == constants.JOYPAD_CLOCK assert joypad.joyp == value - assert joypad.buttons == valueButtons + assert joypad.buttonCode == 0 def test_read_write(): joypad = get_joypad() @@ -62,20 +182,22 @@ def test_update(): joypad = get_joypad() - joypad.driver.buttons = 0x1 - assert joypad.driver.getButtons() == 0x1 - joypad.driver.directions = 0x2 - assert joypad.driver.getDirections() == 0x2 - assert joypad.buttons == 0xF + joypad.driver.buttonSelect() + assert joypad.driver.getButtonCode() == constants.BUTTON_SELECT + joypad.driver.buttonUp() + assert joypad.driver.getDirectionCode() == constants.BUTTON_UP + assert joypad.buttonCode == 0xF joypad.joyp = 0x1 joypad.update() - assert joypad.buttons == joypad.driver.buttons + assert joypad.buttonCode == (constants.BUTTON_SELECT | constants.BUTTON_UP) joypad.joyp = 0x2 joypad.update() - assert joypad.buttons == joypad.driver.directions + assert joypad.buttonCode == (constants.BUTTON_SELECT | constants.BUTTON_UP) joypad.joyp = 0x3 joypad.update() - assert joypad.buttons == 0xF + assert joypad.buttonCode == 0xF + + \ No newline at end of file From arigo at codespeak.net Sat Mar 29 17:02:11 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 29 Mar 2008 17:02:11 +0100 (CET) Subject: [pypy-svn] r53096 - in pypy/branch/jit-hotpath/pypy: jit/hintannotator jit/hintannotator/test jit/rainbow jit/rainbow/test jit/tl module/pypyjit module/pypyjit/test rlib rlib/test translator Message-ID: <20080329160211.DE24B169F29@codespeak.net> Author: arigo Date: Sat Mar 29 17:02:08 2008 New Revision: 53096 Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py pypy/branch/jit-hotpath/pypy/jit/tl/targettiny2hotpath.py pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py pypy/branch/jit-hotpath/pypy/module/pypyjit/__init__.py pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_jit_setup.py pypy/branch/jit-hotpath/pypy/rlib/jit.py pypy/branch/jit-hotpath/pypy/rlib/test/test_jit.py pypy/branch/jit-hotpath/pypy/translator/driver.py Log: Biggish refactoring of the way the JitDriver class is used. We're now supposed to create a (singleton) instance of it, and subclassing JitDriver is optional. This is somewhat a clean-up. It fixes the translation issues about the way JIT parameters are set (classmethods are not really supported in RPython). All tests (I think) ported to the new style -- keyboard macros rule :-) Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py Sat Mar 29 17:02:08 2008 @@ -14,7 +14,7 @@ class HotPathHintAnnotator(HintAnnotator): def build_hotpath_types(self): - self.jitdriverclasses = {} + self.jitdrivers = {} self.prepare_portal_graphs() graph = self.portalgraph_with_on_enter_jit input_args_hs = [SomeLLAbstractConstant(v.concretetype, @@ -33,8 +33,8 @@ raise JitHintError("found %d graphs with a jit_merge_point()," " expected 1 (for now)" % len(found_at)) origportalgraph, _, origportalop = found_at[0] - drivercls = origportalop.args[1].value - self.jitdriverclasses[drivercls] = True + jitdriver = origportalop.args[1].value + self.jitdrivers[jitdriver] = True # # We make a copy of origportalgraph and mutate it to make it # the portal. The portal really starts at the jit_merge_point() @@ -58,12 +58,12 @@ # and turned into rainbow bytecode. On the other hand, the # 'self.portalgraph' is the copy that will run directly, in # non-JITting mode, so it should not contain the on_enter_jit() call. - if hasattr(drivercls, 'on_enter_jit'): + if hasattr(jitdriver, 'on_enter_jit'): anothercopy = copygraph(portalgraph) anothercopy.tag = 'portal' insert_on_enter_jit_handling(self.base_translator.rtyper, anothercopy, - drivercls) + jitdriver) self.portalgraph_with_on_enter_jit = anothercopy else: self.portalgraph_with_on_enter_jit = portalgraph # same is ok @@ -113,14 +113,14 @@ else: return None -def insert_on_enter_jit_handling(rtyper, graph, drivercls): +def insert_on_enter_jit_handling(rtyper, graph, jitdriver): vars = [varoftype(v.concretetype, name=v) for v in graph.getargs()] newblock = Block(vars) op = graph.startblock.operations[0] assert op.opname == 'jit_marker' assert op.args[0].value == 'jit_merge_point' - assert op.args[1].value is drivercls + assert op.args[1].value is jitdriver allvars = [] i = 0 for v in op.args[2:]: @@ -131,7 +131,8 @@ i += 1 assert i == len(vars) - compute_invariants_func = drivercls.compute_invariants.im_func + # six lines just to get at the INVARIANTS type... + compute_invariants_func = jitdriver.compute_invariants.im_func bk = rtyper.annotator.bookkeeper s_func = bk.immutablevalue(compute_invariants_func) r_func = rtyper.getrepr(s_func) @@ -139,33 +140,37 @@ INVARIANTS = c_func.concretetype.TO.RESULT llops = LowLevelOpList(rtyper) - # generate ops to make an instance of DriverCls - classdef = rtyper.annotator.bookkeeper.getuniqueclassdef(drivercls) + # generate ops to make an instance of RedVarsHolder + RedVarsHolder = jitdriver._RedVarsHolder + classdef = rtyper.annotator.bookkeeper.getuniqueclassdef(RedVarsHolder) s_instance = annmodel.SomeInstance(classdef) r_instance = rtyper.getrepr(s_instance) - v_self = r_instance.new_instance(llops) - # generate ops to store the 'greens' and 'reds' variables on 'self' - num_greens = len(drivercls.greens) - num_reds = len(drivercls.reds) + v_reds = r_instance.new_instance(llops) + # generate ops to store the 'reds' variables on the RedVarsHolder + num_greens = len(jitdriver.greens) + num_reds = len(jitdriver.reds) assert len(allvars) == num_greens + num_reds - for name, v_value in zip(drivercls.reds, allvars[num_greens:]): - r_instance.setfield(v_self, name, v_value, llops) - # generate a call to on_enter_jit(self, invariants, *greens) - on_enter_jit_func = drivercls.on_enter_jit.im_func + for name, v_value in zip(jitdriver.reds, allvars[num_greens:]): + r_instance.setfield(v_reds, name, v_value, llops) + # generate a call to on_enter_jit(self, reds, invariants, *greens) + on_enter_jit_func = jitdriver.on_enter_jit.im_func s_func = rtyper.annotator.bookkeeper.immutablevalue(on_enter_jit_func) r_func = rtyper.getrepr(s_func) c_func = r_func.get_unique_llfn() + ON_ENTER_JIT = c_func.concretetype.TO + assert ON_ENTER_JIT.ARGS[0] is lltype.Void + assert ON_ENTER_JIT.ARGS[1] == INVARIANTS + assert ON_ENTER_JIT.ARGS[2] == r_instance.lowleveltype + c_self = inputconst(lltype.Void, jitdriver) v_invariants = varoftype(INVARIANTS, 'invariants') c_hint = inputconst(lltype.Void, {'concrete': True}) llops.genop('hint', [v_invariants, c_hint], resulttype=INVARIANTS) vlist = allvars[:num_greens] - llops.genop('direct_call', [c_func, v_self, v_invariants] + vlist) - # generate ops to reload the 'reds' variables from 'self' - # XXX Warning! the 'greens' variables are not reloaded. This is - # a bit of a mess color-wise, and probably not useful. + llops.genop('direct_call', [c_func, c_self, v_invariants, v_reds] + vlist) + # generate ops to reload the 'reds' variables from the RedVarsHolder newvars = allvars[:num_greens] - for name, v_value in zip(drivercls.reds, allvars[num_greens:]): - v_value = r_instance.getfield(v_self, name, llops) + for name, v_value in zip(jitdriver.reds, allvars[num_greens:]): + v_value = r_instance.getfield(v_reds, name, llops) newvars.append(v_value) newvars = [v for v in newvars if v.concretetype is not lltype.Void] # done, fill the block and link it to make it the startblock Modified: pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/test_hotpath.py Sat Mar 29 17:02:08 2008 @@ -17,22 +17,20 @@ backendoptimize=backendoptimize) def test_simple_loop(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n1', 'total'] + myjitdriver = JitDriver([], ['n1', 'total']) def ll_function(n): n1 = n * 2 total = 0 while True: - MyJitDriver.jit_merge_point(n1=n1, total=total) + myjitdriver.jit_merge_point(n1=n1, total=total) if n1 <= 0: break if we_are_jitted(): total += 1000 total += n1 n1 -= 1 - MyJitDriver.can_enter_jit(n1=n1, total=total) + myjitdriver.can_enter_jit(n1=n1, total=total) return total def main(n, m): @@ -45,13 +43,11 @@ assert 'int_mul' not in summary(graphs[0]) def test_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['count', 'x', 'y'] + myjitdriver = JitDriver([], ['count', 'x', 'y']) def add(count, x, y): result = x + y - MyJitDriver.can_enter_jit(count=count, x=x, y=y) + myjitdriver.can_enter_jit(count=count, x=x, y=y) return result add._dont_inline_ = True def sub(x, y): @@ -59,7 +55,7 @@ sub._dont_inline_ = True def main(count, x, y): while True: - MyJitDriver.jit_merge_point(count=count, x=x, y=y) + myjitdriver.jit_merge_point(count=count, x=x, y=y) count -= 1 if not count: break Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sat Mar 29 17:02:08 2008 @@ -1524,9 +1524,9 @@ def decode_hp_hint_args(self, op): # Returns (list-of-green-vars, list-of-red-vars) without Voids. - drivercls = op.args[1].value - numgreens = len(drivercls.greens) - numreds = len(drivercls.reds) + jitdriver = op.args[1].value + numgreens = len(jitdriver.greens) + numreds = len(jitdriver.reds) greens_v = op.args[2:2+numgreens] reds_v = op.args[2+numgreens:] assert len(reds_v) == numreds Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/graphopt.py Sat Mar 29 17:02:08 2008 @@ -51,8 +51,9 @@ for op in block.operations: if op.opname == 'malloc': self.add_safe_variable(graph, op.result) - elif op.opname == 'jit_merge_point': - for v in op.args[1:]: + elif (op.opname == 'jit_marker' and + op.args[0].value == 'jit_merge_point'): + for v in op.args[2:]: self.add_safe_variable(graph, v) def add_safe_variable(self, graph, v): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py Sat Mar 29 17:02:08 2008 @@ -9,6 +9,7 @@ from pypy.rlib.objectmodel import we_are_translated, UnboxedValue from pypy.rlib.rarithmetic import r_uint from pypy.rlib.unroll import unrolling_iterable +from pypy.rlib.jit import PARAMETERS from pypy.jit.codegen.i386.rgenop import cast_whatever_to_int from pypy.jit.hintannotator.model import originalconcretetype from pypy.jit.timeshifter import rvalue @@ -20,7 +21,7 @@ class HotRunnerDesc: def __init__(self, hintannotator, rtyper, entryjitcode, RGenOp, - codewriter, jitdrivercls, translate_support_code = True, + codewriter, jitdriver, translate_support_code = True, verbose_level=3): self.hintannotator = hintannotator self.entryjitcode = entryjitcode @@ -30,7 +31,7 @@ self.interpreter = codewriter.interpreter self.ts = self.interpreter.ts self.codewriter = codewriter - self.jitdrivercls = jitdrivercls + self.jitdriver = jitdriver self.translate_support_code = translate_support_code self.verbose_level = verbose_level @@ -57,7 +58,7 @@ self.red_args_spec = [] self.green_args_spec = [] args = newportalgraph.getargs() - if hasattr(self.jitdrivercls, 'on_enter_jit'): + if hasattr(self.jitdriver, 'on_enter_jit'): args = args[:-1] # ignore the final 'invariants' argument for v in args: TYPE = v.concretetype @@ -310,7 +311,7 @@ args_s = [annmodel.SomeInteger()] s_result = annmodel.s_None setter_fnptr = self.annhelper.delayedfunction( - setter, args_s, s_result) + ll_setter, args_s, s_result) self._set_param_fn_cache[param_name] = setter_fnptr vlist = [Constant(setter_fnptr, lltype.Ptr(SETTERFUNC)), @@ -335,16 +336,14 @@ green_args_range = unrolling_iterable( range(len(hotrunnerdesc.green_args_spec))) if hotrunnerdesc.green_args_spec: - INITIAL_HASH_TABLE_BITS = 14 MAX_HASH_TABLE_BITS = 28 else: - INITIAL_HASH_TABLE_BITS = 0 MAX_HASH_TABLE_BITS = 0 # ---------- hacks for the 'invariants' argument ---------- - drivercls = hotrunnerdesc.jitdrivercls - if hasattr(drivercls, 'on_enter_jit'): - wrapper = drivercls._get_compute_invariants_wrapper() + jitdriver = hotrunnerdesc.jitdriver + if hasattr(jitdriver, 'on_enter_jit'): + wrapper = jitdriver._compute_invariants_wrapper bk = hotrunnerdesc.rtyper.annotator.bookkeeper s_func = bk.immutablevalue(wrapper) r_func = hotrunnerdesc.rtyper.getrepr(s_func) @@ -381,9 +380,11 @@ NULL_MC = lltype.nullptr(hotrunnerdesc.RESIDUAL_FUNCTYPE) def __init__(self): - self.set_param_threshold(40) - self.set_param_trace_eagerness(10) - self.set_param_hash_bits(INITIAL_HASH_TABLE_BITS) + # initialize the state with the default values of the + # parameters specified in rlib/jit.py + for name, default_value in PARAMETERS.items(): + meth = getattr(self, 'set_param_' + name) + meth(default_value) def set_param_threshold(self, threshold): if threshold > THRESHOLD_MAX: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_graphopt.py Sat Mar 29 17:02:08 2008 @@ -35,17 +35,16 @@ self.getters[func] = self.getters.get(func, 0) + gettercount def test_simple_case(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['xy', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['xy', 'i', 'res']) def f(xy): i = 1024 while i > 0: i >>= 1 res = xy.x+xy.y - MyJitDriver.jit_merge_point(xy=xy, res=res, i=i) - MyJitDriver.can_enter_jit(xy=xy, res=res, i=i) + myjitdriver.jit_merge_point(xy=xy, res=res, i=i) + myjitdriver.can_enter_jit(xy=xy, res=res, i=i) return res def main(x, y): @@ -57,9 +56,8 @@ assert self.getters[f] == 0 def test_through_residual(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['xy', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['xy', 'i', 'res']) def debug(xy): unrelated = XY(7, 8) @@ -73,8 +71,8 @@ i >>= 1 res = xy.x+xy.y debug(xy) - MyJitDriver.jit_merge_point(xy=xy, res=res, i=i) - MyJitDriver.can_enter_jit(xy=xy, res=res, i=i) + myjitdriver.jit_merge_point(xy=xy, res=res, i=i) + myjitdriver.can_enter_jit(xy=xy, res=res, i=i) return res def main(x, y): @@ -88,9 +86,8 @@ assert self.getters[debug] == 1 def test_from_heap(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['lst', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['lst', 'i', 'res']) def f(lst): i = 1024 @@ -98,8 +95,8 @@ i >>= 1 xy = lst[0] res = xy.x+xy.y - MyJitDriver.jit_merge_point(lst=lst, res=res, i=i) - MyJitDriver.can_enter_jit(lst=lst, res=res, i=i) + myjitdriver.jit_merge_point(lst=lst, res=res, i=i) + myjitdriver.can_enter_jit(lst=lst, res=res, i=i) return res def main(x, y): @@ -112,9 +109,8 @@ # 2 in the portal itself def test_track_in_graph_bug(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i'] + myjitdriver = JitDriver(greens = [], + reds = ['i']) class State: pass @@ -135,16 +131,15 @@ while i > 0: i >>= 1 debug1(i) - MyJitDriver.jit_merge_point(i=i) - MyJitDriver.can_enter_jit(i=i) + myjitdriver.jit_merge_point(i=i) + myjitdriver.can_enter_jit(i=i) self.run(f, [], 2) assert self.setters[operate] == 1 def test_prebuilt_vable(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i'] + myjitdriver = JitDriver(greens = [], + reds = ['i']) class State: pass @@ -163,8 +158,8 @@ while i > 0: i >>= 1 debug1(i) - MyJitDriver.jit_merge_point(i=i) - MyJitDriver.can_enter_jit(i=i) + myjitdriver.jit_merge_point(i=i) + myjitdriver.can_enter_jit(i=i) self.run(f, [], 2) assert self.setters[operate] == 1 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Sat Mar 29 17:02:08 2008 @@ -70,12 +70,11 @@ return self._run(main, main_args) def _rewrite(self, threshold, small): - assert len(self.hintannotator.jitdriverclasses) == 1 # xxx for now - jitdrivercls = self.hintannotator.jitdriverclasses.keys()[0] + assert len(self.hintannotator.jitdrivers) == 1 # xxx for now + jitdriver = self.hintannotator.jitdrivers.keys()[0] self.hotrunnerdesc = HotRunnerDesc(self.hintannotator, self.rtyper, self.jitcode, self.RGenOp, self.writer, - jitdrivercls, - self.translate_support_code) + jitdriver, self.translate_support_code) self.hotrunnerdesc.rewrite_all() self.hotrunnerdesc.state.set_param_threshold(threshold) self.hotrunnerdesc.state.set_param_trace_eagerness(1) # for tests @@ -151,20 +150,18 @@ def test_simple_loop(self): # there are no greens in this test - class MyJitDriver(JitDriver): - greens = [] - reds = ['n1', 'total'] + myjitdriver = JitDriver(greens=[], reds=['n1', 'total']) def ll_function(n): n1 = n * 2 total = 0 while True: - MyJitDriver.jit_merge_point(n1=n1, total=total) + myjitdriver.jit_merge_point(n1=n1, total=total) total += n1 if n1 <= 1: break n1 -= 1 - MyJitDriver.can_enter_jit(n1=n1, total=total) + myjitdriver.can_enter_jit(n1=n1, total=total) raise Exit(total) def main(n, m): @@ -210,15 +207,14 @@ "fb_raise Exit"]) def test_greens(self): - class MyJitDriver(JitDriver): - greens = ['code', 'pc'] - reds = ['accum', 'data', 'buffer'] + myjitdriver = JitDriver(greens = ['code', 'pc'], + reds = ['accum', 'data', 'buffer']) def ll_function(code, buffer, data): accum = 0 pc = 0 while True: - MyJitDriver.jit_merge_point(code=code, pc=pc, accum=accum, + myjitdriver.jit_merge_point(code=code, pc=pc, accum=accum, data=data, buffer=buffer) if pc == len(code): raise Exit(accum) @@ -254,7 +250,7 @@ pc -= 1 assert pc >= 0 pc += 1 - MyJitDriver.can_enter_jit(code=code, pc=pc, + myjitdriver.can_enter_jit(code=code, pc=pc, accum=accum, data=data, buffer=buffer) @@ -310,21 +306,20 @@ assert len(self.get_traces()) < 20 def test_simple_return(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'total'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'total']) def ll_function(n): total = 0 if n <= 0: return -1 while True: - MyJitDriver.jit_merge_point(n=n, total=total) + myjitdriver.jit_merge_point(n=n, total=total) total += n if n <= 1: return total n -= 1 - MyJitDriver.can_enter_jit(n=n, total=total) + myjitdriver.can_enter_jit(n=n, total=total) res = self.run(ll_function, [0], threshold=3, small=True) assert res == -1 @@ -341,17 +336,16 @@ assert len(self.get_traces()) < 20 def test_hint_errors(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n'] + myjitdriver = JitDriver(greens = [], + reds = ['n']) def ll_function(n): - MyJitDriver.jit_merge_point(n=n) - MyJitDriver.can_enter_jit(foobar=n) + myjitdriver.jit_merge_point(n=n) + myjitdriver.can_enter_jit(foobar=n) py.test.raises(JitHintError, self.run, ll_function, [5], 3) def ll_function(n): - MyJitDriver.jit_merge_point(n=n) # wrong color + myjitdriver.jit_merge_point(n=n) # wrong color hint(n, concrete=True) py.test.raises(JitHintError, self.run, ll_function, [5], 3) @@ -359,12 +353,13 @@ class MyJitDriver(JitDriver): greens = [] reds = ['n'] - def on_enter_jit(self, invariants): - self.n += 100 # doesn't make sense, just for testing + def on_enter_jit(self, invariants, reds): + reds.n += 100 # doesn't make sense, just for testing + myjitdriver = MyJitDriver() def ll_function(n): - MyJitDriver.jit_merge_point(n=n) - MyJitDriver.can_enter_jit(n=n) + myjitdriver.jit_merge_point(n=n) + myjitdriver.can_enter_jit(n=n) return n + 5 res = self.run(ll_function, [2], threshold=1, small=True) @@ -379,12 +374,13 @@ class MyJitDriver(JitDriver): greens = ['void1', 'm'] reds = ['void2', 'n'] - def on_enter_jit(self, invariants, void1, m): - self.n += m # doesn't make sense, just for testing + def on_enter_jit(self, invariants, reds, void1, m): + reds.n += m # doesn't make sense, just for testing + myjitdriver = MyJitDriver() def ll_function(n, m): - MyJitDriver.jit_merge_point(n=n, m=m, void1=None, void2=None) - MyJitDriver.can_enter_jit(n=n, m=m, void1=None, void2=None) + myjitdriver.jit_merge_point(n=n, m=m, void1=None, void2=None) + myjitdriver.can_enter_jit(n=n, m=m, void1=None, void2=None) hint(m, concrete=True) return n + 5 @@ -400,41 +396,42 @@ class MyJitDriver(JitDriver): greens = ['m'] reds = [] - def on_enter_jit(self, invariants, m): + def on_enter_jit(self, invariants, reds, m): hint(m, concrete=True) + myjitdriver = MyJitDriver() def ll_function(m): - MyJitDriver.jit_merge_point(m=m) - MyJitDriver.can_enter_jit(m=m) + myjitdriver.jit_merge_point(m=m) + myjitdriver.can_enter_jit(m=m) self.run(ll_function, [2], threshold=1, small=True) def test_compute_invariants(self): class MyJitDriver(JitDriver): greens = ['m'] reds = ['n'] - def compute_invariants(self, m): - return self.n + 10*m # doesn't make sense, just for testing - def on_enter_jit(self, invariants, m): - self.n += invariants * 1000 + def compute_invariants(self, reds, m): + return reds.n + 10*m # doesn't make sense, just for testing + def on_enter_jit(self, invariants, reds, m): + reds.n += invariants * 1000 + myjitdriver = MyJitDriver() def ll_function(n, m): - MyJitDriver.jit_merge_point(m=m, n=n) - MyJitDriver.can_enter_jit(m=m, n=n) + myjitdriver.jit_merge_point(m=m, n=n) + myjitdriver.can_enter_jit(m=m, n=n) hint(m, concrete=True) return n res = self.run(ll_function, [2, 7], threshold=1, small=True) assert res == 72002 def test_set_threshold(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'x'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'x']) def ll_function(x): - MyJitDriver.set_param(threshold=x) + myjitdriver.set_param("threshold", x) i = 1024 while i > 0: i >>= 1 x += i - MyJitDriver.jit_merge_point(i=i, x=x) - MyJitDriver.can_enter_jit(i=i, x=x) + myjitdriver.jit_merge_point(i=i, x=x) + myjitdriver.can_enter_jit(i=i, x=x) return x res = self.run(ll_function, [2], threshold=9) assert res == 1025 @@ -454,17 +451,16 @@ ]) def test_set_trace_eagerness(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'x'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'x']) def ll_function(x): - MyJitDriver.set_param(trace_eagerness=x) + myjitdriver.set_param("trace_eagerness", x) i = 1024 while i > 0: i >>= 1 x += i - MyJitDriver.jit_merge_point(i=i, x=x) - MyJitDriver.can_enter_jit(i=i, x=x) + myjitdriver.jit_merge_point(i=i, x=x) + myjitdriver.can_enter_jit(i=i, x=x) return x res = self.run(ll_function, [2], threshold=5) assert res == 1025 @@ -567,9 +563,8 @@ def test_loop_with_more_and_more_structs(self): py.test.skip("shows problem with current merging logic") - class MyJitDriver(JitDriver): - greens = [] - reds = ['n1', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['n1', 'res']) class List(object): def __init__(self, value, prev): @@ -580,12 +575,12 @@ n1 = n * 2 res = None while True: - MyJitDriver.jit_merge_point(n1=n1, res=res) + myjitdriver.jit_merge_point(n1=n1, res=res) if n1 <= 1: break n1 -= 1 res = List(n1, res) - MyJitDriver.can_enter_jit(n1=n1, res=res) + myjitdriver.can_enter_jit(n1=n1, res=res) final = [] while res: final.append(str(res.value)) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sat Mar 29 17:02:08 2008 @@ -17,8 +17,8 @@ # while i > 0: # i >>= 1 # ...real test code here... -# MyJitDriver.jit_merge_point(...) -# MyJitDriver.can_enter_jit(...) +# myjitdriver.jit_merge_point(...) +# myjitdriver.can_enter_jit(...) # # and we use a threshold of 2, typically. This ensures that in a single # call, the test code is run in all three ways: @@ -32,17 +32,16 @@ class TestHotInterpreter(test_hotpath.HotPathTest): def test_loop_convert_const_to_redbox(self): - class MyJitDriver(JitDriver): - greens = ['x'] - reds = ['y', 'tot'] + myjitdriver = JitDriver(greens = ['x'], + reds = ['y', 'tot']) def ll_function(x, y): tot = 0 while x: # conversion from green '0' to red 'tot' hint(x, concrete=True) tot += y x -= 1 - MyJitDriver.jit_merge_point(x=x, y=y, tot=tot) - MyJitDriver.can_enter_jit(x=x, y=y, tot=tot) + myjitdriver.jit_merge_point(x=x, y=y, tot=tot) + myjitdriver.can_enter_jit(x=x, y=y, tot=tot) return tot res = self.run(ll_function, [7, 2], threshold=1) @@ -50,15 +49,14 @@ self.check_insns_excluding_return({'int_add': 6}) def test_ifs(self): - class MyJitDriver(JitDriver): - greens = ['green'] - reds = ['x', 'y', 'i'] + myjitdriver = JitDriver(greens = ['green'], + reds = ['x', 'y', 'i']) def f(green, x, y): i = 1024 while i > 0: i >>= 1 - MyJitDriver.jit_merge_point(green=green, x=x, y=y, i=i) - MyJitDriver.can_enter_jit(green=green, x=x, y=y, i=i) + myjitdriver.jit_merge_point(green=green, x=x, y=y, i=i) + myjitdriver.can_enter_jit(green=green, x=x, y=y, i=i) green = hint(green, concrete=True) if x: # red if, and compiling pause res = 100 @@ -78,12 +76,11 @@ assert res == f(g, x, y) def test_simple_opt_const_propagation2(self): - class MyJitDriver(JitDriver): - greens = ['x', 'y'] - reds = [] + myjitdriver = JitDriver(greens = ['x', 'y'], + reds = []) def ll_function(x, y): - MyJitDriver.jit_merge_point(x=x, y=y) - MyJitDriver.can_enter_jit(x=x, y=y) + myjitdriver.jit_merge_point(x=x, y=y) + myjitdriver.can_enter_jit(x=x, y=y) hint(x, concrete=True) hint(y, concrete=True) x = hint(x, variable=True) @@ -97,12 +94,11 @@ self.check_insns_excluding_return({}) def test_loop_folding(self): - class MyJitDriver(JitDriver): - greens = ['x', 'y'] - reds = [] + myjitdriver = JitDriver(greens = ['x', 'y'], + reds = []) def ll_function(x, y): - MyJitDriver.jit_merge_point(x=x, y=y) - MyJitDriver.can_enter_jit(x=x, y=y) + myjitdriver.jit_merge_point(x=x, y=y) + myjitdriver.can_enter_jit(x=x, y=y) hint(x, concrete=True) hint(y, concrete=True) x = hint(x, variable=True) @@ -240,9 +236,8 @@ self.check_insns({'int_gt': 1}) def test_arith_plus_minus(self): - class MyJitDriver(JitDriver): - greens = ['encoded_insn', 'nb_insn'] - reds = ['i', 'x', 'y', 'acc'] + myjitdriver = JitDriver(greens = ['encoded_insn', 'nb_insn'], + reds = ['i', 'x', 'y', 'acc']) def ll_plus_minus(encoded_insn, nb_insn, x, y): i = 1024 while i > 0: @@ -258,10 +253,10 @@ elif op == 0x5: acc -= y pc += 1 - MyJitDriver.jit_merge_point(encoded_insn=encoded_insn, + myjitdriver.jit_merge_point(encoded_insn=encoded_insn, nb_insn=nb_insn, x=x, y=y, i=i, acc=acc) - MyJitDriver.can_enter_jit(encoded_insn=encoded_insn, + myjitdriver.can_enter_jit(encoded_insn=encoded_insn, nb_insn=nb_insn, x=x, y=y, i=i, acc=acc) return acc @@ -272,9 +267,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_call_3(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'y', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'y', 'res']) def ll_add_one(x): return x + 1 def ll_two(x): @@ -284,8 +278,8 @@ while i > 0: i >>= 1 res = ll_two(y) * y - MyJitDriver.jit_merge_point(y=y, i=i, res=res) - MyJitDriver.can_enter_jit(y=y, i=i, res=res) + myjitdriver.jit_merge_point(y=y, i=i, res=res) + myjitdriver.can_enter_jit(y=y, i=i, res=res) return res res = self.run(ll_function, [5], threshold=2) assert res == 10 @@ -293,9 +287,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_call_mixed_color_args(self): - class MyJitDriver(JitDriver): - greens = ['g1', 'g2'] - reds = ['r1', 'r2', 'i', 'res'] + myjitdriver = JitDriver(greens = ['g1', 'g2'], + reds = ['r1', 'r2', 'i', 'res']) def ll_grr(a, b, c): return a + 3*b + 7*c def ll_rgr(a, b, c): return a + 3*b + 7*c @@ -316,18 +309,17 @@ ll_rgg(r1, g2, g1) * 100000) hint(g1, concrete=True) hint(g2, concrete=True) - MyJitDriver.jit_merge_point(g1=g1, g2=g2, r1=r1, r2=r2, + myjitdriver.jit_merge_point(g1=g1, g2=g2, r1=r1, r2=r2, i=i, res=res) - MyJitDriver.can_enter_jit(g1=g1, g2=g2, r1=r1, r2=r2, + myjitdriver.can_enter_jit(g1=g1, g2=g2, r1=r1, r2=r2, i=i, res=res) return res res = self.run(ll_function, [1, 2, 4, 8], threshold=2) assert res == ll_function(1, 2, 4, 8) def test_call_mixed_color_args_with_void(self): - class MyJitDriver(JitDriver): - greens = ['g1', 'g2'] - reds = ['r1', 'r2', 'i', 'res'] + myjitdriver = JitDriver(greens = ['g1', 'g2'], + reds = ['r1', 'r2', 'i', 'res']) def ll_vrg(a, b, c): return 1 + 3*b + 7*c def ll_gvr(a, b, c): return a + 3*1 + 7*c @@ -349,18 +341,17 @@ ll_grv(g1, r2, vv) * 100000) hint(g1, concrete=True) hint(g2, concrete=True) - MyJitDriver.jit_merge_point(g1=g1, g2=g2, r1=r1, r2=r2, + myjitdriver.jit_merge_point(g1=g1, g2=g2, r1=r1, r2=r2, i=i, res=res) - MyJitDriver.can_enter_jit(g1=g1, g2=g2, r1=r1, r2=r2, + myjitdriver.can_enter_jit(g1=g1, g2=g2, r1=r1, r2=r2, i=i, res=res) return res res = self.run(ll_function, [1, 2, 4, 8], threshold=2) assert res == ll_function(1, 2, 4, 8) def test_void_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['y', 'i'] + myjitdriver = JitDriver(greens = [], + reds = ['y', 'i']) S = lltype.GcStruct('S', ('x', lltype.Signed)) def ll_do_nothing(s, x): s.x = x + 1 @@ -371,8 +362,8 @@ s = lltype.malloc(S) ll_do_nothing(s, y) y = s.x - MyJitDriver.jit_merge_point(y=y, i=i) - MyJitDriver.can_enter_jit(y=y, i=i) + myjitdriver.jit_merge_point(y=y, i=i) + myjitdriver.can_enter_jit(y=y, i=i) return y res = self.run(ll_function, [3], threshold=2) @@ -381,12 +372,11 @@ 'int_gt': 1, 'int_rshift': 1}) def test_green_return(self): - class MyJitDriver(JitDriver): - greens = ['x'] - reds = [] + myjitdriver = JitDriver(greens = ['x'], + reds = []) def ll_function(x): - MyJitDriver.jit_merge_point(x=x) - MyJitDriver.can_enter_jit(x=x) + myjitdriver.jit_merge_point(x=x) + myjitdriver.can_enter_jit(x=x) return hint(x, concrete=True) + 1 res = self.run(ll_function, [3], threshold=1) @@ -394,12 +384,11 @@ self.check_insns_excluding_return({}) def test_void_return(self): - class MyJitDriver(JitDriver): - greens = ['x'] - reds = [] + myjitdriver = JitDriver(greens = ['x'], + reds = []) def ll_function(x): - MyJitDriver.jit_merge_point(x=x) - MyJitDriver.can_enter_jit(x=x) + myjitdriver.jit_merge_point(x=x) + myjitdriver.can_enter_jit(x=x) hint(x, concrete=True) res = self.run(ll_function, [3], threshold=1) @@ -407,24 +396,22 @@ self.check_insns_excluding_return({}) def test_fbinterp_void_return(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i'] + myjitdriver = JitDriver(greens = [], + reds = ['i']) def ll_function(): i = 1024 while i > 0: i >>= 1 - MyJitDriver.jit_merge_point(i=i) - MyJitDriver.can_enter_jit(i=i) + myjitdriver.jit_merge_point(i=i) + myjitdriver.can_enter_jit(i=i) res = self.run(ll_function, [], threshold=2) assert res is None self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_green_call(self): - class MyJitDriver(JitDriver): - greens = ['y'] - reds = ['i'] + myjitdriver = JitDriver(greens = ['y'], + reds = ['i']) def ll_boring(x): return def ll_add_one(x): @@ -433,8 +420,8 @@ i = 1024 while i > 0: i >>= 1 - MyJitDriver.jit_merge_point(y=y, i=i) - MyJitDriver.can_enter_jit(y=y, i=i) + myjitdriver.jit_merge_point(y=y, i=i) + myjitdriver.can_enter_jit(y=y, i=i) ll_boring(y) z = ll_add_one(y) z = hint(z, concrete=True) @@ -445,9 +432,8 @@ self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_recursive_via_residual(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'fudge', 'res', 'i'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'fudge', 'res', 'i']) def indirection(n, fudge): return ll_pseudo_factorial(n, fudge) def ll_pseudo_factorial(n, fudge): @@ -460,8 +446,8 @@ else: v = n * indirection(n - 1, fudge + n) - fudge res += v - MyJitDriver.jit_merge_point(n=n, fudge=fudge, res=res, i=i) - MyJitDriver.can_enter_jit(n=n, fudge=fudge, res=res, i=i) + myjitdriver.jit_merge_point(n=n, fudge=fudge, res=res, i=i) + myjitdriver.can_enter_jit(n=n, fudge=fudge, res=res, i=i) return res res = self.run(ll_pseudo_factorial, [3, 2], threshold=2, policy=StopAtXPolicy(indirection)) @@ -470,9 +456,8 @@ def test_recursive_call(self): py.test.skip("in-progress") - class MyJitDriver(JitDriver): - greens = ['n'] - reds = ['fudge', 'res', 'i'] + myjitdriver = JitDriver(greens = ['n'], + reds = ['fudge', 'res', 'i']) def indirection(n, fudge): return ll_pseudo_factorial(n, fudge) def ll_pseudo_factorial(n, fudge): @@ -484,8 +469,8 @@ res = 1 else: res = n * indirection(n - 1, fudge + n) - fudge - MyJitDriver.jit_merge_point(n=n, fudge=fudge, res=res, i=i) - MyJitDriver.can_enter_jit(n=n, fudge=fudge, res=res, i=i) + myjitdriver.jit_merge_point(n=n, fudge=fudge, res=res, i=i) + myjitdriver.can_enter_jit(n=n, fudge=fudge, res=res, i=i) return res res = self.run(ll_pseudo_factorial, [3, 2], threshold=2) expected = ll_pseudo_factorial(3, 2) @@ -502,15 +487,15 @@ while i > 0: i >>= 1 s1 = s - if MyJitDriver.case >= 2: + if myjitdriver.case >= 2: hint(s1, concrete=True) # green - if MyJitDriver.case == 3: + if myjitdriver.case == 3: s1 = hint(s1, variable=True) # constant redbox # res = s1.hello * s1.world # - MyJitDriver.jit_merge_point(s=s, i=i, res=res) - MyJitDriver.can_enter_jit(s=s, i=i, res=res) + myjitdriver.jit_merge_point(s=s, i=i, res=res) + myjitdriver.can_enter_jit(s=s, i=i, res=res) return res def main(x, y): @@ -519,27 +504,24 @@ s1.world = y return ll_function(s1) - class MyJitDriver(JitDriver): - greens = [] - reds = ['s', 'i', 'res'] - case = 1 + myjitdriver = JitDriver(greens = [], + reds = ['s', 'i', 'res']) + myjitdriver.case = 1 res = self.run(main, [6, 7], threshold=2) assert res == 42 self.check_insns_in_loops({'getfield': 2, 'int_mul': 1, 'int_gt': 1, 'int_rshift': 1}) - class MyJitDriver(JitDriver): - greens = ['s'] - reds = ['i', 'res'] - case = 2 + myjitdriver = JitDriver(greens = ['s'], + reds = ['i', 'res']) + myjitdriver.case = 2 res = self.run(main, [8, 9], threshold=2) assert res == 72 self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) - class MyJitDriver(JitDriver): - greens = ['s'] - reds = ['i', 'res'] - case = 3 + myjitdriver = JitDriver(greens = ['s'], + reds = ['i', 'res']) + myjitdriver.case = 3 res = self.run(main, [10, 11], threshold=2) assert res == 110 self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) @@ -552,15 +534,15 @@ while i > 0: i >>= 1 a1 = a - if MyJitDriver.case >= 2: + if myjitdriver.case >= 2: hint(a1, concrete=True) # green - if MyJitDriver.case == 3: + if myjitdriver.case == 3: a1 = hint(a1, variable=True) # constant redbox # res = a1[0] * a1[1] + len(a1) # - MyJitDriver.jit_merge_point(a=a, i=i, res=res) - MyJitDriver.can_enter_jit(a=a, i=i, res=res) + myjitdriver.jit_merge_point(a=a, i=i, res=res) + myjitdriver.can_enter_jit(a=a, i=i, res=res) return res def main(x, y): @@ -569,28 +551,25 @@ a[1] = y return ll_function(a) - class MyJitDriver(JitDriver): - greens = [] - reds = ['a', 'i', 'res'] - case = 1 + myjitdriver = JitDriver(greens = [], + reds = ['a', 'i', 'res']) + myjitdriver.case = 1 res = self.run(main, [6, 7], threshold=2) assert res == 44 self.check_insns_in_loops({'getarrayitem': 2, 'int_mul': 1, 'getarraysize': 1, 'int_add': 1, 'int_gt': 1, 'int_rshift': 1}) - class MyJitDriver(JitDriver): - greens = ['a'] - reds = ['i', 'res'] - case = 2 + myjitdriver = JitDriver(greens = ['a'], + reds = ['i', 'res']) + myjitdriver.case = 2 res = self.run(main, [8, 9], threshold=2) assert res == 74 self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) - class MyJitDriver(JitDriver): - greens = ['a'] - reds = ['i', 'res'] - case = 3 + myjitdriver = JitDriver(greens = ['a'], + reds = ['i', 'res']) + myjitdriver.case = 3 res = self.run(main, [10, 11], threshold=2) assert res == 112 self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) @@ -673,9 +652,8 @@ assert res == 4 * 4 def test_degenerate_with_voids(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'res']) S = lltype.GcStruct('S', ('y', lltype.Void), ('x', lltype.Signed)) def ll_function(): @@ -686,8 +664,8 @@ res = lltype.malloc(S) res.x = 123 # - MyJitDriver.jit_merge_point(i=i, res=res) - MyJitDriver.can_enter_jit(i=i, res=res) + myjitdriver.jit_merge_point(i=i, res=res) + myjitdriver.can_enter_jit(i=i, res=res) return res res = self.run(ll_function, [], threshold=2) @@ -695,9 +673,8 @@ self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_plus_minus(self): - class MyJitDriver(JitDriver): - greens = ['s'] - reds = ['x', 'y', 'i', 'acc'] + myjitdriver = JitDriver(greens = ['s'], + reds = ['x', 'y', 'i', 'acc']) def ll_plus_minus(s, x, y): i = 1024 while i > 0: @@ -715,8 +692,8 @@ acc -= y pc += 1 # - MyJitDriver.jit_merge_point(s=s, x=x, y=y, i=i, acc=acc) - MyJitDriver.can_enter_jit(s=s, x=x, y=y, i=i, acc=acc) + myjitdriver.jit_merge_point(s=s, x=x, y=y, i=i, acc=acc) + myjitdriver.can_enter_jit(s=s, x=x, y=y, i=i, acc=acc) return acc def main(copies, x, y): @@ -732,9 +709,8 @@ # this checks that red boxes are able to be virtualized dynamically by # the compiler (the P_NOVIRTUAL policy prevents the hint-annotator from # marking variables in blue) - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'i', 'res']) S = lltype.GcStruct('S', ('n', lltype.Signed)) def make(n): s = lltype.malloc(S) @@ -748,8 +724,8 @@ s = make(n) res = s.n # - MyJitDriver.jit_merge_point(n=n, i=i, res=res) - MyJitDriver.can_enter_jit(n=n, i=i, res=res) + myjitdriver.jit_merge_point(n=n, i=i, res=res) + myjitdriver.can_enter_jit(n=n, i=i, res=res) return res res = self.run(ll_function, [42], threshold=2) assert res == 42 @@ -757,9 +733,8 @@ def test_setarrayitem(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'res']) A = lltype.GcArray(lltype.Signed) a = lltype.malloc(A, 2, immortal=True) def ll_function(): @@ -771,8 +746,8 @@ a[1] = 2 res = a[0]+a[1] # - MyJitDriver.jit_merge_point(i=i, res=res) - MyJitDriver.can_enter_jit(i=i, res=res) + myjitdriver.jit_merge_point(i=i, res=res) + myjitdriver.can_enter_jit(i=i, res=res) return res res = self.run(ll_function, [], threshold=2) assert res == 3 @@ -781,9 +756,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_red_array(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['x', 'y', 'n', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['x', 'y', 'n', 'i', 'res']) A = lltype.GcArray(lltype.Signed) def ll_function(x, y, n): i = 1024 @@ -796,8 +770,8 @@ res = a[n]*len(a) n = 1 - n # - MyJitDriver.jit_merge_point(x=x, y=y, n=n, i=i, res=res) - MyJitDriver.can_enter_jit(x=x, y=y, n=n, i=i, res=res) + myjitdriver.jit_merge_point(x=x, y=y, n=n, i=i, res=res) + myjitdriver.can_enter_jit(x=x, y=y, n=n, i=i, res=res) return res res = self.run(ll_function, [21, -21, 0], threshold=2) @@ -809,9 +783,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_red_struct_array(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['x', 'y', 'n', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['x', 'y', 'n', 'i', 'res']) S = lltype.Struct('s', ('x', lltype.Signed)) A = lltype.GcArray(S) def ll_function(x, y, n): @@ -825,8 +798,8 @@ res = a[n].x*len(a) n = 1 - n # - MyJitDriver.jit_merge_point(x=x, y=y, n=n, i=i, res=res) - MyJitDriver.can_enter_jit(x=x, y=y, n=n, i=i, res=res) + myjitdriver.jit_merge_point(x=x, y=y, n=n, i=i, res=res) + myjitdriver.can_enter_jit(x=x, y=y, n=n, i=i, res=res) return res res = self.run(ll_function, [21, -21, 0], threshold=2) @@ -839,9 +812,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_red_varsized_struct(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['x', 'y', 'n', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['x', 'y', 'n', 'i', 'res']) A = lltype.Array(lltype.Signed) S = lltype.GcStruct('S', ('foo', lltype.Signed), ('a', A)) def ll_function(x, y, n): @@ -856,8 +828,8 @@ res = s.a[n]*s.foo n = 1 - n # - MyJitDriver.jit_merge_point(x=x, y=y, n=n, i=i, res=res) - MyJitDriver.can_enter_jit(x=x, y=y, n=n, i=i, res=res) + myjitdriver.jit_merge_point(x=x, y=y, n=n, i=i, res=res) + myjitdriver.can_enter_jit(x=x, y=y, n=n, i=i, res=res) return res res = self.run(ll_function, [21, -21, 0], threshold=2) @@ -866,9 +838,8 @@ getinteriorarraysize=1) def test_array_of_voids(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'i', 'res']) A = lltype.GcArray(lltype.Void) def ll_function(n): i = 1024 @@ -883,8 +854,8 @@ # from disappearing keepalive_until_here(b) # - MyJitDriver.jit_merge_point(n=n, i=i, res=res) - MyJitDriver.can_enter_jit(n=n, i=i, res=res) + myjitdriver.jit_merge_point(n=n, i=i, res=res) + myjitdriver.can_enter_jit(n=n, i=i, res=res) return res res = self.run(ll_function, [2], threshold=3) @@ -904,9 +875,8 @@ def test_red_subcontainer_escape(self): py.test.skip("broken") - class MyJitDriver(JitDriver): - greens = [] - reds = ['k', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['k', 'i', 'res']) S = lltype.GcStruct('S', ('n', lltype.Signed)) T = lltype.GcStruct('T', ('s', S), ('n', lltype.Signed)) def ll_function(k): @@ -923,8 +893,8 @@ t.n = k*k res = s # - MyJitDriver.jit_merge_point(k=k, i=i, res=res) - MyJitDriver.can_enter_jit(k=k, i=i, res=res) + myjitdriver.jit_merge_point(k=k, i=i, res=res) + myjitdriver.can_enter_jit(k=k, i=i, res=res) return res res = self.run(ll_function, [7], threshold=2) @@ -938,9 +908,8 @@ self.check_insns_in_loops(malloc=1, setfield=2) def test_red_subcontainer_cast(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['k', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['k', 'i', 'res']) S = lltype.GcStruct('S', ('n', lltype.Signed)) T = lltype.GcStruct('T', ('s', S), ('n', lltype.Float)) def ll_function(k): @@ -961,8 +930,8 @@ keepalive_until_here(t) k += 1 # - MyJitDriver.jit_merge_point(k=k, i=i, res=res) - MyJitDriver.can_enter_jit(k=k, i=i, res=res) + myjitdriver.jit_merge_point(k=k, i=i, res=res) + myjitdriver.can_enter_jit(k=k, i=i, res=res) return res res = self.run(ll_function, [-10], threshold=2) assert res == 10*9 @@ -1037,9 +1006,8 @@ self.check_insns({}) def test_residual_red_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'x', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'x', 'res']) def g(x): return x+1 def f(x): @@ -1047,8 +1015,8 @@ while i > 0: i >>= 1 res = 2*g(x) - MyJitDriver.jit_merge_point(x=x, i=i, res=res) - MyJitDriver.can_enter_jit(x=x, i=i, res=res) + myjitdriver.jit_merge_point(x=x, i=i, res=res) + myjitdriver.can_enter_jit(x=x, i=i, res=res) return res res = self.run(f, [20], threshold=2, policy=StopAtXPolicy(g)) @@ -1057,9 +1025,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_residual_red_call_with_exc(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'x', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'x', 'res']) def h(x): if x > 0: @@ -1078,8 +1045,8 @@ res = g(x) except ValueError: res = 7 - MyJitDriver.jit_merge_point(x=x, i=i, res=res) - MyJitDriver.can_enter_jit(x=x, i=i, res=res) + myjitdriver.jit_merge_point(x=x, i=i, res=res) + myjitdriver.can_enter_jit(x=x, i=i, res=res) return res stop_at_h = StopAtXPolicy(h) @@ -1094,9 +1061,8 @@ self.check_insns_in_loops(int_add=0, int_mul=0) def test_residual_red_call_with_exc_more(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'x', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'x', 'res']) def h(x): if x > 0: @@ -1114,8 +1080,8 @@ except ValueError: v = 7 res = res * 10 + v - MyJitDriver.jit_merge_point(x=x, i=i, res=res) - MyJitDriver.can_enter_jit(x=x, i=i, res=res) + myjitdriver.jit_merge_point(x=x, i=i, res=res) + myjitdriver.can_enter_jit(x=x, i=i, res=res) return res stop_at_h = StopAtXPolicy(h) @@ -1140,9 +1106,8 @@ assert res == 212 def test_simple_yellow_meth(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['flag', 'res', 'i'] + myjitdriver = JitDriver(greens = [], + reds = ['flag', 'res', 'i']) class Base(object): def m(self): @@ -1163,8 +1128,8 @@ else: o = Concrete() res = o.m() # yellow call - MyJitDriver.jit_merge_point(flag=flag, res=res, i=i) - MyJitDriver.can_enter_jit(flag=flag, res=res, i=i) + myjitdriver.jit_merge_point(flag=flag, res=res, i=i) + myjitdriver.can_enter_jit(flag=flag, res=res, i=i) return res res = self.run(f, [0], threshold=2) @@ -1173,9 +1138,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_simple_red_meth(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['flag', 'res', 'i'] + myjitdriver = JitDriver(greens = [], + reds = ['flag', 'res', 'i']) class Base(object): def m(self, i): @@ -1196,8 +1160,8 @@ else: o = Concrete() res = o.m(i) # red call - MyJitDriver.jit_merge_point(flag=flag, res=res, i=i) - MyJitDriver.can_enter_jit(flag=flag, res=res, i=i) + myjitdriver.jit_merge_point(flag=flag, res=res, i=i) + myjitdriver.can_enter_jit(flag=flag, res=res, i=i) return res res = self.run(f, [0], threshold=2) @@ -1206,9 +1170,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_simple_red_meth_vars_around(self): - class MyJitDriver(JitDriver): - greens = ['y'] - reds = ['flag', 'x', 'z', 'res', 'i'] + myjitdriver = JitDriver(greens = ['y'], + reds = ['flag', 'x', 'z', 'res', 'i']) class Base(object): def m(self, n): @@ -1230,9 +1193,9 @@ o = Concrete() hint(y, concrete=True) res = (o.m(x)+y)-z - MyJitDriver.jit_merge_point(flag=flag, res=res, i=i, + myjitdriver.jit_merge_point(flag=flag, res=res, i=i, x=x, y=y, z=z) - MyJitDriver.can_enter_jit(flag=flag, res=res, i=i, + myjitdriver.can_enter_jit(flag=flag, res=res, i=i, x=x, y=y, z=z) return res @@ -1243,9 +1206,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_green_red_mismatch_in_call(self): - class MyJitDriver(JitDriver): - greens = ['x', 'y'] - reds = ['u', 'res', 'i'] + myjitdriver = JitDriver(greens = ['x', 'y'], + reds = ['u', 'res', 'i']) def add(a,b, u): return a+b @@ -1258,8 +1220,8 @@ z = x+y z = hint(z, concrete=True) + r # this checks that 'r' is green res = hint(z, variable=True) - MyJitDriver.jit_merge_point(x=x, y=y, u=u, res=res, i=i) - MyJitDriver.can_enter_jit(x=x, y=y, u=u, res=res, i=i) + myjitdriver.jit_merge_point(x=x, y=y, u=u, res=res, i=i) + myjitdriver.can_enter_jit(x=x, y=y, u=u, res=res, i=i) return res res = self.run(f, [4, 5, 0], threshold=2) @@ -1279,9 +1241,8 @@ assert res == 120 def test_simple_indirect_call(self): - class MyJitDriver(JitDriver): - greens = ['flag'] - reds = ['v', 'res', 'i'] + myjitdriver = JitDriver(greens = ['flag'], + reds = ['v', 'res', 'i']) def g1(v): return v * 2 @@ -1298,8 +1259,8 @@ else: g = g2 res = g(v) - MyJitDriver.jit_merge_point(flag=flag, v=v, res=res, i=i) - MyJitDriver.can_enter_jit(flag=flag, v=v, res=res, i=i) + myjitdriver.jit_merge_point(flag=flag, v=v, res=res, i=i) + myjitdriver.can_enter_jit(flag=flag, v=v, res=res, i=i) return res res = self.run(f, [0, 40], threshold=2) @@ -1308,9 +1269,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_normalize_indirect_call(self): - class MyJitDriver(JitDriver): - greens = ['flag'] - reds = ['v', 'res', 'i'] + myjitdriver = JitDriver(greens = ['flag'], + reds = ['v', 'res', 'i']) def g1(v): return -17 @@ -1327,8 +1287,8 @@ else: g = g2 res = g(v) - MyJitDriver.jit_merge_point(flag=flag, v=v, res=res, i=i) - MyJitDriver.can_enter_jit(flag=flag, v=v, res=res, i=i) + myjitdriver.jit_merge_point(flag=flag, v=v, res=res, i=i) + myjitdriver.can_enter_jit(flag=flag, v=v, res=res, i=i) return res res = self.run(f, [0, 40], threshold=2) @@ -1341,9 +1301,8 @@ self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_normalize_indirect_call_more(self): - class MyJitDriver(JitDriver): - greens = ['flag'] - reds = ['v', 'res', 'i'] + myjitdriver = JitDriver(greens = ['flag'], + reds = ['v', 'res', 'i']) def g1(v): if v >= 0: @@ -1364,8 +1323,8 @@ else: g = g2 res = g(v) + w - MyJitDriver.jit_merge_point(flag=flag, v=v, res=res, i=i) - MyJitDriver.can_enter_jit(flag=flag, v=v, res=res, i=i) + myjitdriver.jit_merge_point(flag=flag, v=v, res=res, i=i) + myjitdriver.can_enter_jit(flag=flag, v=v, res=res, i=i) return res res = self.run(f, [0, 40], threshold=2) @@ -1426,9 +1385,8 @@ assert count_depth(res) == 2 def test_known_nonzero(self): - class MyJitDriver(JitDriver): - greens = ['x'] - reds = ['y', 'res', 'i'] + myjitdriver = JitDriver(greens = ['x'], + reds = ['y', 'res', 'i']) S = lltype.GcStruct('s', ('x', lltype.Signed)) global_s = lltype.malloc(S, immortal=True) global_s.x = 100 @@ -1467,8 +1425,8 @@ else: res = 0 # - MyJitDriver.jit_merge_point(x=x, y=y, res=res, i=i) - MyJitDriver.can_enter_jit(x=x, y=y, res=res, i=i) + myjitdriver.jit_merge_point(x=x, y=y, res=res, i=i) + myjitdriver.can_enter_jit(x=x, y=y, res=res, i=i) return res P = StopAtXPolicy(h) @@ -1502,9 +1460,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_debug_assert_ptr_nonzero(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['m', 'res', 'i'] + myjitdriver = JitDriver(greens = [], + reds = ['m', 'res', 'i']) S = lltype.GcStruct('s', ('x', lltype.Signed)) global_s = lltype.malloc(S) global_s.x = 42 @@ -1528,8 +1485,8 @@ n *= m res = n # - MyJitDriver.jit_merge_point(m=m, res=res, i=i) - MyJitDriver.can_enter_jit(m=m, res=res, i=i) + myjitdriver.jit_merge_point(m=m, res=res, i=i) + myjitdriver.can_enter_jit(m=m, res=res, i=i) return res P = StopAtXPolicy(h) @@ -1540,9 +1497,8 @@ self.check_insns_in_loops(int_mul=0, ptr_iszero=0, ptr_nonzero=0) def test_indirect_red_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'x', 'res', 'i'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'x', 'res', 'i']) def h1(n): return n*2 def h2(n): @@ -1556,8 +1512,8 @@ h = l[n&1] res = h(n) + x # - MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) - MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + myjitdriver.jit_merge_point(n=n, x=x, res=res, i=i) + myjitdriver.can_enter_jit(n=n, x=x, res=res, i=i) return res res = self.run(f, [7, 3], threshold=2) @@ -1596,9 +1552,8 @@ self.check_insns(indirect_call=1) def test_indirect_gray_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'x', 'res', 'i'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'x', 'res', 'i']) def h1(w, n): w[0] = n*2 def h2(w, n): @@ -1614,17 +1569,16 @@ h(w, n) res = w[0] + x # - MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) - MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + myjitdriver.jit_merge_point(n=n, x=x, res=res, i=i) + myjitdriver.can_enter_jit(n=n, x=x, res=res, i=i) return res res = self.run(f, [7, 3], threshold=2) assert res == f(7,3) def test_indirect_residual_red_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'x', 'res', 'i'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'x', 'res', 'i']) def h1(n): return n*2 def h2(n): @@ -1638,8 +1592,8 @@ h = l[n&1] res = h(n) + x # - MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) - MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + myjitdriver.jit_merge_point(n=n, x=x, res=res, i=i) + myjitdriver.can_enter_jit(n=n, x=x, res=res, i=i) return res P = StopAtXPolicy(h1, h2) @@ -1652,9 +1606,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_indirect_residual_red_call_with_exc(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'x', 'res', 'i'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'x', 'res', 'i']) def h1(n): if n < 0: raise ValueError @@ -1673,8 +1626,8 @@ except ValueError: res = -42 # - MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) - MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + myjitdriver.jit_merge_point(n=n, x=x, res=res, i=i) + myjitdriver.can_enter_jit(n=n, x=x, res=res, i=i) return res P = StopAtXPolicy(h1, h2) @@ -1686,9 +1639,8 @@ self.check_insns_in_loops(indirect_call=1, int_add=0, int_mul=0) def test_constant_indirect_red_call(self): - class MyJitDriver(JitDriver): - greens = ['m', 'n'] - reds = ['x', 'res', 'i'] + myjitdriver = JitDriver(greens = ['m', 'n'], + reds = ['x', 'res', 'i']) def h1(m, n, x): return x-2 def h2(m, n, x): @@ -1705,8 +1657,8 @@ h = frozenl[hint(n, variable=True) & 1] res = h(m, 5, x) # - MyJitDriver.jit_merge_point(m=m, n=n, x=x, res=res, i=i) - MyJitDriver.can_enter_jit(m=m, n=n, x=x, res=res, i=i) + myjitdriver.jit_merge_point(m=m, n=n, x=x, res=res, i=i) + myjitdriver.can_enter_jit(m=m, n=n, x=x, res=res, i=i) return res res = self.run(f, [1, 7, 3], threshold=2) @@ -1719,9 +1671,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_constant_indirect_red_call_no_result(self): - class MyJitDriver(JitDriver): - greens = ['m', 'n'] - reds = ['x', 'res', 'i'] + myjitdriver = JitDriver(greens = ['m', 'n'], + reds = ['x', 'res', 'i']) class A: pass glob_a = A() @@ -1742,8 +1693,8 @@ h(m, 5, x) res = glob_a.x # - MyJitDriver.jit_merge_point(m=m, n=n, x=x, res=res, i=i) - MyJitDriver.can_enter_jit(m=m, n=n, x=x, res=res, i=i) + myjitdriver.jit_merge_point(m=m, n=n, x=x, res=res, i=i) + myjitdriver.can_enter_jit(m=m, n=n, x=x, res=res, i=i) return res res = self.run(f, [1, 7, 3], threshold=2) @@ -1754,9 +1705,8 @@ self.check_insns_in_loops(int_mul=0, int_sub=1, setfield=1, getfield=1) def test_indirect_sometimes_residual_pure_red_call(self): - class MyJitDriver(JitDriver): - greens = ['n'] - reds = ['x', 'res', 'i'] + myjitdriver = JitDriver(greens = ['n'], + reds = ['x', 'res', 'i']) def h1(x): return x-2 def h2(x): @@ -1772,8 +1722,8 @@ h = frozenl[n&1] res = h(x) # - MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) - MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + myjitdriver.jit_merge_point(n=n, x=x, res=res, i=i) + myjitdriver.can_enter_jit(n=n, x=x, res=res, i=i) return res P = StopAtXPolicy(h1) @@ -1788,9 +1738,8 @@ 'int_gt': 1, 'int_rshift': 1}) def test_indirect_sometimes_residual_pure_but_fixed_red_call(self): - class MyJitDriver(JitDriver): - greens = ['n', 'x'] - reds = ['i', 'res'] + myjitdriver = JitDriver(greens = ['n', 'x'], + reds = ['i', 'res']) def h1(x): return x-2 def h2(x): @@ -1807,8 +1756,8 @@ hint(z, concrete=True) res = hint(z, variable=True) # - MyJitDriver.jit_merge_point(n=n, x=x, res=res, i=i) - MyJitDriver.can_enter_jit(n=n, x=x, res=res, i=i) + myjitdriver.jit_merge_point(n=n, x=x, res=res, i=i) + myjitdriver.can_enter_jit(n=n, x=x, res=res, i=i) return res P = StopAtXPolicy(h1) @@ -1821,9 +1770,8 @@ self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_manual_marking_of_pure_functions(self): - class MyJitDriver(JitDriver): - greens = ['n'] - reds = ['i', 'res'] + myjitdriver = JitDriver(greens = ['n'], + reds = ['i', 'res']) d = {} def h1(s): try: @@ -1845,8 +1793,8 @@ a = h1(s) res = hint(a, variable=True) # - MyJitDriver.jit_merge_point(n=n, res=res, i=i) - MyJitDriver.can_enter_jit(n=n, res=res, i=i) + myjitdriver.jit_merge_point(n=n, res=res, i=i) + myjitdriver.can_enter_jit(n=n, res=res, i=i) return res P = StopAtXPolicy(h1) @@ -1860,9 +1808,8 @@ def test_red_int_add_ovf(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'm', 'i', 'result'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'm', 'i', 'result']) def f(n, m): i = 1024 while i > 0: @@ -1871,8 +1818,8 @@ result = ovfcheck(n + m) except OverflowError: result = -42 + m - MyJitDriver.jit_merge_point(n=n, m=m, i=i, result=result) - MyJitDriver.can_enter_jit(n=n, m=m, i=i, result=result) + myjitdriver.jit_merge_point(n=n, m=m, i=i, result=result) + myjitdriver.can_enter_jit(n=n, m=m, i=i, result=result) return result + 1 res = self.run(f, [100, 20], threshold=2) @@ -1887,9 +1834,11 @@ class MyJitDriver(JitDriver): greens = [] reds = ['n', 'm', 'i', 'result'] - def on_enter_jit(self, invariants): - self.n = hint(hint(self.n, promote=True), variable=True) - self.m = hint(hint(self.m, promote=True), variable=True) + def on_enter_jit(self, invariants, reds): + reds.n = hint(hint(reds.n, promote=True), variable=True) + reds.m = hint(hint(reds.m, promote=True), variable=True) + myjitdriver = MyJitDriver() + def f(n, m): i = 1024 result = 0 @@ -1899,8 +1848,8 @@ result += ovfcheck(n + m) except OverflowError: result += -42 + m - MyJitDriver.jit_merge_point(n=n, m=m, i=i, result=result) - MyJitDriver.can_enter_jit(n=n, m=m, i=i, result=result) + myjitdriver.jit_merge_point(n=n, m=m, i=i, result=result) + myjitdriver.can_enter_jit(n=n, m=m, i=i, result=result) return result res = self.run(f, [100, 20], threshold=2) @@ -1992,9 +1941,8 @@ assert res == -7 def test_switch(self): - class MyJitDriver(JitDriver): - greens = ['m'] - reds = ['n', 'i', 'res'] + myjitdriver = JitDriver(greens = ['m'], + reds = ['n', 'i', 'res']) def g(n, x): if n == 0: return 12 + x @@ -2015,8 +1963,8 @@ y = g(hint(m, concrete=True), n) # gives a green switch res = x - y # - MyJitDriver.jit_merge_point(n=n, m=m, res=res, i=i) - MyJitDriver.can_enter_jit(n=n, m=m, res=res, i=i) + myjitdriver.jit_merge_point(n=n, m=m, res=res, i=i) + myjitdriver.can_enter_jit(n=n, m=m, res=res, i=i) return res res = self.run(f, [7, 2], threshold=2) @@ -2063,9 +2011,8 @@ bbox.getgenvar(jitstate)) return IntRedBox(abox.kind, gv_result) - class MyJitDriver(JitDriver): - greens = [] - reds = ['a', 'b', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['a', 'b', 'i', 'res']) A = lltype.GcArray(lltype.Signed) @@ -2082,8 +2029,8 @@ res[2*i] = x res[2*i+1] = y # - MyJitDriver.jit_merge_point(a=a, b=b, res=res, i=i) - MyJitDriver.can_enter_jit(a=a, b=b, res=res, i=i) + myjitdriver.jit_merge_point(a=a, b=b, res=res, i=i) + myjitdriver.can_enter_jit(a=a, b=b, res=res, i=i) i += 1 return res @@ -2117,9 +2064,8 @@ gv_result = builder.genop1("int_neg", mbox.getgenvar(jitstate)) return IntRedBox(mbox.kind, gv_result) - class MyJitDriver(JitDriver): - greens = ['m'] - reds = ['n', 'i', 'res'] + myjitdriver = JitDriver(greens = ['m'], + reds = ['n', 'i', 'res']) class Fz(object): x = 10 @@ -2142,8 +2088,8 @@ hint(y, concrete=True) res = x + g(fz, y) # this g() too # - MyJitDriver.jit_merge_point(n=n, m=m, res=res, i=i) - MyJitDriver.can_enter_jit(n=n, m=m, res=res, i=i) + myjitdriver.jit_merge_point(n=n, m=m, res=res, i=i) + myjitdriver.can_enter_jit(n=n, m=m, res=res, i=i) return res class MyPolicy(HintAnnotatorPolicy): @@ -2176,9 +2122,8 @@ assert res == f(0) def test_learn_boolvalue(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'i', 'tot', 'b'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'i', 'tot', 'b']) class A(object): pass def f(b, n): @@ -2199,17 +2144,16 @@ tot += 2 + n else: tot += -2 + n - MyJitDriver.jit_merge_point(tot=tot, i=i, n=n, b=b) - MyJitDriver.can_enter_jit(tot=tot, i=i, n=n, b=b) + myjitdriver.jit_merge_point(tot=tot, i=i, n=n, b=b) + myjitdriver.can_enter_jit(tot=tot, i=i, n=n, b=b) return tot res = self.run(f, [False, 5], threshold=2) assert res == f(False, 5) self.check_insns_in_loops({'int_add': 2, 'int_gt': 1, 'int_rshift': 1}) def test_learn_nonzeroness(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['a', 'i', 'tot', 'x'] + myjitdriver = JitDriver(greens = [], + reds = ['a', 'i', 'tot', 'x']) class A: pass class B: @@ -2236,8 +2180,8 @@ tot += 2 + x else: tot += -2 + x - MyJitDriver.jit_merge_point(tot=tot, i=i, a=a, x=x) - MyJitDriver.can_enter_jit(tot=tot, i=i, a=a, x=x) + myjitdriver.jit_merge_point(tot=tot, i=i, a=a, x=x) + myjitdriver.can_enter_jit(tot=tot, i=i, a=a, x=x) return tot res = self.run(f, [False, 5], threshold=2, policy=StopAtXPolicy(g)) assert res == f(False, 5) @@ -2263,9 +2207,8 @@ def _freeze_(self): return True - class MyJitDriver(JitDriver): - greens = [] - reds = ['space', 'x', 'y', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['space', 'x', 'y', 'i', 'res']) def f(space, x, y): i = 1024 @@ -2277,9 +2220,9 @@ else: res = space.sub(6, y) # - MyJitDriver.jit_merge_point(space=space, x=x, y=y, + myjitdriver.jit_merge_point(space=space, x=x, y=y, res=res, i=i) - MyJitDriver.can_enter_jit(space=space, x=x, y=y, + myjitdriver.can_enter_jit(space=space, x=x, y=y, res=res, i=i) return res @@ -2303,9 +2246,9 @@ else: res = space.sub(6, y) # - MyJitDriver.jit_merge_point(space=space, x=x, y=y, + myjitdriver.jit_merge_point(space=space, x=x, y=y, res=res, i=i) - MyJitDriver.can_enter_jit(space=space, x=x, y=y, + myjitdriver.can_enter_jit(space=space, x=x, y=y, res=res, i=i) return res Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_llinterp.py Sat Mar 29 17:02:08 2008 @@ -25,6 +25,10 @@ from pypy.jit.rainbow.test.test_hotpath import TestHotPath llinterp(TestHotPath.test_simple_loop) +def test_set_threshold(): + from pypy.jit.rainbow.test.test_hotpath import TestHotPath + llinterp(TestHotPath.test_set_threshold) + def test_hp_tlr(): from pypy.jit.rainbow.test.test_hotpath import TestHotPath llinterp(TestHotPath.test_hp_tlr) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_promotion.py Sat Mar 29 17:02:08 2008 @@ -12,14 +12,13 @@ py.test.skip("fix this test") def test_easy_case(self): - class MyJitDriver(JitDriver): - greens = ['n'] - reds = [] + myjitdriver = JitDriver(greens = ['n'], + reds = []) def ll_two(k): return (k+1)*2 def ll_function(n): - MyJitDriver.jit_merge_point(n=n) - MyJitDriver.can_enter_jit(n=n) + myjitdriver.jit_merge_point(n=n) + myjitdriver.can_enter_jit(n=n) hint(n, concrete=True) n = hint(n, variable=True) # n => constant red box k = hint(n, promote=True) # no-op @@ -31,14 +30,13 @@ self.check_insns_excluding_return({}) def test_simple_promotion(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n'] + myjitdriver = JitDriver(greens = [], + reds = ['n']) def ll_two(k): return (k+1)*2 def ll_function(n): - MyJitDriver.jit_merge_point(n=n) - MyJitDriver.can_enter_jit(n=n) + myjitdriver.jit_merge_point(n=n) + myjitdriver.can_enter_jit(n=n) k = hint(n, promote=True) k = ll_two(k) return hint(k, variable=True) @@ -48,15 +46,14 @@ self.check_insns(int_add=0, int_mul=0) def test_many_promotions(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'total'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'total']) def ll_two(k): return k*k def ll_function(n, total): while n > 0: - MyJitDriver.jit_merge_point(n=n, total=total) - MyJitDriver.can_enter_jit(n=n, total=total) + myjitdriver.jit_merge_point(n=n, total=total) + myjitdriver.can_enter_jit(n=n, total=total) k = hint(n, promote=True) k = ll_two(k) total += hint(k, variable=True) @@ -87,9 +84,8 @@ ]) def test_promote_after_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n'] + myjitdriver = JitDriver(greens = [], + reds = ['n']) S = lltype.GcStruct('S', ('x', lltype.Signed)) def ll_two(k, s): if k > 5: @@ -97,8 +93,8 @@ else: s.x = k def ll_function(n): - MyJitDriver.jit_merge_point(n=n) - MyJitDriver.can_enter_jit(n=n) + myjitdriver.jit_merge_point(n=n) + myjitdriver.can_enter_jit(n=n) s = lltype.malloc(S) ll_two(n, s) k = hint(n, promote=True) @@ -110,9 +106,8 @@ self.check_insns(int_mul=0, int_add=0) def test_promote_after_yellow_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'i'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'i']) S = lltype.GcStruct('S', ('x', lltype.Signed)) def ll_two(k, s): if k > 5: @@ -126,8 +121,8 @@ i = 10 while i > 0: i -= 1 - MyJitDriver.jit_merge_point(n=n, i=i) - MyJitDriver.can_enter_jit(n=n, i=i) + myjitdriver.jit_merge_point(n=n, i=i) + myjitdriver.can_enter_jit(n=n, i=i) s = lltype.malloc(S) c = ll_two(n, s) k = hint(s.x, promote=True) @@ -140,9 +135,8 @@ self.check_insns(int_add=0) def test_promote_inside_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'i'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'i']) def ll_two(n): k = hint(n, promote=True) k *= 17 @@ -151,8 +145,8 @@ i = 1024 while i > 0: i >>= 1 - MyJitDriver.jit_merge_point(n=n, i=i) - MyJitDriver.can_enter_jit(n=n, i=i) + myjitdriver.jit_merge_point(n=n, i=i) + myjitdriver.can_enter_jit(n=n, i=i) res = ll_two(n + 1) - 1 return res @@ -161,9 +155,8 @@ self.check_insns(int_add=1, int_mul=0, int_sub=0) def test_promote_inside_call2(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'm', 'i'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'm', 'i']) def ll_two(n): k = hint(n, promote=True) k *= 17 @@ -172,8 +165,8 @@ i = 1024 while i > 0: i >>= 1 - MyJitDriver.jit_merge_point(n=n, m=m, i=i) - MyJitDriver.can_enter_jit(n=n, m=m, i=i) + myjitdriver.jit_merge_point(n=n, m=m, i=i) + myjitdriver.can_enter_jit(n=n, m=m, i=i) if not n: return -41 if m: @@ -197,15 +190,14 @@ 'int_rshift': 1}) def test_two_promotions(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'm', 'i'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'm', 'i']) def ll_function(n, m): i = 1024 while i > 0: i >>= 1 - MyJitDriver.jit_merge_point(n=n, m=m, i=i) - MyJitDriver.can_enter_jit(n=n, m=m, i=i) + myjitdriver.jit_merge_point(n=n, m=m, i=i) + myjitdriver.can_enter_jit(n=n, m=m, i=i) n1 = hint(n, promote=True) m1 = hint(m, promote=True) s1 = n1 + m1 @@ -258,9 +250,8 @@ self.check_insns(int_add=0, int_mul=0) def test_more_promotes(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['n', 'm', 'i', 's'] + myjitdriver = JitDriver(greens = [], + reds = ['n', 'm', 'i', 's']) S = lltype.GcStruct('S', ('x', lltype.Signed), ('y', lltype.Signed)) def ll_two(s, i, m): if i > 4: @@ -282,8 +273,8 @@ s.y = 0 i = 0 while i < n: - MyJitDriver.jit_merge_point(n=n, m=m, i=i, s=s) - MyJitDriver.can_enter_jit(n=n, m=m, i=i, s=s) + myjitdriver.jit_merge_point(n=n, m=m, i=i, s=s) + myjitdriver.can_enter_jit(n=n, m=m, i=i, s=s) k = ll_two(s, i, m) if m & 1: k *= 3 @@ -327,14 +318,13 @@ assert res == ll_function(6, 3, 2, 2) def test_green_across_global_mp(self): - class MyJitDriver(JitDriver): - greens = ['n1', 'n2'] - reds = ['total', 'n3', 'n4'] + myjitdriver = JitDriver(greens = ['n1', 'n2'], + reds = ['total', 'n3', 'n4']) def ll_function(n1, n2, n3, n4, total): while n2: - MyJitDriver.jit_merge_point(n1=n1, n2=n2, n3=n3, n4=n4, + myjitdriver.jit_merge_point(n1=n1, n2=n2, n3=n3, n4=n4, total=total) - MyJitDriver.can_enter_jit(n1=n1, n2=n2, n3=n3, n4=n4, + myjitdriver.can_enter_jit(n1=n1, n2=n2, n3=n3, n4=n4, total=total) total += n4 total *= n2 @@ -380,15 +370,14 @@ self.check_flexswitches(1) def test_virtual_list_copy(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['x', 'y', 'repeat'] + myjitdriver = JitDriver(greens = [], + reds = ['x', 'y', 'repeat']) def ll_function(x, y): repeat = 10 while repeat > 0: repeat -= 1 - MyJitDriver.jit_merge_point(x=x, y=y, repeat=repeat) - MyJitDriver.can_enter_jit(x=x, y=y, repeat=repeat) + myjitdriver.jit_merge_point(x=x, y=y, repeat=repeat) + myjitdriver.can_enter_jit(x=x, y=y, repeat=repeat) l = [y] * x size = len(l) size = hint(size, promote=True) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vdict.py Sat Mar 29 17:02:08 2008 @@ -9,9 +9,8 @@ type_system = "lltype" def test_vdict(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot']) def ll_function(): tot = 0 i = 1024 @@ -21,17 +20,16 @@ dic[12] = 34 dic[13] = 35 tot += dic[12] - MyJitDriver.jit_merge_point(tot=tot, i=i) - MyJitDriver.can_enter_jit(tot=tot, i=i) + myjitdriver.jit_merge_point(tot=tot, i=i) + myjitdriver.can_enter_jit(tot=tot, i=i) return tot res = self.run(ll_function, [], 2, policy=P_OOPSPEC) assert res == 34 * 11 self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1}) def test_merge(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot', 'flag'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot', 'flag']) def ll_function(flag): tot = 0 i = 1024 @@ -45,17 +43,16 @@ dic[12] = 35 dic[13] = 35 tot += dic[12] - MyJitDriver.jit_merge_point(tot=tot, i=i, flag=flag) - MyJitDriver.can_enter_jit(tot=tot, i=i, flag=flag) + myjitdriver.jit_merge_point(tot=tot, i=i, flag=flag) + myjitdriver.can_enter_jit(tot=tot, i=i, flag=flag) return tot res = self.run(ll_function, [True], 2, policy=P_OOPSPEC) assert res == 34 * 11 self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1}) def test_vdict_and_vlist(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot']) def ll_function(): tot = 0 i = 1024 @@ -66,17 +63,16 @@ dic[12] = 34 dic[13] = 35 tot += dic[lst.pop()] - MyJitDriver.jit_merge_point(tot=tot, i=i) - MyJitDriver.can_enter_jit(tot=tot, i=i) + myjitdriver.jit_merge_point(tot=tot, i=i) + myjitdriver.can_enter_jit(tot=tot, i=i) return tot res = self.run(ll_function, [], 2, policy=P_OOPSPEC) assert res == 34 * 11 self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1}) def test_multiple_vdicts(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot']) def ll_function(): tot = 0 i = 1024 @@ -89,8 +85,8 @@ d2 = {} d2['foo'] = 'hello' tot += d1[l1.pop()] + len(d2[l2.pop()]) - MyJitDriver.jit_merge_point(tot=tot, i=i) - MyJitDriver.can_enter_jit(tot=tot, i=i) + myjitdriver.jit_merge_point(tot=tot, i=i) + myjitdriver.can_enter_jit(tot=tot, i=i) return tot res = self.run(ll_function, [], 2, policy=P_OOPSPEC) assert res == 39 * 11 @@ -105,9 +101,8 @@ return d1 else: return d2 - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot', 'n', 'x'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot', 'n', 'x']) def ll_function(n, x): tot = 0 i = 1024 @@ -118,8 +113,8 @@ res = d[i] res = hint(res, variable=True) tot += res - MyJitDriver.jit_merge_point(tot=tot, i=i, n=n, x=x) - MyJitDriver.can_enter_jit(tot=tot, i=i, n=n, x=x) + myjitdriver.jit_merge_point(tot=tot, i=i, n=n, x=x) + myjitdriver.can_enter_jit(tot=tot, i=i, n=n, x=x) return tot res = self.run(ll_function, [3, 2], 2, policy=P_OOPSPEC) assert res == 54 * 11 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Sat Mar 29 17:02:08 2008 @@ -122,9 +122,8 @@ type_system = "lltype" def test_simple(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot', 'xy'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot', 'xy']) def f(xy): tot = 0 @@ -134,8 +133,8 @@ x = xy_get_x(xy) y = xy_get_y(xy) tot += x+y - MyJitDriver.jit_merge_point(tot=tot, i=i, xy=xy) - MyJitDriver.can_enter_jit(tot=tot, i=i, xy=xy) + myjitdriver.jit_merge_point(tot=tot, i=i, xy=xy) + myjitdriver.can_enter_jit(tot=tot, i=i, xy=xy) return tot def main(x, y): @@ -158,9 +157,8 @@ [lltype.Ptr(XY), lltype.Signed, lltype.Signed]) def test_simple_set(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot', 'xy'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot', 'xy']) def f(xy): tot = 0 @@ -171,8 +169,8 @@ xy_set_y(xy, 1) y = xy_get_y(xy) tot += x+y - MyJitDriver.jit_merge_point(tot=tot, i=i, xy=xy) - MyJitDriver.can_enter_jit(tot=tot, i=i, xy=xy) + myjitdriver.jit_merge_point(tot=tot, i=i, xy=xy) + myjitdriver.can_enter_jit(tot=tot, i=i, xy=xy) return tot def main(x, y): @@ -193,9 +191,8 @@ [lltype.Ptr(XY), lltype.Signed, lltype.Signed]) def test_set_effect(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot', 'xy'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot', 'xy']) def f(xy): tot = 0 @@ -207,8 +204,8 @@ y = xy_get_y(xy) v = x + y tot += v - MyJitDriver.jit_merge_point(tot=tot, i=i, xy=xy) - MyJitDriver.can_enter_jit(tot=tot, i=i, xy=xy) + myjitdriver.jit_merge_point(tot=tot, i=i, xy=xy) + myjitdriver.can_enter_jit(tot=tot, i=i, xy=xy) return tot def main(x, y): @@ -230,9 +227,8 @@ [lltype.Ptr(XY), lltype.Signed, lltype.Signed]) def test_simple_escape(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'xy', 'e'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'xy', 'e']) def f(e, xy): i = 1024 @@ -240,8 +236,8 @@ i >>= 1 xy_set_y(xy, xy_get_y(xy) + 3) e.xy = xy - MyJitDriver.jit_merge_point(i=i, xy=xy, e=e) - MyJitDriver.can_enter_jit(i=i, xy=xy, e=e) + myjitdriver.jit_merge_point(i=i, xy=xy, e=e) + myjitdriver.can_enter_jit(i=i, xy=xy, e=e) return e.xy.y def main(x, y): @@ -264,9 +260,8 @@ [lltype.Ptr(XY), lltype.Signed, lltype.Signed, lltype.Ptr(E)]) def test_simple_return_it(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['which', 'i', 'xy1', 'xy2'] + myjitdriver = JitDriver(greens = [], + reds = ['which', 'i', 'xy1', 'xy2']) def f(which, xy1, xy2): i = 1024 @@ -274,8 +269,8 @@ i >>= 1 xy_set_y(xy1, xy_get_y(xy1) + 3) xy_set_y(xy2, xy_get_y(xy2) + 7) - MyJitDriver.jit_merge_point(i=i, which=which, xy1=xy1, xy2=xy2) - MyJitDriver.can_enter_jit(i=i, which=which, xy1=xy1, xy2=xy2) + myjitdriver.jit_merge_point(i=i, which=which, xy1=xy1, xy2=xy2) + myjitdriver.can_enter_jit(i=i, which=which, xy1=xy1, xy2=xy2) if which == 1: return xy1 else: @@ -305,9 +300,8 @@ self.check_insns_in_loops(getfield=0, setfield=0) def test_simple_aliasing(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'xy1', 'xy2', 'res', 'which'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'xy1', 'xy2', 'res', 'which']) def f(which, xy1, xy2): xy_set_y(xy1, xy_get_y(xy1) + 3) @@ -332,8 +326,8 @@ xy = f(which, xy1, xy2) assert xy is xy1 or xy is xy2 res = xy.x+xy.y - MyJitDriver.jit_merge_point(i=i, xy1=xy1, xy2=xy2, res=res, which=which) - MyJitDriver.can_enter_jit(i=i, xy1=xy1, xy2=xy2, res=res, which=which) + myjitdriver.jit_merge_point(i=i, xy1=xy1, xy2=xy2, res=res, which=which) + myjitdriver.can_enter_jit(i=i, xy1=xy1, xy2=xy2, res=res, which=which) return res res = self.run(main, [1, 20, 22], 2) @@ -344,9 +338,8 @@ self.check_insns_in_loops(getfield=0) def test_simple_construct_no_escape(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot', 'x', 'y'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot', 'x', 'y']) def f(x, y): xy = lltype.malloc(XY) @@ -363,8 +356,8 @@ while i: i >>= 1 tot += f(x, y) - MyJitDriver.jit_merge_point(tot=tot, i=i, x=x, y=y) - MyJitDriver.can_enter_jit(tot=tot, i=i, x=x, y=y) + myjitdriver.jit_merge_point(tot=tot, i=i, x=x, y=y) + myjitdriver.can_enter_jit(tot=tot, i=i, x=x, y=y) return tot res = self.run(main, [20, 22], 2) @@ -373,13 +366,12 @@ 'int_rshift': 1}) def test_simple_construct_escape(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['x', 'y'] + myjitdriver = JitDriver(greens = [], + reds = ['x', 'y']) def f(x, y): - MyJitDriver.jit_merge_point(x=x, y=y) - MyJitDriver.can_enter_jit(x=x, y=y) + myjitdriver.jit_merge_point(x=x, y=y) + myjitdriver.can_enter_jit(x=x, y=y) xy = lltype.malloc(XY) xy.vable_access = lltype.nullptr(XY_ACCESS) xy.x = x @@ -401,9 +393,8 @@ def test_pass_in_construct_another_and_escape(self): py.test.skip("in-progress") - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'xy', 'x', 'y'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'xy', 'x', 'y']) def f(x, y): i = 1024 @@ -415,8 +406,8 @@ xy.y = y x = xy_get_x(xy) y = xy_get_y(xy) - MyJitDriver.jit_merge_point(xy=xy, i=i, x=x, y=y) - MyJitDriver.can_enter_jit(xy=xy, i=i, x=x, y=y) + myjitdriver.jit_merge_point(xy=xy, i=i, x=x, y=y) + myjitdriver.can_enter_jit(xy=xy, i=i, x=x, y=y) return xy def main(x, y): @@ -429,9 +420,8 @@ self.check_insns_in_loops(getfield=0) def test_simple_with_struct(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot', 'xp'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot', 'xp']) def f(xp): tot = 0 @@ -442,8 +432,8 @@ p = xp_get_p(xp) res = x+p.a+p.b tot += res - MyJitDriver.jit_merge_point(tot=tot, i=i, xp=xp) - MyJitDriver.can_enter_jit(tot=tot, i=i, xp=xp) + myjitdriver.jit_merge_point(tot=tot, i=i, xp=xp) + myjitdriver.can_enter_jit(tot=tot, i=i, xp=xp) return tot def main(x, a, b): @@ -461,9 +451,8 @@ self.check_insns_in_loops(getfield=2) def test_simple_with_setting_struct(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot', 'xp', 's', 'x'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot', 'xp', 's', 'x']) def f(xp, s): tot = 0 @@ -476,8 +465,8 @@ p.b = p.b*2 v = x+p.a+p.b tot += v+xp.p.b - MyJitDriver.jit_merge_point(tot=tot, i=i, xp=xp, s=s, x=x) - MyJitDriver.can_enter_jit(tot=tot, i=i, xp=xp, s=s, x=x) + myjitdriver.jit_merge_point(tot=tot, i=i, xp=xp, s=s, x=x) + myjitdriver.can_enter_jit(tot=tot, i=i, xp=xp, s=s, x=x) return tot def main(x, a, b): @@ -495,9 +484,8 @@ self.check_insns_in_loops(getfield=4) def test_simple_with_setting_new_struct(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot', 'xp', 'a', 'b'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot', 'xp', 'a', 'b']) def f(xp, a, b): tot = 0 @@ -513,8 +501,8 @@ x = xp_get_x(xp) v = x+p.a+p.b tot += v - MyJitDriver.jit_merge_point(tot=tot, i=i, xp=xp, a=a, b=b) - MyJitDriver.can_enter_jit(tot=tot, i=i, xp=xp, a=a, b=b) + myjitdriver.jit_merge_point(tot=tot, i=i, xp=xp, a=a, b=b) + myjitdriver.can_enter_jit(tot=tot, i=i, xp=xp, a=a, b=b) return tot def main(x, a, b): @@ -530,9 +518,8 @@ def test_simple_constr_with_setting_new_struct(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'xp', 'x', 'a', 'b'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'xp', 'x', 'a', 'b']) def f(x, a, b): i = 1024 @@ -550,8 +537,8 @@ p.b = p.b*2 x = xp_get_x(xp) # - MyJitDriver.jit_merge_point(xp=xp, i=i, x=x, a=a, b=b) - MyJitDriver.can_enter_jit(xp=xp, i=i, x=x, a=a, b=b) + myjitdriver.jit_merge_point(xp=xp, i=i, x=x, a=a, b=b) + myjitdriver.can_enter_jit(xp=xp, i=i, x=x, a=a, b=b) return xp def main(x, a, b): @@ -568,9 +555,8 @@ self.check_insns_in_loops(getfield=0, malloc=0) def test_simple_read(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot', 'e'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot', 'e']) def f(e): tot = 0 @@ -581,8 +567,8 @@ xy_set_y(xy, xy_get_y(xy) + 3) v = xy_get_x(xy)*2 tot += v - MyJitDriver.jit_merge_point(tot=tot, i=i, e=e) - MyJitDriver.can_enter_jit(tot=tot, i=i, e=e) + myjitdriver.jit_merge_point(tot=tot, i=i, e=e) + myjitdriver.can_enter_jit(tot=tot, i=i, e=e) return tot def main(x, y): @@ -600,9 +586,8 @@ self.check_insns_in_loops(getfield=3) def test_simple_escape_through_vstruct(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'e', 'x', 'y'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'e', 'x', 'y']) def f(x, y): i = 1024 @@ -619,8 +604,8 @@ newy = 2*y xy_set_y(xy, newy) # - MyJitDriver.jit_merge_point(e=e, i=i, x=x, y=y) - MyJitDriver.can_enter_jit(e=e, i=i, x=x, y=y) + myjitdriver.jit_merge_point(e=e, i=i, x=x, y=y) + myjitdriver.can_enter_jit(e=e, i=i, x=x, y=y) return e def main(x, y): @@ -636,9 +621,8 @@ self.check_insns_in_loops(getfield=0, malloc=0) def test_residual_doing_nothing(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['xy', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['xy', 'i', 'res']) class Counter: counter = 0 @@ -653,8 +637,8 @@ i >>= 1 g(xy) res = xy.x + 1 - MyJitDriver.jit_merge_point(xy=xy, res=res, i=i) - MyJitDriver.can_enter_jit(xy=xy, res=res, i=i) + myjitdriver.jit_merge_point(xy=xy, res=res, i=i) + myjitdriver.can_enter_jit(xy=xy, res=res, i=i) return res def main(x, y): @@ -671,9 +655,8 @@ self.check_insns_in_loops(direct_call=1) def test_late_residual_red_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['e', 'z', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['e', 'z', 'i', 'res']) def g(e): xy = e.xy @@ -695,8 +678,8 @@ res = z*3 g(e) # - MyJitDriver.jit_merge_point(e=e, z=z, res=res, i=i) - MyJitDriver.can_enter_jit(e=e, z=z, res=res, i=i) + myjitdriver.jit_merge_point(e=e, z=z, res=res, i=i) + myjitdriver.can_enter_jit(e=e, z=z, res=res, i=i) return res def main(x, y, z): @@ -718,9 +701,8 @@ assert res == main(0, 21, 11) def test_residual_red_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['e', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['e', 'i', 'res']) def g(e): xy = e.xy @@ -739,8 +721,8 @@ g(e) res = xy.x # - MyJitDriver.jit_merge_point(e=e, res=res, i=i) - MyJitDriver.can_enter_jit(e=e, res=res, i=i) + myjitdriver.jit_merge_point(e=e, res=res, i=i) + myjitdriver.can_enter_jit(e=e, res=res, i=i) return res def main(x, y): @@ -762,9 +744,8 @@ assert res == main(2, 20) def test_force_in_residual_red_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['e', 'a', 'b', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['e', 'a', 'b', 'i', 'res']) def g(e): xp = e.xp @@ -791,8 +772,8 @@ g(e) res = xp.x # - MyJitDriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) - MyJitDriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) + myjitdriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) + myjitdriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) return res def main(a, b, x): @@ -814,9 +795,8 @@ assert res == main(2, 20, 10) def test_force_multiple_reads_residual_red_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['e', 'a', 'b', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['e', 'a', 'b', 'i', 'res']) def g(e): xp = e.xp @@ -841,8 +821,8 @@ g(e) res = xp.x # - MyJitDriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) - MyJitDriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) + myjitdriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) + myjitdriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) return res def main(a, b, x): @@ -864,9 +844,8 @@ assert res == main(2, 20, 10) def test_force_unaliased_residual_red_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['e', 'a', 'b', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['e', 'a', 'b', 'i', 'res']) def g(e): pq = e.pq @@ -891,8 +870,8 @@ g(e) res = pq.p.a # - MyJitDriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) - MyJitDriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) + myjitdriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) + myjitdriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) return res def main(a, b, x): @@ -914,9 +893,8 @@ assert res == main(2, 20, 10) def test_force_aliased_residual_red_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['e', 'a', 'b', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['e', 'a', 'b', 'i', 'res']) def g(e): pq = e.pq @@ -938,8 +916,8 @@ g(e) res = pq.p.a # - MyJitDriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) - MyJitDriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) + myjitdriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) + myjitdriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) return res def main(a, b, x): @@ -961,9 +939,8 @@ assert res == main(2, 20, 10) def test_force_in_residual_red_call_with_more_use(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['e', 'a', 'b', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['e', 'a', 'b', 'i', 'res']) def g(e): xp = e.xp @@ -991,8 +968,8 @@ s.b = s.b*5 res = xp.x # - MyJitDriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) - MyJitDriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) + myjitdriver.jit_merge_point(e=e, a=a, b=b, res=res, i=i) + myjitdriver.can_enter_jit(e=e, a=a, b=b, res=res, i=i) return res def main(a, b, x): @@ -1014,9 +991,8 @@ assert res == main(2, 20, 10) def test_virtualizable_escaped_as_argument_to_red_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['x', 'y', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['x', 'y', 'i', 'res']) def g(xy): x = xy_get_x(xy) @@ -1036,8 +1012,8 @@ x = xy_get_x(xy) y = xy_get_y(xy) # - MyJitDriver.jit_merge_point(x=x, y=y, res=res, i=i) - MyJitDriver.can_enter_jit(x=x, y=y, res=res, i=i) + myjitdriver.jit_merge_point(x=x, y=y, res=res, i=i) + myjitdriver.can_enter_jit(x=x, y=y, res=res, i=i) return res def main(x, y): @@ -1052,9 +1028,8 @@ assert res == main(20, 11) def test_setting_in_residual_call(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['x', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['x', 'i', 'res']) def g(xy): x = xy_get_x(xy) @@ -1076,8 +1051,8 @@ y = xy_get_y(xy) res = x*2 + y # - MyJitDriver.jit_merge_point(x=x, res=res, i=i) - MyJitDriver.can_enter_jit(x=x, res=res, i=i) + myjitdriver.jit_merge_point(x=x, res=res, i=i) + myjitdriver.can_enter_jit(x=x, res=res, i=i) return res def main(x): @@ -1099,9 +1074,8 @@ py.test.skip("port me") def test_simple(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['xy', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['xy', 'i', 'res']) class XY(object): _virtualizable_ = True @@ -1115,8 +1089,8 @@ while i > 0: i >>= 1 res = xy.x+xy.y - MyJitDriver.jit_merge_point(xy=xy, res=res, i=i) - MyJitDriver.can_enter_jit(xy=xy, res=res, i=i) + myjitdriver.jit_merge_point(xy=xy, res=res, i=i) + myjitdriver.can_enter_jit(xy=xy, res=res, i=i) return res def main(x, y): @@ -1128,9 +1102,8 @@ self.check_insns_in_loops(getfield=0) def test_simple__class__(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['v', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['v', 'i', 'res']) class V(object): _virtualizable_ = True @@ -1151,8 +1124,8 @@ while i > 0: i >>= 1 res = v.__class__ - MyJitDriver.jit_merge_point(v=v, res=res, i=i) - MyJitDriver.can_enter_jit(v=v, res=res, i=i) + myjitdriver.jit_merge_point(v=v, res=res, i=i) + myjitdriver.can_enter_jit(v=v, res=res, i=i) return res def main(x, y): @@ -1182,9 +1155,8 @@ assert res == 2 def test_simple_inheritance(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['xy', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['xy', 'i', 'res']) class X(object): _virtualizable_ = True @@ -1203,8 +1175,8 @@ while i > 0: i >>= 1 res = xy.x+xy.y - MyJitDriver.jit_merge_point(xy=xy, res=res, i=i) - MyJitDriver.can_enter_jit(xy=xy, res=res, i=i) + myjitdriver.jit_merge_point(xy=xy, res=res, i=i) + myjitdriver.can_enter_jit(xy=xy, res=res, i=i) return res def main(x, y): @@ -1221,9 +1193,8 @@ self.check_insns_in_loops(getfield=0) def test_simple_interpreter_with_frame(self): - class MyJitDriver(JitDriver): - greens = ['pc', 'n', 's'] - reds = ['frame'] + myjitdriver = JitDriver(greens = ['pc', 'n', 's'], + reds = ['frame']) class Log: acc = 0 @@ -1245,7 +1216,7 @@ n = len(s) pc = 0 while True: - MyJitDriver.jit_merge_point(frame=self, pc=pc, n=n, s=s) + myjitdriver.jit_merge_point(frame=self, pc=pc, n=n, s=s) self.pc = pc if hint(pc >= n, concrete=True): break @@ -1260,7 +1231,7 @@ if self.acc > 0: pc -= 3 assert pc >= 0 - MyJitDriver.can_enter_jit(frame=self, pc=pc, + myjitdriver.can_enter_jit(frame=self, pc=pc, n=n, s=s) elif op == 'd': self.debug() @@ -1545,9 +1516,8 @@ def test_virtual_list(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['v', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['v', 'i', 'res']) class V(object): _virtualizable_ = True @@ -1571,8 +1541,8 @@ g(v) l2 = v.l res = l[0]*2 + l[1] + l2[0] * 2 + l2[1] - MyJitDriver.jit_merge_point(v=v, res=res, i=i) - MyJitDriver.can_enter_jit(v=v, res=res, i=i) + myjitdriver.jit_merge_point(v=v, res=res, i=i) + myjitdriver.can_enter_jit(v=v, res=res, i=i) return res def main(): @@ -1585,9 +1555,8 @@ assert res == main() def test_virtual_list_and_struct(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['v', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['v', 'i', 'res']) class S(object): def __init__(self, x, y): @@ -1619,8 +1588,8 @@ l2 = v.l s2 = v.s res = l[0]*2 + l[1] + l2[0] * 2 + l2[1] + s.x * 7 + s.y + s2.x * 7 + s2.y - MyJitDriver.jit_merge_point(v=v, res=res, i=i) - MyJitDriver.can_enter_jit(v=v, res=res, i=i) + myjitdriver.jit_merge_point(v=v, res=res, i=i) + myjitdriver.can_enter_jit(v=v, res=res, i=i) return res def main(): @@ -1633,17 +1602,17 @@ assert res == main() def test_simple_interpreter_with_frame_with_stack(self): - class MyJitDriver(JitDriver): + class MyJitdriver(JitDriver): greens = ['pc', 's'] reds = ['frame'] - def compute_invariants(self, pc, s): - frame = self.frame + def compute_invariants(self, reds, pc, s): + frame = reds.frame stacklen = len(frame.stack) return stacklen - def on_enter_jit(self, invariant, pc, s): - frame = self.frame + def on_enter_jit(self, invariant, reds, pc, s): + frame = reds.frame origstack = frame.stack stacklen = invariant curstack = [] @@ -1655,6 +1624,8 @@ frame.stack = curstack log.expected_stack = None + myjitdriver = MyJitdriver() + class Log: stack = None log = Log() @@ -1676,7 +1647,7 @@ def interpret(self, s): pc = 0 while True: - MyJitDriver.jit_merge_point(frame=self, s=s, pc=pc) + myjitdriver.jit_merge_point(frame=self, s=s, pc=pc) self.pc = pc if hint(pc >= len(s), concrete=True): break @@ -1703,7 +1674,7 @@ cond = self.stack.pop() if cond > 0: pc = hint(target, promote=True) - MyJitDriver.can_enter_jit(frame=self, s=s, pc=pc) + myjitdriver.can_enter_jit(frame=self, s=s, pc=pc) elif op == 't': self.trace = self.trace * 3 + self.stack[-1] elif op == 'd': @@ -1748,9 +1719,8 @@ def test_virtual_list_and_struct_fallback(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['v', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['v', 'i', 'res']) class Counter: pass @@ -1790,8 +1760,8 @@ l.pop() assert len(l) == 0 v.l = None - MyJitDriver.jit_merge_point(v=v, res=res, i=i) - MyJitDriver.can_enter_jit(v=v, res=res, i=i) + myjitdriver.jit_merge_point(v=v, res=res, i=i) + myjitdriver.can_enter_jit(v=v, res=res, i=i) return res def main(): @@ -1884,9 +1854,8 @@ assert res == 222 def test_type_bug(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['x', 'v', 'i', 'res'] + myjitdriver = JitDriver(greens = [], + reds = ['x', 'v', 'i', 'res']) class V(object): _virtualizable_ = True @@ -1905,8 +1874,8 @@ pass res = x*2, v # - MyJitDriver.jit_merge_point(x=x, v=v, res=res, i=i) - MyJitDriver.can_enter_jit(x=x, v=v, res=res, i=i) + myjitdriver.jit_merge_point(x=x, v=v, res=res, i=i) + myjitdriver.can_enter_jit(x=x, v=v, res=res, i=i) return res def main(x,y): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_vlist.py Sat Mar 29 17:02:08 2008 @@ -10,9 +10,8 @@ type_system = "lltype" def test_vlist(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot']) def ll_function(): tot = 0 i = 1024 @@ -21,17 +20,16 @@ lst = [] lst.append(12) tot += lst[0] - MyJitDriver.jit_merge_point(tot=tot, i=i) - MyJitDriver.can_enter_jit(tot=tot, i=i) + myjitdriver.jit_merge_point(tot=tot, i=i) + myjitdriver.can_enter_jit(tot=tot, i=i) return tot res = self.run(ll_function, [], threshold=2) assert res == ll_function() self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1, 'int_add': 1}) def test_enter_block(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot', 'flag'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot', 'flag']) def ll_function(flag): tot = 0 i = 1024 @@ -44,8 +42,8 @@ tot += lst[0] else: tot += lst[1] - MyJitDriver.jit_merge_point(tot=tot, i=i, flag=flag) - MyJitDriver.can_enter_jit(tot=tot, i=i, flag=flag) + myjitdriver.jit_merge_point(tot=tot, i=i, flag=flag) + myjitdriver.can_enter_jit(tot=tot, i=i, flag=flag) return tot res = self.run(ll_function, [6], threshold=2) assert res == ll_function(6) @@ -57,9 +55,8 @@ 'int_is_true': 1}) def test_merge(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot', 'flag'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot', 'flag']) def ll_function(flag): tot = 0 i = 1024 @@ -71,8 +68,8 @@ else: lst.append(131) tot += lst[-1] - MyJitDriver.jit_merge_point(tot=tot, i=i, flag=flag) - MyJitDriver.can_enter_jit(tot=tot, i=i, flag=flag) + myjitdriver.jit_merge_point(tot=tot, i=i, flag=flag) + myjitdriver.can_enter_jit(tot=tot, i=i, flag=flag) return tot res = self.run(ll_function, [6], threshold=2, policy=P_OOPSPEC) assert res == ll_function(6) @@ -100,9 +97,8 @@ self.check_insns({'int_is_true': 1}) def test_force(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot', 'flag'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot', 'flag']) def ll_function(flag): i = 1024 tot = 0 @@ -113,8 +109,8 @@ if flag: lst.append(12) tot += lst[-1] - MyJitDriver.jit_merge_point(tot=tot, i=i, flag=flag) - MyJitDriver.can_enter_jit(tot=tot, i=i, flag=flag) + myjitdriver.jit_merge_point(tot=tot, i=i, flag=flag) + myjitdriver.can_enter_jit(tot=tot, i=i, flag=flag) return tot res = self.run(ll_function, [6], 2, policy=P_OOPSPEC) assert res == ll_function(6) @@ -122,9 +118,8 @@ assert res == ll_function(0) def test_oop_vlist(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot']) def ll_function(): i = 1024 tot = 0 @@ -152,8 +147,8 @@ three * 100 + seven * 10 + nine * 1) - MyJitDriver.jit_merge_point(tot=tot, i=i) - MyJitDriver.can_enter_jit(tot=tot, i=i) + myjitdriver.jit_merge_point(tot=tot, i=i) + myjitdriver.can_enter_jit(tot=tot, i=i) return tot assert ll_function() == 30185379 * 11 res = self.run(ll_function, [], 2, policy=P_OOPSPEC) @@ -162,9 +157,8 @@ 'int_is_true': 1}) def test_alloc_and_set(self): - class MyJitDriver(JitDriver): - greens = [] - reds = ['i', 'tot'] + myjitdriver = JitDriver(greens = [], + reds = ['i', 'tot']) def ll_function(): i = 1024 tot = 0 @@ -172,8 +166,8 @@ i >>= 1 lst = [0] * 9 tot += len(lst) - MyJitDriver.jit_merge_point(tot=tot, i=i) - MyJitDriver.can_enter_jit(tot=tot, i=i) + myjitdriver.jit_merge_point(tot=tot, i=i) + myjitdriver.can_enter_jit(tot=tot, i=i) return tot res = self.run(ll_function, [], 2, policy=P_OOPSPEC) assert res == 9 * 11 @@ -202,9 +196,8 @@ def test_frozen_list(self): lst = [5, 7, 9] - class MyJitDriver(JitDriver): - greens = ['x'] - reds = ['i', 'tot'] + myjitdriver = JitDriver(greens = ['x'], + reds = ['i', 'tot']) def ll_function(x): i = 1024 tot = 0 @@ -214,8 +207,8 @@ z = mylist[x] hint(z, concrete=True) tot += z - MyJitDriver.jit_merge_point(x=x, tot=tot, i=i) - MyJitDriver.can_enter_jit(x=x, tot=tot, i=i) + myjitdriver.jit_merge_point(x=x, tot=tot, i=i) + myjitdriver.can_enter_jit(x=x, tot=tot, i=i) return tot res = self.run(ll_function, [1], 2, policy=P_OOPSPEC) @@ -225,9 +218,8 @@ def test_frozen_list_indexerror(self): lst = [5, 7, 9] - class MyJitDriver(JitDriver): - greens = ['x'] - reds = ['i', 'tot'] + myjitdriver = JitDriver(greens = ['x'], + reds = ['i', 'tot']) def ll_function(x): i = 1024 tot = 0 @@ -241,8 +233,8 @@ else: hint(z, concrete=True) tot += z - MyJitDriver.jit_merge_point(x=x, tot=tot, i=i) - MyJitDriver.can_enter_jit(x=x, tot=tot, i=i) + myjitdriver.jit_merge_point(x=x, tot=tot, i=i) + myjitdriver.can_enter_jit(x=x, tot=tot, i=i) return tot res = self.run(ll_function, [4], threshold=2, policy=P_OOPSPEC) Modified: pypy/branch/jit-hotpath/pypy/jit/tl/targettiny2hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/targettiny2hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/targettiny2hotpath.py Sat Mar 29 17:02:08 2008 @@ -2,19 +2,32 @@ from pypy.jit.codegen.hlinfo import highleveljitinfo +def help(err="Invalid command line arguments."): + print err + print highleveljitinfo.sys_executable, + print "[-j param=value,...]", + print "'tiny2 program string' arg0 [arg1 [arg2 [...]]]" + return 1 + def entry_point(args): """Main entry point of the stand-alone executable: takes a list of strings and returns the exit code. """ # store args[0] in a place where the JIT log can find it (used by # viewcode.py to know the executable whose symbols it should display) - highleveljitinfo.sys_executable = args[0] - if len(args) < 2: - print "Invalid command line arguments." - print args[0] + " 'tiny2 program string' arg0 [arg1 [arg2 [...]]]" - return 1 - bytecode = [s for s in args[1].split(' ') if s != ''] - args = [tiny2.StrBox(arg) for arg in args[2:]] + highleveljitinfo.sys_executable = args.pop(0) + if len(args) < 1: + return help() + if args[0] == '-j': + if len(args) < 3: + return help() + try: + tiny2.tinyjitdriver.set_user_param(args[1]) + except ValueError: + return help("Bad argument to -j.") + args = args[2:] + bytecode = [s for s in args[0].split(' ') if s != ''] + args = [tiny2.StrBox(arg) for arg in args[1:]] res = tiny2.interpret(bytecode, args) print tiny2.repr(res) return 0 Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tiny2_hotpath.py Sat Mar 29 17:02:08 2008 @@ -103,23 +103,23 @@ reds = ['args', 'loops', 'stack'] greens = ['bytecode', 'pos'] - def compute_invariants(self, bytecode, pos): + def compute_invariants(self, reds, bytecode, pos): # Some of the information that we maintain only really depends on # bytecode and pos: the whole 'loops' list has this property. # By being a bit careful we could also put len(args) in the # invariants, but although it doesn't make much sense it is a # priori possible for the same bytecode to be run with # different len(args). - return self.loops + return reds.loops - def on_enter_jit(self, invariants, bytecode, pos): + def on_enter_jit(self, invariants, reds, bytecode, pos): # Now some strange code that makes a copy of the 'args' list in # a complicated way... this is a workaround forcing the whole 'args' # list to be virtual. It is a way to tell the JIT compiler that it # doesn't have to worry about the 'args' list being unpredictably # modified. oldloops = invariants - oldargs = self.args + oldargs = reds.args argcount = hint(len(oldargs), promote=True) args = [] n = 0 @@ -127,7 +127,7 @@ hint(n, concrete=True) args.append(oldargs[n]) n += 1 - self.args = args + reds.args = args # turn the green 'loops' from 'invariants' into a virtual list oldloops = hint(oldloops, deepfreeze=True) argcount = len(oldloops) @@ -137,7 +137,9 @@ hint(n, concrete=True) loops.append(oldloops[n]) n += 1 - self.loops = loops + reds.loops = loops + +tinyjitdriver = TinyJitDriver() def interpret(bytecode, args): """The interpreter's entry point and portal function. @@ -146,7 +148,7 @@ stack = empty_stack() pos = 0 while True: - TinyJitDriver.jit_merge_point(args=args, loops=loops, stack=stack, + tinyjitdriver.jit_merge_point(args=args, loops=loops, stack=stack, bytecode=bytecode, pos=pos) bytecode = hint(bytecode, deepfreeze=True) if pos >= len(bytecode): @@ -188,7 +190,7 @@ # case above into 'loops', which is a virtual list, so the # promotion below is just a way to make the colors match. pos = hint(pos, promote=True) - TinyJitDriver.can_enter_jit(args=args, loops=loops, stack=stack, + tinyjitdriver.can_enter_jit(args=args, loops=loops, stack=stack, bytecode=bytecode, pos=pos) else: stack = Stack(StrBox(opcode), stack) Modified: pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/tl/tlr.py Sat Mar 29 17:02:08 2008 @@ -53,26 +53,28 @@ greens = ['bytecode', 'pc'] reds = ['a', 'regs'] - def compute_invariants(self, bytecode, pc): - return len(self.regs) + def compute_invariants(self, reds, bytecode, pc): + return len(reds.regs) - def on_enter_jit(self, invariant, bytecode, pc): + def on_enter_jit(self, invariant, reds, bytecode, pc): # make a copy of the 'regs' list to make it a VirtualList for the JIT length = invariant newregs = [0] * length i = 0 while i < length: i = hint(i, concrete=True) - newregs[i] = self.regs[i] + newregs[i] = reds.regs[i] i += 1 - self.regs = newregs + reds.regs = newregs + +tlrjitdriver = TLRJitDriver() def hp_interpret(bytecode, a): """A copy of interpret() with the hints required by the hotpath policy.""" regs = [] pc = 0 while True: - TLRJitDriver.jit_merge_point(bytecode=bytecode, pc=pc, a=a, regs=regs) + tlrjitdriver.jit_merge_point(bytecode=bytecode, pc=pc, a=a, regs=regs) opcode = hint(ord(bytecode[pc]), concrete=True) pc += 1 if opcode == MOV_A_R: @@ -88,7 +90,7 @@ pc += 1 if a: if target < pc: - TLRJitDriver.can_enter_jit(bytecode=bytecode, pc=target, + tlrjitdriver.can_enter_jit(bytecode=bytecode, pc=target, a=a, regs=regs) pc = target elif opcode == SET_A: Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/__init__.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/__init__.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/__init__.py Sat Mar 29 17:02:08 2008 @@ -5,11 +5,7 @@ } interpleveldefs = { - 'getthreshold': 'interp_jit.getthreshold', - 'setthreshold': 'interp_jit.setthreshold', - 'enable': 'interp_jit.enable', - 'disable': 'interp_jit.disable', - 'isenabled': 'interp_jit.isenabled', + 'set_param': 'interp_jit.set_param', } def setup_after_space_initialization(self): Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Sat Mar 29 17:02:08 2008 @@ -8,7 +8,8 @@ from pypy.rlib.rarithmetic import r_uint, intmask from pypy.rlib.jit import hint, _is_early_constant, JitDriver import pypy.interpreter.pyopcode # for side-effects -from pypy.interpreter.gateway import ObjSpace +from pypy.interpreter.error import OperationError +from pypy.interpreter.gateway import ObjSpace, Arguments from pypy.interpreter.eval import Frame from pypy.interpreter.pycode import PyCode, CO_VARARGS, CO_VARKEYWORDS from pypy.interpreter.pyframe import PyFrame @@ -24,18 +25,18 @@ reds = ['frame', 'ec'] greens = ['next_instr', 'pycode'] - def compute_invariants(self, next_instr, pycode): + def compute_invariants(self, reds, next_instr, pycode): # compute the information that really only depends on next_instr # and pycode - frame = self.frame + frame = reds.frame valuestackdepth = frame.valuestackdepth blockstack = frame.blockstack return (valuestackdepth, blockstack) - def on_enter_jit(self, invariants, next_instr, pycode): + def on_enter_jit(self, invariants, reds, next_instr, pycode): # *loads* of nonsense for now (depth, oldblockstack) = invariants - frame = self.frame + frame = reds.frame pycode = hint(pycode, deepfreeze=True) fastlocals_w = [None] * pycode.co_nlocals @@ -63,9 +64,7 @@ # XXX we should also make a completely virtual copy of oldblockstack - def getcurrentthreshold(): - return pypyjitconfig.cur_threshold - getcurrentthreshold = staticmethod(getcurrentthreshold) +pypyjitdriver = PyPyJitDriver() class __extend__(PyFrame): @@ -73,7 +72,7 @@ next_instr = r_uint(next_instr) try: while True: - PyPyJitDriver.jit_merge_point( + pypyjitdriver.jit_merge_point( frame=self, ec=ec, next_instr=next_instr, pycode=pycode) pycode = hint(pycode, deepfreeze=True) co_code = pycode.co_code @@ -89,7 +88,7 @@ def JUMP_ABSOLUTE(f, jumpto, next_instr, *ignored): ec = f.space.getexecutioncontext() - PyPyJitDriver.can_enter_jit(frame=f, ec=ec, next_instr=jumpto, + pypyjitdriver.can_enter_jit(frame=f, ec=ec, next_instr=jumpto, pycode=f.getcode()) return jumpto @@ -112,35 +111,6 @@ # # Public interface -MAX_THRESHOLD = sys.maxint // 2 - -class PyPyJITConfig: - def __init__(self): - self.cur_threshold = MAX_THRESHOLD # disabled until the space is ready - self.configured_threshold = JitDriver.getcurrentthreshold() - - def isenabled(self): - return self.cur_threshold < MAX_THRESHOLD - - def enable(self): - self.cur_threshold = self.configured_threshold - - def disable(self): - self.cur_threshold = MAX_THRESHOLD - - def setthreshold(self, threshold): - if threshold >= MAX_THRESHOLD: - threshold = MAX_THRESHOLD - 1 - self.configured_threshold = threshold - if self.isenabled(): - self.cur_threshold = threshold - - def getthreshold(self): - return self.configured_threshold - -pypyjitconfig = PyPyJITConfig() - - def ensure_sys_executable(space): # save the app-level sys.executable in JITInfo, where the machine # code backend can fish for it. A bit hackish. @@ -149,9 +119,6 @@ space.sys.get('executable')) def startup(space): - # -- for now, we start disabled and you have to use pypyjit.enable() - #pypyjitconfig.enable() - # -- the next line would be nice, but the app-level sys.executable is not # initialized yet :-( What we need is a hook called by app_main.py # after things have really been initialized... For now we work around @@ -161,19 +128,28 @@ pass -def setthreshold(space, threshold): - pypyjitconfig.setthreshold(threshold) -setthreshold.unwrap_spec = [ObjSpace, int] - -def getthreshold(space): - return space.wrap(pypyjitconfig.getthreshold()) - -def enable(space): - ensure_sys_executable(space) - pypyjitconfig.enable() - -def disable(space): - pypyjitconfig.disable() +def set_param(space, args): + '''Configure the tunable JIT parameters. + * set_param(name=value, ...) # as keyword arguments + * set_param("name=value,name=value") # as a user-supplied string + ''' + args_w, kwds_w = args.unpack() + if len(args_w) > 1: + raise OperationError("set_param() takes at most 1 " + "non-keyword argument, %d given" % len(args_w)) + if len(args_w) == 1: + text = space.str_w(args_w[0]) + try: + pypyjitdriver.set_user_param(text) + except ValueError: + raise OperationError(space.w_ValueError, + space.wrap("error in JIT parameters string")) + for key, w_value in kwds_w.items(): + intval = space.int_w(w_value) + try: + pypyjitdriver.set_param(key, intval) + except ValueError: + raise OperationError(space.w_TypeError, + space.wrap("no JIT parameter '%s'" % (key,))) -def isenabled(space): - return space.newbool(pypyjitconfig.isenabled()) +set_param.unwrap_spec = [ObjSpace, Arguments] Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_jit_setup.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_jit_setup.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/test/test_jit_setup.py Sat Mar 29 17:02:08 2008 @@ -9,19 +9,8 @@ # this just checks that the module is setting up things correctly, and # the resulting code makes sense on top of CPython. import pypyjit - #assert pypyjit.isenabled() -- should we start disabled or enabled? - pypyjit.disable() - assert not pypyjit.isenabled() - pypyjit.setthreshold(41) - assert not pypyjit.isenabled() - assert pypyjit.getthreshold() == 41 - pypyjit.enable() - assert pypyjit.getthreshold() == 41 - assert pypyjit.isenabled() - assert pypyjit.getthreshold() == 41 - pypyjit.setthreshold(43) - assert pypyjit.isenabled() - assert pypyjit.getthreshold() == 43 + pypyjit.set_param(threshold=5, hash_bits=9) + pypyjit.set_param("trace_eagerness=3,hash_bits=7") def f(x, y): return x*y+1 Modified: pypy/branch/jit-hotpath/pypy/rlib/jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/jit.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/jit.py Sat Mar 29 17:02:08 2008 @@ -85,202 +85,231 @@ return hop.genop('is_early_constant', [v], resulttype=lltype.Bool) # ____________________________________________________________ -# Internal +# User interface for the hotpath JIT policy -class _JitHintClassMethod(object): - def __init__(self, name): - self.name = name - def __get__(self, instance, type): - return _JitBoundClassMethod(type, self.name) - -class _JitBoundClassMethod(object): - def __init__(self, drivercls, name): - self.drivercls = drivercls - self.name = name - def __eq__(self, other): - return (isinstance(other, _JitBoundClassMethod) and - self.drivercls is other.drivercls and - self.name == other.name) - def __ne__(self, other): - return not (self == other) - def __call__(self, **livevars): - # ignore calls to the hint class methods when running on top of CPython - pass +class JitHintError(Exception): + """Inconsistency in the JIT hints.""" -class Entry(ExtRegistryEntry): - _type_ = _JitBoundClassMethod +PARAMETERS = {'threshold': 40, + 'trace_eagerness': 10, + 'hash_bits': 14, + } +unroll_parameters = unrolling_iterable(PARAMETERS.keys()) - def compute_result_annotation(self, **kwds_s): - drivercls = self.instance.drivercls - drivercls._check_class() - meth = getattr(self, 'annotate_%s' % self.instance.name) - return meth(drivercls, **kwds_s) +class JitDriver: + """Base class to declare fine-grained user control on the JIT. So + far, there must be a singleton instance of JitDriver. This style + will allow us (later) to support a single RPython program with + several independent JITting interpreters in it. + """ + def __init__(self, greens=None, reds=None): + if greens is not None: + self.greens = greens + if reds is not None: + self.reds = reds + if not hasattr(self, 'greens') or not hasattr(self, 'reds'): + raise AttributeError("no 'greens' or 'reds' supplied") + self._alllivevars = dict.fromkeys(self.greens + self.reds) + self._params = PARAMETERS.copy() + if hasattr(self, 'on_enter_jit'): + self._make_on_enter_jit_wrappers() + self._make_extregistryentries() + + def _freeze_(self): + return True + + def jit_merge_point(self, **livevars): + # special-cased by ExtRegistryEntry + assert dict.fromkeys(livevars) == self._alllivevars + + def can_enter_jit(self, **livevars): + # special-cased by ExtRegistryEntry + assert dict.fromkeys(livevars) == self._alllivevars + + def _set_param(self, name, value): + # special-cased by ExtRegistryEntry + # (internal, must receive a constant 'name') + assert name in PARAMETERS + self._params[name] = value + + def set_param(self, name, value): + """Set one of the tunable JIT parameter.""" + for name1 in unroll_parameters: + if name1 == name: + self._set_param(name1, value) + return + raise ValueError("no such parameter") + set_param._annspecialcase_ = 'specialize:arg(0)' + + def set_user_param(self, text): + """Set the tunable JIT parameters from a user-supplied string + following the format 'param=value,param=value'. For programmatic + setting of parameters, use directly JitDriver.set_param(). + """ + for s in text.split(','): + s = s.strip(' ') + parts = s.split('=') + if len(parts) != 2: + raise ValueError + try: + value = int(parts[1]) + except ValueError: + raise # re-raise the ValueError (annotator hint) + name = parts[0] + self.set_param(name, value) + set_user_param._annspecialcase_ = 'specialize:arg(0)' - def specialize_call(self, hop, **kwds_i): - drivercls = self.instance.drivercls - meth = getattr(self, 'specialize_%s' % self.instance.name) - return meth(drivercls, hop, **kwds_i) + def compute_invariants(self, reds, *greens): + """This can compute a value or tuple that is passed as a green + argument 'invariants' to on_enter_jit(). It should in theory + only depend on the 'greens', but in practice it can peek at the + reds currently stored in 'self'. This allows the extraction in + an interpreter-specific way of whatever red information that + ultimately depends on the greens only. + """ + compute_invariants._annspecialcase_ = 'specialize:arg(0)' + + def _emulate_method_calls(self, bk, livevars_s): + # annotate "self.on_enter_jit()" if it is defined. + # self.on_enter_jit(invariants, reds, *greenvars) is called with a + # copy of the value of the red variables in 'reds'. The red variables + # can be modified in order to give hints to the JIT about the + # redboxes. + from pypy.annotation import model as annmodel + if hasattr(self, 'on_enter_jit'): + args_s = [] + for name in self.greens + self.reds: + args_s.append(livevars_s['s_' + name]) + + key = "rlib.jit.JitDriver._on_enter_jit" + s_func = bk.immutablevalue(self._on_enter_jit_wrapper) + s_result = bk.emulate_pbc_call(key, s_func, args_s) + assert annmodel.s_None.contains(s_result) + + key = "rlib.jit.JitDriver._compute_invariants" + s_func = bk.immutablevalue(self._compute_invariants_wrapper) + bk.emulate_pbc_call(key, s_func, args_s) + + def _make_on_enter_jit_wrappers(self): + # build some unrolling wrappers around on_enter_jit() and + # compute_invariants() which takes all green and red arguments + # and puts the red ones in a fresh instance of the + # RedVarsHolder. This logic is here in jit.py because it needs + # to be annotated and rtyped as a high-level function. + + num_green_args = len(self.greens) + unroll_reds = unrolling_iterable(self.reds) + + class RedVarsHolder: + def __init__(self, *redargs): + i = 0 + for name in unroll_reds: + setattr(self, name, redargs[i]) + i += 1 - def annotate_jit_merge_point(self, drivercls, **kwds_s): + self._RedVarsHolder = RedVarsHolder + + def _on_enter_jit_wrapper(*allargs): + # This is what theoretically occurs when we are entering the + # JIT. In truth, compute_invariants() is called only once + # per set of greens and its result is cached. On the other + # hand, on_enter_jit() is compiled into machine code and so + # it runs every time the execution jumps from the regular + # interpreter to the machine code. Also note that changes + # to the attribute of RedVarsHolder are reflected back in + # the caller. + reds = RedVarsHolder(*allargs[num_green_args:]) + greens = allargs[:num_green_args] + invariants = self.compute_invariants(reds, *greens) + return self.on_enter_jit(invariants, reds, *greens) + self._on_enter_jit_wrapper = _on_enter_jit_wrapper + + def _compute_invariants_wrapper(*allargs): + reds = RedVarsHolder(*allargs[num_green_args:]) + greens = allargs[:num_green_args] + return self.compute_invariants(reds, *greens) + self._compute_invariants_wrapper = _compute_invariants_wrapper + + def _make_extregistryentries(self): + # workaround: we cannot declare ExtRegistryEntries for functions + # used as methods of a frozen object, but we can attach the + # bound methods back to 'self' and make ExtRegistryEntries + # specifically for them. + self.jit_merge_point = self.jit_merge_point + self.can_enter_jit = self.can_enter_jit + self._set_param = self._set_param + + class Entry(ExtEnterLeaveMarker): + _about_ = (self.jit_merge_point, self.can_enter_jit) + + class Entry(ExtSetParam): + _about_ = self._set_param + +# ____________________________________________________________ +# +# Annotation and rtyping of some of the JitDriver methods + +class ExtEnterLeaveMarker(ExtRegistryEntry): + # Replace a call to myjitdriver.jit_merge_point(**livevars) + # with an operation jit_marker('jit_merge_point', myjitdriver, livevars...) + # Also works with can_enter_jit. + + def compute_result_annotation(self, **kwds_s): from pypy.annotation import model as annmodel + driver = self.instance.im_self keys = kwds_s.keys() keys.sort() - expected = ['s_' + name for name in drivercls.greens + drivercls.reds] + expected = ['s_' + name for name in driver.greens + driver.reds] expected.sort() if keys != expected: - raise JitHintError("%s.%s(): must give exactly the same keywords" - " as the 'greens' and 'reds'" % ( - drivercls.__name__, self.instance.name)) - drivercls._emulate_method_calls(self.bookkeeper, kwds_s) + raise JitHintError("%s expects the following keyword " + "arguments: %s" % (self.instance, + expected)) + driver._emulate_method_calls(self.bookkeeper, kwds_s) return annmodel.s_None - annotate_can_enter_jit = annotate_jit_merge_point - - def specialize_jit_merge_point(self, drivercls, hop, **kwds_i): - # replace a call to MyDriverCls.hintname(**livevars) - # with an operation 'hintname(MyDriverCls, livevars...)' + def specialize_call(self, hop, **kwds_i): # XXX to be complete, this could also check that the concretetype # of the variables are the same for each of the calls. from pypy.rpython.error import TyperError from pypy.rpython.lltypesystem import lltype + driver = self.instance.im_self greens_v = [] reds_v = [] - for name in drivercls.greens: + for name in driver.greens: i = kwds_i['i_' + name] r_green = hop.args_r[i] v_green = hop.inputarg(r_green, arg=i) greens_v.append(v_green) - for name in drivercls.reds: + for name in driver.reds: i = kwds_i['i_' + name] r_red = hop.args_r[i] v_red = hop.inputarg(r_red, arg=i) reds_v.append(v_red) hop.exception_cannot_occur() - vlist = [hop.inputconst(lltype.Void, self.instance.name), - hop.inputconst(lltype.Void, drivercls)] + vlist = [hop.inputconst(lltype.Void, self.instance.__name__), + hop.inputconst(lltype.Void, driver)] vlist.extend(greens_v) vlist.extend(reds_v) return hop.genop('jit_marker', vlist, resulttype=lltype.Void) - specialize_can_enter_jit = specialize_jit_merge_point +class ExtSetParam(ExtRegistryEntry): - def annotate_set_param(self, drivercls, **kwds_s): + def compute_result_annotation(self, s_name, s_value): from pypy.annotation import model as annmodel - if len(kwds_s) != 1: - raise Exception("DriverCls.set_param(): must specify exactly " - "one keyword argument") + assert s_name.is_constant() + assert annmodel.SomeInteger().contains(s_value) return annmodel.s_None - def specialize_set_param(self, drivercls, hop, **kwds_i): + def specialize_call(self, hop): from pypy.rpython.lltypesystem import lltype - [(name, i)] = kwds_i.items() - assert name.startswith('i_') - name = name[2:] - v_value = hop.inputarg(lltype.Signed, arg=i) + driver = self.instance.im_self + name = hop.args_s[0].const + v_value = hop.inputarg(lltype.Signed, arg=1) vlist = [hop.inputconst(lltype.Void, "set_param"), - hop.inputconst(lltype.Void, drivercls), + hop.inputconst(lltype.Void, driver), hop.inputconst(lltype.Void, name), v_value] return hop.genop('jit_marker', vlist, resulttype=lltype.Void) - -# ____________________________________________________________ -# User interface for the hotpath JIT policy - -class JitHintError(Exception): - """Inconsistency in the JIT hints.""" - -class JitDriver: - """Base class to declare fine-grained user control on the JIT process.""" - - # NB. one of the points of requiring subclasses of this a class is - # to support a single RPython program with several independent - # JITting interpreters in it. XXX that's not implemented yet. - - jit_merge_point = _JitHintClassMethod("jit_merge_point") - can_enter_jit = _JitHintClassMethod("can_enter_jit") - set_param = _JitHintClassMethod("set_param") - - def compute_invariants(self, *greens): - """This can compute a value or tuple that is passed as a green - argument 'invariants' to on_enter_jit(). It should in theory - only depend on the 'greens', but in practice it can peek at the - reds currently stored in 'self'. This allows the extraction in - an interpreter-specific way of whatever red information that - ultimately depends on the greens only. - """ - - def _on_enter_jit(self, *greens): - """This is what theoretically occurs when we are entering the JIT. - In truth, compute_invariants() is called only once per set of greens - and its result is cached. On the other hand, on_enter_jit() is - compiled into machine code and so it runs every time the execution - jumps from the regular interpreter to the machine code. - """ - invariants = self.compute_invariants(*greens) - return self.on_enter_jit(invariants, *greens) - - def _check_class(cls): - if cls is JitDriver: - raise JitHintError("must subclass JitDriver") - for name in cls.greens + cls.reds: - if name.startswith('_'): - raise JitHintError("%s: the 'greens' and 'reds' names should" - " not start with an underscore" % (cls,)) - _check_class = classmethod(_check_class) - - def _emulate_method_calls(cls, bookkeeper, livevars_s): - # annotate "cls.on_enter_jit()" if it is defined - # on_enter_jit(self, invariants, *greenvars) is called with a copy - # of the value of the red variables on self. The red variables - # can be modified in order to give hints to the JIT about the - # redboxes. - from pypy.annotation import model as annmodel - if hasattr(cls, 'on_enter_jit'): - classdef = bookkeeper.getuniqueclassdef(cls) - s_self = annmodel.SomeInstance(classdef) - args_s = [s_self] - allargs_s = [] - for name in cls.greens: - s_value = livevars_s['s_' + name] - args_s.append(s_value) - allargs_s.append(s_value) - for name in cls.reds: - s_value = livevars_s['s_' + name] - s_self.setattr(bookkeeper.immutablevalue(name), s_value) - allargs_s.append(s_value) - - key = "rlib.jit.JitDriver._on_enter_jit" - s_func = bookkeeper.immutablevalue(cls._on_enter_jit.im_func) - s_result = bookkeeper.emulate_pbc_call(key, s_func, args_s) - assert annmodel.s_None.contains(s_result) - - wrapper = cls._get_compute_invariants_wrapper() - key = "rlib.jit.JitDriver._compute_invariants_wrapper" - s_func = bookkeeper.immutablevalue(wrapper) - bookkeeper.emulate_pbc_call(key, s_func, allargs_s) - _emulate_method_calls = classmethod(_emulate_method_calls) - - def _get_compute_invariants_wrapper(cls): - try: - return cls.__dict__['_compute_invariants_wrapper'] - except KeyError: - num_green_args = len(cls.greens) - unroll_reds = unrolling_iterable(cls.reds) - # make a wrapper around compute_invariants() which takes all - # green and red arguments and puts the red ones in a fresh - # instance of the JitDriver subclass. This logic is here - # in jit.py because it needs to be annotated and rtyped as - # a high-level function. - def _compute_invariants_wrapper(*args): - greenargs = args[:num_green_args] - self = cls() - i = num_green_args - for name in unroll_reds: - setattr(self, name, args[i]) - i += 1 - return self.compute_invariants(*greenargs) - cls._compute_invariants_wrapper = _compute_invariants_wrapper - return _compute_invariants_wrapper - _get_compute_invariants_wrapper = classmethod(_get_compute_invariants_wrapper) Modified: pypy/branch/jit-hotpath/pypy/rlib/test/test_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rlib/test/test_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/rlib/test/test_jit.py Sat Mar 29 17:02:08 2008 @@ -28,10 +28,9 @@ assert res == 42 def test_set_param(self): - class MyJitDriver(JitDriver): - greens = reds = [] + myjitdriver = JitDriver(greens=[], reds=[]) def f(x): - MyJitDriver.set_param(foo=x) + myjitdriver.set_param("threshold", x) assert f(4) is None res = self.interpret(f, [4]) Modified: pypy/branch/jit-hotpath/pypy/translator/driver.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/driver.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/driver.py Sat Mar 29 17:02:08 2008 @@ -438,10 +438,10 @@ jitcode = writer.make_bytecode(self.portal_graph) if ha.policy.hotpath: from pypy.jit.rainbow.hotpath import HotRunnerDesc - assert len(ha.jitdriverclasses) == 1 - jitdrivercls = ha.jitdriverclasses.keys()[0] # hack + assert len(ha.jitdrivers) == 1 # xxx for now + jitdriver = ha.jitdrivers.keys()[0] # hack hotrunnerdesc = HotRunnerDesc(ha, rtyper, jitcode, RGenOp, - writer, jitdrivercls, + writer, jitdriver, translate_support_code=True, verbose_level=1) hotrunnerdesc.rewrite_all() From arigo at codespeak.net Sat Mar 29 17:15:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 29 Mar 2008 17:15:09 +0100 (CET) Subject: [pypy-svn] r53098 - in pypy/branch/jit-hotpath/pypy: module/pypyjit translator/goal Message-ID: <20080329161509.DBD5D169F3D@codespeak.net> Author: arigo Date: Sat Mar 29 17:15:09 2008 New Revision: 53098 Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/__init__.py pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py pypy/branch/jit-hotpath/pypy/translator/goal/targetpypystandalone.py Log: Try to give a --jit option to tune the jit when pypy-c starts up. A bit ad-hoc and undocumented for now. Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/__init__.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/__init__.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/__init__.py Sat Mar 29 17:15:09 2008 @@ -11,7 +11,3 @@ def setup_after_space_initialization(self): # force the __extend__ hacks to occur early import pypy.module.pypyjit.interp_jit - - def startup(self, space): - from pypy.module.pypyjit import interp_jit - interp_jit.startup(space) Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Sat Mar 29 17:15:09 2008 @@ -111,21 +111,21 @@ # # Public interface -def ensure_sys_executable(space): +def jit_startup(space, argv): # save the app-level sys.executable in JITInfo, where the machine # code backend can fish for it. A bit hackish. from pypy.jit.codegen.hlinfo import highleveljitinfo - highleveljitinfo.sys_executable = space.str_w( - space.sys.get('executable')) + highleveljitinfo.sys_executable = argv[0] -def startup(space): - # -- the next line would be nice, but the app-level sys.executable is not - # initialized yet :-( What we need is a hook called by app_main.py - # after things have really been initialized... For now we work around - # this problem by calling ensure_sys_executable() from pypyjit.enable(). - - #ensure_sys_executable(space) - pass + # recognize the option --jit PARAM=VALUE,PARAM=VALUE... + # if it is at the beginning. A bit ad-hoc. + if len(argv) > 2 and argv[1] == '--jit': + argv.pop(1) + try: + pypyjitdriver.set_user_param(argv.pop(1)) + except ValueError: + from pypy.rlib.debug import debug_print + debug_print("WARNING: invalid --jit parameters string") def set_param(space, args): Modified: pypy/branch/jit-hotpath/pypy/translator/goal/targetpypystandalone.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/goal/targetpypystandalone.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/goal/targetpypystandalone.py Sat Mar 29 17:15:09 2008 @@ -40,9 +40,18 @@ from pypy.rlib import rgc rgc.set_max_heap_size(int(argv[2])) argv = argv[:1] + argv[3:] + try: try: space.call_function(w_run_toplevel, w_call_startup_gateway) + + if self.translateconfig.goal_options.jit: + # initial setup of the JIT and handling of the + # '--jit PARAM=VALUE,PARAM=VALUE...' command-line option + # (for now it's a bit ad-hoc) + from pypy.module.pypyjit.interp_jit import jit_startup + jit_startup(space, argv) + w_executable = space.wrap(argv[0]) w_argv = space.newlist([space.wrap(s) for s in argv[1:]]) w_exitcode = space.call_function(w_entry_point, w_executable, w_argv, w_os) From arigo at codespeak.net Sat Mar 29 17:59:31 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 29 Mar 2008 17:59:31 +0100 (CET) Subject: [pypy-svn] r53099 - in pypy/branch/jit-hotpath/pypy/rpython: . test Message-ID: <20080329165931.9E7B1169F2B@codespeak.net> Author: arigo Date: Sat Mar 29 17:59:29 2008 New Revision: 53099 Modified: pypy/branch/jit-hotpath/pypy/rpython/rtyper.py pypy/branch/jit-hotpath/pypy/rpython/test/test_rlist.py Log: Quick workaround for an rtyper crash in valid code. Modified: pypy/branch/jit-hotpath/pypy/rpython/rtyper.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/rtyper.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/rtyper.py Sat Mar 29 17:59:29 2008 @@ -797,11 +797,13 @@ if self.llops.implicit_exceptions_checked is not None: # sanity check: complain if an has_implicit_exception() check is # missing in the rtyper. - for link in self.exceptionlinks: - if link.exitcase not in self.llops.implicit_exceptions_checked: - raise TyperError("the graph catches %s, but the rtyper " - "did not explicitely handle it" % ( - link.exitcase.__name__,)) + # XXX can't do this, see test_rlist.py:test_catch_other_exc + pass + #for link in self.exceptionlinks: + # if link.exitcase not in self.llops.implicit_exceptions_checked: + # raise TyperError("the graph catches %s, but the rtyper " + # "did not explicitely handle it" % ( + # link.exitcase.__name__,)) self.llops.llop_raising_exceptions = len(self.llops) def exception_cannot_occur(self): Modified: pypy/branch/jit-hotpath/pypy/rpython/test/test_rlist.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/test/test_rlist.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/test/test_rlist.py Sat Mar 29 17:59:29 2008 @@ -1323,6 +1323,16 @@ res = self.interpret(f, []) assert res == 42 + def test_catch_other_exc(self): + def f(x): + l1 = [x] + try: + return l1.pop(0) + except ValueError: + return 42 + res = self.interpret(f, [5]) + assert res == 5 + class TestLLtype(BaseTestRlist, LLRtypeMixin): rlist = ll_rlist From arigo at codespeak.net Sat Mar 29 17:59:40 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 29 Mar 2008 17:59:40 +0100 (CET) Subject: [pypy-svn] r53100 - in pypy/branch/jit-hotpath/pypy: module/pypyjit translator/goal Message-ID: <20080329165940.E87FF169FB7@codespeak.net> Author: arigo Date: Sat Mar 29 17:59:40 2008 New Revision: 53100 Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py pypy/branch/jit-hotpath/pypy/translator/goal/targetpypystandalone.py Log: Translation fixes and typos. Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py Sat Mar 29 17:59:40 2008 @@ -135,8 +135,9 @@ ''' args_w, kwds_w = args.unpack() if len(args_w) > 1: - raise OperationError("set_param() takes at most 1 " - "non-keyword argument, %d given" % len(args_w)) + msg = ("set_param() takes at most 1 non-keyword argument, %d given" + % len(args_w)) + raise OperationError(space.w_TypeError, space.wrap(msg)) if len(args_w) == 1: text = space.str_w(args_w[0]) try: Modified: pypy/branch/jit-hotpath/pypy/translator/goal/targetpypystandalone.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/translator/goal/targetpypystandalone.py (original) +++ pypy/branch/jit-hotpath/pypy/translator/goal/targetpypystandalone.py Sat Mar 29 17:59:40 2008 @@ -45,7 +45,7 @@ try: space.call_function(w_run_toplevel, w_call_startup_gateway) - if self.translateconfig.goal_options.jit: + if space.config.objspace.usemodules.pypyjit: # initial setup of the JIT and handling of the # '--jit PARAM=VALUE,PARAM=VALUE...' command-line option # (for now it's a bit ad-hoc) From cfbolz at codespeak.net Sat Mar 29 20:29:44 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 29 Mar 2008 20:29:44 +0100 (CET) Subject: [pypy-svn] r53108 - in pypy/branch/jit-hotpath/pypy/jit/codegen: dump/test i386/test Message-ID: <20080329192944.47C89169F2D@codespeak.net> Author: cfbolz Date: Sat Mar 29 20:29:42 2008 New Revision: 53108 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/dump/test/test_rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_exception.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_portal.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_promotion.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tl.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tlc.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tlr.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_ts.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_virtualizable.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_vlist.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_interp_ts.py Log: skip non-ported tests Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/dump/test/test_rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/dump/test/test_rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/dump/test/test_rgenop.py Sat Mar 29 20:29:42 2008 @@ -1,4 +1,5 @@ import py +py.test.skip("port me") from pypy.jit.codegen.dump.rgenop import RDumpGenOp from pypy.jit.timeshifter.test.test_timeshift import Whatever from pypy.rpython.lltypesystem import lltype Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_exception.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_exception.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_exception.py Sat Mar 29 20:29:42 2008 @@ -1,4 +1,5 @@ import py +py.test.skip("port me") from pypy.jit.timeshifter.test import test_exception from pypy.jit.codegen.i386.test.test_genc_ts import I386TimeshiftingTestMixin Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_portal.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_portal.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_portal.py Sat Mar 29 20:29:42 2008 @@ -1,4 +1,5 @@ import py, os, sys +py.test.skip("port me") from pypy.annotation import model as annmodel from pypy.rlib.unroll import unrolling_iterable from pypy.translator.c.genc import CStandaloneBuilder Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_promotion.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_promotion.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_promotion.py Sat Mar 29 20:29:42 2008 @@ -1,4 +1,5 @@ import py +py.test.skip("port me") from pypy.jit.timeshifter.test import test_promotion from pypy.jit.codegen.i386.test.test_genc_ts import I386TimeshiftingTestMixin Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tl.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tl.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tl.py Sat Mar 29 20:29:42 2008 @@ -1,4 +1,5 @@ import py +py.test.skip("port me") from pypy.jit.timeshifter.test import test_1tl from pypy.jit.codegen.i386.test.test_genc_ts import I386TimeshiftingTestMixin Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tlc.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tlc.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tlc.py Sat Mar 29 20:29:42 2008 @@ -1,4 +1,5 @@ import py +py.test.skip("port me") from pypy.jit.timeshifter.test import test_0tlc from pypy.jit.codegen.i386.test.test_genc_portal import I386PortalTestMixin Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tlr.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tlr.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tlr.py Sat Mar 29 20:29:42 2008 @@ -1,4 +1,5 @@ import py +py.test.skip("port me") from pypy.jit.timeshifter.test import test_tlr from pypy.jit.codegen.i386.test.test_genc_portal import I386PortalTestMixin Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_ts.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_ts.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_ts.py Sat Mar 29 20:29:42 2008 @@ -1,4 +1,5 @@ import py, os, sys +py.test.skip("port me") from pypy.annotation import model as annmodel from pypy.annotation.listdef import s_list_of_strings from pypy.rlib.objectmodel import keepalive_until_here Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_virtualizable.py Sat Mar 29 20:29:42 2008 @@ -1,3 +1,5 @@ +import py +py.test.skip("port me") from pypy.jit.codegen.i386.test.test_genc_portal import I386PortalTestMixin from pypy.jit.timeshifter.test import test_virtualizable Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_vlist.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_vlist.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_vlist.py Sat Mar 29 20:29:42 2008 @@ -1,4 +1,5 @@ import py +py.test.skip("port me") from pypy.jit.timeshifter.test import test_vlist from pypy.jit.codegen.i386.test.test_genc_ts import I386TimeshiftingTestMixin Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_interp_ts.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_interp_ts.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_interp_ts.py Sat Mar 29 20:29:42 2008 @@ -1,4 +1,5 @@ import os, py +py.test.skip("port me") from pypy.annotation import model as annmodel from pypy.jit.timeshifter.test import test_timeshift from pypy.jit.timeshifter.test.test_timeshift import Whatever From cfbolz at codespeak.net Sat Mar 29 20:53:45 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 29 Mar 2008 20:53:45 +0100 (CET) Subject: [pypy-svn] r53109 - in pypy/branch/jit-hotpath/pypy/jit: codegen codegen/dump codegen/dump/test codegen/i386 codegen/llgraph codegen/ppc codegen/test rainbow rainbow/test timeshifter timeshifter/test Message-ID: <20080329195345.CDE7F169F10@codespeak.net> Author: cfbolz Date: Sat Mar 29 20:53:43 2008 New Revision: 53109 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/dump/test/test_dump.py pypy/branch/jit-hotpath/pypy/jit/codegen/graph2rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/model.py pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/portal.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/support.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rvalue.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py Log: remove most uses of kind tokens in the codegen interface, since it didn't really help the backend. Probably small amounts of breakage left. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py Sat Mar 29 20:53:43 2008 @@ -42,13 +42,12 @@ self.dump("%s.start_writing()" % self.name) self.llbuilder.start_writing() - def enter_next_block(self, kinds, args_gv): + def enter_next_block(self, args_gv): self.dump("args_gv = [%s]" % self.rgenop.vlistname(args_gv)) - lbl = self.llbuilder.enter_next_block(kinds, args_gv) - self.dump("%s = %s.enter_next_block([%s], args_gv)" % ( + lbl = self.llbuilder.enter_next_block(args_gv) + self.dump("%s = %s.enter_next_block(args_gv)" % ( self.rgenop.lblname(lbl), - self.name, - self.rgenop.kindtokensname(kinds))) + self.name)) self.dump("%s = args_gv" % self.rgenop.vlistassname(args_gv)) return lbl @@ -143,59 +142,53 @@ self.rgenop.vname(gv_arg2))) return v1, v2 - def genop_ptr_iszero(self, kind, gv_ptr): - v = self.llbuilder.genop_ptr_iszero(kind, gv_ptr) - self.dump("%s = %s.genop_ptr_iszero(%s, %s)" % ( + def genop_ptr_iszero(self, gv_ptr): + v = self.llbuilder.genop_ptr_iszero(gv_ptr) + self.dump("%s = %s.genop_ptr_iszero(%s)" % ( self.rgenop.vname(v), self.name, - self.rgenop.kindtokenname(kind), self.rgenop.vname(gv_ptr))) return v - def genop_ptr_nonzero(self, kind, gv_ptr): - v = self.llbuilder.genop_ptr_nonzero(kind, gv_ptr) - self.dump("%s = %s.genop_ptr_nonzero(%s, %s)" % ( + def genop_ptr_nonzero(self, gv_ptr): + v = self.llbuilder.genop_ptr_nonzero(gv_ptr) + self.dump("%s = %s.genop_ptr_nonzero(%s)" % ( self.rgenop.vname(v), self.name, - self.rgenop.kindtokenname(kind), self.rgenop.vname(gv_ptr))) return v - def genop_ptr_eq(self, kind, gv_ptr1, gv_ptr2): - v = self.llbuilder.genop_ptr_eq(kind, gv_ptr1, gv_ptr2) - self.dump("%s = %s.genop_ptr_eq(%s, %s, %s)" % ( + def genop_ptr_eq(self, gv_ptr1, gv_ptr2): + v = self.llbuilder.genop_ptr_eq(gv_ptr1, gv_ptr2) + self.dump("%s = %s.genop_ptr_eq(%s, %s)" % ( self.rgenop.vname(v), self.name, - self.rgenop.kindtokenname(kind), self.rgenop.vname(gv_ptr1), self.rgenop.vname(gv_ptr2))) return v - def genop_ptr_ne(self, kind, gv_ptr1, gv_ptr2): - v = self.llbuilder.genop_ptr_ne(kind, gv_ptr1, gv_ptr2) - self.dump("%s = %s.genop_ptr_ne(%s, %s, %s)" % ( + def genop_ptr_ne(self, gv_ptr1, gv_ptr2): + v = self.llbuilder.genop_ptr_ne(gv_ptr1, gv_ptr2) + self.dump("%s = %s.genop_ptr_ne(%s, %s)" % ( self.rgenop.vname(v), self.name, - self.rgenop.kindtokenname(kind), self.rgenop.vname(gv_ptr1), self.rgenop.vname(gv_ptr2))) return v - def genop_cast_int_to_ptr(self, kind, gv_int): - v = self.llbuilder.genop_cast_int_to_ptr(kind, gv_int) - self.dump("%s = %s.genop_cast_int_to_ptr(%s, %s)" % ( + def genop_cast_int_to_ptr(self, gv_int): + v = self.llbuilder.genop_cast_int_to_ptr(gv_int) + self.dump("%s = %s.genop_cast_int_to_ptr(%s)" % ( self.rgenop.vname(v), self.name, - self.rgenop.kindtokenname(kind), self.rgenop.vname(gv_int))) return v - def genop_same_as(self, kind, gv_x): - v = self.llbuilder.genop_same_as(kind, gv_x) - self.dump("%s = %s.genop_same_as(%s, %s)" % ( + def genop_same_as(self, gv_x): + v = self.llbuilder.genop_same_as(gv_x) + self.dump("%s = %s.genop_same_as(%s)" % ( self.rgenop.vname(v), self.name, - self.rgenop.kindtokenname(kind), self.rgenop.vname(gv_x))) return v Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/dump/test/test_dump.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/dump/test/test_dump.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/dump/test/test_dump.py Sat Mar 29 20:53:43 2008 @@ -28,11 +28,9 @@ builder, gv_callable, inputargs_gv = rgenop.newgraph( RDumpGenOp.sigToken(FUNC0), "foobar") builder.start_writing() - builder.genop_same_as(RDumpGenOp.kindToken(lltype.Signed), - rgenop.genconst(0)) + builder.genop_same_as(rgenop.genconst(0)) log = self.getlog() assert 'rgenop.genconst(0)' in log - builder.genop_same_as(RDumpGenOp.kindToken(lltype.Bool), - rgenop.genconst(False)) + builder.genop_same_as(rgenop.genconst(False)) log = self.getlog() assert 'rgenop.genconst(False)' in log Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/graph2rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/graph2rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/graph2rgenop.py Sat Mar 29 20:53:43 2008 @@ -79,8 +79,7 @@ break # done along this branch else: # create a label and proceed - kinds = map(varkind, block.inputargs) - labels[block] = builder.enter_next_block(kinds, args_gv) + labels[block] = builder.enter_next_block(args_gv) # generate the operations varmap = dict(zip(block.inputargs, args_gv)) @@ -153,33 +152,24 @@ var2gv(op.args[1]), var2gv(op.args[2])) elif op.opname == 'same_as': - token = rgenop.kindToken(op.args[0].concretetype) - gv_result = builder.genop_same_as(token, var2gv(op.args[0])) + gv_result = builder.genop_same_as(var2gv(op.args[0])) elif op.opname == 'ptr_iszero': - token = rgenop.kindToken(op.args[0].concretetype) - gv_result = builder.genop_ptr_iszero(token, var2gv(op.args[0])) + gv_result = builder.genop_ptr_iszero(var2gv(op.args[0])) elif op.opname == 'ptr_nonzero': - token = rgenop.kindToken(op.args[0].concretetype) - gv_result = builder.genop_ptr_nonzero(token, var2gv(op.args[0])) + gv_result = builder.genop_ptr_nonzero(var2gv(op.args[0])) elif op.opname == 'ptr_eq': - token = rgenop.kindToken(op.args[0].concretetype) - gv_result = builder.genop_ptr_eq(token, - var2gv(op.args[0]), + gv_result = builder.genop_ptr_eq(var2gv(op.args[0]), var2gv(op.args[1])) elif op.opname == 'ptr_ne': - token = rgenop.kindToken(op.args[0].concretetype) - gv_result = builder.genop_ptr_ne(token, - var2gv(op.args[0]), + gv_result = builder.genop_ptr_ne(var2gv(op.args[0]), var2gv(op.args[1])) elif op.opname == 'cast_int_to_ptr': - token = rgenop.kindToken(op.result.concretetype) - gv_result = builder.genop_cast_int_to_ptr(token, - var2gv(op.args[0])) + gv_result = builder.genop_cast_int_to_ptr(var2gv(op.args[0])) elif len(op.args) == 1: gv_result = builder.genop1(op.opname, var2gv(op.args[0])) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py Sat Mar 29 20:53:43 2008 @@ -37,6 +37,9 @@ def repr(self): return "const=$%s" % (self.value,) + def getkind(self): + return None + class AddrConst(GenConst): def __init__(self, addr): @@ -53,6 +56,9 @@ def repr(self): return "const=<0x%x>" % (llmemory.cast_adr_to_int(self.addr),) + def getkind(self): + return None + @specialize.arg(0) def cast_int_to_whatever(T, value): if isinstance(T, lltype.Ptr): @@ -257,7 +263,7 @@ self.operations.append(OpTouch(self.keepalives_gv)) self.keepalives_gv = None - def enter_next_block(self, kinds, args_gv): + def enter_next_block(self, args_gv): # we get better register allocation if we write a single large mc block self.insert_keepalives() for i in range(len(args_gv)): @@ -400,25 +406,25 @@ self.operations.append(op_excflag) return op, op_excflag - def genop_ptr_iszero(self, kind, gv_ptr): + def genop_ptr_iszero(self, gv_ptr): cls = getopclass1('ptr_iszero') op = cls(gv_ptr) self.operations.append(op) return op - def genop_ptr_nonzero(self, kind, gv_ptr): + def genop_ptr_nonzero(self, gv_ptr): cls = getopclass1('ptr_nonzero') op = cls(gv_ptr) self.operations.append(op) return op - def genop_ptr_eq(self, kind, gv_ptr1, gv_ptr2): + def genop_ptr_eq(self, gv_ptr1, gv_ptr2): cls = getopclass2('ptr_eq') op = cls(gv_ptr1, gv_ptr2) self.operations.append(op) return op - def genop_ptr_ne(self, kind, gv_ptr1, gv_ptr2): + def genop_ptr_ne(self, gv_ptr1, gv_ptr2): cls = getopclass2('ptr_ne') op = cls(gv_ptr1, gv_ptr2) self.operations.append(op) @@ -427,7 +433,7 @@ def genop_cast_int_to_ptr(self, kind, gv_int): return gv_int # identity - def genop_same_as(self, kind, gv_x): + def genop_same_as(self, gv_x): if gv_x.is_const: # must always return a var op = OpSameAs(gv_x) self.operations.append(op) @@ -533,7 +539,7 @@ self.operations.append(place) return place - def genop_absorb_place(self, kind, place): + def genop_absorb_place(self, place): v = OpAbsorbPlace(place) self.operations.append(v) return v @@ -650,8 +656,8 @@ #inputargs_gv = ops return builder, IntConst(entrypoint), inputargs_gv[:] - def replay(self, label, kinds): - return ReplayBuilder(self), [dummy_var] * len(kinds) + def replay(self, label): + return ReplayBuilder(self), [dummy_var] * len(label.inputoperands) @specialize.genconst(1) def genconst(self, llvalue): Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py Sat Mar 29 20:53:43 2008 @@ -669,6 +669,10 @@ eliminate_empty_blocks(graph) graph.show() + +def getkind(gv): + return constTYPE(_from_opaque(gv).concretetype) + # ____________________________________________________________ CONSTORVAR = lltype.Ptr(lltype.OpaqueType("ConstOrVar")) @@ -777,6 +781,7 @@ #setannotation(placeholder, s_ConstOrVar, specialize_as_constant=True) setannotation(show_incremental_progress, None) +setannotation(getkind, s_ConstOrVar) # read frame var support Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py Sat Mar 29 20:53:43 2008 @@ -16,6 +16,9 @@ def __repr__(self): return repr(RGenOp.reveal(self)) + def getkind(self): + return LLConst(llimpl.getkind(self.v)) + class LLConst(GenConst): def __init__(self, v): @@ -31,6 +34,9 @@ def __repr__(self): return repr(RGenOp.reveal(self)) + def getkind(self): + return LLConst(llimpl.getkind(self.v)) + _gv_TYPE_cache = {} def gv_TYPE(TYPE): @@ -50,9 +56,10 @@ gv_Address = gv_TYPE(llmemory.Address) class LLLabel(GenLabel): - def __init__(self, b, g): + def __init__(self, b, g, args_gv): self.b = b self.g = g + self.args_gv = args_gv class LLPlace: absorbed = False @@ -253,22 +260,19 @@ return LLVar(llimpl.genop(self.b, 'new', vars_gv, gv_OBJTYPE.v)) - def genop_same_as(self, gv_TYPE, gv_value): + def genop_same_as(self, gv_value): ll_assert(self.rgenop.currently_writing is self, "genop_same_as: bad currently_writing") - gv_value = llimpl.cast(self.b, gv_TYPE.v, gv_value.v) - return LLVar(llimpl.genop(self.b, 'same_as', [gv_value], gv_TYPE.v)) + return LLVar(llimpl.genop(self.b, 'same_as', [gv_value], gv_value.getkind().v)) - def genop_ptr_iszero(self, gv_PTRTYPE, gv_ptr): + def genop_ptr_iszero(self, gv_ptr): ll_assert(self.rgenop.currently_writing is self, "genop_ptr_iszero: bad currently_writing") - gv_ptr = llimpl.cast(self.b, gv_PTRTYPE.v, gv_ptr.v) return LLVar(llimpl.genop(self.b, 'ptr_iszero', [gv_ptr], gv_Bool.v)) - def genop_ptr_nonzero(self, gv_PTRTYPE, gv_ptr): + def genop_ptr_nonzero(self, gv_ptr): ll_assert(self.rgenop.currently_writing is self, "genop_ptr_nonzero: bad currently_writing") - gv_ptr = llimpl.cast(self.b, gv_PTRTYPE.v, gv_ptr.v) return LLVar(llimpl.genop(self.b, 'ptr_nonzero', [gv_ptr], gv_Bool.v)) def genop_oononnull(self, gv_OBJTYPE, gv_obj): @@ -277,18 +281,18 @@ gv_obj = llimpl.cast(self.b, gv_OBJTYPE.v, gv_obj.v) return LLVar(llimpl.genop(self.b, 'oononnull', [gv_obj], gv_Bool.v)) - def genop_ptr_eq(self, gv_PTRTYPE, gv_ptr1, gv_ptr2): + def genop_ptr_eq(self, gv_ptr1, gv_ptr2): ll_assert(self.rgenop.currently_writing is self, "genop_ptr_eq: bad currently_writing") - gv_ptr1 = llimpl.cast(self.b, gv_PTRTYPE.v, gv_ptr1.v) + gv_PTRTYPE = gv_ptr1.getkind() gv_ptr2 = llimpl.cast(self.b, gv_PTRTYPE.v, gv_ptr2.v) return LLVar(llimpl.genop(self.b, 'ptr_eq', [gv_ptr1, gv_ptr2], gv_Bool.v)) - def genop_ptr_ne(self, gv_PTRTYPE, gv_ptr1, gv_ptr2): + def genop_ptr_ne(self, gv_ptr1, gv_ptr2): ll_assert(self.rgenop.currently_writing is self, "genop_ptr_ne: bad currently_writing") - gv_ptr1 = llimpl.cast(self.b, gv_PTRTYPE.v, gv_ptr1.v) + gv_PTRTYPE = gv_ptr1.getkind() gv_ptr2 = llimpl.cast(self.b, gv_PTRTYPE.v, gv_ptr2.v) return LLVar(llimpl.genop(self.b, 'ptr_ne', [gv_ptr1, gv_ptr2], gv_Bool.v)) @@ -299,19 +303,20 @@ return LLVar(llimpl.genop(self.b, 'cast_int_to_ptr', [gv_int], gv_PTRTYPE.v)) - def _newblock(self, kinds): + def _newblock(self, args_gv): self.b = newb = llimpl.newblock() - return [LLVar(llimpl.geninputarg(newb, kind.v)) for kind in kinds] + return [LLVar(llimpl.geninputarg(newb, gv.getkind().v)) + for gv in args_gv] - def enter_next_block(self, kinds, args_gv): + def enter_next_block(self, args_gv): ll_assert(self.rgenop.currently_writing is self, "enter_next_block: bad currently_writing") lnk = llimpl.closeblock1(self.b) - newb_args_gv = self._newblock(kinds) + newb_args_gv = self._newblock(args_gv) llimpl.closelink(lnk, args_gv, self.b) for i in range(len(args_gv)): args_gv[i] = newb_args_gv[i] - return LLLabel(self.b, self.gv_f) + return LLLabel(self.b, self.gv_f, newb_args_gv) def finish_and_goto(self, args_gv, target): lnk = llimpl.closeblock1(self.b) @@ -400,7 +405,7 @@ gv_TYPE.v)) return LLPlace(v, llimpl.get_frame_info(self.b, [v])) - def genop_absorb_place(self, gv_TYPE, place): + def genop_absorb_place(self, place): ll_assert(self.rgenop.currently_writing is self, "alloc_frame_place: bad currently_writing") ll_assert(not place.absorbed, "place already absorbed") @@ -486,9 +491,9 @@ def genzeroconst(gv_TYPE): return LLConst(llimpl.genzeroconst(gv_TYPE.v)) - def replay(self, label, kinds): + def replay(self, label): builder = LLBuilder(self, label.g, llimpl.nullblock) - args_gv = builder._newblock(kinds) + args_gv = builder._newblock(label.args_gv) ll_assert(self.currently_writing is None, "replay: currently_writing") self.currently_writing = builder Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/model.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/model.py Sat Mar 29 20:53:43 2008 @@ -18,6 +18,12 @@ pointer, but not converting a float to an integer.''' raise NotConstant(self) + def getkind(self): + ''' Return the kind of the GenVarOrConst which the backend needs to + store on it somehow.''' + raise NotImplementedError("abstract base class") + + class GenVar(GenVarOrConst): is_const = False @@ -82,22 +88,21 @@ ## def genop_malloc_fixedsize(self, alloctoken): ## def genop_malloc_varsize(self, varsizealloctoken, gv_size): ## def genop_call(self, sigtoken, gv_fnptr, args_gv): -## def genop_same_as(self, kindtoken, gv_x): +## def genop_same_as(self, gv_x): ## def genop_debug_pdb(self): # may take an args_gv later -## def genop_ptr_iszero(self, kindtoken, gv_ptr) -## def genop_ptr_nonzero(self, kindtoken, gv_ptr) -## def genop_ptr_eq(self, kindtoken, gv_ptr1, gv_ptr2) -## def genop_ptr_ne(self, kindtoken, gv_ptr1, gv_ptr2) -## def genop_cast_int_to_ptr(self, kindtoken, gv_int) +## def genop_ptr_iszero(self, gv_ptr) +## def genop_ptr_nonzero(self, gv_ptr) +## def genop_ptr_eq(self, gv_ptr1, gv_ptr2) +## def genop_ptr_ne(self, gv_ptr1, gv_ptr2) +## def genop_cast_int_to_ptr(self, kind, gv_int) # the other thing that happens for a given chunk is entering and # leaving basic blocks inside it. - def enter_next_block(self, kinds, args_gv): + def enter_next_block(self, args_gv): '''Called before generating the code for a basic block. - zip(kinds, args_gv) gives the kindtoken and GenVarOrConst for - each inputarg of the block. + args_gv gives the GenVarOrConst for each inputarg of the block. The Obscure Bit: args_gv must be mutated in place until it is a list of unique GenVars. So GenConsts must be replaced with @@ -226,7 +231,7 @@ ''' raise NotImplementedError - def genop_absorb_place(self, kind, place): + def genop_absorb_place(self, place): '''Absorb a place. This turns it into a regular variable, containing the last value written into that place. The place itself is no longer a valid target for write_frame_place() @@ -438,16 +443,16 @@ def genraisingop2(self, opname, gv_arg1, gv_arg2): return dummy_var, dummy_var - def genop_ptr_iszero(self, kind, gv_ptr): + def genop_ptr_iszero(self, gv_ptr): return dummy_var - def genop_ptr_nonzero(self, kind, gv_ptr): + def genop_ptr_nonzero(self, gv_ptr): return dummy_var - def genop_ptr_eq(self, kind, gv_ptr1, gv_ptr2): + def genop_ptr_eq(self, gv_ptr1, gv_ptr2): return dummy_var - def genop_ptr_ne(self, kind, gv_ptr1, gv_ptr2): + def genop_ptr_ne(self, gv_ptr1, gv_ptr2): return dummy_var def genop_getfield(self, fieldtoken, gv_ptr): @@ -480,13 +485,13 @@ def genop_call(self, sigtoken, gv_fnptr, args_gv): return dummy_var - def genop_same_as(self, kind, gv_x): + def genop_same_as(self, gv_x): return dummy_var def genop_debug_pdb(self): # may take an args_gv later pass - def enter_next_block(self, kinds, args_gv): + def enter_next_block(self, args_gv): return None def jump_if_false(self, gv_condition, args_gv): @@ -517,5 +522,5 @@ def alloc_frame_place(self, kind, gv_initial_value=None): return None - def genop_absorb_place(self, kind, place): + def genop_absorb_place(self, place): return dummy_var Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/rgenop.py Sat Mar 29 20:53:43 2008 @@ -295,16 +295,16 @@ r = genmethod(gv_arg) return r - def genop_ptr_iszero(self, kind, gv_ptr): + def genop_ptr_iszero(self, gv_ptr): return self.op_ptr_iszero(gv_ptr) - def genop_ptr_nonzero(self, kind, gv_ptr): + def genop_ptr_nonzero(self, gv_ptr): return self.op_ptr_nonzero(gv_ptr) - def genop_ptr_eq(self, kind, gv_ptr1, gv_ptr2): + def genop_ptr_eq(self, gv_ptr1, gv_ptr2): return self.op_ptr_eq(gv_ptr1, gv_ptr2) - def genop_ptr_ne(self, kind, gv_ptr1, gv_ptr2): + def genop_ptr_ne(self, gv_ptr1, gv_ptr2): return self.op_ptr_ne(gv_ptr1, gv_ptr2) def genop_call(self, sigtoken, gv_fnptr, args_gv): @@ -390,7 +390,7 @@ [gv_size, gv_result, IntConst(lengthoffset)])) return gv_result - def genop_same_as(self, kindtoken, gv_arg): + def genop_same_as(self, gv_arg): if not isinstance(gv_arg, Var): gv_result = Var() gv_arg.load(self.insns, gv_result) @@ -398,7 +398,7 @@ else: return gv_arg - def genop_cast_int_to_ptr(self, ptrkindtoken, gv_int): + def genop_cast_int_to_ptr(self, kind, gv_int): return gv_int ## def genop_debug_pdb(self): # may take an args_gv later @@ -427,12 +427,12 @@ self.insns.append(insn.CopyIntoStack(place, gv_initial_value)) return place - def genop_absorb_place(self, kind, place): + def genop_absorb_place(self, place): var = Var() self.insns.append(insn.CopyOffStack(var, place)) return var - def enter_next_block(self, kinds, args_gv): + def enter_next_block(self, args_gv): if DEBUG_PRINT: print 'enter_next_block1', args_gv seen = {} @@ -1185,8 +1185,8 @@ def genzeroconst(kind): return zero_const - def replay(self, label, kinds): - return ReplayBuilder(self), [dummy_var] * len(kinds) + def replay(self, label): + return ReplayBuilder(self), [dummy_var] * len(label.args_gv) @staticmethod def erasedType(T): Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Sat Mar 29 20:53:43 2008 @@ -45,7 +45,7 @@ gv_z = builder.genop2("int_sub", gv_x, rgenop.genconst(1)) args_gv = [gv_y, gv_z, gv_x] - builder.enter_next_block([signed_kind, signed_kind, signed_kind], args_gv) + builder.enter_next_block(args_gv) [gv_y2, gv_z2, gv_x2] = args_gv gv_s2 = builder.genop2("int_sub", gv_y2, gv_z2) @@ -76,7 +76,6 @@ def make_largedummy(rgenop): # 'return v0-v1+v2-v3+v4-v5...+v98-v99' - signed_kind = rgenop.kindToken(lltype.Signed) sigtoken = rgenop.sigToken(FUNC100) builder, gv_largedummyfn, gvs = rgenop.newgraph(sigtoken, "largedummy") builder.start_writing() @@ -84,7 +83,7 @@ for i in range(0, 100, 2): gvs.append(builder.genop2("int_sub", gvs[i], gvs[i+1])) - builder.enter_next_block([signed_kind] * 150, gvs) + builder.enter_next_block(gvs) while len(gvs) > 101: gv_sum = builder.genop2("int_add", gvs.pop(), gvs.pop()) gvs.append(gv_sum) @@ -125,7 +124,6 @@ def make_branching(rgenop): # 'if x > 5: return x-1 # else: return y' - signed_kind = rgenop.kindToken(lltype.Signed) sigtoken = rgenop.sigToken(FUNC2) builder, gv_branchingfn, [gv_x, gv_y] = rgenop.newgraph(sigtoken, "branching") @@ -135,7 +133,7 @@ # true path args_gv = [rgenop.genconst(1), gv_x, gv_y] - builder.enter_next_block([signed_kind, signed_kind, signed_kind], args_gv) + builder.enter_next_block(args_gv) [gv_one, gv_x2, gv_y2] = args_gv gv_s2 = builder.genop2("int_sub", gv_x2, gv_one) @@ -160,10 +158,9 @@ return branching_runner # loop start block -def loop_start(rgenop, builder, signed_kind, gv_x, gv_y): +def loop_start(rgenop, builder, gv_x, gv_y): args_gv = [gv_x, gv_y, rgenop.genconst(1)] - loopblock = builder.enter_next_block( - [signed_kind, signed_kind, signed_kind], args_gv) + loopblock = builder.enter_next_block(args_gv) [gv_x, gv_y, gv_z] = args_gv gv_cond = builder.genop2("int_gt", gv_x, rgenop.genconst(0)) @@ -171,16 +168,15 @@ return args_gv, loopblock, bodybuilder # loop exit -def loop_exit(builder, sigtoken, signed_kind, gv_y, gv_z): +def loop_exit(builder, sigtoken, gv_y, gv_z): args_gv = [gv_y, gv_z] - builder.enter_next_block( - [signed_kind, signed_kind], args_gv) + builder.enter_next_block(args_gv) [gv_y, gv_z] = args_gv gv_y3 = builder.genop2("int_add", gv_y, gv_z) builder.finish_and_return(sigtoken, gv_y3) # loop body -def loop_body(rgenop, loopblock, bodybuilder, signed_kind, gv_x, gv_y, gv_z): +def loop_body(rgenop, loopblock, bodybuilder, gv_x, gv_y, gv_z): bodybuilder.start_writing() gv_z2 = bodybuilder.genop2("int_mul", gv_x, gv_z) gv_y2 = bodybuilder.genop2("int_add", gv_x, gv_y) @@ -195,17 +191,16 @@ # x = x - 1 # y += z # return y - signed_kind = rgenop.kindToken(lltype.Signed) sigtoken = rgenop.sigToken(FUNC2) builder, gv_gotofn, [gv_x, gv_y] = rgenop.newgraph(sigtoken, "goto") builder.start_writing() [gv_x, gv_y, gv_z],loopblock,bodybuilder = loop_start( - rgenop, builder, signed_kind, gv_x, gv_y) + rgenop, builder, gv_x, gv_y) loop_exit( - builder, sigtoken, signed_kind, gv_y, gv_z) + builder, sigtoken, gv_y, gv_z) loop_body( - rgenop, loopblock, bodybuilder, signed_kind, gv_x, gv_y, gv_z) + rgenop, loopblock, bodybuilder, gv_x, gv_y, gv_z) # done builder.end() @@ -226,14 +221,13 @@ # if x > 5: # x //= 2 # return x + a - signed_kind = rgenop.kindToken(lltype.Signed) sigtoken = rgenop.sigToken(FUNC2) builder, gv_gotofn, [gv_x1, gv_unused] = rgenop.newgraph(sigtoken, "if") builder.start_writing() # check args_gv = [gv_x1, gv_unused] - builder.enter_next_block([signed_kind, signed_kind], args_gv) + builder.enter_next_block(args_gv) [gv_x1, gv_unused] = args_gv gv_cond = builder.genop2("int_gt", gv_x1, rgenop.genconst(5)) @@ -244,7 +238,7 @@ # end block args_gv = [gv_x2, gv_x1] - label = builder.enter_next_block([signed_kind, signed_kind], args_gv) + label = builder.enter_next_block(args_gv) [gv_x2, gv_a] = args_gv gv_res = builder.genop2("int_add", gv_x2, gv_a) builder.finish_and_return(sigtoken, gv_res) @@ -277,7 +271,6 @@ else: return v1 """ - signed_kind = rgenop.kindToken(lltype.Signed) sigtoken = rgenop.sigToken(FUNC2) builder, gv_switch, [gv0, gv1] = rgenop.newgraph(sigtoken, "switch") builder.start_writing() @@ -326,7 +319,6 @@ else: return v1 """ - signed_tok = rgenop.kindToken(lltype.Signed) f2_token = rgenop.sigToken(FUNC2) builder, gv_switch, (gv0, gv1) = rgenop.newgraph(f2_token, "large_switch") builder.start_writing() @@ -370,7 +362,6 @@ # w = x*z # return w # return 1 - signed_kind = rgenop.kindToken(lltype.Signed) sigtoken = rgenop.sigToken(FUNC) builder, gv_fact, [gv_x] = rgenop.newgraph(sigtoken, "fact") builder.start_writing() @@ -407,7 +398,6 @@ # return x # else: # return -x - signed_kind = rgenop.kindToken(lltype.Signed) sigtoken = rgenop.sigToken(FUNC) builder, gv_f, [gv_x] = rgenop.newgraph(sigtoken, "abs") builder.start_writing() @@ -451,7 +441,6 @@ # else: # return 0 - bool_kind = rgenop.kindToken(lltype.Bool) sigtoken = rgenop.sigToken(FUNC) builder, gv_f, [gv_y] = rgenop.newgraph(sigtoken, "abs") builder.start_writing() @@ -463,7 +452,7 @@ gv_x2 = builder.genop2("int_le", gv_y, rgenop.genconst(4)) args_gv = [gv_x2] - label = builder.enter_next_block([bool_kind], args_gv) + label = builder.enter_next_block(args_gv) [gv_x2] = args_gv return_false_builder = builder.jump_if_false(gv_x2, []) @@ -574,7 +563,7 @@ gv_y2 = builder.genop_call(rgenop.sigToken(FUNC), gv_add1, [gv_y]) args_gv = [gv_y2, gv_y] - label = builder.enter_next_block([signed_kind, signed_kind], args_gv) + label = builder.enter_next_block(args_gv) [gv_z, gv_w] = args_gv builder = builder.pause_writing(args_gv) @@ -653,7 +642,7 @@ gv_z = builder.genop_call(readertoken, gv_reader, [gv_base]) args_gv = [gv_y, gv_z] - builder.enter_next_block([signed_kind]*2, args_gv) + builder.enter_next_block(args_gv) [gv_y, gv_z] = args_gv builder.finish_and_return(sigtoken, gv_z) builder.end() @@ -1136,7 +1125,7 @@ builder.start_writing() args_gv = [gv_x, gv_y] - builder.enter_next_block([signed_kind, signed_kind], args_gv) + builder.enter_next_block(args_gv) [gv_x, gv_y] = args_gv gv_gt = builder.genop2("int_gt", gv_x, gv_y) @@ -1236,13 +1225,12 @@ # x = y # return x rgenop = self.RGenOp() - signed_kind = rgenop.kindToken(lltype.Signed) sigtoken = rgenop.sigToken(FUNC) builder, gv_callable, [gv_x] = rgenop.newgraph(sigtoken, "tightloop") builder.start_writing() args_gv = [gv_x] - loopstart = builder.enter_next_block([signed_kind], args_gv) + loopstart = builder.enter_next_block(args_gv) [gv_x] = args_gv gv_y = builder.genop2("int_sub", gv_x, rgenop.genconst(7)) @@ -1263,7 +1251,6 @@ def test_jump_to_block_with_many_vars(self): rgenop = self.RGenOp() - signed_kind = rgenop.kindToken(lltype.Signed) sigtoken = rgenop.sigToken(FUNC) builder, gv_verysmall_callable, [gv_x] = rgenop.newgraph(sigtoken, "verysmall") @@ -1280,7 +1267,7 @@ builder2.start_writing() args_gv = [gv_x] - label = builder2.enter_next_block([signed_kind], args_gv) + label = builder2.enter_next_block(args_gv) [gv_x2] = args_gv gvs = [] @@ -1305,11 +1292,10 @@ def test_same_as(self): rgenop = self.RGenOp() - signed_kind = rgenop.kindToken(lltype.Signed) sigtoken = rgenop.sigToken(FUNC) builder, gv_callable, [gv_x] = rgenop.newgraph(sigtoken, "sameas") builder.start_writing() - gv_nineteen = builder.genop_same_as(signed_kind, rgenop.genconst(19)) + gv_nineteen = builder.genop_same_as(rgenop.genconst(19)) assert not gv_nineteen.is_const # 'same_as' must return a variable builder.finish_and_return(sigtoken, gv_nineteen) builder.end() @@ -1369,7 +1355,6 @@ def test_defaultonly_switch(self): rgenop = self.RGenOp() - signed_kind = rgenop.kindToken(lltype.Signed) sigtoken = rgenop.sigToken(FUNC) builder, gv_callable, [gv_x] = rgenop.newgraph(sigtoken, "defaultonly") builder.start_writing() @@ -1384,8 +1369,6 @@ def test_bool_not_direct(self): rgenop = self.RGenOp() - signed_kind = rgenop.kindToken(lltype.Signed) - bool_kind = rgenop.kindToken(lltype.Bool) sigtoken = rgenop.sigToken(FUNC) builder, gv_callable, [gv_x] = rgenop.newgraph(sigtoken, "bool_not") builder.start_writing() @@ -1510,7 +1493,7 @@ builder1 = builder0.pause_writing([v1, v0, v2]) builder1.start_writing() args_gv = [v1, v0, v2] - label0 = builder1.enter_next_block([signed_kind]*3, args_gv) + label0 = builder1.enter_next_block(args_gv) [v3, v4, v5] = args_gv place = builder1.alloc_frame_place(signed_kind, rgenop.genconst(0)) v6 = builder1.genop_get_frame_base() @@ -1519,7 +1502,7 @@ # here would be a call v8 = builder1.genop_absorb_place(signed_kind, place) args_gv = [v3, v4, v5, v8] - label1 = builder1.enter_next_block([signed_kind]*4, args_gv) + label1 = builder1.enter_next_block(args_gv) [v9, v10, v11, v12] = args_gv # test duplicates in live vars while we're at it flexswitch0, builder2 = builder1.flexswitch(v12, [v9, v10, v12, v10]) @@ -1543,7 +1526,6 @@ rgenop = self.RGenOp() - signed_kind = rgenop.kindToken(lltype.Signed) sigtoken = rgenop.sigToken(FUNC2) builder, gv_callable, [gv_x, gv_y] = rgenop.newgraph(sigtoken, "f") builder.start_writing() @@ -1552,7 +1534,7 @@ false_builder = builder.jump_if_false(gv_cond, []) args_gv = [gv_y, gv_y] - label = builder.enter_next_block([signed_kind, signed_kind], args_gv) + label = builder.enter_next_block(args_gv) [gv_a, gv_b] = args_gv gv_result = builder.genop2("int_add", gv_a, gv_b) @@ -1595,12 +1577,12 @@ builder0.start_writing() args_gv = [v0, v1] - label0 = builder0.enter_next_block([signed_kind, signed_kind], args_gv) + label0 = builder0.enter_next_block(args_gv) [v3, v4] = args_gv v5 = builder0.genop1('int_is_true', v4) builder1 = builder0.jump_if_true(v5, [v3, v4]) args_gv = [v3, v4, rgenop.genconst(True)] - label1 = builder0.enter_next_block([signed_kind, signed_kind, bool_kind], args_gv) + label1 = builder0.enter_next_block(args_gv) [v6, v7, v8] = args_gv v9 = builder0.genop1('int_is_true', v7) builder2 = builder0.jump_if_true(v9, [v7, v8, v6]) @@ -1617,7 +1599,7 @@ builder3.start_writing() args_gv = [v8, v7] - label2 = builder3.enter_next_block([bool_kind, signed_kind], args_gv) + label2 = builder3.enter_next_block(args_gv) [v14, v15] = args_gv v16 = builder3.genop2('int_mul', v15, rgenop.genconst(-468864544)) v17 = builder3.genop1('cast_bool_to_int', v14) @@ -1647,8 +1629,6 @@ # return intmask(d) rgenop = self.RGenOp() - signed_kind = rgenop.kindToken(lltype.Signed) - bool_kind = rgenop.kindToken(lltype.Bool) builder0, gv_callable, [v0, v1, v2] = rgenop.newgraph(rgenop.sigToken(FUNC3), 'compiled_dummyfn') builder0.start_writing() @@ -1657,7 +1637,7 @@ builder1 = builder0.jump_if_true(v3, [v0, v1, v2]) args_gv = [v0, v1, v2, rgenop.genconst(True)] - label0 = builder0.enter_next_block([signed_kind, signed_kind, signed_kind, bool_kind], args_gv) + label0 = builder0.enter_next_block(args_gv) [v4, v5, v6, v7] = args_gv v8 = builder0.genop1('int_is_true', v4) @@ -1665,7 +1645,7 @@ builder3 = builder0.jump_if_false(v7, [v7, v6, v4]) args_gv = [v6, v6, v7, v4] - label1 = builder0.enter_next_block([signed_kind, signed_kind, bool_kind, signed_kind], args_gv) + label1 = builder0.enter_next_block(args_gv) [v9, v10, v11, v12] = args_gv v13 = builder0.genop2('int_sub', v12, rgenop.genconst(1)) @@ -1702,8 +1682,6 @@ # return intmask(b+g+2*y) rgenop = self.RGenOp() - signed_kind = rgenop.kindToken(lltype.Signed) - bool_kind = rgenop.kindToken(lltype.Bool) builder0, gv_callable, [v0, v1, v2, v3, v4] = rgenop.newgraph(rgenop.sigToken(FUNC5), 'compiled_dummyfn') builder0.start_writing() @@ -1714,30 +1692,27 @@ builder1.start_writing() args_gv = [v0, v1, v2, v3] - label0 = builder1.enter_next_block([signed_kind, signed_kind, signed_kind, signed_kind], args_gv) + label0 = builder1.enter_next_block(args_gv) [v6, v7, v8, v9] = args_gv v10 = builder1.genop1('int_is_true', v8) builder2 = builder1.jump_if_false(v10, [v6, v7, v9, v8]) args_gv = [v6, v7, v8, v9, rgenop.genconst(False)] - label1 = builder1.enter_next_block( - [signed_kind, signed_kind, signed_kind, signed_kind, bool_kind], args_gv) + label1 = builder1.enter_next_block(args_gv) [v11, v12, v13, v14, v15] = args_gv v16 = builder1.genop1('int_is_true', v14) builder3 = builder1.jump_if_true(v16, [v11, v13, v15, v14, v12]) args_gv = [v11, v13, v14, v14, v15] - label2 = builder1.enter_next_block( - [signed_kind, signed_kind, signed_kind, signed_kind, bool_kind], args_gv) + label2 = builder1.enter_next_block(args_gv) [v17, v18, v19, v20, v21] = args_gv builder4 = builder1.jump_if_false(v21, [v17, v18, v19, v20, v21]) args_gv = [v19, v18, v19, v20, v21, v17] - label3 = builder1.enter_next_block( - [signed_kind, signed_kind, signed_kind, signed_kind, bool_kind, signed_kind], args_gv) + label3 = builder1.enter_next_block(args_gv) [v22, v23, v24, v25, v26, v27] = args_gv v28 = builder1.genop2('int_sub', v27, rgenop.genconst(1)) @@ -1770,8 +1745,6 @@ def test_from_random_4_direct(self): rgenop = self.RGenOp() - signed_kind = rgenop.kindToken(lltype.Signed) - bool_kind = rgenop.kindToken(lltype.Bool) builder0, gv_callable, [v0, v1, v2] = rgenop.newgraph( rgenop.sigToken(FUNC3), 'compiled_dummyfn') @@ -1779,7 +1752,7 @@ builder0.start_writing() args_gv = [v0, v1, v2] - label0 = builder0.enter_next_block([signed_kind, signed_kind, signed_kind], args_gv) + label0 = builder0.enter_next_block(args_gv) [v3, v4, v5] = args_gv v6 = builder0.genop2('int_add', v5, v4) @@ -1787,7 +1760,7 @@ builder1 = builder0.jump_if_false(v7, [v4, v5, v3, v6]) args_gv = [v3, v4, v5] - label1 = builder0.enter_next_block([signed_kind, signed_kind, signed_kind], args_gv) + label1 = builder0.enter_next_block(args_gv) [v8, v9, v10] = args_gv v11 = builder0.genop1('int_is_true', v10) @@ -1801,7 +1774,7 @@ builder7 = builder1.jump_if_true(v25, [v24, v4, v5]) args_gv = [v5, v6, v4] - label4 = builder1.enter_next_block([signed_kind, signed_kind, signed_kind], args_gv) + label4 = builder1.enter_next_block(args_gv) [v26, v27, v28] = args_gv builder1.finish_and_return(rgenop.sigToken(FUNC3), v27) @@ -1851,40 +1824,38 @@ ## return intmask(a*-468864544+b*-340864157+c*-212863774+d*-84863387+e*43136996+f*171137383+g*299137766+h*427138153+i*555138536+j*683138923+k*811139306+l*939139693+m*1067140076+n*1195140463+o*1323140846+p*1451141233+q*1579141616+r*1707142003+s*1835142386+t*1963142773+u*2091143156+v*-2075823753+w*-1947823370+x*-1819822983+y*-1691822600+z*-1563822213) rgenop = self.RGenOp() - signed_kind = rgenop.kindToken(lltype.Signed) - bool_kind = rgenop.kindToken(lltype.Bool) builder0, gv_callable, [v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26] = rgenop.newgraph(rgenop.sigToken(FUNC27), 'compiled_dummyfn') builder0.start_writing() args_gv = [v0, v1, v2, v3, v6, v8, v9, v10, v11, v12, v13, v14, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26] - label0 = builder0.enter_next_block([signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind], args_gv) + label0 = builder0.enter_next_block(args_gv) [v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49] = args_gv v50 = builder0.genop1('int_is_true', v29) builder1 = builder0.jump_if_true(v50, [v48, v38, v27, v30, v32, v34, v47, v40, v28, v41, v43, v45, v37, v46, v31, v33, v35, v39, v36, v42, v49, v44, v29]) args_gv = [v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49] - label1 = builder0.enter_next_block([signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind], args_gv) + label1 = builder0.enter_next_block(args_gv) [v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63, v64, v65, v66, v67, v68, v69, v70, v71, v72, v73] = args_gv v74 = builder0.genop1('int_is_true', v64) builder2 = builder0.jump_if_true(v74, [v54, v52, v65, v58, v60, v62, v64, v68, v56, v69, v71, v51, v73, v53, v67, v57, v55, v59, v61, v63, v66, v70, v72]) args_gv = [v51, v52, v53, v54, v55, v64, v56, v57, v58, v59, v60, v61, v62, v63, v64, v65, v66, v67, v68, v69, v70, v71, v72, v73] - label2 = builder0.enter_next_block([signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind], args_gv) + label2 = builder0.enter_next_block(args_gv) [v75, v76, v77, v78, v79, v80, v81, v82, v83, v84, v85, v86, v87, v88, v89, v90, v91, v92, v93, v94, v95, v96, v97, v98] = args_gv v99 = builder0.genop2('int_sub', v91, v97) v100 = builder0.genop2('int_ne', v97, v79) v101 = builder0.genop1('int_is_true', v78) builder3 = builder0.jump_if_true(v101, [v85, v93, v94, v87, v91, v97, v89, v98, v80, v82, v78, v86, v84, v99, v88, v100, v90, v92, v96, v75, v95, v76, v77, v79, v81]) args_gv = [v75, v76, v77, v78, v99, v100, v79, v80, v81, v82, v83, v84, v85, v86, v87, v88, v89, v90, v91, v92, v93, v94, v95, v96, v97, v98] - label3 = builder0.enter_next_block([signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, bool_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind], args_gv) + label3 = builder0.enter_next_block(args_gv) [v102, v103, v104, v105, v106, v107, v108, v109, v110, v111, v112, v113, v114, v115, v116, v117, v118, v119, v120, v121, v122, v123, v124, v125, v126, v127] = args_gv v128 = builder0.genop1('int_is_true', v106) builder4 = builder0.jump_if_false(v128, [v114, v111, v116, v113, v118, v122, v110, v124, v103, v125, v105, v127, v107, v112, v121, v109, v115, v117, v119, v123, v102, v120, v104, v126, v106, v108]) args_gv = [v102, v103, v104, v105, v106, v107, v108, v109, v110, v111, v112, v113, v114, v115, v116, v106, v117, v118, v119, v120, v122, v123, v124, v125, v126, v127] - label4 = builder0.enter_next_block([signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, bool_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind], args_gv) + label4 = builder0.enter_next_block(args_gv) [v129, v130, v131, v132, v133, v134, v135, v136, v137, v138, v139, v140, v141, v142, v143, v144, v145, v146, v147, v148, v149, v150, v151, v152, v153, v154] = args_gv v155 = builder0.genop2('int_gt', v141, v144) builder5 = builder0.jump_if_false(v134, [v149, v148, v141, v143, v145, v147, v151, v139, v152, v132, v154, v134, v136, v130, v140, v138, v142, v155, v144, v146, v150, v129, v137, v131, v153, v133, v135]) args_gv = [v130, v131, v132, v133, v134, v135, v136, v137, v138, v139, v140, v141, v142, v143, v144, v145, v146, v147, v148, v155, v149, v150, v151, v152, v153, v154, v129] - label5 = builder0.enter_next_block([signed_kind, signed_kind, signed_kind, signed_kind, bool_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, bool_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind, signed_kind], args_gv) + label5 = builder0.enter_next_block(args_gv) [v156, v157, v158, v159, v160, v161, v162, v163, v164, v165, v166, v167, v168, v169, v170, v171, v172, v173, v174, v175, v176, v177, v178, v179, v180, v181, v182] = args_gv v183 = builder0.genop2('int_sub', v182, rgenop.genconst(1)) v184 = builder0.genop1('int_is_true', v183) @@ -2130,14 +2101,14 @@ builder3 = builder1.pause_writing([v7]) builder3.start_writing() args_gv = [v7] - label0 = builder3.enter_next_block([signed_kind], args_gv) + label0 = builder3.enter_next_block(args_gv) [v8] = args_gv builder4 = builder3.pause_writing([v8]) builder2.start_writing() builder2.finish_and_goto([rgenop.genconst(-1)], label0) builder4.start_writing() args_gv = [v8] - label1 = builder4.enter_next_block([signed_kind], args_gv) + label1 = builder4.enter_next_block(args_gv) [v9] = args_gv builder4.finish_and_return(rgenop.sigToken(FUNC3), v9) builder0.end() @@ -2225,9 +2196,7 @@ py.test.skip("requires RGenOpPacked") def fallback_loop(args_gv, expected_case): - L0 = builder.enter_next_block([signed_kind] * (len(args_gv) - 1) - + [bool_kind], - args_gv) + L0 = builder.enter_next_block(args_gv) gv_switchvar = args_gv[-1] flexswitch, default_builder = builder.flexswitch(gv_switchvar, args_gv) @@ -2239,8 +2208,7 @@ [gv_fbp, gv_switchvar, gv_framebase]) gv_exc_type = default_builder.genop_getfield(exc_type_token, gv_exc_data) - gv_noexc = default_builder.genop_ptr_iszero(exc_type_kind, - gv_exc_type) + gv_noexc = default_builder.genop_ptr_iszero(gv_exc_type) excpath_builder = default_builder.jump_if_false(gv_noexc, []) default_builder.finish_and_goto(args_gv, L0) @@ -2271,8 +2239,7 @@ gv_x = rgenop.genconst(1234) args_gv = [gv_i, gv_j, gv_x] - L1 = builder.enter_next_block([signed_kind, signed_kind, signed_kind], - args_gv) + L1 = builder.enter_next_block(args_gv) [gv_i, gv_j, gv_x] = args_gv gv_cond = builder.genop2("int_le", gv_j, gv_i) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sat Mar 29 20:53:43 2008 @@ -50,7 +50,7 @@ def fetch_from_frame(self, box, gv): # fetch the value from the machine code stack - return self.rgenop.genconst_from_frame_var(box.kind, self.framebase, + return self.rgenop.genconst_from_frame_var(gv.getkind(), self.framebase, self.frameinfo, self.gv_to_index[gv]) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Sat Mar 29 20:53:43 2008 @@ -473,7 +473,7 @@ def opimpl_make_redbox(self, genconst, typeid): redboxcls = self.frame.bytecode.redboxclasses[typeid] kind = self.frame.bytecode.typekinds[typeid] - return redboxcls(kind, genconst) + return redboxcls(genconst) @arguments("red", returns="green_from_red") def opimpl_revealconst(self, box): @@ -648,8 +648,7 @@ def opimpl_yellow_retrieve_result_as_red(self, typeid): # XXX all this jitstate.greens business is a bit messy redboxcls = self.frame.bytecode.redboxclasses[typeid] - kind = self.frame.bytecode.typekinds[typeid] - return redboxcls(kind, self.jitstate.greens[0]) + return redboxcls(self.jitstate.greens[0]) @arguments("oopspec", "bool", returns="red") def opimpl_red_oopspec_call_0(self, oopspec, deepfrozen): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/portal.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/portal.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/portal.py Sat Mar 29 20:53:43 2008 @@ -236,13 +236,12 @@ self.interpreter.exceptiondesc.fetch_global_excdata(jitstate) RESTYPE = RESIDUAL_FUNCTYPE.RESULT - reskind = rgenop.kindToken(RESTYPE) boxbuilder = rvalue.ll_redboxbuilder(RESTYPE) if RESTYPE == lltype.Void: retbox = None else: - retbox = boxbuilder(reskind, gv_res) + retbox = boxbuilder(gv_res) jitstate.returnbox = retbox assert jitstate.next is None @@ -334,12 +333,11 @@ self.collect_residual_args = collect_residual_args TYPE = self.original_concretetype - kind = self.RGenOp.kindToken(TYPE) boxcls = rvalue.ll_redboxcls(TYPE) def make_arg_redbox(jitstate, inputargs_gv, i): gv_arg = inputargs_gv[i] - box = boxcls(kind, gv_arg) + box = boxcls(gv_arg) return box self.make_arg_redbox = make_arg_redbox make_arg_redbox.consumes = 1 @@ -369,7 +367,6 @@ redirected_fielddescs = unrolling_iterable( typedesc.redirected_fielddescs) TYPE = self.original_concretetype - kind = self.RGenOp.kindToken(TYPE) def make_arg_redbox(jitstate, inputargs_gv, i): box = typedesc.factory() @@ -382,8 +379,7 @@ for fieldesc, j in redirected_fielddescs: content_boxes[j] = fieldesc.makebox(None, inputargs_gv[i]) i += 1 - content_boxes[-1] = rvalue.PtrRedBox(content_boxes[-1].kind, - gv_outside, + content_boxes[-1] = rvalue.PtrRedBox(gv_outside, known_nonzero = True) return box Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Sat Mar 29 20:53:43 2008 @@ -356,8 +356,7 @@ # code was compiled and we should loop back to 'switchblock' to enter it, # or it may have set an exception. gv_exc_type = exceptiondesc.genop_get_exc_type(default_builder) - gv_noexc = default_builder.genop_ptr_iszero( - exceptiondesc.exc_type_kind, gv_exc_type) + gv_noexc = default_builder.genop_ptr_iszero(gv_exc_type) excpath_builder = default_builder.jump_if_false(gv_noexc, []) if check_exceptions: @@ -440,7 +439,7 @@ # to be passed along to the new block assert not gv_flags.is_const tok_signed = hotrunnerdesc.RGenOp.kindToken(lltype.Signed) - flagbox = rvalue.IntRedBox(tok_signed, gv_flags) + flagbox = rvalue.IntRedBox(gv_flags) jitstate.frame.local_boxes.append(flagbox) hotpromotiondesc = hotrunnerdesc.signed_hotpromotiondesc @@ -490,8 +489,7 @@ jitstate.residual_ll_exception(ll_evalue) return assert not gv_raised.is_const - tok_bool = hotrunnerdesc.RGenOp.kindToken(lltype.Bool) - raisedbox = rvalue.IntRedBox(tok_bool, gv_raised) + raisedbox = rvalue.IntRedBox(gv_raised) jitstate.frame.local_boxes.append(raisedbox) hotpromotiondesc = hotrunnerdesc.bool_hotpromotiondesc Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Sat Mar 29 20:53:43 2008 @@ -2009,7 +2009,7 @@ builder = jitstate.curbuilder gv_result = builder.genop2("int_sub", abox.getgenvar(jitstate), bbox.getgenvar(jitstate)) - return IntRedBox(abox.kind, gv_result) + return IntRedBox(gv_result) myjitdriver = JitDriver(greens = [], reds = ['a', 'b', 'i', 'res']) @@ -2062,7 +2062,7 @@ from pypy.jit.timeshifter.rvalue import IntRedBox builder = jitstate.curbuilder gv_result = builder.genop1("int_neg", mbox.getgenvar(jitstate)) - return IntRedBox(mbox.kind, gv_result) + return IntRedBox(gv_result) myjitdriver = JitDriver(greens = ['m'], reds = ['n', 'i', 'res']) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Sat Mar 29 20:53:43 2008 @@ -218,13 +218,12 @@ greenargs.append(rgenop.genconst(ll_val)) else: TYPE = lltype.typeOf(ll_val) - kind = rgenop.kindToken(TYPE) boxcls = rvalue.ll_redboxcls(TYPE) if i in opt_consts: gv_arg = rgenop.genconst(ll_val) else: gv_arg = inputargs_gv[red_i] - redargs.append(boxcls(kind, gv_arg)) + redargs.append(boxcls(gv_arg)) residualargs.append(ll_val) red_i += 1 jitstate = writer.interpreter.run(jitstate, jitcode, greenargs, redargs) @@ -1808,7 +1807,7 @@ builder = jitstate.curbuilder gv_result = builder.genop2("int_sub", abox.getgenvar(jitstate), bbox.getgenvar(jitstate)) - return IntRedBox(abox.kind, gv_result) + return IntRedBox(gv_result) def g(a, b): return a + b @@ -1844,7 +1843,7 @@ from pypy.jit.timeshifter.rvalue import IntRedBox builder = jitstate.curbuilder gv_result = builder.genop1("int_neg", mbox.getgenvar(jitstate)) - return IntRedBox(mbox.kind, gv_result) + return IntRedBox(gv_result) class Fz(object): x = 10 @@ -1989,6 +1988,8 @@ res = self.interpret(main2, [5, 6], policy=StopAtXPolicy(g)) assert res == 11 +class TestLLType(SimpleTests): + type_system = "lltype" class TestOOType(SimpleTests): type_system = "ootype" @@ -2069,7 +2070,5 @@ test_void_args = _skip -class TestLLType(SimpleTests): - type_system = "lltype" Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py Sat Mar 29 20:53:43 2008 @@ -33,10 +33,10 @@ return builder.genop_malloc_fixedsize(alloctoken) def genop_ptr_iszero(self, builder, argbox, gv_addr): - return builder.genop_ptr_iszero(argbox.kind, gv_addr) + return builder.genop_ptr_iszero(gv_addr) def genop_ptr_nonzero(self, builder, argbox, gv_addr): - return builder.genop_ptr_nonzero(argbox.kind, gv_addr) + return builder.genop_ptr_nonzero(gv_addr) def get_FuncType(self, ARGS, RESULT): FUNCTYPE = lltype.FuncType(ARGS, RESULT) @@ -55,10 +55,10 @@ return builder.genop_new(alloctoken) def genop_ptr_iszero(self, builder, argbox, gv_addr): - return builder.genop_ooisnull(argbox.kind, gv_addr) + return builder.genop_ooisnull(gv_addr) def genop_ptr_nonzero(self, builder, argbox, gv_addr): - return builder.genop_oononnull(argbox.kind, gv_addr) + return builder.genop_oononnull(gv_addr) def get_FuncType(self, ARGS, RESULT): FUNCTYPE = ootype.StaticMethod(ARGS, RESULT) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py Sat Mar 29 20:53:43 2008 @@ -37,8 +37,8 @@ gv_evalue = self.genop_get_exc_value(builder) self.genop_set_exc_type (builder, self.gv_null_exc_type ) self.genop_set_exc_value(builder, self.gv_null_exc_value) - etypebox = rvalue.PtrRedBox(self.exc_type_kind, gv_etype ) - evaluebox = rvalue.PtrRedBox(self.exc_value_kind, gv_evalue) + etypebox = rvalue.PtrRedBox( gv_etype ) + evaluebox = rvalue.PtrRedBox(gv_evalue) etypebox .known_nonzero = known_occurred evaluebox.known_nonzero = known_occurred rtimeshift.setexctypebox (jitstate, etypebox) @@ -61,10 +61,8 @@ class LLTypeExceptionDesc(AbstractExceptionDesc): def _create_boxes(self, RGenOp): - self.null_exc_type_box = rvalue.PtrRedBox(self.exc_type_kind, - self.gv_null_exc_type) - self.null_exc_value_box = rvalue.PtrRedBox(self.exc_value_kind, - self.gv_null_exc_value) + self.null_exc_type_box = rvalue.PtrRedBox(self.gv_null_exc_type) + self.null_exc_value_box = rvalue.PtrRedBox(self.gv_null_exc_value) def genop_get_exc_type(self, builder): return builder.genop_getfield(self.exc_type_token, self.gv_excdata) @@ -80,16 +78,14 @@ def gen_exc_occurred(self, builder): gv_etype = self.genop_get_exc_type(builder) - return builder.genop_ptr_nonzero(self.exc_type_kind, gv_etype) + return builder.genop_ptr_nonzero(gv_etype) class OOTypeExceptionDesc(AbstractExceptionDesc): def _create_boxes(self, RGenOp): # XXX: think more about exceptions - self.null_exc_type_box = rvalue.InstanceRedBox(self.exc_type_kind, - self.gv_null_exc_type) - self.null_exc_value_box = rvalue.InstanceRedBox(self.exc_value_kind, - self.gv_null_exc_value) + self.null_exc_type_box = rvalue.InstanceRedBox(self.gv_null_exc_type) + self.null_exc_value_box = rvalue.InstanceRedBox(self.gv_null_exc_value) def genop_get_exc_type(self, builder): return builder.genop_oogetfield(self.exc_type_token, self.gv_excdata) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py Sat Mar 29 20:53:43 2008 @@ -183,7 +183,7 @@ self.gv_fnptr, args_gv) if self.can_raise: jitstate.generated_oop_residual_can_raise = True - return self.redboxbuilder(self.result_kind, gv_result) + return self.redboxbuilder(gv_result) def residual_exception(self, jitstate, ExcCls): from pypy.jit.rainbow.codewriter import residual_exception_nontranslated Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Sat Mar 29 20:53:43 2008 @@ -219,7 +219,7 @@ vstruct = self.VirtualStructCls(self) vstruct.content_boxes = [desc.makedefaultbox() for desc in self.fielddescs] - box = rvalue.PtrRedBox(self.innermostdesc.ptrkind, known_nonzero=True) + box = rvalue.PtrRedBox(known_nonzero=True) box.content = vstruct vstruct.ownbox = box return box @@ -274,7 +274,7 @@ alloctoken = contdesc.varsizealloctoken genvar = jitstate.curbuilder.genop_malloc_varsize(alloctoken, gv_size) # XXX MemoryError checking - return rvalue.PtrRedBox(contdesc.ptrkind, genvar, known_nonzero=True) + return rvalue.PtrRedBox(genvar, known_nonzero=True) class VirtualizableStructTypeDesc(StructTypeDesc): @@ -395,8 +395,7 @@ def factory(self): vstructbox = StructTypeDesc.factory(self) - outsidebox = rvalue.PtrRedBox(self.innermostdesc.ptrkind, - self.gv_null) + outsidebox = rvalue.PtrRedBox(self.gv_null) content = vstructbox.content assert isinstance(content, VirtualizableStruct) content.content_boxes.append(outsidebox) @@ -525,7 +524,7 @@ genvar = jitstate.curbuilder.genop_getarraysize( arrayfielddesc.arraytoken, argbox.getgenvar(jitstate)) - return rvalue.IntRedBox(arrayfielddesc.indexkind, genvar) + return rvalue.IntRedBox(genvar) self.perform_getinteriorarraysize = perform_getinteriorarraysize self.gengetinteriorarraysize = gengetinteriorarraysize @@ -655,7 +654,7 @@ return True def makedefaultbox(self): - return self.redboxcls(self.kind, self.gv_default) + return self.redboxcls(self.gv_default) def makebox(self, jitstate, gvar): if self.virtualizable: @@ -664,7 +663,7 @@ assert isinstance(content, VirtualizableStruct) content.load_from(jitstate, gvar) return structbox - box = self.redboxcls(self.kind, gvar) + box = self.redboxcls(gvar) if self.fieldnonnull: assert isinstance(box, rvalue.PtrRedBox) box.known_nonzero = True @@ -936,7 +935,7 @@ builder = jitstate.curbuilder place = builder.alloc_frame_place(typedesc.ptrkind) vrti.forced_place = place - forced_box = rvalue.PtrRedBox(typedesc.ptrkind) + forced_box = rvalue.PtrRedBox() memo.forced_boxes.append((forced_box, place)) vars_gv = memo.framevars_gv @@ -1025,8 +1024,7 @@ assert isinstance(typedesc, VirtualizableStructTypeDesc) builder = jitstate.curbuilder gv_outside = builder.genop_malloc_fixedsize(typedesc.alloctoken) - outsidebox = rvalue.PtrRedBox(self.content_boxes[-1].kind, - gv_outside, + outsidebox = rvalue.PtrRedBox(gv_outside, known_nonzero = True) self.content_boxes[-1] = outsidebox jitstate.add_virtualizable(self.ownbox) @@ -1060,8 +1058,7 @@ assert isinstance(typedesc, VirtualizableStructTypeDesc) assert self.content_boxes[-1].genvar is typedesc.gv_null boxes = self.content_boxes - boxes[-1] = rvalue.PtrRedBox(boxes[-1].kind, - gv_outside, + boxes[-1] = rvalue.PtrRedBox(gv_outside, known_nonzero=True) builder = jitstate.curbuilder builder.genop_call(typedesc.access_is_null_token, Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Sat Mar 29 20:53:43 2008 @@ -44,7 +44,6 @@ self.nb_args = len(ARGS) self.ARGS = ARGS self.RESULT = RESULT - self.result_kind = RGenOp.kindToken(RESULT) self.whatever_result = RESULT._defl() self.redboxcls = rvalue.ll_redboxcls(RESULT) self.canfold = self.llop.canfold @@ -87,7 +86,7 @@ return rvalue.ll_fromvalue(jitstate, res) gv_arg = argbox.getgenvar(jitstate) genvar = jitstate.curbuilder.genop1(opdesc.opname, gv_arg) - return opdesc.redboxcls(opdesc.result_kind, genvar) + return opdesc.redboxcls(genvar) def ll_gen1_canraise(opdesc, jitstate, argbox): ARG0 = opdesc.ARG0 @@ -108,7 +107,7 @@ genvar, gv_raised = jitstate.curbuilder.genraisingop1(opdesc.opname, gv_arg) jitstate.gv_op_raised = gv_raised # for split_raisingop() - return opdesc.redboxcls(opdesc.result_kind, genvar) + return opdesc.redboxcls(genvar) def ll_gen2(opdesc, jitstate, argbox0, argbox1): ARG0 = opdesc.ARG0 @@ -123,7 +122,7 @@ gv_arg0 = argbox0.getgenvar(jitstate) gv_arg1 = argbox1.getgenvar(jitstate) genvar = jitstate.curbuilder.genop2(opdesc.opname, gv_arg0, gv_arg1) - return opdesc.redboxcls(opdesc.result_kind, genvar) + return opdesc.redboxcls(genvar) def ll_gen2_canraise(opdesc, jitstate, argbox0, argbox1): ARG0 = opdesc.ARG0 @@ -148,14 +147,14 @@ genvar, gv_raised = jitstate.curbuilder.genraisingop2(opdesc.opname, gv_arg0, gv_arg1) jitstate.gv_op_raised = gv_raised # for split_raisingop() - return opdesc.redboxcls(opdesc.result_kind, genvar) + return opdesc.redboxcls(genvar) def genmalloc_varsize(jitstate, contdesc, sizebox): gv_size = sizebox.getgenvar(jitstate) alloctoken = contdesc.varsizealloctoken genvar = jitstate.curbuilder.genop_malloc_varsize(alloctoken, gv_size) # XXX MemoryError handling - return rvalue.PtrRedBox(contdesc.ptrkind, genvar, known_nonzero=True) + return rvalue.PtrRedBox(genvar, known_nonzero=True) def gengetfield(jitstate, deepfrozen, fielddesc, argbox): assert isinstance(argbox, rvalue.AbstractPtrRedBox) @@ -231,11 +230,11 @@ except rcontainer.SegfaultException: pass else: - return rvalue.redboxbuilder_int(fielddesc.indexkind, resgv) + return rvalue.redboxbuilder_int(resgv) genvar = jitstate.curbuilder.genop_getarraysize( fielddesc.arraytoken, argbox.getgenvar(jitstate)) - return rvalue.IntRedBox(fielddesc.indexkind, genvar) + return rvalue.IntRedBox(genvar) def genptrnonzero(jitstate, argbox, reverse): assert isinstance(argbox, rvalue.AbstractPtrRedBox) @@ -251,7 +250,7 @@ gv_res = jitstate.ts.genop_ptr_iszero(builder, argbox, gv_addr) else: gv_res = jitstate.ts.genop_ptr_nonzero(builder, argbox, gv_addr) - return rvalue.IntRedBox(builder.rgenop.kindToken(lltype.Bool), gv_res) + return rvalue.IntRedBox(gv_res) def genptreq(jitstate, argbox0, argbox1, reverse): assert isinstance(argbox0, rvalue.PtrRedBox) @@ -272,22 +271,20 @@ gv_addr0 = argbox0.getgenvar(jitstate) gv_addr1 = argbox1.getgenvar(jitstate) if reverse: - gv_res = builder.genop_ptr_ne(argbox0.kind, gv_addr0, gv_addr1) + gv_res = builder.genop_ptr_ne(gv_addr0, gv_addr1) else: - gv_res = builder.genop_ptr_eq(argbox0.kind, gv_addr0, gv_addr1) - return rvalue.IntRedBox(builder.rgenop.kindToken(lltype.Bool), gv_res) + gv_res = builder.genop_ptr_eq(gv_addr0, gv_addr1) + return rvalue.IntRedBox(gv_res) # ____________________________________________________________ # other jitstate/graph level operations def enter_next_block(jitstate, incoming): linkargs = [] - kinds = [] for redbox in incoming: assert not redbox.genvar.is_const linkargs.append(redbox.genvar) - kinds.append(redbox.kind) - newblock = jitstate.curbuilder.enter_next_block(kinds, linkargs) + newblock = jitstate.curbuilder.enter_next_block(linkargs) for i in range(len(incoming)): incoming[i].genvar = linkargs[i] return newblock @@ -595,7 +592,7 @@ args_gv = [argbox.getgenvar(jitstate) for argbox in argboxes] jitstate.prepare_for_residual_call() gv_result = builder.genop_call(calldesc.sigtoken, gv_funcbox, args_gv) - return calldesc.redboxbuilder(calldesc.result_kind, gv_result) + return calldesc.redboxbuilder(gv_result) def gvflags_after_residual_call(jitstate, exceptiondesc, check_forced): builder = jitstate.curbuilder @@ -622,7 +619,7 @@ builder = jitstate.curbuilder if gv_flags is None: gv_flags = builder.rgenop.constPrebuiltGlobal(0) - return rvalue.IntRedBox(builder.rgenop.kindToken(lltype.Signed), gv_flags) + return rvalue.IntRedBox(gv_flags) def residual_fetch(jitstate, exceptiondesc, check_forced, flagsbox): flags = rvalue.ll_getvalue(flagsbox, lltype.Signed) @@ -698,8 +695,7 @@ incoming = [] memo = rvalue.unfreeze_memo() jitstate = self.frozen.unfreeze(incoming, memo) - kinds = [box.kind for box in incoming] - builder, vars_gv = self.rgenop.replay(self.replayableblock, kinds) + builder, vars_gv = self.rgenop.replay(self.replayableblock) for i in range(len(incoming)): assert incoming[i].genvar is None incoming[i].genvar = vars_gv[i] @@ -1191,7 +1187,7 @@ shape_kind = builder.rgenop.kindToken(lltype.Signed) for forced_box, forced_place in self.forced_boxes: - gv_forced = builder.genop_absorb_place(forced_box.kind, forced_place) + gv_forced = builder.genop_absorb_place(forced_place) forced_box.setgenvar(gv_forced) self.forced_boxes = None Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Sat Mar 29 20:53:43 2008 @@ -47,10 +47,9 @@ class RedBox(object): - _attrs_ = ['kind', 'genvar'] + _attrs_ = ['genvar'] - def __init__(self, kind, genvar=None): - self.kind = kind + def __init__(self, genvar=None): self.genvar = genvar # None or a genvar def __repr__(self): @@ -61,6 +60,11 @@ def is_constant(self): return bool(self.genvar) and self.genvar.is_const + + def getkind(self): + if self.genvar is None: + return None + return self.genvar.getkind() def getgenvar(self, jitstate): return self.genvar @@ -83,7 +87,7 @@ # cannot mutate constant boxes in-place builder = jitstate.curbuilder box = self.copy(memo) - box.genvar = builder.genop_same_as(self.kind, self.genvar) + box.genvar = builder.genop_same_as(self.genvar) return box else: return self @@ -97,11 +101,11 @@ assert TYPE is not lltype.Void, "cannot make red boxes of voids" return ll_redboxbuilder(TYPE) -def redboxbuilder_void(kind, gv_value):return None -def redboxbuilder_int(kind, gv_value): return IntRedBox(kind, gv_value) -def redboxbuilder_dbl(kind, gv_value): return DoubleRedBox(kind,gv_value) -def redboxbuilder_ptr(kind, gv_value): return PtrRedBox(kind, gv_value) -def redboxbuilder_inst(kind, gv_value): return InstanceRedBox(kind, gv_value) +def redboxbuilder_void(gv_value): return None +def redboxbuilder_int(gv_value): return IntRedBox(gv_value) +def redboxbuilder_dbl(gv_value): return DoubleRedBox(gv_value) +def redboxbuilder_ptr(gv_value): return PtrRedBox(gv_value) +def redboxbuilder_inst(gv_value): return InstanceRedBox(gv_value) def ll_redboxbuilder(TYPE): if TYPE is lltype.Void: @@ -121,16 +125,14 @@ "Make a constant RedBox from a low-level value." gv = ll_gv_fromvalue(jitstate, value) T = lltype.typeOf(value) - kind = jitstate.curbuilder.rgenop.kindToken(T) cls = ll_redboxcls(T) - return cls(kind, gv) + return cls(gv) def redbox_from_prebuilt_value(RGenOp, value): T = lltype.typeOf(value) - kind = RGenOp.kindToken(T) gv = RGenOp.constPrebuiltGlobal(value) cls = ll_redboxcls(T) - return cls(kind, gv) + return cls(gv) def ll_gv_fromvalue(jitstate, value): rgenop = jitstate.curbuilder.rgenop @@ -161,7 +163,7 @@ try: return memo[self] except KeyError: - result = memo[self] = IntRedBox(self.kind, self.genvar) + result = memo[self] = IntRedBox(self.genvar) return result def freeze(self, memo): @@ -170,9 +172,9 @@ return memo[self] except KeyError: if self.is_constant(): - result = FrozenIntConst(self.kind, self.genvar) + result = FrozenIntConst(self.genvar) else: - result = FrozenIntVar(self.kind) + result = FrozenIntVar() memo[self] = result return result @@ -185,7 +187,7 @@ try: return memo[self] except KeyError: - result = memo[self] = DoubleRedBox(self.kind, self.genvar) + result = memo[self] = DoubleRedBox(self.genvar) return result def freeze(self, memo): @@ -194,9 +196,9 @@ return memo[self] except KeyError: if self.is_constant(): - result = FrozenDoubleConst(self.kind, self.genvar) + result = FrozenDoubleConst(self.genvar) else: - result = FrozenDoubleVar(self.kind) + result = FrozenDoubleVar() memo[self] = result return result @@ -208,8 +210,7 @@ content = None # or an AbstractContainer - def __init__(self, kind, genvar=None, known_nonzero=False): - self.kind = kind + def __init__(self, genvar=None, known_nonzero=False): self.genvar = genvar # None or a genvar if genvar is not None and genvar.is_const: known_nonzero = bool(self._revealconst(genvar)) @@ -235,7 +236,9 @@ if self.known_nonzero: ok = False elif not self.is_constant(): - gv_null = jitstate.curbuilder.rgenop.genzeroconst(self.kind) + assert self.genvar is not None + kind = self.genvar.getkind() + gv_null = jitstate.curbuilder.rgenop.genzeroconst(kind) self.setgenvar_hint(gv_null, known_nonzero=False) return ok @@ -252,7 +255,7 @@ try: result = boxmemo[self] except KeyError: - result = self.__class__(self.kind, self.genvar, self.known_nonzero) + result = self.__class__(self.genvar, self.known_nonzero) boxmemo[self] = result if self.content: result.content = self.content.copy(memo) @@ -280,20 +283,19 @@ if not self.genvar: from pypy.jit.timeshifter import rcontainer assert isinstance(content, rcontainer.VirtualContainer) - result = self.FrozenPtrVirtual(self.kind) + result = self.FrozenPtrVirtual() boxmemo[self] = result result.fz_content = content.freeze(memo) return result elif self.genvar.is_const: - result = self.FrozenPtrConst(self.kind, self.genvar) + result = self.FrozenPtrConst(self.genvar) elif content is None: - result = self.FrozenPtrVar(self.kind, self.known_nonzero) + result = self.FrozenPtrVar(self.known_nonzero) else: # if self.content is not None, it's a PartialDataStruct from pypy.jit.timeshifter import rcontainer assert isinstance(content, rcontainer.PartialDataStruct) - result = self.FrozenPtrVarWithPartialData(self.kind, - known_nonzero=True) + result = self.FrozenPtrVarWithPartialData(known_nonzero=True) boxmemo[self] = result result.fz_partialcontent = content.partialfreeze(memo) return result @@ -319,7 +321,7 @@ # cannot mutate constant boxes in-place builder = jitstate.curbuilder box = self.copy(memo) - box.genvar = builder.genop_same_as(self.kind, self.genvar) + box.genvar = builder.genop_same_as(self.genvar) else: # force virtual containers self.getgenvar(jitstate) @@ -387,9 +389,6 @@ class FrozenValue(object): """An abstract value frozen in a saved state. """ - def __init__(self, kind): - self.kind = kind - def is_constant_equal(self, box): return False @@ -424,8 +423,7 @@ class FrozenIntConst(FrozenConst): - def __init__(self, kind, gv_const): - self.kind = kind + def __init__(self, gv_const): self.gv_const = gv_const def is_constant_equal(self, box): @@ -435,7 +433,7 @@ def unfreeze(self, incomingvarboxes, memo): # XXX could return directly the original IntRedBox - return IntRedBox(self.kind, self.gv_const) + return IntRedBox(self.gv_const) class FrozenIntVar(FrozenVar): @@ -443,7 +441,7 @@ def unfreeze(self, incomingvarboxes, memo): memo = memo.boxes if self not in memo: - newbox = IntRedBox(self.kind, None) + newbox = IntRedBox(None) incomingvarboxes.append(newbox) memo[self] = newbox return newbox @@ -453,8 +451,7 @@ class FrozenDoubleConst(FrozenConst): - def __init__(self, kind, gv_const): - self.kind = kind + def __init__(self, gv_const): self.gv_const = gv_const def is_constant_equal(self, box): @@ -463,7 +460,7 @@ box.genvar.revealconst(lltype.Float)) def unfreeze(self, incomingvarboxes, memo): - return DoubleRedBox(self.kind, self.gv_const) + return DoubleRedBox(self.gv_const) class FrozenDoubleVar(FrozenVar): @@ -471,7 +468,7 @@ def unfreeze(self, incomingvarboxes, memo): memo = memo.boxes if self not in memo: - newbox = DoubleRedBox(self.kind, None) + newbox = DoubleRedBox(None) incomingvarboxes.append(newbox) memo[self] = newbox return newbox @@ -481,8 +478,7 @@ class FrozenAbstractPtrConst(FrozenConst): - def __init__(self, kind, gv_const): - self.kind = kind + def __init__(self, gv_const): self.gv_const = gv_const def is_constant_equal(self, box): @@ -506,7 +502,7 @@ return match def unfreeze(self, incomingvarboxes, memo): - return self.PtrRedBox(self.kind, self.gv_const) + return self.PtrRedBox(self.gv_const) class FrozenPtrConst(FrozenAbstractPtrConst, LLTypeMixin): @@ -518,8 +514,7 @@ class AbstractFrozenPtrVar(FrozenVar): - def __init__(self, kind, known_nonzero): - self.kind = kind + def __init__(self, known_nonzero): self.known_nonzero = known_nonzero def exactmatch(self, box, outgoingvarboxes, memo): @@ -539,7 +534,7 @@ def unfreeze(self, incomingvarboxes, memo): memo = memo.boxes if self not in memo: - newbox = self.PtrRedBox(self.kind, None, self.known_nonzero) + newbox = self.PtrRedBox(None, self.known_nonzero) incomingvarboxes.append(newbox) memo[self] = newbox return newbox Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/support.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/support.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/support.py Sat Mar 29 20:53:43 2008 @@ -1,17 +1,19 @@ # Fake stuff for the tests. from pypy.jit.codegen.model import GenVarOrConst, GenVar, GenConst -from pypy.rpython.lltypesystem import lltype +from pypy.rpython.lltypesystem import lltype, llmemory from pypy.jit.timeshifter import rvalue, rcontainer +from pypy.jit.rainbow.typesystem import LLTypeHelper class FakeJITState(object): def __init__(self): self.curbuilder = FakeBuilder() + self.ts = LLTypeHelper() class FakeRGenOp(object): def genzeroconst(self, kind): - if kind == "dummy pointer": + if kind == ("kind", llmemory.Address): return FakeGenConst("NULL") return FakeGenConst(0) @@ -95,7 +97,7 @@ if not isinstance(value, GenVarOrConst): assert isinstance(value, int) # for now value = FakeGenConst(value) - return rvalue.IntRedBox(signed_kind, value) + return rvalue.IntRedBox(value) def getfielddesc(STRUCT, name): assert isinstance(STRUCT, lltype.Struct) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py Sat Mar 29 20:53:43 2008 @@ -83,7 +83,7 @@ forcedbox = constbox23.forcevar(jitstate, replace_memo, False) assert not forcedbox.is_constant() assert jitstate.curbuilder.ops == [ - ('same_as', (signed_kind, constbox23.genvar), forcedbox.genvar)] + ('same_as', (constbox23.genvar, ), forcedbox.genvar)] assert replace_memo.boxes == {constbox23: forcedbox} # change constbox to forcedbox inside newbox @@ -101,7 +101,7 @@ def test_merge_with_ptrvar(self): DontMerge = rvalue.DontMerge V0 = FakeGenVar() - ptrbox = rvalue.PtrRedBox("dummy pointer", V0) + ptrbox = rvalue.PtrRedBox(V0) S = self.STRUCT constbox20 = makebox(20) oldbox = vmalloc(S, constbox20) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rvalue.py Sat Mar 29 20:53:43 2008 @@ -8,7 +8,7 @@ def test_create_int_redbox_var(): jitstate = FakeJITState() gv = FakeGenVar() - box = rvalue.IntRedBox("dummy kind", gv) + box = rvalue.IntRedBox(gv) assert not box.is_constant() assert box.getgenvar(jitstate) is gv gv2 = FakeGenVar() @@ -19,7 +19,7 @@ def test_create_int_redbox_const(): jitstate = FakeJITState() gv = FakeGenConst() - box = rvalue.IntRedBox("dummy kind", gv) + box = rvalue.IntRedBox(gv) assert box.is_constant() assert box.getgenvar(jitstate) is gv gv2 = FakeGenVar() @@ -28,10 +28,10 @@ def test_forcevar(): jitstate = FakeJITState() gv = FakeGenVar() - intbox = rvalue.IntRedBox("dummy kind", gv) + intbox = rvalue.IntRedBox(gv) assert intbox.forcevar(jitstate, rvalue.copy_memo(), False) is intbox - doublebox = rvalue.DoubleRedBox("dummy kind", FakeGenConst()) + doublebox = rvalue.DoubleRedBox(FakeGenConst()) box2 = doublebox.forcevar(jitstate, rvalue.copy_memo(), False) assert doublebox is not box2 assert not box2.is_constant() @@ -40,7 +40,7 @@ def test_learn_nonzeroness(): jitstate = FakeJITState() gv = FakeGenVar() - box = rvalue.PtrRedBox("dummy pointer", gv) + box = rvalue.PtrRedBox(gv) assert not box.known_nonzero assert box.learn_nonzeroness(jitstate, True) assert box.known_nonzero @@ -48,7 +48,7 @@ assert not box.learn_nonzeroness(jitstate, False) assert box.learn_nonzeroness(jitstate, True) - box = rvalue.PtrRedBox("dummy pointer", gv) + box = rvalue.PtrRedBox(gv) assert box.learn_nonzeroness(jitstate, False) assert box.is_constant() assert box.genvar._value == "NULL" @@ -58,7 +58,7 @@ def test_box_get_set_field(): jitstate = FakeJITState() V0 = FakeGenVar() - box = rvalue.PtrRedBox("dummy pointer", V0) + box = rvalue.PtrRedBox(V0) STRUCT = lltype.Struct("dummy", ("foo", lltype.Signed)) desc = rcontainer.StructFieldDesc(FakeRGenOp, lltype.Ptr(STRUCT), "foo", 0) box2 = box.op_getfield(jitstate, desc) @@ -68,6 +68,6 @@ jitstate.curbuilder.ops = [] V42 = FakeGenVar(42) - valuebox = rvalue.IntRedBox("dummy kind", V42) + valuebox = rvalue.IntRedBox(V42) box.op_setfield(jitstate, desc, valuebox) assert jitstate.curbuilder.ops == [('setfield', (('field', STRUCT, 'foo'), V0, V42), None)] Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py Sat Mar 29 20:53:43 2008 @@ -142,7 +142,7 @@ def factory(self): vdict = self.VirtualDict(self) - box = rvalue.PtrRedBox(self.ptrkind, known_nonzero=True) + box = rvalue.PtrRedBox(known_nonzero=True) box.content = vdict vdict.ownbox = box return box Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py Sat Mar 29 20:53:43 2008 @@ -96,7 +96,7 @@ def factory(self, length, itembox): vlist = VirtualList(self, length, itembox) - box = rvalue.PtrRedBox(self.ptrkind, known_nonzero=True) + box = rvalue.PtrRedBox(known_nonzero=True) box.content = vlist vlist.ownbox = box return box @@ -244,7 +244,7 @@ builder = jitstate.curbuilder place = builder.alloc_frame_place(typedesc.ptrkind) vrti.forced_place = place - forced_box = rvalue.PtrRedBox(typedesc.ptrkind) + forced_box = rvalue.PtrRedBox() memo.forced_boxes.append((forced_box, place)) vars_gv = memo.framevars_gv From cfbolz at codespeak.net Sat Mar 29 21:13:29 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 29 Mar 2008 21:13:29 +0100 (CET) Subject: [pypy-svn] r53110 - in pypy/branch/jit-hotpath/pypy/jit/codegen: iaxx llgraph Message-ID: <20080329201329.EC5FC169F04@codespeak.net> Author: cfbolz Date: Sat Mar 29 21:13:28 2008 New Revision: 53110 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py Log: fix some problems Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/rgenop.py Sat Mar 29 21:13:28 2008 @@ -473,7 +473,7 @@ # XXX only for int return_kind, check calling conventions return self.returnvar(eax) - def genop_same_as(self, kind, gv_x): + def genop_same_as(self, gv_x): if gv_x.is_const: # must always return a var return self.returnvar(gv_x.operand(self)) else: @@ -482,7 +482,7 @@ def genop_debug_pdb(self): # may take an args_gv later self.mc.BREAKPOINT() - def enter_next_block(self, kinds, args_gv): + def enter_next_block(self, args_gv): self._open() arg_positions = [] seen = {} @@ -951,13 +951,13 @@ def genop_call(self, sigtoken, gv_fnptr, args_gv): return dummy_var - def genop_same_as(self, kind, gv_x): + def genop_same_as(self, gv_x): return dummy_var def genop_debug_pdb(self): # may take an args_gv later pass - def enter_next_block(self, kinds, args_gv): + def enter_next_block(self, args_gv): return None def jump_if_false(self, gv_condition, args_gv): @@ -1031,8 +1031,8 @@ initialstackdepth = ((numargs+MASK)&~MASK) + 1 return initialstackdepth - def replay(self, label, kinds): - return ReplayBuilder(self), [dummy_var] * len(kinds) + def replay(self, label): + return ReplayBuilder(self), [dummy_var] * len(label.arg_positions) @specialize.genconst(1) def genconst(self, llvalue): Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py Sat Mar 29 21:13:28 2008 @@ -275,10 +275,9 @@ "genop_ptr_nonzero: bad currently_writing") return LLVar(llimpl.genop(self.b, 'ptr_nonzero', [gv_ptr], gv_Bool.v)) - def genop_oononnull(self, gv_OBJTYPE, gv_obj): + def genop_oononnull(self, gv_obj): ll_assert(self.rgenop.currently_writing is self, "genop_oononnull: bad currently_writing") - gv_obj = llimpl.cast(self.b, gv_OBJTYPE.v, gv_obj.v) return LLVar(llimpl.genop(self.b, 'oononnull', [gv_obj], gv_Bool.v)) def genop_ptr_eq(self, gv_ptr1, gv_ptr2): From cfbolz at codespeak.net Sat Mar 29 21:25:14 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 29 Mar 2008 21:25:14 +0100 (CET) Subject: [pypy-svn] r53111 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080329202514.859BF169F2D@codespeak.net> Author: cfbolz Date: Sat Mar 29 21:25:14 2008 New Revision: 53111 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py Log: another loose end Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py Sat Mar 29 21:25:14 2008 @@ -101,4 +101,4 @@ def gen_exc_occurred(self, builder): gv_etype = self.genop_get_exc_type(builder) - return builder.genop_oononnull(self.exc_type_kind, gv_etype) + return builder.genop_oononnull(gv_etype) From arigo at codespeak.net Sat Mar 29 21:34:00 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Sat, 29 Mar 2008 21:34:00 +0100 (CET) Subject: [pypy-svn] r53112 - pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph Message-ID: <20080329203400.07845169F2D@codespeak.net> Author: arigo Date: Sat Mar 29 21:33:59 2008 New Revision: 53112 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py Log: Translation fixes. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py Sat Mar 29 21:33:59 2008 @@ -284,7 +284,7 @@ ll_assert(self.rgenop.currently_writing is self, "genop_ptr_eq: bad currently_writing") gv_PTRTYPE = gv_ptr1.getkind() - gv_ptr2 = llimpl.cast(self.b, gv_PTRTYPE.v, gv_ptr2.v) + gv_ptr2 = LLVar(llimpl.cast(self.b, gv_PTRTYPE.v, gv_ptr2.v)) return LLVar(llimpl.genop(self.b, 'ptr_eq', [gv_ptr1, gv_ptr2], gv_Bool.v)) @@ -292,7 +292,7 @@ ll_assert(self.rgenop.currently_writing is self, "genop_ptr_ne: bad currently_writing") gv_PTRTYPE = gv_ptr1.getkind() - gv_ptr2 = llimpl.cast(self.b, gv_PTRTYPE.v, gv_ptr2.v) + gv_ptr2 = LLVar(llimpl.cast(self.b, gv_PTRTYPE.v, gv_ptr2.v)) return LLVar(llimpl.genop(self.b, 'ptr_ne', [gv_ptr1, gv_ptr2], gv_Bool.v)) @@ -399,7 +399,8 @@ "alloc_frame_place: bad currently_writing") if gv_initial_value is None: gv_initial_value = self.rgenop.genzeroconst(gv_TYPE) - gv_initial_value = llimpl.cast(self.b, gv_TYPE.v, gv_initial_value.v) + gv_initial_value = LLVar(llimpl.cast(self.b, gv_TYPE.v, + gv_initial_value.v)) v = LLVar(llimpl.genop(self.b, 'same_as', [gv_initial_value], gv_TYPE.v)) return LLPlace(v, llimpl.get_frame_info(self.b, [v])) From cfbolz at codespeak.net Sat Mar 29 21:35:24 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 29 Mar 2008 21:35:24 +0100 (CET) Subject: [pypy-svn] r53113 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080329203524.EB425169F2D@codespeak.net> Author: cfbolz Date: Sat Mar 29 21:35:24 2008 New Revision: 53113 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: more problems Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Sat Mar 29 21:35:24 2008 @@ -1184,15 +1184,13 @@ content = virtualizable_box.content assert isinstance(content, rcontainer.VirtualizableStruct) content.check_forced_after_residual_call(self) - shape_kind = builder.rgenop.kindToken(lltype.Signed) for forced_box, forced_place in self.forced_boxes: gv_forced = builder.genop_absorb_place(forced_place) forced_box.setgenvar(gv_forced) self.forced_boxes = None - gv_shape = builder.genop_absorb_place(shape_kind, - self.shape_place) + gv_shape = builder.genop_absorb_place(self.shape_place) self.shape_place = None return gv_shape From cfbolz at codespeak.net Sat Mar 29 22:23:54 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sat, 29 Mar 2008 22:23:54 +0100 (CET) Subject: [pypy-svn] r53115 - pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test Message-ID: <20080329212354.3C281169F10@codespeak.net> Author: cfbolz Date: Sat Mar 29 22:23:53 2008 New Revision: 53115 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_operation.py Log: fix test Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_operation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_operation.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_operation.py Sat Mar 29 22:23:53 2008 @@ -70,10 +70,10 @@ builder1 = builder0.pause_writing([v2]) builder1.start_writing() args_gv = [v2] - label0 = builder1.enter_next_block([signed_kind], args_gv) + label0 = builder1.enter_next_block(args_gv) [v3] = args_gv args_gv = [v3] - label1 = builder1.enter_next_block([signed_kind], args_gv) + label1 = builder1.enter_next_block(args_gv) [v4] = args_gv builder1.finish_and_return(rgenop.sigToken(FUNC0), v4) builder0.end() From cfbolz at codespeak.net Sun Mar 30 00:56:50 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 30 Mar 2008 00:56:50 +0100 (CET) Subject: [pypy-svn] r53119 - pypy/branch/jit-hotpath/pypy/jit/codegen/test Message-ID: <20080329235650.E06B6169F2D@codespeak.net> Author: cfbolz Date: Sun Mar 30 00:56:48 2008 New Revision: 53119 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Log: fix more tests Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Sun Mar 30 00:56:48 2008 @@ -370,7 +370,7 @@ true_builder = builder.jump_if_true(gv_cond, [gv_x]) - builder.enter_next_block([], []) + builder.enter_next_block([]) builder.finish_and_return(sigtoken, rgenop.genconst(1)) true_builder.start_writing() @@ -691,8 +691,8 @@ place2 = builder.alloc_frame_place(signed_kind) gv_writer = rgenop.constPrebuiltGlobal(get_writer(place1, place2)) builder.genop_call(writertoken, gv_writer, [gv_base, gv_x]) - gv_y = builder.genop_absorb_place(signed_kind, place1) - gv_z = builder.genop_absorb_place(signed_kind, place2) + gv_y = builder.genop_absorb_place(place1) + gv_z = builder.genop_absorb_place(place2) gv_diff = builder.genop2("int_sub", gv_y, gv_z) builder.finish_and_return(sigtoken, gv_diff) builder.end() @@ -743,7 +743,7 @@ builder.genop_call(writertoken, gv_writer, [gv_base, gv_x]) gv_sum = rgenop.genconst(0) for p in places: - gv_i = builder.genop_absorb_place(signed_kind, p) + gv_i = builder.genop_absorb_place(p) gv_sum = builder.genop2("int_add", gv_sum, gv_i) builder.finish_and_return(sigtoken, gv_sum) builder.end() @@ -787,7 +787,7 @@ gv_base = builder.genop_get_frame_base() gv_reader = rgenop.constPrebuiltGlobal(get_reader(place)) gv_z = builder.genop_call(readertoken, gv_reader, [gv_base]) - builder.genop_absorb_place(signed_kind, place) # mark end of use + builder.genop_absorb_place(place) # mark end of use builder.finish_and_return(sigtoken, gv_z) builder.end() @@ -1500,7 +1500,7 @@ c_seven = rgenop.genconst(7) frameinfo = builder1.get_frame_info([v3, v4, c_seven, v5]) # here would be a call - v8 = builder1.genop_absorb_place(signed_kind, place) + v8 = builder1.genop_absorb_place(place) args_gv = [v3, v4, v5, v8] label1 = builder1.enter_next_block(args_gv) [v9, v10, v11, v12] = args_gv From cfbolz at codespeak.net Sun Mar 30 01:27:19 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 30 Mar 2008 01:27:19 +0100 (CET) Subject: [pypy-svn] r53120 - pypy/branch/jit-hotpath/pypy/jit/codegen/ppc Message-ID: <20080330002719.33F4B169F25@codespeak.net> Author: cfbolz Date: Sun Mar 30 01:27:18 2008 New Revision: 53120 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/codebuf.py Log: starting to fix the ppc jit backend Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/codebuf.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/codebuf.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/codebuf.py Sun Mar 30 01:27:18 2008 @@ -1,14 +1,18 @@ -from ctypes import POINTER, cast, c_void_p, c_int, c_char +from pypy.rpython.lltypesystem import rffi, lltype from pypy.jit.codegen.i386 import codebuf_posix + def alloc(map_size): flags = codebuf_posix.MAP_PRIVATE | codebuf_posix.MAP_ANONYMOUS prot = codebuf_posix.PROT_EXEC | codebuf_posix.PROT_READ | codebuf_posix.PROT_WRITE - res = codebuf_posix.mmap_(PTR(), map_size, prot, flags, -1, 0) - if not res: + hintp = rffi.cast(codebuf_posix.PTR, codebuf_posix.hint.pos) + res = codebuf_posix.mmap_(hintp, map_size, prot, flags, -1, 0) + if res == rffi.cast(codebuf_posix.PTR, -1): raise MemoryError + codebuf_posix.hint.pos += map_size return res +PTR = lltype.Ptr(lltype.Array(lltype.Unsigned, hints={'nolength': True})) free = codebuf_posix.munmap_ class CodeBlockOverflow(Exception): @@ -25,18 +29,18 @@ p = self._pos if p >= self._size: raise CodeBlockOverflow - self._data.contents[p] = data + self._data[p] = data self._pos = p + 1 def getpos(self): return self._pos def setpos(self, _pos): - assert _pos >=0 + assert _pos >= 0 self._pos = _pos def tell(self): - baseaddr = cast(self._data, c_void_p).value + baseaddr = rffi.cast(lltype.Signed, self._data) return baseaddr + self._pos * 4 def reserve(self, _size): @@ -47,20 +51,20 @@ class ExistingCodeBlock(MachineCodeBlock): def __init__(self, start, end): - _size = (end-start)/4 - _data = cast(c_void_p(start), POINTER(c_int * _size)) + _size = (end - start) / 4 + _data = rffi.cast(PTR, start) MachineCodeBlock.__init__(self, _data, _size, 0) class OwningMachineCodeBlock(MachineCodeBlock): def __init__(self, size_in_bytes): assert size_in_bytes % 4 == 0 res = alloc(size_in_bytes) - _size = size_in_bytes/4 - _data = cast(res, POINTER(c_int * _size)) + _size = size_in_bytes / 4 + _data = rffi.cast(PTR, res) MachineCodeBlock.__init__(self, _data, _size, 0) def __del__(self): - free(cast(self._data, PTR), self._size * 4) + free(rffi.cast(PTR, self._data), self._size * 4) # ------------------------------------------------------------ From cfbolz at codespeak.net Sun Mar 30 01:55:38 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 30 Mar 2008 01:55:38 +0100 (CET) Subject: [pypy-svn] r53121 - pypy/branch/jit-hotpath/pypy/jit/codegen/ppc Message-ID: <20080330005538.74725169F1C@codespeak.net> Author: cfbolz Date: Sun Mar 30 01:55:36 2008 New Revision: 53121 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/codebuf.py Log: some more fixes Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/codebuf.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/codebuf.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/codebuf.py Sun Mar 30 01:55:36 2008 @@ -1,5 +1,6 @@ -from pypy.rpython.lltypesystem import rffi, lltype from pypy.jit.codegen.i386 import codebuf_posix +from pypy.rlib.rarithmetic import r_uint +from pypy.rpython.lltypesystem import rffi, lltype def alloc(map_size): @@ -46,7 +47,7 @@ def reserve(self, _size): r = MachineCodeBlock(self._data, self._pos + _size, self._pos) for i in range(_size): - self.write(0) + self.write(r_uint(0)) return r class ExistingCodeBlock(MachineCodeBlock): @@ -64,7 +65,7 @@ MachineCodeBlock.__init__(self, _data, _size, 0) def __del__(self): - free(rffi.cast(PTR, self._data), self._size * 4) + free(rffi.cast(codebuf_posix.PTR, self._data), self._size * 4) # ------------------------------------------------------------ From cfbolz at codespeak.net Sun Mar 30 01:58:57 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 30 Mar 2008 01:58:57 +0100 (CET) Subject: [pypy-svn] r53122 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080330005857.40B0A169F2B@codespeak.net> Author: cfbolz Date: Sun Mar 30 01:58:56 2008 New Revision: 53122 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Log: kill unused function Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Sun Mar 30 01:58:56 2008 @@ -143,10 +143,6 @@ "Return the content of a known-to-be-constant RedBox." return box.genvar.revealconst(T) -def ll_is_constant(box): - "Check if a red box is known to be constant." - return box.is_constant() - class IntRedBox(RedBox): "A red box that contains a constant integer-like value." From fijal at codespeak.net Sun Mar 30 04:13:22 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 04:13:22 +0200 (CEST) Subject: [pypy-svn] r53123 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080330021322.90FAD169F36@codespeak.net> Author: fijal Date: Sun Mar 30 04:13:20 2008 New Revision: 53123 Modified: pypy/dist/pypy/lib/_ctypes/function.py pypy/dist/pypy/lib/app_test/ctypes/test_cast.py Log: support for casting functions. still impossible to call a result Modified: pypy/dist/pypy/lib/_ctypes/function.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/function.py (original) +++ pypy/dist/pypy/lib/_ctypes/function.py Sun Mar 30 04:13:20 2008 @@ -12,6 +12,9 @@ def _alignmentofinstances(self): return _rawffi.alignment('P') + def _is_pointer_like(self): + return True + class CFuncPtr(_CData): __metaclass__ = CFuncPtrType @@ -67,6 +70,8 @@ # we need to check dll anyway self._getfuncptr([], ctypes.c_int) elif argument is None: + self._buffer = _rawffi.Array('P')(1) + self._needs_free = True return # needed for test.. else: raise TypeError("Unknown constructor %s" % (argument,)) @@ -139,6 +144,7 @@ if self._needs_free: self._buffer.free() self._buffer = None - self._ptr.free() - self._ptr = None - self._needs_free = False + if hasattr(self, '_ptr'): + self._ptr.free() + self._ptr = None + self._needs_free = False Modified: pypy/dist/pypy/lib/app_test/ctypes/test_cast.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_cast.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_cast.py Sun Mar 30 04:13:20 2008 @@ -74,3 +74,8 @@ s = c_wchar_p("hiho") assert cast(cast(s, c_void_p), c_wchar_p).value == ( "hiho") + + def test_cast_functype(self): + # make sure we can cast function type + P = CFUNCTYPE(c_int) + cast(1, P) From fijal at codespeak.net Sun Mar 30 04:31:45 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 04:31:45 +0200 (CEST) Subject: [pypy-svn] r53124 - pypy/dist/pypy/module/_rawffi Message-ID: <20080330023145.9CDCD169F37@codespeak.net> Author: fijal Date: Sun Mar 30 04:31:39 2008 New Revision: 53124 Modified: pypy/dist/pypy/module/_rawffi/array.py pypy/dist/pypy/module/_rawffi/structure.py Log: These two are also not acceptable as base classes. Modified: pypy/dist/pypy/module/_rawffi/array.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/array.py (original) +++ pypy/dist/pypy/module/_rawffi/array.py Sun Mar 30 04:31:39 2008 @@ -252,3 +252,4 @@ byptr = interp2app(W_ArrayInstance.byptr), itemaddress = interp2app(W_ArrayInstance.descr_itemaddress), ) +W_ArrayInstanceAutoFree.typedef.acceptable_as_base_class = False Modified: pypy/dist/pypy/module/_rawffi/structure.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/structure.py (original) +++ pypy/dist/pypy/module/_rawffi/structure.py Sun Mar 30 04:31:39 2008 @@ -222,4 +222,4 @@ byptr = interp2app(W_StructureInstance.byptr), fieldaddress= interp2app(W_StructureInstance.descr_fieldaddress), ) - +W_StructureInstanceAutoFree.typedef.acceptable_as_base_class = False From fijal at codespeak.net Sun Mar 30 04:46:04 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 04:46:04 +0200 (CEST) Subject: [pypy-svn] r53125 - in pypy/dist/pypy/module/_rawffi: . test Message-ID: <20080330024604.23102169F3D@codespeak.net> Author: fijal Date: Sun Mar 30 04:46:01 2008 New Revision: 53125 Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py pypy/dist/pypy/module/_rawffi/test/test__rawffi.py Log: Allow creation of raw callable pointers. Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/interp_rawffi.py (original) +++ pypy/dist/pypy/module/_rawffi/interp_rawffi.py Sun Mar 30 04:46:01 2008 @@ -124,6 +124,26 @@ size, alignment = resshape._size_alignment() return ('V', length*size, alignment) # value object +def unpack_resshape(space, w_restype): + if space.is_w(w_restype, space.w_None): + resshape = None + ffi_restype = ffi_type_void + else: + tp_letter, ffi_restype, resshape = unpack_to_ffi_type(space, + w_restype, + allow_void=True, + shape=True) + return ffi_restype, resshape + +def unpack_argshapes(space, w_argtypes): + argletters = [] + ffi_argtypes = [] + for w_arg in space.unpackiterable(w_argtypes): + argletter, ffi_argtype, _ = unpack_to_ffi_type(space, w_arg) + argletters.append(argletter) + ffi_argtypes.append(ffi_argtype) + return ffi_argtypes, argletters + class W_CDLL(Wrappable): def __init__(self, space, name): self.cdll = CDLL(name) @@ -135,15 +155,7 @@ """ Get a pointer for function name with provided argtypes and restype """ - # xxx refactor - if space.is_w(w_restype, space.w_None): - resshape = None - ffi_restype = ffi_type_void - else: - tp_letter, ffi_restype, resshape = unpack_to_ffi_type(space, - w_restype, - allow_void=True, - shape=True) + ffi_restype, resshape = unpack_resshape(space, w_restype) w = space.wrap argtypes_w = space.unpackiterable(w_argtypes) w_argtypes = space.newtuple(argtypes_w) @@ -155,13 +167,7 @@ pass else: raise - argletters = [] - ffi_argtypes = [] - for w_arg in argtypes_w: - argletter, ffi_argtype, _ = unpack_to_ffi_type(space, w_arg) - argletters.append(argletter) - ffi_argtypes.append(ffi_argtype) - + ffi_argtypes, argletters = unpack_argshapes(space, w_argtypes) try: ptr = self.cdll.getrawpointer(name, ffi_argtypes, ffi_restype) w_funcptr = W_FuncPtr(space, ptr, argletters, resshape) @@ -397,10 +403,19 @@ return space.w_None call.unwrap_spec = ['self', ObjSpace, 'args_w'] +def descr_new_funcptr(space, w_tp, addr, w_args, w_res): + ffi_args, args = unpack_argshapes(space, w_args) + ffi_res, res = unpack_resshape(space, w_res) + ptr = RawFuncPtr('???', ffi_args, ffi_res, rffi.cast(rffi.VOIDP, addr)) + return space.wrap(W_FuncPtr(space, ptr, args, res)) +descr_new_funcptr.unwrap_spec = [ObjSpace, W_Root, r_uint, W_Root, W_Root] + W_FuncPtr.typedef = TypeDef( 'FuncPtr', + __new__ = interp2app(descr_new_funcptr), __call__ = interp2app(W_FuncPtr.call) ) +W_FuncPtr.typedef.acceptable_as_base_class = False def _create_new_accessor(func_name, name): def accessor(space, tp_letter): Modified: pypy/dist/pypy/module/_rawffi/test/test__rawffi.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/test/test__rawffi.py (original) +++ pypy/dist/pypy/module/_rawffi/test/test__rawffi.py Sun Mar 30 04:46:01 2008 @@ -63,6 +63,11 @@ return one + two; } + void* get_raw_pointer() + { + return (void*)add_shorts; + } + char get_char(char* s, unsigned short num) { return s[num]; @@ -215,6 +220,22 @@ arg1.free() arg2.free() + def test_raw_callable(self): + import _rawffi + lib = _rawffi.CDLL(self.lib_name) + get_raw_pointer = lib.ptr('get_raw_pointer', [], 'P') + ptr = get_raw_pointer() + rawcall = _rawffi.FuncPtr(ptr[0], ['h', 'h'], 'H') + A = _rawffi.Array('h') + arg1 = A(1) + arg2 = A(1) + arg1[0] = 1 + arg2[0] = 2 + res = rawcall(arg1, arg2) + assert res[0] == 3 + arg1.free() + arg2.free() + def test_short_addition(self): import _rawffi lib = _rawffi.CDLL(self.lib_name) @@ -700,7 +721,6 @@ assert a[3] == 'z' assert a[4] == 't' - class AppTestAutoFree: def setup_class(cls): space = gettestobjspace(usemodules=('_rawffi', 'struct')) From fijal at codespeak.net Sun Mar 30 05:34:05 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 05:34:05 +0200 (CEST) Subject: [pypy-svn] r53126 - pypy/dist/pypy/tool Message-ID: <20080330033405.7394D169F0A@codespeak.net> Author: fijal Date: Sun Mar 30 05:34:03 2008 New Revision: 53126 Modified: pypy/dist/pypy/tool/udir.py Log: How this get checked in ???? Modified: pypy/dist/pypy/tool/udir.py ============================================================================== --- pypy/dist/pypy/tool/udir.py (original) +++ pypy/dist/pypy/tool/udir.py Sun Mar 30 05:34:03 2008 @@ -18,8 +18,8 @@ return basename.split('/')[-2] try: - basename = '-' + svn_info(py.path.svnwc().info().url) + '-' + basename = '-' + svn_info(py.path.svnwc(py.magic.autopath()).info().url) + '-' except: basename = '-' -udir = local.make_numbered_dir(prefix='usession' + basename, keep=3) +udir = local.make_numbered_dir(prefix='usession' + basename, keep=100) From fijal at codespeak.net Sun Mar 30 05:34:27 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 05:34:27 +0200 (CEST) Subject: [pypy-svn] r53127 - pypy/branch/jit-hotpath/pypy/tool Message-ID: <20080330033427.173C5169F0A@codespeak.net> Author: fijal Date: Sun Mar 30 05:34:27 2008 New Revision: 53127 Modified: pypy/branch/jit-hotpath/pypy/tool/udir.py Log: port from trunk Modified: pypy/branch/jit-hotpath/pypy/tool/udir.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/tool/udir.py (original) +++ pypy/branch/jit-hotpath/pypy/tool/udir.py Sun Mar 30 05:34:27 2008 @@ -18,7 +18,7 @@ return basename.split('/')[-2] try: - basename = '-' + svn_info(py.path.svnwc().info().url) + '-' + basename = '-' + svn_info(py.path.svnwc(py.magic.autopath()).info().url) + '-' except: basename = '-' From fijal at codespeak.net Sun Mar 30 05:36:46 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 05:36:46 +0200 (CEST) Subject: [pypy-svn] r53128 - pypy/dist/pypy/tool Message-ID: <20080330033646.EB62F169F0A@codespeak.net> Author: fijal Date: Sun Mar 30 05:36:46 2008 New Revision: 53128 Modified: pypy/dist/pypy/tool/udir.py Log: race conditions with slow network connection... Modified: pypy/dist/pypy/tool/udir.py ============================================================================== --- pypy/dist/pypy/tool/udir.py (original) +++ pypy/dist/pypy/tool/udir.py Sun Mar 30 05:36:46 2008 @@ -22,4 +22,4 @@ except: basename = '-' -udir = local.make_numbered_dir(prefix='usession' + basename, keep=100) +udir = local.make_numbered_dir(prefix='usession' + basename, keep=3) From fijal at codespeak.net Sun Mar 30 06:18:58 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 06:18:58 +0200 (CEST) Subject: [pypy-svn] r53129 - in pypy/dist/pypy/module/_rawffi: . test Message-ID: <20080330041858.E491A169F31@codespeak.net> Author: fijal Date: Sun Mar 30 06:18:57 2008 New Revision: 53129 Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py pypy/dist/pypy/module/_rawffi/test/test__rawffi.py Log: support for buffer access and byptr on W_FuncPtr Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/interp_rawffi.py (original) +++ pypy/dist/pypy/module/_rawffi/interp_rawffi.py Sun Mar 30 06:18:57 2008 @@ -356,6 +356,22 @@ self.argletters = argletters self.resshape = resshape + def getbuffer(space, self): + return space.wrap(rffi.cast(lltype.Unsigned, self.ptr.funcsym)) + + # XXX exactly the same as previous one, but arguments are suitable + # for calling with python + def _getbuffer(self, space): + return space.wrap(rffi.cast(lltype.Unsigned, self.ptr.funcsym)) + + def byptr(self, space): + from pypy.module._rawffi.array import get_array_cache + array_of_ptr = get_array_cache(space).array_of_ptr + array = array_of_ptr.allocate(space, 1) + array.setitem(space, 0, self._getbuffer(space)) + return space.wrap(array) + byptr.unwrap_spec = ['self', ObjSpace] + def call(self, space, args_w): from pypy.module._rawffi.array import W_ArrayInstance from pypy.module._rawffi.structure import W_StructureInstance @@ -413,7 +429,9 @@ W_FuncPtr.typedef = TypeDef( 'FuncPtr', __new__ = interp2app(descr_new_funcptr), - __call__ = interp2app(W_FuncPtr.call) + __call__ = interp2app(W_FuncPtr.call), + buffer = GetSetProperty(W_FuncPtr.getbuffer), + byptr = interp2app(W_FuncPtr.byptr), ) W_FuncPtr.typedef.acceptable_as_base_class = False Modified: pypy/dist/pypy/module/_rawffi/test/test__rawffi.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/test/test__rawffi.py (original) +++ pypy/dist/pypy/module/_rawffi/test/test__rawffi.py Sun Mar 30 06:18:57 2008 @@ -235,6 +235,10 @@ assert res[0] == 3 arg1.free() arg2.free() + assert rawcall.buffer == ptr[0] + ptr = rawcall.byptr() + assert ptr[0] == rawcall.buffer + ptr.free() def test_short_addition(self): import _rawffi From fijal at codespeak.net Sun Mar 30 06:21:36 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 06:21:36 +0200 (CEST) Subject: [pypy-svn] r53130 - pypy/dist/pypy/tool Message-ID: <20080330042136.C3670169F31@codespeak.net> Author: fijal Date: Sun Mar 30 06:21:36 2008 New Revision: 53130 Modified: pypy/dist/pypy/tool/lsprofcalltree.py pypy/dist/pypy/tool/udir.py Log: I wonder how many bugs I'll discover here... Modified: pypy/dist/pypy/tool/lsprofcalltree.py ============================================================================== --- pypy/dist/pypy/tool/lsprofcalltree.py (original) +++ pypy/dist/pypy/tool/lsprofcalltree.py Sun Mar 30 06:21:36 2008 @@ -8,7 +8,7 @@ import sys try: - import cProfile + import profile as cProfile except ImportError: raise SystemExit("This script requires cProfile from Python 2.5") Modified: pypy/dist/pypy/tool/udir.py ============================================================================== --- pypy/dist/pypy/tool/udir.py (original) +++ pypy/dist/pypy/tool/udir.py Sun Mar 30 06:21:36 2008 @@ -18,7 +18,7 @@ return basename.split('/')[-2] try: - basename = '-' + svn_info(py.path.svnwc(py.magic.autopath()).info().url) + '-' + basename = '-' + svn_info(py.path.svnwc(py.magic.autopath().dirpath()).info().url) + '-' except: basename = '-' From fijal at codespeak.net Sun Mar 30 06:22:11 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 06:22:11 +0200 (CEST) Subject: [pypy-svn] r53131 - pypy/dist/pypy/tool Message-ID: <20080330042211.8C893169F31@codespeak.net> Author: fijal Date: Sun Mar 30 06:22:11 2008 New Revision: 53131 Modified: pypy/dist/pypy/tool/lsprofcalltree.py Log: this was not intended. Modified: pypy/dist/pypy/tool/lsprofcalltree.py ============================================================================== --- pypy/dist/pypy/tool/lsprofcalltree.py (original) +++ pypy/dist/pypy/tool/lsprofcalltree.py Sun Mar 30 06:22:11 2008 @@ -8,7 +8,7 @@ import sys try: - import profile as cProfile + import cProfile except ImportError: raise SystemExit("This script requires cProfile from Python 2.5") From fijal at codespeak.net Sun Mar 30 06:22:55 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 06:22:55 +0200 (CEST) Subject: [pypy-svn] r53132 - pypy/branch/jit-hotpath/pypy/tool Message-ID: <20080330042255.7B612169F31@codespeak.net> Author: fijal Date: Sun Mar 30 06:22:55 2008 New Revision: 53132 Modified: pypy/branch/jit-hotpath/pypy/tool/udir.py Log: port fix from trunk Modified: pypy/branch/jit-hotpath/pypy/tool/udir.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/tool/udir.py (original) +++ pypy/branch/jit-hotpath/pypy/tool/udir.py Sun Mar 30 06:22:55 2008 @@ -18,7 +18,7 @@ return basename.split('/')[-2] try: - basename = '-' + svn_info(py.path.svnwc(py.magic.autopath()).info().url) + '-' + basename = '-' + svn_info(py.path.svnwc(py.magic.autopath().dirpath()).info().url) + '-' except: basename = '-' From fijal at codespeak.net Sun Mar 30 06:27:58 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 06:27:58 +0200 (CEST) Subject: [pypy-svn] r53133 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080330042758.AD918169F31@codespeak.net> Author: fijal Date: Sun Mar 30 06:27:58 2008 New Revision: 53133 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_pointers.py Log: these tests are passing these days. Modified: pypy/dist/pypy/lib/app_test/ctypes/test_pointers.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_pointers.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_pointers.py Sun Mar 30 06:27:58 2008 @@ -59,7 +59,6 @@ assert i.value == 54345 def test_callbacks_with_pointers(self): - py.test.skip("This test looks bogus (never checks anything)") # a function type receiving a pointer PROTOTYPE = CFUNCTYPE(c_int, POINTER(c_int)) @@ -113,7 +112,6 @@ assert p1.contents.value == 42 def test_from_address(self): - py.test.skip("It cannot work") from array import array a = array('i', [100, 200, 300, 400, 500]) addr = a.buffer_info()[0] From fijal at codespeak.net Sun Mar 30 06:29:34 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 06:29:34 +0200 (CEST) Subject: [pypy-svn] r53134 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080330042934.8D468169ED5@codespeak.net> Author: fijal Date: Sun Mar 30 06:29:34 2008 New Revision: 53134 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_array_in_pointer.py Log: we support buffer protocol these days. Modified: pypy/dist/pypy/lib/app_test/ctypes/test_array_in_pointer.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_array_in_pointer.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_array_in_pointer.py Sun Mar 30 06:29:34 2008 @@ -8,14 +8,7 @@ # helper function to dump memory contents in hex, with a hyphen # between the bytes. # cast it to the raw buffer - try: - import _rawffi - except ImportError: - h = hexlify(buffer(obj)) - else: - size = sizeof(obj) - a = _rawffi.Array('c').fromaddress(obj._buffer.buffer, size) - h = hexlify([a[i] for i in range(len(a))]) + h = hexlify(buffer(obj)) return re.sub(r"(..)", r"\1-", h)[:-1] class Value(Structure): From fijal at codespeak.net Sun Mar 30 06:34:03 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 06:34:03 +0200 (CEST) Subject: [pypy-svn] r53135 - pypy/dist/pypy/lib/app_test/ctypes Message-ID: <20080330043403.B59A3169EF5@codespeak.net> Author: fijal Date: Sun Mar 30 06:34:03 2008 New Revision: 53135 Modified: pypy/dist/pypy/lib/app_test/ctypes/test_numbers.py Log: these are passing. Modified: pypy/dist/pypy/lib/app_test/ctypes/test_numbers.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_numbers.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_numbers.py Sun Mar 30 06:34:03 2008 @@ -122,7 +122,6 @@ assert (code, alignment(t())) == (code, align) def test_int_from_address(self): - py.test.skip("Unsupported") from array import array for t in signed_types + unsigned_types: # the array module doesn't suppport all format codes @@ -144,7 +143,6 @@ def test_float_from_address(self): - py.test.skip("Unsupported") from array import array for t in float_types: a = array(t._type_, [3.14]) @@ -156,7 +154,6 @@ assert type(v) is t def test_char_from_address(self): - py.test.skip("Unsupported") from ctypes import c_char from array import array From fijal at codespeak.net Sun Mar 30 08:16:04 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 08:16:04 +0200 (CEST) Subject: [pypy-svn] r53136 - pypy/dist/pypy/module/_rawffi Message-ID: <20080330061604.3562E169F0A@codespeak.net> Author: fijal Date: Sun Mar 30 08:16:02 2008 New Revision: 53136 Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py pypy/dist/pypy/module/_rawffi/tracker.py Log: Don't trace W_FuncPtr's buffer, because they tend to live forever (attached to the library) Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/interp_rawffi.py (original) +++ pypy/dist/pypy/module/_rawffi/interp_rawffi.py Sun Mar 30 08:16:02 2008 @@ -369,6 +369,10 @@ array_of_ptr = get_array_cache(space).array_of_ptr array = array_of_ptr.allocate(space, 1) array.setitem(space, 0, self._getbuffer(space)) + if tracker.DO_TRACING: + # XXX this is needed, because functions tend to live forever + # hence our testing is not performing that well + del tracker.alloced[rffi.cast(lltype.Unsigned, array.ll_buffer)] return space.wrap(array) byptr.unwrap_spec = ['self', ObjSpace] Modified: pypy/dist/pypy/module/_rawffi/tracker.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/tracker.py (original) +++ pypy/dist/pypy/module/_rawffi/tracker.py Sun Mar 30 08:16:02 2008 @@ -15,7 +15,8 @@ self.alloced[address] = None def trace_free(self, address): - del self.alloced[address] + if address in self.alloced: + del self.alloced[address] # single, global, static object to keep all tracker info tracker = Tracker() From fijal at codespeak.net Sun Mar 30 08:16:58 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 08:16:58 +0200 (CEST) Subject: [pypy-svn] r53137 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes Message-ID: <20080330061658.8913E169F0A@codespeak.net> Author: fijal Date: Sun Mar 30 08:16:57 2008 New Revision: 53137 Modified: pypy/dist/pypy/lib/_ctypes/function.py pypy/dist/pypy/lib/app_test/ctypes/test_cast.py pypy/dist/pypy/lib/app_test/ctypes/test_cfuncs.py pypy/dist/pypy/lib/app_test/ctypes/test_checkretval.py pypy/dist/pypy/lib/app_test/ctypes/test_returnfuncptrs.py pypy/dist/pypy/lib/app_test/ctypes/test_simplesubclasses.py pypy/dist/pypy/lib/app_test/ctypes/test_values.py Log: * support for address parameters for CFUNCTYPE * few minor fixes. Modified: pypy/dist/pypy/lib/_ctypes/function.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/function.py (original) +++ pypy/dist/pypy/lib/_ctypes/function.py Sun Mar 30 08:16:57 2008 @@ -1,8 +1,9 @@ -import types from _ctypes.basics import _CData, _CDataMeta, ArgumentError, keepalive_key import _rawffi +# XXX this file needs huge refactoring I fear + class CFuncPtrType(_CDataMeta): # XXX write down here defaults and such things @@ -24,6 +25,9 @@ _ffishape = 'P' _fficompositesize = None _needs_free = False + callable = None + _ptr = None + _buffer = None def _getargtypes(self): return self._argtypes_ @@ -37,30 +41,34 @@ if restype is int: from ctypes import c_int restype = c_int - if not isinstance(restype, _CDataMeta) and not restype is None: + if not isinstance(restype, _CDataMeta) and not restype is None and \ + not callable(restype): raise TypeError("Expected ctypes type, got %s" % (restype,)) self._restype_ = restype - restype = property(_getrestype, _setrestype) + restype = property(_getrestype, _setrestype) + + def _ffishapes(self, args, restype): + argtypes = [arg._ffiargshape for arg in args] + if restype is not None: + restype = restype._ffiargshape + else: + restype = 'O' # void + return argtypes, restype def __init__(self, argument=None): - self.callable = None self.name = None self._objects = {keepalive_key(0):self} - if isinstance(argument, int): - self._buffer = _rawffi.Array('P').fromaddress(argument, 1) - # XXX finish this one, we need to be able to jump there somehow + self._needs_free = True + if isinstance(argument, (int, long)): + ffiargs, ffires = self._ffishapes(self._argtypes_, self._restype_) + self._ptr = _rawffi.FuncPtr(argument, ffiargs, ffires) + self._buffer = self._ptr.byptr() elif callable(argument): self.callable = argument - argtypes = [arg._ffiargshape for arg in self._argtypes_] - restype = self._restype_ - if restype is not None: - restype = restype._ffiargshape - else: - restype = 'O' # void + ffiargs, ffires = self._ffishapes(self._argtypes_, self._restype_) self._ptr = _rawffi.CallbackPtr(self._wrap_callable(argument, self.argtypes), - argtypes, restype) - self._needs_free = True + ffiargs, ffires) self._buffer = self._ptr.byptr() elif isinstance(argument, tuple) and len(argument) == 2: import ctypes @@ -68,11 +76,12 @@ if isinstance(self.dll, str): self.dll = ctypes.CDLL(self.dll) # we need to check dll anyway - self._getfuncptr([], ctypes.c_int) + ptr = self._getfuncptr([], ctypes.c_int) + self._buffer = ptr.byptr() elif argument is None: + # this is needed for casts self._buffer = _rawffi.Array('P')(1) - self._needs_free = True - return # needed for test.. + return else: raise TypeError("Unknown constructor %s" % (argument,)) @@ -86,7 +95,10 @@ def __call__(self, *args): if self.callable is not None: - return self.callable(*args) + res = self.callable(*args) + if self._restype_ is not None: + return res + return argtypes = self._argtypes_ if argtypes is None: argtypes = self._guess_argtypes(args) @@ -102,14 +114,21 @@ args = self._wrap_args(argtypes, args) resbuffer = funcptr(*[arg._buffer for obj, arg in args]) if restype is not None: + if not isinstance(restype, _CDataMeta): + return restype(resbuffer[0]) return restype._CData_retval(resbuffer) def _getfuncptr(self, argtypes, restype): - if restype is None: + if self._ptr is not None: + return self._ptr + if restype is None or not isinstance(restype, _CDataMeta): import ctypes restype = ctypes.c_int argshapes = [arg._ffiargshape for arg in argtypes] resshape = restype._ffiargshape + if self._buffer is not None: + self._ptr = _rawffi.FuncPtr(self._buffer[0], argshapes, resshape) + return self._ptr return self.dll._handle.ptr(self.name, argshapes, resshape) def _guess_argtypes(self, args): @@ -144,7 +163,7 @@ if self._needs_free: self._buffer.free() self._buffer = None - if hasattr(self, '_ptr'): + if isinstance(self._ptr, _rawffi.CallbackPtr): self._ptr.free() self._ptr = None - self._needs_free = False + self._needs_free = False Modified: pypy/dist/pypy/lib/app_test/ctypes/test_cast.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_cast.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_cast.py Sun Mar 30 08:16:57 2008 @@ -2,6 +2,10 @@ import sys, py from support import BaseCTypesTestChecker +def setup_module(mod): + import conftest + mod.lib = CDLL(str(conftest.sofile)) + class TestCast(BaseCTypesTestChecker): def test_array2pointer(self): @@ -77,5 +81,7 @@ def test_cast_functype(self): # make sure we can cast function type - P = CFUNCTYPE(c_int) - cast(1, P) + my_sqrt = lib.my_sqrt + sqrt = cast(cast(my_sqrt, c_void_p), CFUNCTYPE(c_double, c_double)) + assert sqrt(4.0) == 2.0 + Modified: pypy/dist/pypy/lib/app_test/ctypes/test_cfuncs.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_cfuncs.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_cfuncs.py Sun Mar 30 08:16:57 2008 @@ -163,7 +163,6 @@ assert self.S() == 42 def test_callwithresult(self): - py.test.skip("function as restype unsupported") def process_result(result): return result * 2 self._dll.tf_i.restype = process_result Modified: pypy/dist/pypy/lib/app_test/ctypes/test_checkretval.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_checkretval.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_checkretval.py Sun Mar 30 08:16:57 2008 @@ -16,7 +16,7 @@ class TestRetval: def test_checkretval(self): - py.test.skip("restype being a function not implemented") + py.test.skip("_check_retval_ is not supported") assert 42 == dll._testfunc_p_p(42) Modified: pypy/dist/pypy/lib/app_test/ctypes/test_returnfuncptrs.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_returnfuncptrs.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_returnfuncptrs.py Sun Mar 30 08:16:57 2008 @@ -9,7 +9,6 @@ class TestReturnFuncPtr: def test_with_prototype(self): - py.test.skip("returning functions doesn't work") # The _ctypes_test shared lib/dll exports quite some functions for testing. # The get_strchr function returns a *pointer* to the C strchr function. get_strchr = dll.get_strchr @@ -21,7 +20,6 @@ raises(TypeError, strchr, "abcdef") def test_without_prototype(self): - py.test.skip("constructing functions from address doesn't work") get_strchr = dll.get_strchr # the default 'c_int' would not work on systems where sizeof(int) != sizeof(void *) get_strchr.restype = c_void_p Modified: pypy/dist/pypy/lib/app_test/ctypes/test_simplesubclasses.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_simplesubclasses.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_simplesubclasses.py Sun Mar 30 08:16:57 2008 @@ -15,7 +15,6 @@ assert not MyInt(42) == MyInt(43) def test_ignore_retval(self): - py.test.skip("XXX different callback behavior") # Test if the return value of a callback is ignored # if restype is None proto = CFUNCTYPE(None) @@ -27,7 +26,7 @@ def test_int_callback(self): - py.test.skip("XXX different callback behavior") + py.test.skip("XXX subclassing not implemented") args = [] def func(arg): args.append(arg) Modified: pypy/dist/pypy/lib/app_test/ctypes/test_values.py ============================================================================== --- pypy/dist/pypy/lib/app_test/ctypes/test_values.py (original) +++ pypy/dist/pypy/lib/app_test/ctypes/test_values.py Sun Mar 30 08:16:57 2008 @@ -26,7 +26,7 @@ class TestWin_Values(BaseCTypesTestChecker): """This test only works when python itself is a dll/shared library""" def setup_class(cls): - py.test.skip("not implemented") + py.test.skip("only when cpython itself is a dll") def test_optimizeflag(self): # This test accesses the Py_OptimizeFlag intger, which is From cami at codespeak.net Sun Mar 30 11:15:35 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sun, 30 Mar 2008 11:15:35 +0200 (CEST) Subject: [pypy-svn] r53138 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test Message-ID: <20080330091535.2ED04169ED5@codespeak.net> Author: cami Date: Sun Mar 30 11:15:34 2008 New Revision: 53138 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Log: added buttons test to test_joypad cleaned up video added VideoDriver in video added CartridgeManager in cartridge added CartridgeStoreManager in cartridge added ClockDriver in timer added SoundDriver in sound Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Sun Mar 30 11:15:34 2008 @@ -31,7 +31,7 @@ # ============================================================================== # CARTRIDGE -class CartridgeLoader(object): +class CartridgeManager(object): def __init__(self, storeDriver, clockDriver): self.store = storeDriver @@ -118,6 +118,92 @@ return (checksum == self.getHeaderChecksum()) +def CartridgeStoreManager(object): + + def __init__(self): + self.cartridgeName = "" + + def setCartridgeName(self, cartridgeName): + self.cartridgeName = cartridgeName + self.batteryName = self.createBatteryName() + self.cartridgeFile = File(self.cartridgeName) + self.batteryFile = File(self.batteryName) + + def createBatteryName(self): + if self.cartridgeName.endsWith(constants.CARTRIDGE_FILE_EXTENSION): + self.batteryName = self.cartridgeName.replace(constants.CARTRIDGE_FILE_EXTENSION, + constants.BATTERY_FILE_EXTENSION); + elif self.cartridgeName.endsWith(constants.CARTRIDGE_COLOR_FILE_EXTENSION): + self.batteryName = self.cartridgeName.replace(constants.CARTRIDGE_COLOR_FILE_EXTENSION, + constants.BATTERY_FILE_EXTENSION); + else: + batteryName = cartridgeName + batteryName.BATTERY_FILE_EXTENSION; + + def getCartridgeName(self): + return self.cartridgeName + + def getCartridgeFile(self): + return self.cartridgeFile + + def hasCartridge(self): + return self.cartridgeFile.exists() + + def getCartridgeSize(self): + return self.cartridgeFile.length() + + def readCartridge(self, buffer): + try: + self.readFile(self.cartridgeFile, buffer); + except: + raise Exception("Could not load cartridge: " + + self.cartridgeFile.getPath()) + + def getBatteryName(self): + return self.batteryName; + + def getBatteryFile(self): + return self.batteryFile + + def hasBattery(self): + return self.batteryFile.exists() + + def getBatterySize(self): + return self.batteryFile.length() + + def readBattery(self, buffer): + try: + self.readFile(self.batteryFile, buffer) + except: + raise Exception("Could not load battery: " + + self.batteryFile.getPath()) + + def writeBattery(self, buffer): + try: + self.writeFile(self.batteryFile, buffer) + except: + raise Exception("Could not save battery: " + + batteryFile.getPath()) + + def removeBattery(): + if not self.batteryFile.delete(): + raise Exception("Could not delete battery: " + + batteryFile.getPath()) + + def readFile(file, buffer): + input = FileInputStream(file); + try : + if (input.read(buffer, 0, buffer.length) != buffer.length): + raise Exception("Unexpected end of file"); + finally: + input.close(); + + def writeFile(file, buffer): + output = FileOutputStream(file); + try : + output.write(buffer, 0, buffer.length); + finally: + output.close(); + # ============================================================================== # CARTRIDGE TYPES Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/constants.py Sun Mar 30 11:15:34 2008 @@ -54,6 +54,12 @@ # constants.RAM Bank Size (8KB) RAM_BANK_SIZE = 0x2000 + + + +CARTRIDGE_FILE_EXTENSION = ".gb" +CARTRIDGE_COLOR_FILE_EXTENSION = ".gbc" +BATTERY_FILE_EXTENSION = ".sav" # ___________________________________________________________________________ # CPU FLAGS @@ -222,6 +228,7 @@ AUD3WAVERAM = 0xFF30 +BUFFER_LOG_SIZE = 5; # ___________________________________________________________________________ # TIMER # ___________________________________________________________________________ Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/gameboy.py Sun Mar 30 11:15:34 2008 @@ -63,7 +63,7 @@ def cycles(self): - return min(self.video.cycles(), self.serial.cycles(), + return min( self.video.cycles(), self.serial.cycles(), self.timer.cycles(), self.sound.cycles(), self.joypad.cycles()) @@ -120,12 +120,12 @@ for index in range(0, 48): bits = self.cartridge.read(0x0104 + index) pattern0 = ((bits >> 0) & 0x80) + ((bits >> 1) & 0x60)\ - + ((bits >> 2) & 0x18) + ((bits >> 3) & 0x06)\ - + ((bits >> 4) & 0x01) + + ((bits >> 2) & 0x18) + ((bits >> 3) & 0x06)\ + + ((bits >> 4) & 0x01) pattern1 = ((bits << 4) & 0x80) + ((bits << 3) & 0x60)\ - + ((bits << 2) & 0x18) + ((bits << 1) & 0x06)\ - + ((bits << 0) & 0x01) + + ((bits << 2) & 0x18) + ((bits << 1) & 0x06)\ + + ((bits << 0) & 0x01) self.video.write(0x8010 + (index << 3), pattern0) self.video.write(0x8012 + (index << 3), pattern0) Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py Sun Mar 30 11:15:34 2008 @@ -739,3 +739,34 @@ if ((index & 31) == 0): self.noiseStep15Table[index >> 5] = 0 self.noiseStep15Table[index >> 5] |= (polynomial & 1) << (index & 31) + + + +# SOUND DRIVER ----------------------------------------------------------------- + +class SoundDriver(object): + + def __init__(self): + self.enabled = True + + + def isEnabled(self): + return self.enabled + + def getSampleRate(self): + self.sampleRate + + def getChannels(self): + return self.channelCount + + def getBitsPerSample(self): + return self.bitsPerSample + + def start(self): + pass + + def stop(self): + pass + + def write(self, buffer, length): + pass Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py Sun Mar 30 11:15:34 2008 @@ -1,6 +1,7 @@ from pypy.lang.gameboy.joypad import * from pypy.lang.gameboy.interrupt import * from pypy.lang.gameboy import constants +import math BUTTON_CODE = 0x3 @@ -12,6 +13,34 @@ def get_button(): return Button(BUTTON_CODE) + +def test_number_to_bool_bin(): + assert len(number_to_bool_bin(16, 1)) == 1 + assert len(number_to_bool_bin(1, 16)) == 16 + for i in range(0, 20): + number = 0 + binNumber = number_to_bool_bin(i) + size = len(binNumber) + str = "" + for j in range(0, size): + if binNumber[j]: + number += (1 << (size-j-1)) + str += ("1") + else: + str += ("0") + print i, str, binNumber + assert number == i + +def number_to_bool_bin(number, size=None): + if size == None: + if number == 0: + return [] + size = int(math.ceil(math.log(number, 2)))+1 + bin = [False]*size + for i in range(0, size): + if (number & (1 << i)) != 0: + bin[size-i-1] = True + return bin # TEST BUTTON ------------------------------------------------------------------ @@ -130,6 +159,39 @@ assert button.isPressed() == False assert driver.getButtonCode() == 0 assert driver.getDirectionCode() == 0 + + +def test_toggle_multiple_buttons(): + driver = get_driver() + buttons = [(driver.buttonSelect, driver.select), + (driver.buttonStart, driver.start), + (driver.buttonA, driver.a), + (driver.buttonB, driver.b)] + toggle_multiple_test(driver, driver.getButtonCode, buttons) + +def test_toggle_mutliple_directions(): + driver = get_driver() + directions = [(driver.buttonUp, driver.up), + #(driver.buttonDown, driver.down), + #(driver.buttonLeft, driver.left), + (driver.buttonRight, driver.right)] + toggle_multiple_test(driver, driver.getDirectionCode, directions) + +def toggle_multiple_test(driver, codeGetter, buttons): + size = len(buttons) + for i in range(0, 2**size): + toggled = number_to_bool_bin(i, size) + code = 0 + for j in range(0, size): + if toggled[j]: + buttons[j][0]() + code |= buttons[j][1].codeValue + else: + buttons[j][0](False) + assert buttons[j][1].isPressed() == toggled[j] + assert codeGetter() == code + + # TEST JOYPAD ------------------------------------------------------------------ Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/timer.py Sun Mar 30 11:15:34 2008 @@ -89,3 +89,13 @@ self.tima = self.tma self.interrupt.raiseInterrupt(constants.TIMER) +# CLOCK DRIVER ----------------------------------------------------------------- + +class ClockDriver(object): + + def __init__(self): + pass + + def getTime(self): + return System.currentTimeMillis() / 1000 + Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/video.py Sun Mar 30 11:15:34 2008 @@ -6,54 +6,14 @@ from pypy.lang.gameboy import constants class Video(object): - - # constants.OAM Registers - oam = [] #= new byte[OAM_SIZE] - - # Video constants.RAM - vram = []#= new byte[VRAM_SIZE] - - - # constants.LCD Registers int - lcdc = 0 - stat = 0 - scy = 0 - scx = 0 - ly = 0 - lyc = 0 - dma = 0 - bgp = 0 - obp0 = 0 - obp1 = 0 - wy = 0 - wx = 0 - wly = 0 - - cycles = 0 - frames = 0 frameSkip = 0 - #boolean - transfer = False - display = False - vblank = False - dirty = False - # Line Buffer, constants.OAM Cache and Color Palette line = []#= new int[8 + 160 + 8] objects = []#= new int[OBJECTS_PER_LINE] palette = []#= new int[1024] - # Video Driver VideoDriver - driver = None - - # Interrupt Controller Interrupt - interrupt = None - - # Memory Interface Memory - memory = None - def __init__(self, videDriver, interrupt, memory): self.driver = videoDriver @@ -61,41 +21,34 @@ self.memory = memory self.reset() - def getFrameSkip(self): return self.frameSkip - def setFrameSkip(self, frameSkip): self.frameSkip = frameSkip - def reset(self): self.cycles = constants.MODE_2_TICKS - self.lcdc = 0x91 + self.control = 0x91 self.stat = 2 - self.ly = 0 - self.lyc = 0 + self.lineY = 0 + self.lineYCompare = 0 self.dma = 0xFF - self.scy = 0 - self.scx = 0 - self.wy = self.wly = 0 - self.wx = 0 - self.bgp = 0xFC - self.obp0 = self.obp1 = 0xFF + self.scrollY = 0 + self.scrollX = 0 + self.windowY = self.wlineY = 0 + self.windowX = 0 + self.backgroundPalette = 0xFC + self.objectPalette0 = self.objectPalette1 = 0xFF self.transfer = True self.display = True self.vblank = True self.dirty = True - for index in range(0, constants.VRAM_SIZE): - self.vram[index] = 0x00 - - for index in range(0, constants.OAM_SIZE): - self.oam[index] = 0x00 - + self.vram = [0]*constants.VRAM_SIZE + self.oam = [0]*constants.OAM_SIZE def write(self, address, data): # assert data >= 0x00 and data <= 0xFF @@ -108,7 +61,7 @@ elif address == constants.SCX: self.setScrollX(data) elif address == constants.LY: - # Read Only + # Read OnlineY pass elif address == constants.LYC: self.setLYCompare(data) @@ -132,7 +85,6 @@ #TODO convert to byte self.vram[address - constants.VRAM_ADDR] =data - def read(self, address): if address == constants.LCDC: return self.getControl() @@ -165,116 +117,94 @@ return self.vram[address - constants.VRAM_ADDR] & 0xFF return 0xFF - def cycles(self): return self.cycles - def emulate(self, ticks): - if ((self.lcdc & 0x80) != 0): + if (self.control & 0x80) != 0: self.cycles -= ticks while (self.cycles <= 0): - switch = self.stat & 0x03 - if switch == 0: + if self.stat == 0: self.emulateHBlank() - elif switch == 1: + elif self.stat == 1: self.emulateVBlank() - elif switch == 2: + elif self.stat == 2: self.emulateOAM() - elif switch == 3: + else: self.emulateTransfer() def getControl(self): - return self.lcdc - + return self.control def getStatus(self): return 0x80 | self.stat - def getScrollY(self): - return self.scy - + return self.scrollY def getScrollX(self): - return self.scx - + return self.scrollX def getLineY(self): - return self.ly - + return self.lineY def getLineYCompare(self): - return self.lyc - + return self.lineYCompare def getDMA(self): return self.dma - def getBackgroundPalette(self): - return self.bgp - + return self.backgroundPalette def getObjectPalette0(self): - return self.obp0 - + return self.objectPalette0 def getObjectPalette1(self): - return self.obp1 - + return self.objectPalette1 def getWindowY(self): - return self.wy - + return self.windowY def getWindowX(self): - return self.wx - + return self.windowX def setControl(self, data): - if ((self.lcdc & 0x80) != (data & 0x80)): - # constants.NOTE: do not reset constants.LY=LYC flag (bit 2) of the constants.STAT register (Mr. - # Do!) - if ((data & 0x80) != 0): + if (self.control & 0x80) != (data & 0x80): + # NOTE: do not reset constants.LY=LYC flag (bit 2) of the STAT register (Mr. Do!) + if (data & 0x80) != 0: self.stat = (self.stat & 0xFC) | 0x02 self.cycles = constants.MODE_2_TICKS - self.ly = 0 + self.lineY = 0 self.display = False else: self.stat = (self.stat & 0xFC) | 0x00 self.cycles = constants.MODE_1_TICKS - self.ly = 0 - + self.lineY = 0 self.clearFrame() # don't draw window if it was not enabled and not being drawn before - if ((self.lcdc & 0x20) == 0 and (data & 0x20) != 0 and self.wly == 0 and self.ly > self.wy): - self.wly = 144 - self.lcdc = data - + if ((self.control & 0x20) == 0 and (data & 0x20) != 0 and self.wlineY == 0 and self.lineY > self.windowY): + self.wlineY = 144 + self.control = data def setStatus(self, data): self.stat = (self.stat & 0x87) | (data & 0x78) # Gameboy Bug - if ((self.lcdc & 0x80) != 0 and (self.stat & 0x03) == 0x01 and (self.stat & 0x44) != 0x44): + if ((self.control & 0x80) != 0 and (self.stat & 0x03) == 0x01 and (self.stat & 0x44) != 0x44): self.interrupt.raiseInterrupt(constants.LCD) - def setScrollY(self, data): - self.scy = data - + self.scrollY = data def setScrollX(self, data): - self.scx = data - + self.scrollX = data def setLYCompare(self, data): - self.lyc = data - if ((self.lcdc & 0x80) != 0): - if (self.ly == self.lyc): - # constants.NOTE: raise interrupt once per line (Prehistorik Man, The - # Jetsons, Muhammad Ali) + self.lineYCompare = data + if ((self.control & 0x80) != 0): + if (self.lineY == self.lineYCompare): + # NOTE: raise interrupt once per line (Prehistorik Man, The Jetsons, Muhammad Ali) if ((self.stat & 0x04) == 0): # constants.LYC=LY interrupt self.stat |= 0x04 @@ -283,70 +213,61 @@ else: self.stat &= 0xFB - def setDMA(self, data): self.dma = data for index in range(0, constants.OAM_SIZE): self.oam[index] = self.memory.read((self.dma << 8) + index) - def setBackgroundPalette(self, data): - if (self.bgp != data): - self.bgp = data + if (self.backgroundPalette != data): + self.backgroundPalette = data self.dirty = True - def setObjectPalette0(self, data): - if (self.obp0 != data): - self.obp0 = data + if (self.objectPalette0 != data): + self.objectPalette0 = data self.dirty = True - def setObjectPalette1(self, data): - if (self.obp1 != data): - self.obp1 = data + if (self.objectPalette1 != data): + self.objectPalette1 = data self.dirty = True - def setWindowY(self, data): - self.wy = data - + self.windowY = data def setWindowX(self, data): - self.wx = data - + self.windowX = data def emulateOAM(self): self.stat = (self.stat & 0xFC) | 0x03 self.cycles += constants.MODE_3_BEGIN_TICKS self.transfer = True - def emulateTransfer(self): - if (self.transfer): + if self.transfer: if (self.display): self.drawLine() self.stat = (self.stat & 0xFC) | 0x03 self.cycles += constants.MODE_3_END_TICKS self.transfer = False else: - self.stat = (self.stat & 0xFC) | 0x00 + self.stat = (self.stat & 0xFC) self.cycles += constants.MODE_0_TICKS # H-Blank interrupt if ((self.stat & 0x08) != 0 and (self.stat & 0x44) != 0x44): self.interrupt.raiseInterrupt(constants.LCD) - def emulateHBlank(self): - self.ly+=1 - if (self.ly == self.lyc): + self.lineY+=1 + if (self.lineY == self.lineYCompare): # constants.LYC=LY interrupt self.stat |= 0x04 if ((self.stat & 0x40) != 0): self.interrupt.raiseInterrupt(constants.LCD) else: self.stat &= 0xFB - if (self.ly < 144): + if (self.lineY < 144): self.stat = (self.stat & 0xFC) | 0x02 self.cycles += constants.MODE_2_TICKS # constants.OAM interrupt @@ -366,7 +287,6 @@ self.cycles += constants.MODE_1_BEGIN_TICKS self.vblank = True - def emulateVBlank(self): if (self.vblank): self.vblank = False @@ -377,25 +297,25 @@ self.interrupt.raiseInterrupt(constants.LCD) # V-Blank interrupt self.interrupt.raiseInterrupt(constants.VBLANK) - elif (self.ly == 0): + elif (self.lineY == 0): self.stat = (self.stat & 0xFC) | 0x02 self.cycles += constants.MODE_2_TICKS # constants.OAM interrupt if ((self.stat & 0x20) != 0 and (self.stat & 0x44) != 0x44): self.interrupt.raiseInterrupt(constants.LCD) else: - if (self.ly < 153): - self.ly+=1 + if (self.lineY < 153): + self.lineY+=1 self.stat = (self.stat & 0xFC) | 0x01 - if (self.ly == 153): + if (self.lineY == 153): self.cycles += constants.MODE_1_END_TICKS else: self.cycles += constants.MODE_1_TICKS else: - self.ly = self.wly = 0 + self.lineY = self.wlineY = 0 self.stat = (self.stat & 0xFC) | 0x01 self.cycles += constants.MODE_1_TICKS - constants.MODE_1_END_TICKS - if (self.ly == self.lyc): + if (self.lineY == self.lineYCompare): # constants.LYC=LY interrupt self.stat |= 0x04 if ((self.stat & 0x40) != 0): @@ -403,60 +323,53 @@ else: self.stat &= 0xFB - def drawFrame(self): - self.driver.display() - + self.driver.updateDisplay() def clearFrame(self): self.clearPixels() - self.driver.display() - + self.driver.updateDisplay() def drawLine(self): - if ((self.lcdc & 0x01) != 0): + if ((self.control & 0x01) != 0): self.drawBackground() else: self.drawCleanBackground() - if ((self.lcdc & 0x20) != 0): + if ((self.control & 0x20) != 0): self.drawWindow() - if ((self.lcdc & 0x02) != 0): + if ((self.control & 0x02) != 0): self.drawObjects() self.drawPixels() - def drawCleanBackground(self): for x in range(0, 8+160+8): self.line[x] = 0x00 - def drawBackground(self): - y = (self.scy + self.ly) & 0xFF - x = self.scx & 0xFF + y = (self.scrollY + self.lineY) & 0xFF + x = self.scrollX & 0xFF tileMap = constants.VRAM_MAP_A - if (self.lcdc & 0x08) != 0: + if (self.control & 0x08) != 0: tileMap = constants.VRAM_MAP_B tileData = constants.VRAM_DATA_B - if (self.lcdc & 0x10) != 0: + if (self.control & 0x10) != 0: tileData = constants.VRAM_DATA_A tileMap += ((y >> 3) << 5) + (x >> 3) tileData += (y & 7) << 1 self.drawTiles(8 - (x & 7), tileMap, tileData) - def drawWindow(self): - if (self.ly >= self.wy and self.wx < 167 and self.wly < 144): + if (self.lineY >= self.windowY and self.windowX < 167 and self.wlineY < 144): tileMap = constants.VRAM_MAP_A - if (self.lcdc & 0x40) != 0: + if (self.control & 0x40) != 0: tileMap = constants.VRAM_MAP_B tileData = constants.VRAM_DATA_B - if (self.lcdc & 0x10) != 0: + if (self.control & 0x10) != 0: tileData = constants.VRAM_DATA_A - tileMap += (self.wly >> 3) << 5 - tileData += (self.wly & 7) << 1 - self.drawTiles(self.wx + 1, tileMap, tileData) - self.wly+=1 - + tileMap += (self.wlineY >> 3) << 5 + tileData += (self.wlineY & 7) << 1 + self.drawTiles(self.windowX + 1, tileMap, tileData) + self.wlineY+=1 def drawObjects(self): count = self.scanObjects() @@ -472,7 +385,6 @@ self.drawOverlappedObjectTile(x, address, flags) lastx = x - def scanObjects(self): count = 0 # search active objects @@ -484,9 +396,9 @@ tile = self.oam[offset + 2] & 0xFF flags = self.oam[offset + 3] & 0xFF - y = self.ly - y + 16 + y = self.lineY - y + 16 - if ((self.lcdc & 0x04) != 0): + if ((self.control & 0x04) != 0): # 8x16 tile size if (y < 0 or y > 15): continue @@ -502,7 +414,8 @@ if ((flags & 0x40) != 0): y = 7 - y self.objects[count] = (x << 24) + (count << 20) + (flags << 12) + ((tile << 4) + (y << 1)) - if (++count >= constants.OBJECTS_PER_LINE): + count += 1 + if count >= constants.OBJECTS_PER_LINE: break self.sortScanObject(count) return count @@ -519,33 +432,20 @@ self.objects[index] = self.objects[rightmost] self.objects[rightmost] = data - def drawTiles(self, x, tileMap, tileData): - if ((self.lcdc & 0x10) != 0): - while (x < 168): + while (x < 168): + if (self.control & 0x10) != 0: tile = self.vram[tileMap] & 0xFF - self.drawTile(x, tileData + (tile << 4)) - tileMap = (tileMap & 0x1FE0) + ((tileMap + 1) & 0x001F) - x += 8 - else: - while (x < 168): + else: tile = (self.vram[tileMap] ^ 0x80) & 0xFF - self.drawTile(x, tileData + (tile << 4)) - tileMap = (tileMap & 0x1FE0) + ((tileMap + 1) & 0x001F) - x += 8 - + self.drawTile(x, tileData + (tile << 4)) + tileMap = (tileMap & 0x1FE0) + ((tileMap + 1) & 0x001F) + x += 8 def drawTile(self, x, address): pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8) - self.line[x + 0] = (pattern >> 7) & 0x0101 - self.line[x + 1] = (pattern >> 6) & 0x0101 - self.line[x + 2] = (pattern >> 5) & 0x0101 - self.line[x + 3] = (pattern >> 4) & 0x0101 - self.line[x + 4] = (pattern >> 3) & 0x0101 - self.line[x + 5] = (pattern >> 2) & 0x0101 - self.line[x + 6] = (pattern >> 1) & 0x0101 - self.line[x + 7] = (pattern >> 0) & 0x0101 - + for i in range(0, 8): + self.line[x + i] = (pattern >> (7-i)) & 0x0101 def drawObjectTile(self, x, address, flags): pattern = (self.vram[address] & 0xFF) + ((self.vram[address + 1] & 0xFF) << 8) @@ -558,55 +458,27 @@ mask |= 0x0004 # X flip if (flags & 0x20) != 0: + self.drawObjectTileXFlipped(x, pattern, mask) + else: + self.drawObjectTileNormal(x, pattern, mask) + + def drawObjectTileNormal(self, x, pattern, mask): + for i in range(0, 7): + color = (pattern >> (6-i)) + if ((color & 0x0202) != 0): + self.line[x + i] |= color | mask color = (pattern << 1) if ((color & 0x0202) != 0): - self.line[x + 0] |= color | mask - color = (pattern >> 0) - if ((color & 0x0202) != 0): - self.line[x + 1] |= color | mask - color = (pattern >> 1) - if ((color & 0x0202) != 0): - self.line[x + 2] |= color | mask - color = (pattern >> 2) - if ((color & 0x0202) != 0): - self.line[x + 3] |= color | mask - color = (pattern >> 3) - if ((color & 0x0202) != 0): - self.line[x + 4] |= color | mask - color = (pattern >> 4) - if ((color & 0x0202) != 0): - self.line[x + 5] |= color | mask - color = (pattern >> 5) - if ((color & 0x0202) != 0): - self.line[x + 6] |= color | mask - color = (pattern >> 6) - if ((color & 0x0202) != 0): self.line[x + 7] |= color | mask - else: - color = (pattern >> 6) - if ((color & 0x0202) != 0): - self.line[x + 0] |= color | mask - color = (pattern >> 5) - if ((color & 0x0202) != 0): - self.line[x + 1] |= color | mask - color = (pattern >> 4) - if ((color & 0x0202) != 0): - self.line[x + 2] |= color | mask - color = (pattern >> 3) - if ((color & 0x0202) != 0): - self.line[x + 3] |= color | mask - color = (pattern >> 2) - if ((color & 0x0202) != 0): - self.line[x + 4] |= color | mask - color = (pattern >> 1) - if ((color & 0x0202) != 0): - self.line[x + 5] |= color | mask - color = (pattern >> 0) - if ((color & 0x0202) != 0): - self.line[x + 6] |= color | mask + + def drawObjectTileXFlipped(self, x, pattern, mask): color = (pattern << 1) if ((color & 0x0202) != 0): - self.line[x + 7] |= color | mask + self.line[x + 0] |= color | mask + for i in range(0, 7): + color = (pattern >> i) + if ((color & 0x0202) != 0): + self.line[x + i + 1] |= color | mask def drawOverlappedObjectTile(self, x, address, flags): @@ -620,82 +492,46 @@ mask |= 0x0004 # X flip if ((flags & 0x20) != 0): + self.drawOverlappedObjectTileXFlipped(x, pattern, mask) + else: + self.drawOverlappedObjectTileNormal(x, pattern, mask) + + def drawOverlappedObjectTileNormal(self, x, pattern, mask): + for i in range(0,7): + color = (pattern >> (6-i)) + if ((color & 0x0202) != 0): + self.line[x + i] = (self.line[x + i] & 0x0101) | color | mask color = (pattern << 1) if ((color & 0x0202) != 0): - self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask - color = (pattern >> 0) - if ((color & 0x0202) != 0): - self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask - color = (pattern >> 1) - if ((color & 0x0202) != 0): - self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask - color = (pattern >> 2) - if ((color & 0x0202) != 0): - self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask - color = (pattern >> 3) - if ((color & 0x0202) != 0): - self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask - color = (pattern >> 4) - if ((color & 0x0202) != 0): - self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask - color = (pattern >> 6) - if ((color & 0x0202) != 0): self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask - color = (pattern >> 5) - if ((color & 0x0202) != 0): - self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask - else: - color = (pattern >> 6) - if ((color & 0x0202) != 0): - self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask - color = (pattern >> 5) - if ((color & 0x0202) != 0): - self.line[x + 1] = (self.line[x + 1] & 0x0101) | color | mask - color = (pattern >> 4) - if ((color & 0x0202) != 0): - self.line[x + 2] = (self.line[x + 2] & 0x0101) | color | mask - color = (pattern >> 3) - if ((color & 0x0202) != 0): - self.line[x + 3] = (self.line[x + 3] & 0x0101) | color | mask - color = (pattern >> 2) - if ((color & 0x0202) != 0): - self.line[x + 4] = (self.line[x + 4] & 0x0101) | color | mask - color = (pattern >> 1) - if ((color & 0x0202) != 0): - self.line[x + 5] = (self.line[x + 5] & 0x0101) | color | mask - color = (pattern >> 0) - if ((color & 0x0202) != 0): - self.line[x + 6] = (self.line[x + 6] & 0x0101) | color | mask + + def drawOverlappedObjectTileXFlipped(self, x, pattern, mask): color = (pattern << 1) if ((color & 0x0202) != 0): - self.line[x + 7] = (self.line[x + 7] & 0x0101) | color | mask - + self.line[x + 0] = (self.line[x + 0] & 0x0101) | color | mask + #TODO maybe a bug in the java implementetation [0,1,2,3,4,6,5] + for i in range(0,7): + color = (pattern >> i) + if ((color & 0x0202) != 0): + self.line[x + i + 1] = (self.line[x + i +1] & 0x0101) | color | mask def drawPixels(self): self.updatePalette() pixels = self.driver.getPixels() - offset = self.ly * self.driver.getWidth() + offset = self.lineY * self.driver.getWidth() for x in range(8, 168, 4): - pattern0 = self.line[x + 0] - pattern1 = self.line[x + 1] - pattern2 = self.line[x + 2] - pattern3 = self.line[x + 3] - pixels[offset + 0] = self.palette[pattern0] - pixels[offset + 1] = self.palette[pattern1] - pixels[offset + 2] = self.palette[pattern2] - pixels[offset + 3] = self.palette[pattern3] + for i in range(0,4): + pattern = self.line[x + i] + pixels[offset + i] = self.palette[pattern] offset += 4 - def clearPixels(self): pixels = self.driver.getPixels() - length = self.driver.getWidth() * self.driver.getHeight() - for offset in range(0, length): + for offset in range(0, len(pixels)): pixels[offset] = constants.COLOR_MAP[0] - def updatePalette(self): - if (not self.dirty): + if not self.dirty: return # bit 4/0 = constants.BG color, bit 5/1 = constants.OBJ color, bit 2 = constants.OBJ palette, bit # 3 = constants.OBJ priority @@ -703,12 +539,35 @@ #color if ((pattern & 0x22) == 0 or ((pattern & 0x08) != 0 and (pattern & 0x11) != 0)): # constants.OBJ behind constants.BG color 1-3 - color = (self.bgp >> ((((pattern >> 3) & 0x02) + (pattern & 0x01)) << 1)) & 0x03 + color = (self.backgroundPalette >> ((((pattern >> 3) & 0x02) + (pattern & 0x01)) << 1)) & 0x03 # constants.OBJ above constants.BG elif ((pattern & 0x04) == 0): - color = (self.obp0 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03 + color = (self.objectPalette0 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03 else: - color = (self.obp1 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03 - + color = (self.objectPalette1 >> ((((pattern >> 4) & 0x02) + ((pattern >> 1) & 0x01)) << 1)) & 0x03 self.palette[((pattern & 0x30) << 4) + (pattern & 0x0F)] = constants.COLOR_MAP[color] self.dirty = False + + +# ------------------------------------------------------------------------------ + +class VideoDriver(object): + + def __init__(self, width, height): + self.width = width + self.height = height + self.pixels = [0]*width*height + + def getWidth(self): + return self.width + + def getHeight(self): + return selg.height + + def getPixels(self): + return self.pixels + + def updateDisplay(self): + self.resetPixels() + + \ No newline at end of file From cami at codespeak.net Sun Mar 30 11:16:43 2008 From: cami at codespeak.net (cami at codespeak.net) Date: Sun, 30 Mar 2008 11:16:43 +0200 (CEST) Subject: [pypy-svn] r53139 - pypy/branch/gameboy-emulator/pypy/lang/gameboy/test Message-ID: <20080330091643.F2FA3169ED5@codespeak.net> Author: cami Date: Sun Mar 30 11:16:43 2008 New Revision: 53139 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py Log: added comment line Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_joypad.py Sun Mar 30 11:16:43 2008 @@ -170,6 +170,9 @@ toggle_multiple_test(driver, driver.getButtonCode, buttons) def test_toggle_mutliple_directions(): + """ + only testing non-opposite buttons, since they would exclude each other + """ driver = get_driver() directions = [(driver.buttonUp, driver.up), #(driver.buttonDown, driver.down), From cfbolz at codespeak.net Sun Mar 30 15:15:29 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 30 Mar 2008 15:15:29 +0200 (CEST) Subject: [pypy-svn] r53142 - in pypy/branch/jit-hotpath/pypy/jit: rainbow timeshifter Message-ID: <20080330131529.4B554169F00@codespeak.net> Author: cfbolz Date: Sun Mar 30 15:15:27 2008 New Revision: 53142 Added: pypy/branch/jit-hotpath/pypy/jit/timeshifter/booleffect.py (contents, props changed) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Log: Introduce BoolRedBox, where arbitrary information can be attached about what happens when a bool is true or false. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 30 15:15:27 2008 @@ -457,18 +457,6 @@ linkfalse, linktrue = linktrue, linkfalse color = self.varcolor(block.exitswitch) index = self.serialize_oparg(color, block.exitswitch) - reverse = None - if color == "red": - srcopname, srcargs = self.trace_back_bool_var( - block, block.exitswitch) - if srcopname is not None: - if srcopname in ('ptr_nonzero', 'oononnull'): - reverse = False - elif srcopname in ('ptr_iszero', 'ooisnull'): - reverse = True - if reverse is not None: - ptrindex = self.serialize_oparg("red", srcargs[0]) - falserenaming = self.insert_renaming(linkfalse) truerenaming = self.insert_renaming(linktrue) if self.hannotator.policy.hotpath and color == "red": @@ -477,13 +465,9 @@ self.emit("%s_goto_iftrue" % color) self.emit(index) self.emit(tlabel(linktrue)) - if reverse is not None: - self.emit("learn_nonzeroness", ptrindex, reverse) self.emit(*falserenaming) self.make_bytecode_block(linkfalse.target, insert_goto=True) self.emit(label(linktrue)) - if reverse is not None: - self.emit("learn_nonzeroness", ptrindex, not reverse) self.emit(*truerenaming) self.make_bytecode_block(linktrue.target, insert_goto=True) else: Added: pypy/branch/jit-hotpath/pypy/jit/timeshifter/booleffect.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/booleffect.py Sun Mar 30 15:15:27 2008 @@ -0,0 +1,27 @@ +from pypy.jit.timeshifter import rvalue + +class Effect(object): + def learn_boolvalue(self, jitstate, boolval): + if boolval: + return self._apply(jitstate) + else: + return self._apply_reverse(jitstate) + + def _apply(self, jitstate): + return True + + def _apply_reverse(self, jitstate): + return True + +class PtrIsNonZeroEffect(Effect): + def __init__(self, ptrbox, reverse=False): + assert isinstance(ptrbox, rvalue.AbstractPtrRedBox) + self.ptrbox = ptrbox + self.reverse = reverse + + def learn_boolvalue(self, jitstate, boolval): + return self.ptrbox.learn_nonzeroness(jitstate, boolval ^ self.reverse) + + def copy(self, memo): + return PtrIsNonZeroEffect(self.ptrbox.copy(memo), self.reverse) + Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Sun Mar 30 15:15:27 2008 @@ -2,7 +2,7 @@ from pypy.annotation import model as annmodel from pypy.rpython.lltypesystem import lltype, lloperation, llmemory from pypy.jit.hintannotator.model import originalconcretetype -from pypy.jit.timeshifter import rvalue, rcontainer, rvirtualizable +from pypy.jit.timeshifter import rvalue, rcontainer, rvirtualizable, booleffect from pypy.jit.timeshifter.greenkey import newgreendict, empty_key from pypy.rlib.objectmodel import we_are_translated from pypy.rlib.unroll import unrolling_iterable @@ -250,7 +250,9 @@ gv_res = jitstate.ts.genop_ptr_iszero(builder, argbox, gv_addr) else: gv_res = jitstate.ts.genop_ptr_nonzero(builder, argbox, gv_addr) - return rvalue.IntRedBox(gv_res) + boolbox = rvalue.BoolRedBox(gv_res) + boolbox.iftrue.append(booleffect.PtrIsNonZeroEffect(argbox, reverse)) + return boolbox def genptreq(jitstate, argbox0, argbox1, reverse): assert isinstance(argbox0, rvalue.PtrRedBox) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Sun Mar 30 15:15:27 2008 @@ -106,6 +106,7 @@ def redboxbuilder_dbl(gv_value): return DoubleRedBox(gv_value) def redboxbuilder_ptr(gv_value): return PtrRedBox(gv_value) def redboxbuilder_inst(gv_value): return InstanceRedBox(gv_value) +def redboxbuilder_bool(gv_value): return BoolRedBox(gv_value) def ll_redboxbuilder(TYPE): if TYPE is lltype.Void: @@ -116,6 +117,8 @@ return redboxbuilder_dbl elif isinstance(TYPE, ootype.OOType): return redboxbuilder_inst + elif TYPE == lltype.Bool: + return redboxbuilder_bool else: assert isinstance(TYPE, lltype.Primitive) # XXX what about long longs? @@ -174,6 +177,44 @@ memo[self] = result return result +class BoolRedBox(RedBox): + # XXX make true and false singletons? + + def __init__(self, genvar): + RedBox.__init__(self, genvar) + self.iftrue = [] + + def learn_boolvalue(self, jitstate, boolval): + if self.is_constant(): + return self.genvar.revealconst(lltype.Bool) == boolval + else: + self.setgenvar(ll_gv_fromvalue(jitstate, boolval)) + result = True + for effect in self.iftrue: + result = effect.learn_boolvalue(jitstate, boolval) and result + self.iftrue = [] + return result + + def copy(self, memo): + memoboxes = memo.boxes + try: + return memoboxes[self] + except KeyError: + result = memoboxes[self] = BoolRedBox(self.genvar) + result.iftrue = [effect.copy(memo) for effect in self.iftrue] + return result + + def freeze(self, memo): + memo = memo.boxes + try: + return memo[self] + except KeyError: + if self.is_constant(): + result = FrozenBoolConst(self.genvar) + else: + result = FrozenBoolVar() + memo[self] = result + return result class DoubleRedBox(RedBox): "A red box that contains a constant double-precision floating point value." @@ -445,6 +486,32 @@ return memo[self] +class FrozenBoolConst(FrozenConst): + + def __init__(self, gv_const): + self.gv_const = gv_const + + def is_constant_equal(self, box): + return (box.is_constant() and + self.gv_const.revealconst(lltype.Bool) == + box.genvar.revealconst(lltype.Bool)) + + def unfreeze(self, incomingvarboxes, memo): + return BoolRedBox(self.gv_const) + + +class FrozenBoolVar(FrozenVar): + + def unfreeze(self, incomingvarboxes, memo): + memo = memo.boxes + if self not in memo: + newbox = BoolRedBox(None) + incomingvarboxes.append(newbox) + memo[self] = newbox + return newbox + else: + return memo[self] + class FrozenDoubleConst(FrozenConst): def __init__(self, gv_const): From cfbolz at codespeak.net Sun Mar 30 15:22:16 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 30 Mar 2008 15:22:16 +0200 (CEST) Subject: [pypy-svn] r53143 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080330132216.E261D168400@codespeak.net> Author: cfbolz Date: Sun Mar 30 15:22:16 2008 New Revision: 53143 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Log: debug_assert handling is simpler now Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 30 15:22:16 2008 @@ -940,13 +940,11 @@ def serialize_op_debug_assert(self, op): v = op.args[0] - srcopname, srcargs = self.trace_back_bool_var(self.current_block, v) - if srcopname in ('ptr_iszero', 'ptr_nonzero'): - arg = self.serialize_oparg("red", srcargs[0]) - self.emit("learn_nonzeroness", arg, srcopname == "ptr_nonzero") - elif srcopname in ('ooisnull', 'oononnull'): - arg = self.serialize_oparg("red", srcargs[0]) - self.emit("learn_nonzeroness", arg, srcopname == "oononnull") + color = self.varcolor(v) + if color == "green": + return + arg = self.serialize_oparg("red", v) + self.emit("learn_boolvalue", arg, True) def serialize_op_direct_call(self, op): kind, withexc = self.guess_call_kind(op) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py Sun Mar 30 15:22:16 2008 @@ -352,7 +352,7 @@ return self.rgenop.genconst(addr1 != addr2) @arguments("red", "bool") - def opimpl_learn_nonzeroness(self, gv_value, boolval): + def opimpl_learn_boolvalue(self, gv_value, boolval): pass @arguments("red_varargs") Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/interpreter.py Sun Mar 30 15:22:16 2008 @@ -541,9 +541,8 @@ ptrbox2, True) @arguments("red", "bool") - def opimpl_learn_nonzeroness(self, redbox, boolval): - assert isinstance(redbox, rvalue.AbstractPtrRedBox) - redbox.learn_nonzeroness(self.jitstate, boolval) + def opimpl_learn_boolvalue(self, redbox, boolval): + redbox.learn_boolvalue(self.jitstate, boolval) @arguments() def opimpl_red_return(self): From cfbolz at codespeak.net Sun Mar 30 15:22:56 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 30 Mar 2008 15:22:56 +0200 (CEST) Subject: [pypy-svn] r53144 - pypy/branch/jit-hotpath/pypy/jit/rainbow Message-ID: <20080330132256.689A3169ECD@codespeak.net> Author: cfbolz Date: Sun Mar 30 15:22:55 2008 New Revision: 53144 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Log: I think this is no longer needed now Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/codewriter.py Sun Mar 30 15:22:55 2008 @@ -1432,29 +1432,6 @@ tsgraph = self.specialized_graph_of(graph, args_v, spaceop.result) yield graph, tsgraph - def trace_back_bool_var(self, block, v): - """Return the (opname, arguments) that created the exitswitch of - the block. The opname is None if not found. - """ - inverted = False - for i in range(len(block.operations)-1, -1, -1): - op = block.operations[i] - if op.result is v: - if op.opname == 'bool_not': - inverted = not inverted - [v] = op.args - elif op.opname == 'same_as': - [v] = op.args - else: - opname = op.opname - opargs = op.args - if inverted: - opname = {'ptr_nonzero': 'ptr_iszero', - 'ptr_iszero' : 'ptr_nonzero'}.get(opname) - return opname, opargs # found - # not found, comes from earlier block - give up - return None, None - def guess_call_kind(self, spaceop): if spaceop.opname == 'direct_call': c_func = spaceop.args[0] From cfbolz at codespeak.net Sun Mar 30 16:32:30 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 30 Mar 2008 16:32:30 +0200 (CEST) Subject: [pypy-svn] r53145 - in pypy/branch/jit-hotpath/pypy/jit: rainbow/test timeshifter Message-ID: <20080330143230.673DF169EFD@codespeak.net> Author: cfbolz Date: Sun Mar 30 16:32:29 2008 New Revision: 53145 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/booleffect.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: mostly for the fun of it: a ptr-equality effect Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_interpreter.py Sun Mar 30 16:32:29 2008 @@ -1943,6 +1943,34 @@ assert res == 7 self.check_insns(int_add=2) + def test_ptrequality(self): + class A(object): + _immutable_ = True + def __init__(self, a): + self.a = a + + five = A(5) + seven = A(7) + + def g(x): + if x: + return seven + return five + def f(green, red): + hint(None, global_merge_point=True) + hint(green, concrete=True) + a = g(red) + if green: + b = seven + else: + b = five + if a is b: + return a.a + return -1 + res = self.interpret(f, [True, True], policy=StopAtXPolicy(g)) + assert res == 7 + self.check_insns(getfield=0) + # void tests def test_void_args(self): class Space(object): @@ -2068,6 +2096,7 @@ test_learn_boolvalue = _skip test_learn_nonzeroness = _skip test_void_args = _skip + test_ptrequality = _skip Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/booleffect.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/booleffect.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/booleffect.py Sun Mar 30 16:32:29 2008 @@ -25,3 +25,26 @@ def copy(self, memo): return PtrIsNonZeroEffect(self.ptrbox.copy(memo), self.reverse) +class PtrEqualEffect(Effect): + def __init__(self, ptrbox1, ptrbox2, reverse=False): + assert isinstance(ptrbox1, rvalue.AbstractPtrRedBox) + assert isinstance(ptrbox2, rvalue.AbstractPtrRedBox) + self.ptrbox1 = ptrbox1 + self.ptrbox2 = ptrbox2 + self.reverse = reverse + + def _apply(self, jitstate): + # the pointers _are_ equal + if self.ptrbox1.is_constant(): + self.ptrbox2.genvar = self.ptrbox1.genvar + return True + if self.ptrbox2.is_constant(): + self.ptrbox1.genvar = self.ptrbox2.genvar + return True + # XXX can do more? + return True + + + def copy(self, memo): + return PtrEqualEffect(self.ptrbox1.copy(memo), + self.ptrbox2.copy(memo), self.reverse) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Sun Mar 30 16:32:29 2008 @@ -276,7 +276,9 @@ gv_res = builder.genop_ptr_ne(gv_addr0, gv_addr1) else: gv_res = builder.genop_ptr_eq(gv_addr0, gv_addr1) - return rvalue.IntRedBox(gv_res) + boolbox = rvalue.BoolRedBox(gv_res) + boolbox.iftrue.append(booleffect.PtrEqualEffect(argbox0, argbox1, reverse)) + return boolbox # ____________________________________________________________ # other jitstate/graph level operations From cfbolz at codespeak.net Sun Mar 30 17:40:52 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 30 Mar 2008 17:40:52 +0200 (CEST) Subject: [pypy-svn] r53146 - in pypy/branch/jit-hotpath/pypy/jit: rainbow/test timeshifter timeshifter/test Message-ID: <20080330154052.E0129169F0A@codespeak.net> Author: cfbolz Date: Sun Mar 30 17:40:51 2008 New Revision: 53146 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/support.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rvalue.py Log: a sort of experimental heuristic for merging: allow the forcing of virtual structs that are written to, but never read from. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Sun Mar 30 17:40:51 2008 @@ -562,7 +562,6 @@ # clue what def test_loop_with_more_and_more_structs(self): - py.test.skip("shows problem with current merging logic") myjitdriver = JitDriver(greens = [], reds = ['n1', 'res']) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Sun Mar 30 17:40:51 2008 @@ -217,6 +217,7 @@ def factory(self): vstruct = self.VirtualStructCls(self) + vstruct.access_info = AccessInfo() vstruct.content_boxes = [desc.makedefaultbox() for desc in self.fielddescs] box = rvalue.PtrRedBox(known_nonzero=True) @@ -788,6 +789,7 @@ def __init__(self, typedesc): self.typedesc = typedesc #self.fz_content_boxes initialized later + #self.access_info initialized later def exactmatch(self, vstruct, outgoingvarboxes, memo): assert isinstance(vstruct, VirtualContainer) @@ -828,6 +830,7 @@ contmemo[self] = ownbox vstruct = ownbox.content assert isinstance(vstruct, VirtualStruct) + vstruct.access_info = self.access_info self_boxes = self.fz_content_boxes for i in range(len(self_boxes)): fz_box = self_boxes[i] @@ -836,13 +839,21 @@ return ownbox +class AccessInfo(object): + def __init__(self): + self.read_fields = False + self.write_fields = False + # XXX what else is needed? + + class VirtualStruct(VirtualContainer): - _attrs_ = "typedesc content_boxes".split() + _attrs_ = "typedesc access_info content_boxes".split() allowed_in_virtualizable = True def __init__(self, typedesc): self.typedesc = typedesc + #self.access_info = ... set in factory #self.content_boxes = ... set in factory() #self.ownbox = ... set in factory() @@ -887,6 +898,7 @@ contmemo = memo.containers assert self not in contmemo # contmemo no longer used result = contmemo[self] = FrozenVirtualStruct(self.typedesc) + result.access_info = self.access_info frozens = [box.freeze(memo) for box in self.content_boxes] result.fz_content_boxes = frozens return result @@ -896,6 +908,7 @@ contmemo = memo.containers assert self not in contmemo # contmemo no longer used result = contmemo[self] = typedesc.VirtualStructCls(typedesc) + result.access_info = self.access_info result.content_boxes = [box.copy(memo) for box in self.content_boxes] result.ownbox = self.ownbox.copy(memo) @@ -911,9 +924,11 @@ self.ownbox = self.ownbox.replace(memo) def op_getfield(self, jitstate, fielddesc): + self.access_info.read_fields = True return self.content_boxes[fielddesc.fieldindex] def op_setfield(self, jitstate, fielddesc, valuebox): + self.access_info.write_fields = True self.content_boxes[fielddesc.fieldindex] = valuebox def op_getsubstruct(self, jitstate, fielddesc): @@ -1260,6 +1275,7 @@ memo.copyfields.append((gv_outside, fielddesc, box)) def op_getfield(self, jitstate, fielddesc): + self.access_info.read_fields = True typedesc = self.typedesc assert isinstance(typedesc, VirtualizableStructTypeDesc) gv_outside = self.content_boxes[-1].genvar @@ -1273,6 +1289,7 @@ return box def op_setfield(self, jitstate, fielddesc, valuebox): + self.access_info.write_fields = True typedesc = self.typedesc assert isinstance(typedesc, VirtualizableStructTypeDesc) fieldindex = fielddesc.fieldindex Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Sun Mar 30 17:40:51 2008 @@ -591,6 +591,11 @@ match = False if not memo.force_merge: if isinstance(box.content, VirtualContainer): + # heuristic: if a virtual is only written to, but never read + # it might not be "important enough" to keep it virtual + if (box.content.access_info.write_fields and not + box.content.access_info.read_fields): + return match raise DontMerge # XXX recursive data structures? return match @@ -634,6 +639,7 @@ def exactmatch(self, box, outgoingvarboxes, memo): assert isinstance(box, PtrRedBox) if box.genvar: + # XXX should we consider self.fz_content.access_info here too? raise DontMerge else: assert box.content is not None Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/support.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/support.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/support.py Sun Mar 30 17:40:51 2008 @@ -60,8 +60,9 @@ class FakeGenVar(GenVar): - def __init__(self, count=0): - self.count=count + def __init__(self, count=0, kind="no clue"): + self.count = count + self.kind = kind def __repr__(self): return "V%d" % self.count @@ -69,6 +70,8 @@ def __eq__(self, other): return self.count == other.count + def getkind(self): + return ("kind", self.kind) class FakeGenConst(GenConst): def __init__(self, _value=None): @@ -77,6 +80,9 @@ def revealconst(self, T): return self._value + def getkind(self): + return ("kind", "no clue") + # ____________________________________________________________ signed_kind = FakeRGenOp.kindToken(lltype.Signed) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py Sun Mar 30 17:40:51 2008 @@ -102,9 +102,14 @@ DontMerge = rvalue.DontMerge V0 = FakeGenVar() ptrbox = rvalue.PtrRedBox(V0) + jitstate = FakeJITState() S = self.STRUCT constbox20 = makebox(20) oldbox = vmalloc(S, constbox20) + + # do a getfield to prevent a merge + box2 = oldbox.op_getfield(jitstate, self.fielddesc) + assert box2 is constbox20 frozenbox = oldbox.freeze(rvalue.freeze_memo()) # check that ptrbox does not match the frozen virtual struct ever py.test.raises(DontMerge, self.match, frozenbox, ptrbox, [ptrbox]) @@ -113,7 +118,22 @@ frozenptrbox = ptrbox.freeze(rvalue.freeze_memo()) py.test.raises(DontMerge, self.match, frozenptrbox, oldbox, [oldbox]) + def test_merge_with_ptrvar_virtual_never_read(self): + DontMerge = rvalue.DontMerge + V0 = FakeGenVar() + ptrbox = rvalue.PtrRedBox(V0) + jitstate = FakeJITState() + S = self.STRUCT + constbox20 = makebox(20) + oldbox = vmalloc(S, constbox20) + + frozenptrbox = ptrbox.freeze(rvalue.freeze_memo()) + assert self.match(frozenptrbox, oldbox, [oldbox]) + # try it the other way round + # XXX what should happen here? + #frozenbox = oldbox.freeze(rvalue.freeze_memo()) + #self.match(frozenbox, ptrbox, [ptrbox]) def test_nested_structure_no_vars(self): NESTED = self.NESTEDSTRUCT Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rvalue.py Sun Mar 30 17:40:51 2008 @@ -1,5 +1,5 @@ import py -from pypy.rpython.lltypesystem import lltype +from pypy.rpython.lltypesystem import lltype, llmemory from pypy.jit.timeshifter import rvalue from pypy.jit.timeshifter import rcontainer from pypy.jit.timeshifter.test.support import * @@ -39,7 +39,7 @@ def test_learn_nonzeroness(): jitstate = FakeJITState() - gv = FakeGenVar() + gv = FakeGenVar(kind=llmemory.Address) box = rvalue.PtrRedBox(gv) assert not box.known_nonzero assert box.learn_nonzeroness(jitstate, True) From fijal at codespeak.net Sun Mar 30 18:55:58 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 18:55:58 +0200 (CEST) Subject: [pypy-svn] r53148 - pypy/dist/pypy/module/_rawffi Message-ID: <20080330165558.4A788169EDD@codespeak.net> Author: fijal Date: Sun Mar 30 18:55:54 2008 New Revision: 53148 Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py Log: Fix translation Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py ============================================================================== --- pypy/dist/pypy/module/_rawffi/interp_rawffi.py (original) +++ pypy/dist/pypy/module/_rawffi/interp_rawffi.py Sun Mar 30 18:55:54 2008 @@ -372,7 +372,7 @@ if tracker.DO_TRACING: # XXX this is needed, because functions tend to live forever # hence our testing is not performing that well - del tracker.alloced[rffi.cast(lltype.Unsigned, array.ll_buffer)] + del tracker.alloced[rffi.cast(rffi.INT, array.ll_buffer)] return space.wrap(array) byptr.unwrap_spec = ['self', ObjSpace] From niko at codespeak.net Sun Mar 30 19:23:04 2008 From: niko at codespeak.net (niko at codespeak.net) Date: Sun, 30 Mar 2008 19:23:04 +0200 (CEST) Subject: [pypy-svn] r53149 - in pypy/dist/pypy/translator: jvm jvm/src/pypy jvm/test oosupport/test_template Message-ID: <20080330172304.30758169EA8@codespeak.net> Author: niko Date: Sun Mar 30 19:23:03 2008 New Revision: 53149 Added: pypy/dist/pypy/translator/jvm/cmpopcodes.py Modified: pypy/dist/pypy/translator/jvm/generator.py pypy/dist/pypy/translator/jvm/metavm.py pypy/dist/pypy/translator/jvm/node.py pypy/dist/pypy/translator/jvm/opcodes.py pypy/dist/pypy/translator/jvm/src/pypy/PyPy.java pypy/dist/pypy/translator/jvm/test/runtest.py pypy/dist/pypy/translator/jvm/test/test_builtin.py pypy/dist/pypy/translator/oosupport/test_template/snippets.py Log: rework the way that comparisons work in the JVM backend: we now detect when the branch depends on a boolean variable defined by the last instruction, and try to inline the comparison. Since the jvm doesn't have opcodes to load the result of a comparison onto the stack, this means that instead of generating code for "if (x(1<<32) bits?? @@ -221,7 +182,6 @@ 'llong_mod_ovf': jvmgen.LREMOVF, 'llong_lshift_ovf': jvmgen.LSHLOVF, - 'ullong_is_true': [PushAllArgs, jvmgen.LCONST_0, 'long_not_equals', StoreResult], 'ullong_invert': jvmgen.PYPYLONGBITWISENEGATE, 'ullong_add': jvmgen.LADD, @@ -231,12 +191,6 @@ 'ullong_truediv': None, # TODO 'ullong_floordiv': jvmgen.LDIV, # valid? 'ullong_mod': jvmgen.PYPYULONGMOD, - 'ullong_lt': 'ulong_less_than', - 'ullong_le': 'ulong_less_equals', - 'ullong_eq': 'ulong_equals', - 'ullong_ne': 'ulong_not_equals', - 'ullong_gt': 'ulong_greater_than', - 'ullong_ge': 'ulong_greater_equals', 'ullong_lshift': [PushAllArgs, jvmgen.L2I, jvmgen.LSHL, StoreResult], 'ullong_rshift': [PushAllArgs, jvmgen.L2I, jvmgen.LUSHR, StoreResult], 'ullong_mod_zer': jvmgen.PYPYULONGMOD, Modified: pypy/dist/pypy/translator/jvm/src/pypy/PyPy.java ============================================================================== --- pypy/dist/pypy/translator/jvm/src/pypy/PyPy.java (original) +++ pypy/dist/pypy/translator/jvm/src/pypy/PyPy.java Sun Mar 30 19:23:03 2008 @@ -256,9 +256,18 @@ public double str_to_double(String s) { try { - return Double.parseDouble(s); + s = s.trim(); + if (s.equalsIgnoreCase("inf")) + return Double.POSITIVE_INFINITY; + else if (s.equalsIgnoreCase("-inf")) + return Double.NEGATIVE_INFINITY; + else if (s.equalsIgnoreCase("nan")) + return Double.NaN; + else + return Double.parseDouble(s); } catch (NumberFormatException ex) { - throw new RuntimeException(ex); + interlink.throwValueError(); + return 0.0; } } @@ -621,6 +630,15 @@ // ---------------------------------------------------------------------- // String + private static String substring(String str, int start, int end) { + if (end >= str.length()) + if (start == 0) + return str; + else + end = str.length(); + return str.substring(start, end); + } + public static String ll_strconcat(String str1, String str2) { return str1 + str2; } @@ -636,23 +654,23 @@ if (start > haystack.length()) return -1; - int res = haystack.indexOf(needle, start); - if (res + needle.length() > end) - return -1; - return res; + haystack = substring(haystack, start, end); + int res = haystack.indexOf(needle); + if (res == -1) return res; + return res + start; } public static int ll_rfind(String haystack, String needle, int start, int end) { - int res = haystack.lastIndexOf(needle, end-1); - if (res >= start) - return res; - return -1; + haystack = substring(haystack, start, end); + int res = haystack.lastIndexOf(needle); + if (res == -1) return res; + return res + start; } public static int ll_count(String haystack, String needle, int start, int end) { - haystack = haystack.substring(start, end); + haystack = substring(haystack, start, end); if (needle.length() == 0) { return haystack.length()+1; @@ -669,27 +687,26 @@ public static int ll_find_char(String haystack, char needle, int start, int end) { - // see ll_find + // see ll_find for why this if is needed if (start > haystack.length()) return -1; - - int res = haystack.indexOf(needle, start); - if (res >= end) - return -1; - return res; + haystack = substring(haystack, start, end); + int res = haystack.indexOf(needle); + if (res == -1) return res; + return res + start; } public static int ll_rfind_char(String haystack, char needle, int start, int end) { - int res = haystack.lastIndexOf(needle, end-1); - if (res >= start) - return res; - return -1; + haystack = substring(haystack, start, end); + int res = haystack.lastIndexOf(needle); + if (res == -1) return res; + return res + start; } public static int ll_count_char(String haystack, char needle, int start, int end) { - haystack = haystack.substring(start, end); + haystack = substring(haystack, start, end); int cnt = 0; int idx = -1; while ((idx = haystack.indexOf(needle, idx+1)) != -1) { @@ -808,7 +825,14 @@ } public String oostring(double d, int base_) { - return new Double(d).toString(); + if (d == Double.POSITIVE_INFINITY) + return "inf"; + else if (d == Double.NEGATIVE_INFINITY) + return "-inf"; + else if (Double.isNaN(d)) + return "nan"; + else + return Double.toString(d); } public String oostring(Object obj, int base_) @@ -822,7 +846,7 @@ public String oostring(char ch, int base_) { - return new Character(ch).toString(); + return Character.toString(ch); } public byte[] oostring(byte[] s, int base_) Modified: pypy/dist/pypy/translator/jvm/test/runtest.py ============================================================================== --- pypy/dist/pypy/translator/jvm/test/runtest.py (original) +++ pypy/dist/pypy/translator/jvm/test/runtest.py Sun Mar 30 19:23:03 2008 @@ -118,11 +118,11 @@ return JvmGeneratedSourceWrapper(self._jvm_src) def _skip_win(self, reason): - if platform.system() == 'Windows': + if hasattr(platform, 'system') and platform.system() == 'Windows': py.test.skip('Windows --> %s' % reason) def _skip_powerpc(self, reason): - if platform.processor() == 'powerpc': + if hasattr(platform, 'processor') and platform.processor() == 'powerpc': py.test.skip('PowerPC --> %s' % reason) def _skip_llinterpreter(self, reason, skipLL=True, skipOO=True): Modified: pypy/dist/pypy/translator/jvm/test/test_builtin.py ============================================================================== --- pypy/dist/pypy/translator/jvm/test/test_builtin.py (original) +++ pypy/dist/pypy/translator/jvm/test/test_builtin.py Sun Mar 30 19:23:03 2008 @@ -3,15 +3,10 @@ from pypy.translator.oosupport.test_template.builtin import BaseTestBuiltin, BaseTestTime from pypy.translator.jvm.test.runtest import JvmTest -def skip_win(): - import platform - if platform.system() == 'Windows': - py.test.skip("Doesn't work on Windows, yet") - class TestJavaBuiltin(JvmTest, BaseTestBuiltin): def test_os_write_magic(self): - skip_win() + self._skip_win('os_write_magic not on windows') BaseTestBuiltin.test_os_write_magic(self) def test_os_path_exists(self): Modified: pypy/dist/pypy/translator/oosupport/test_template/snippets.py ============================================================================== --- pypy/dist/pypy/translator/oosupport/test_template/snippets.py (original) +++ pypy/dist/pypy/translator/oosupport/test_template/snippets.py Sun Mar 30 19:23:03 2008 @@ -68,3 +68,12 @@ res = self.interpret(fn, []) expected = fn() assert res == expected + + def test_branch(self): + def fn(i, j): + if i < j: + return "foo" + else: + return "bar" + assert self.interpret(fn, [1, 2]) == "foo" + assert self.interpret(fn, [2, 1]) == "bar" From fijal at codespeak.net Sun Mar 30 19:27:30 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 19:27:30 +0200 (CEST) Subject: [pypy-svn] r53150 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 user/fijal/ia32 Message-ID: <20080330172730.9883F169EAD@codespeak.net> Author: fijal Date: Sun Mar 30 19:27:29 2008 New Revision: 53150 Added: user/fijal/ia32/ - copied from r53149, pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/ Removed: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/ Log: Move this to my home directory (basically I would like to remove it, but let's keep it for a while) From fijal at codespeak.net Sun Mar 30 19:28:53 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 19:28:53 +0200 (CEST) Subject: [pypy-svn] r53151 - pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx Message-ID: <20080330172853.B1B7D169EA8@codespeak.net> Author: fijal Date: Sun Mar 30 19:28:53 2008 New Revision: 53151 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/rgenop.py Log: check this in, basically in order to move stuff. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/rgenop.py Sun Mar 30 19:28:53 2008 @@ -44,6 +44,14 @@ repr = __repr__ +class IntVar(Var): + pass + +class BoolVar(Var): + pass + +class FloatVar(Var): + pass ##class Const(GenConst): From fijal at codespeak.net Sun Mar 30 19:30:08 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 19:30:08 +0200 (CEST) Subject: [pypy-svn] r53152 - in pypy/branch/jit-hotpath/pypy/jit/codegen: ia32 ia32/test iaxx Message-ID: <20080330173008.392C8169EA8@codespeak.net> Author: fijal Date: Sun Mar 30 19:30:07 2008 New Revision: 53152 Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/ - copied from r53150, pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/__init__.py - copied unchanged from r53151, pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/__init__.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/autopath.py - copied unchanged from r53151, pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/autopath.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/conftest.py - copied unchanged from r53151, pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/conftest.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py - copied unchanged from r53151, pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/ - copied from r53151, pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/test/ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/viewcode.py - copied unchanged from r53151, pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/viewcode.py Removed: pypy/branch/jit-hotpath/pypy/jit/codegen/iaxx/ Log: move iaxx into ia32. From fijal at codespeak.net Sun Mar 30 19:30:44 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 19:30:44 +0200 (CEST) Subject: [pypy-svn] r53153 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test Message-ID: <20080330173044.8BDE7169EA8@codespeak.net> Author: fijal Date: Sun Mar 30 19:30:44 2008 New Revision: 53153 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py Log: fix import. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py Sun Mar 30 19:30:44 2008 @@ -1,4 +1,4 @@ -from pypy.jit.codegen.iaxx.rgenop import RI386GenOp +from pypy.jit.codegen.ia32.rgenop import RI386GenOp from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTests class TestRI386Genop(AbstractRGenOpTests): From fijal at codespeak.net Sun Mar 30 19:57:23 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 19:57:23 +0200 (CEST) Subject: [pypy-svn] r53154 - in pypy/branch/jit-hotpath/pypy/jit/codegen: i386/test test Message-ID: <20080330175723.83195169EFD@codespeak.net> Author: fijal Date: Sun Mar 30 19:57:21 2008 New Revision: 53154 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Log: Split direct and compile tests (rest of backend will follow) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_rgenop.py Sun Mar 30 19:57:21 2008 @@ -1,11 +1,16 @@ import py from pypy.rpython.lltypesystem import lltype from pypy.jit.codegen.i386.rgenop import RI386GenOp -from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTests +from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTestsDirect +from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTestsCompile -class TestRI386Genop(AbstractRGenOpTests): +# for the individual tests see +# ====> ../../test/rgenop_tests.py + +class TestRI386GenopDirect(AbstractRGenOpTestsDirect): RGenOp = RI386GenOp from pypy.jit.codegen.i386.test.test_operation import RGenOpPacked - # for the individual tests see - # ====> ../../test/rgenop_tests.py +class TestRI386GenopCompile(AbstractRGenOpTestsCompile): + RGenOp = RI386GenOp + from pypy.jit.codegen.i386.test.test_operation import RGenOpPacked Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Sun Mar 30 19:57:21 2008 @@ -828,19 +828,177 @@ return res return runner - -class AbstractRGenOpTests(test_boehm.AbstractGCTestClass): +class AbstractTestBase(test_boehm.AbstractGCTestClass): RGenOp = None RGenOpPacked = None + + def cast(self, gv, nb_args, RESULT=lltype.Signed): + F1 = lltype.FuncType([lltype.Signed] * nb_args, RESULT) + return self.RGenOp.get_python_callable(lltype.Ptr(F1), gv) +class AbstractRGenOpTestsCompile(AbstractTestBase): def compile(self, runner, argtypes): return self.getcompiled(runner, argtypes, annotatorpolicy = GENOP_POLICY) + + def test_adder_compile(self): + fn = self.compile(get_adder_runner(self.RGenOp), [int, int]) + res = fn(9080983, -9080941) + assert res == 42 - def cast(self, gv, nb_args, RESULT=lltype.Signed): - F1 = lltype.FuncType([lltype.Signed] * nb_args, RESULT) - return self.RGenOp.get_python_callable(lltype.Ptr(F1), gv) + def test_dummy_compile(self): + fn = self.compile(get_dummy_runner(self.RGenOp), [int, int]) + res = fn(40, 37) + assert res == 42 + + def test_hide_and_reveal(self): + RGenOp = self.RGenOp + def hide_and_reveal(v): + rgenop = RGenOp() + gv = rgenop.genconst(v) + res = gv.revealconst(lltype.Signed) + keepalive_until_here(rgenop) + return res + res = hide_and_reveal(42) + assert res == 42 + fn = self.compile(hide_and_reveal, [int]) + res = fn(42) + assert res == 42 + + + def test_hide_and_reveal_p(self): + RGenOp = self.RGenOp + S = lltype.GcStruct('s', ('x', lltype.Signed)) + S_PTR = lltype.Ptr(S) + s1 = lltype.malloc(S) + s1.x = 8111 + s2 = lltype.malloc(S) + s2.x = 8222 + def hide_and_reveal_p(n): + rgenop = RGenOp() + if n == 1: + s = s1 + else: + s = s2 + gv = rgenop.genconst(s) + s_res = gv.revealconst(S_PTR) + keepalive_until_here(rgenop) + return s_res.x + res = hide_and_reveal_p(1) + assert res == 8111 + res = hide_and_reveal_p(2) + assert res == 8222 + fn = self.compile(hide_and_reveal_p, [int]) + res = fn(1) + assert res == 8111 + res = fn(2) + assert res == 8222 + + def test_largedummy_compile(self): + fn = self.compile(get_largedummy_runner(self.RGenOp), [int] * 100) + args, expected = largedummy_example() + res = fn(*args) + assert res == expected + + def test_branching_compile(self): + fn = self.compile(get_branching_runner(self.RGenOp), [int, int]) + res = fn(30, 17) + assert res == 29 + res = fn(3, 17) + assert res == 17 + + def test_goto_compile(self): + fn = self.compile(get_goto_runner(self.RGenOp), [int, int]) + res = fn(10, 17) + assert res == 3628872 + res = fn(3, 17) + assert res == 29 + def test_if_compile(self): + fn = self.compile(get_if_runner(self.RGenOp), [int, int]) + res = fn(30, 0) + assert res == 45 + res = fn(3, 0) + assert res == 6 + + def test_switch_compile(self): + fn = self.compile(get_switch_runner(self.RGenOp), [int, int]) + res = fn(0, 2) + assert res == 42 + res = fn(1, 17) + assert res == 38 + res = fn(42, 18) + assert res == 18 + + def test_large_switch_compile(self): + fn = self.compile(get_large_switch_runner(self.RGenOp), [int, int]) + res = fn(0, 2) + assert res == 42 + for x in range(1,11): + res = fn(x, 7) + assert res == 2**x+7 + res = fn(42, 18) + assert res == 18 + + def test_fact_compile(self): + fn = self.compile(get_fact_runner(self.RGenOp), [int]) + res = fn(2) + assert res == 2 + res = fn(11) + assert res == 39916800 + + def test_calling_pause_compile(self): + fn = self.compile(get_func_calling_pause_runner(self.RGenOp), [int]) + res = fn(2) + assert res == 2 + res = fn(-72) + assert res == 72 + + def test_pause_and_resume_compile(self): + fn = self.compile(get_pause_and_resume_runner(self.RGenOp), [int]) + + res = fn(1) + assert res == 0 + + res = fn(2) + assert res == 3 + + res = fn(3) + assert res == 8 + + def test_read_frame_var_compile(self): + runner = get_read_frame_var_runner(self.RGenOp, via_genconst=False) + fn = self.compile(runner, [int]) + res = fn(30) + assert res == 60 + + def test_genconst_from_frame_var_compile(self): + runner = get_read_frame_var_runner(self.RGenOp, via_genconst=True) + fn = self.compile(runner, [int]) + res = fn(30) + assert res == 60 + + def test_write_frame_place_compile(self): + fn = self.compile(get_write_frame_place_runner(self.RGenOp), [int]) + res = fn(-42) + assert res == -100 - (-420) + res = fn(606) + assert res == 4242 - 6060 + + def test_read_frame_place_compile(self): + fn = self.compile(get_read_frame_place_runner(self.RGenOp), [int]) + res = fn(-1) + assert res == 42 + + + def test_ovfcheck_adder_compile(self): + fn = self.compile(get_ovfcheck_adder_runner(self.RGenOp), [int, int]) + res = fn(9080983, -9080941) + assert res == (42 << 1) | 0 + res = fn(-sys.maxint, -10) + assert (res & 1) == 1 + +class AbstractRGenOpTestsDirect(AbstractTestBase): def directtesthelper(self, FUNCTYPE, func): # for machine code backends: build a ctypes function pointer # (with a real physical address) that will call back our 'func' @@ -885,11 +1043,6 @@ res = fnptr(37) assert res == 42 - def test_adder_compile(self): - fn = self.compile(get_adder_runner(self.RGenOp), [int, int]) - res = fn(9080983, -9080941) - assert res == 42 - def test_dummy_direct(self): rgenop = self.RGenOp() gv_dummyfn = make_dummy(rgenop) @@ -897,53 +1050,6 @@ res = fnptr(30, 17) assert res == 42 - def test_dummy_compile(self): - fn = self.compile(get_dummy_runner(self.RGenOp), [int, int]) - res = fn(40, 37) - assert res == 42 - - def test_hide_and_reveal(self): - RGenOp = self.RGenOp - def hide_and_reveal(v): - rgenop = RGenOp() - gv = rgenop.genconst(v) - res = gv.revealconst(lltype.Signed) - keepalive_until_here(rgenop) - return res - res = hide_and_reveal(42) - assert res == 42 - fn = self.compile(hide_and_reveal, [int]) - res = fn(42) - assert res == 42 - - def test_hide_and_reveal_p(self): - RGenOp = self.RGenOp - S = lltype.GcStruct('s', ('x', lltype.Signed)) - S_PTR = lltype.Ptr(S) - s1 = lltype.malloc(S) - s1.x = 8111 - s2 = lltype.malloc(S) - s2.x = 8222 - def hide_and_reveal_p(n): - rgenop = RGenOp() - if n == 1: - s = s1 - else: - s = s2 - gv = rgenop.genconst(s) - s_res = gv.revealconst(S_PTR) - keepalive_until_here(rgenop) - return s_res.x - res = hide_and_reveal_p(1) - assert res == 8111 - res = hide_and_reveal_p(2) - assert res == 8222 - fn = self.compile(hide_and_reveal_p, [int]) - res = fn(1) - assert res == 8111 - res = fn(2) - assert res == 8222 - def test_largedummy_direct(self): rgenop = self.RGenOp() gv_largedummyfn = make_largedummy(rgenop) @@ -952,12 +1058,6 @@ res = fnptr(*args) assert res == expected - def test_largedummy_compile(self): - fn = self.compile(get_largedummy_runner(self.RGenOp), [int] * 100) - args, expected = largedummy_example() - res = fn(*args) - assert res == expected - def test_branching_direct(self): rgenop = self.RGenOp() gv_branchingfn = make_branching(rgenop) @@ -967,13 +1067,6 @@ res = fnptr(3, 17) assert res == 17 - def test_branching_compile(self): - fn = self.compile(get_branching_runner(self.RGenOp), [int, int]) - res = fn(30, 17) - assert res == 29 - res = fn(3, 17) - assert res == 17 - def test_goto_direct(self): rgenop = self.RGenOp() gv_gotofn = make_goto(rgenop) @@ -983,13 +1076,6 @@ res = fnptr(3, 17) # <== or here assert res == 29 - def test_goto_compile(self): - fn = self.compile(get_goto_runner(self.RGenOp), [int, int]) - res = fn(10, 17) - assert res == 3628872 - res = fn(3, 17) - assert res == 29 - def test_if_direct(self): rgenop = self.RGenOp() gv_iffn = make_if(rgenop) @@ -999,13 +1085,6 @@ res = fnptr(3, 0) assert res == 6 - def test_if_compile(self): - fn = self.compile(get_if_runner(self.RGenOp), [int, int]) - res = fn(30, 0) - assert res == 45 - res = fn(3, 0) - assert res == 6 - def test_switch_direct(self): rgenop = self.RGenOp() gv_switchfn = make_switch(rgenop) @@ -1017,15 +1096,6 @@ res = fnptr(42, 16) assert res == 16 - def test_switch_compile(self): - fn = self.compile(get_switch_runner(self.RGenOp), [int, int]) - res = fn(0, 2) - assert res == 42 - res = fn(1, 17) - assert res == 38 - res = fn(42, 18) - assert res == 18 - def test_large_switch_direct(self): rgenop = self.RGenOp() gv_switchfn = make_large_switch(rgenop) @@ -1038,16 +1108,6 @@ res = fnptr(42, 16) assert res == 16 - def test_large_switch_compile(self): - fn = self.compile(get_large_switch_runner(self.RGenOp), [int, int]) - res = fn(0, 2) - assert res == 42 - for x in range(1,11): - res = fn(x, 7) - assert res == 2**x+7 - res = fn(42, 18) - assert res == 18 - def test_fact_direct(self): rgenop = self.RGenOp() gv_fact = make_fact(rgenop) @@ -1057,13 +1117,6 @@ res = fnptr(10) assert res == 3628800 - def test_fact_compile(self): - fn = self.compile(get_fact_runner(self.RGenOp), [int]) - res = fn(2) - assert res == 2 - res = fn(11) - assert res == 39916800 - def test_calling_pause_direct(self): rgenop = self.RGenOp() gv_abs = make_func_calling_pause(rgenop) @@ -1073,13 +1126,6 @@ res = fnptr(-42) assert res == 42 - def test_calling_pause_compile(self): - fn = self.compile(get_func_calling_pause_runner(self.RGenOp), [int]) - res = fn(2) - assert res == 2 - res = fn(-72) - assert res == 72 - def test_longwinded_and_direct(self): rgenop = self.RGenOp() gv_fn = make_longwinded_and(rgenop) @@ -1319,18 +1365,6 @@ res = fnptr(3) assert res == 8 - def test_pause_and_resume_compile(self): - fn = self.compile(get_pause_and_resume_runner(self.RGenOp), [int]) - - res = fn(1) - assert res == 0 - - res = fn(2) - assert res == 3 - - res = fn(3) - assert res == 8 - def test_like_residual_red_call_with_exc_direct(self): rgenop = self.RGenOp() gv_callable = make_something_a_bit_like_residual_red_call_with_exc(rgenop) @@ -1414,18 +1448,6 @@ res = fnptr(20) assert res == 40 - def test_read_frame_var_compile(self): - runner = get_read_frame_var_runner(self.RGenOp, via_genconst=False) - fn = self.compile(runner, [int]) - res = fn(30) - assert res == 60 - - def test_genconst_from_frame_var_compile(self): - runner = get_read_frame_var_runner(self.RGenOp, via_genconst=True) - fn = self.compile(runner, [int]) - res = fn(30) - assert res == 60 - def test_write_frame_place_direct(self): def get_writer(place1, place2): fvw = FramePlaceWriter(self.RGenOp) @@ -1442,13 +1464,6 @@ res = fnptr(6) assert res == 42 - 60 - def test_write_frame_place_compile(self): - fn = self.compile(get_write_frame_place_runner(self.RGenOp), [int]) - res = fn(-42) - assert res == -100 - (-420) - res = fn(606) - assert res == 4242 - 6060 - def test_write_lots_of_frame_places_direct(self): def get_writer(places): fvw = ManyFramePlaceWriter(self.RGenOp) @@ -1477,11 +1492,6 @@ res = fnptr(-1) assert res == 42 - def test_read_frame_place_compile(self): - fn = self.compile(get_read_frame_place_runner(self.RGenOp), [int]) - res = fn(-1) - assert res == 42 - def test_frame_vars_like_the_frontend_direct(self): rgenop = self.RGenOp() sigtoken = rgenop.sigToken(FUNC3) @@ -1951,13 +1961,6 @@ res = fnptr(sys.maxint-2) assert (res & 1) == 1 - def test_ovfcheck_adder_compile(self): - fn = self.compile(get_ovfcheck_adder_runner(self.RGenOp), [int, int]) - res = fn(9080983, -9080941) - assert res == (42 << 1) | 0 - res = fn(-sys.maxint, -10) - assert (res & 1) == 1 - def test_ovfcheck1_direct(self): yield self.ovfcheck1_direct, "int_neg_ovf", [(18, -18), (-18, 18), From fijal at codespeak.net Sun Mar 30 20:04:09 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 20:04:09 +0200 (CEST) Subject: [pypy-svn] r53155 - pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/test Message-ID: <20080330180409.49BDD169EFD@codespeak.net> Author: fijal Date: Sun Mar 30 20:04:08 2008 New Revision: 53155 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/test/test_rgenop.py Log: port llgraph tests Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/test/test_rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/test/test_rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/test/test_rgenop.py Sun Mar 30 20:04:08 2008 @@ -2,18 +2,21 @@ from pypy.rpython.lltypesystem import lltype from pypy.jit.codegen.llgraph.rgenop import RGenOp from pypy.jit.codegen.llgraph.llimpl import testgengraph -from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTests +from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTestsDirect +from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTestsCompile from pypy.rpython.test.test_llinterp import gengraph, interpret +# for the individual tests see +# ====> ../../test/rgenop_tests.py -class TestLLGraphRGenop(AbstractRGenOpTests): +class BaseLLGraphRGenop(object): RGenOp = RGenOp RGenOpPacked = RGenOp def setup_method(self, meth): if 'ovfcheck' in meth.__name__: py.test.skip("no chance (the llinterpreter has no rtyper)") - AbstractRGenOpTests.setup_method(self, meth) + super(BaseLLGraphRGenop, self).setup_method(meth) def getcompiled(self, runner, argtypes, annotatorpolicy): def quasi_compiled_runner(*args): @@ -25,10 +28,13 @@ argtypes = [annmodel.lltype_to_annotation(T) for T in FUNC.TO.ARGS] t, rtyper, graph = gengraph(func, argtypes) return rtyper.getcallable(graph) + - # for the individual tests see - # ====> ../../test/rgenop_tests.py +class TestLLGraphRGenopDirect(BaseLLGraphRGenop, AbstractRGenOpTestsDirect): + pass +class TestLLGraphRGenopCompile(BaseLLGraphRGenop, AbstractRGenOpTestsCompile): + pass def test_not_calling_end_explodes(): F1 = lltype.FuncType([lltype.Signed], lltype.Signed) From fijal at codespeak.net Sun Mar 30 20:07:11 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 20:07:11 +0200 (CEST) Subject: [pypy-svn] r53156 - pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/test Message-ID: <20080330180711.E2FAF169E20@codespeak.net> Author: fijal Date: Sun Mar 30 20:07:11 2008 New Revision: 53156 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/test/test_rgenop.py Log: skip these tests. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/test/test_rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/test/test_rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/test/test_rgenop.py Sun Mar 30 20:07:11 2008 @@ -1,4 +1,5 @@ import py +py.test.skip("Port this tests to new style") from pypy.jit.codegen.ppc.rgenop import RPPCGenOp from pypy.rpython.lltypesystem import lltype from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTests, FUNC, FUNC2 From fijal at codespeak.net Sun Mar 30 20:14:13 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 20:14:13 +0200 (CEST) Subject: [pypy-svn] r53157 - pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/test Message-ID: <20080330181413.4680A169EC6@codespeak.net> Author: fijal Date: Sun Mar 30 20:14:12 2008 New Revision: 53157 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/test/test_rgenop.py Log: port those tests Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/test/test_rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/test/test_rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/test/test_rgenop.py Sun Mar 30 20:14:12 2008 @@ -1,8 +1,9 @@ import py -py.test.skip("Port this tests to new style") from pypy.jit.codegen.ppc.rgenop import RPPCGenOp from pypy.rpython.lltypesystem import lltype -from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTests, FUNC, FUNC2 +from pypy.jit.codegen.test.rgenop_tests import FUNC, FUNC2 +from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTestsDirect +from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTestsCompile from ctypes import cast, c_int, c_void_p, CFUNCTYPE from pypy.jit.codegen.ppc import instruction as insn @@ -19,15 +20,14 @@ class FewRegistersAndScribble(FewRegisters): DEBUG_SCRIBBLE = True -class TestRPPCGenop(AbstractRGenOpTests): +class TestRPPCGenopDirect(AbstractRGenOpTestsDirect): RGenOp = RPPCGenOp +class TestRPPCGenopCompile(AbstractRGenOpTestsCompile): + RGenOp = RPPCGenOp -class TestRPPCGenopNoRegs(TestRPPCGenop): +class TestRPPCGenopNoRegs(AbstractRGenOpTestsDirect): RGenOp = FewRegisters - def compile(self, runner, argtypes): - py.test.skip("Skip compiled tests w/ restricted register allocator") - -class TestRPPCGenopNoRegsAndScribble(TestRPPCGenopNoRegs): +class TestRPPCGenopNoRegsAndScribble(AbstractRGenOpTestsDirect): RGenOp = FewRegistersAndScribble From fijal at codespeak.net Sun Mar 30 20:22:42 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 20:22:42 +0200 (CEST) Subject: [pypy-svn] r53158 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test Message-ID: <20080330182242.B9598169EE8@codespeak.net> Author: fijal Date: Sun Mar 30 20:22:42 2008 New Revision: 53158 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py Log: port tests to new style Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py Sun Mar 30 20:22:42 2008 @@ -1,8 +1,17 @@ from pypy.jit.codegen.ia32.rgenop import RI386GenOp -from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTests +from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTestsDirect +from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTestsCompile -class TestRI386Genop(AbstractRGenOpTests): +# for the individual tests see +# ====> ../../test/rgenop_tests.py + +class TestRI386GenopDirect(AbstractRGenOpTestsDirect): + RGenOp = RI386GenOp + from pypy.jit.codegen.i386.test.test_operation import RGenOpPacked + +class TestRI386GenopCompile(AbstractRGenOpTestsCompile): RGenOp = RI386GenOp + from pypy.jit.codegen.i386.test.test_operation import RGenOpPacked - # for the individual tests see - # ====> ../../test/rgenop_tests.py + def setup_class(cls): + py.test.skip("skip compilation tests") From antocuni at codespeak.net Sun Mar 30 20:35:17 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Sun, 30 Mar 2008 20:35:17 +0200 (CEST) Subject: [pypy-svn] r53159 - pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph Message-ID: <20080330183517.A2E68169EFD@codespeak.net> Author: antocuni Date: Sun Mar 30 20:35:17 2008 New Revision: 53159 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py Log: fix test_graph2rgenop Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/llimpl.py Sun Mar 30 20:35:17 2008 @@ -239,6 +239,9 @@ return ootype.cast_to_object(value) elif isinstance(T, ootype.OOType) and ootype.typeOf(value) is ootype.Object: return ootype.cast_from_object(T, value) + elif isinstance(T, ootype.StaticMethod): + fn = value._obj + return ootype._static_meth(T, graph=fn.graph, _callable=fn._callable) else: T1 = lltype.typeOf(value) if T1 is llmemory.Address: From cfbolz at codespeak.net Sun Mar 30 20:39:51 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 30 Mar 2008 20:39:51 +0200 (CEST) Subject: [pypy-svn] r53160 - pypy/branch/jit-hotpath/pypy/jit/codegen/ppc Message-ID: <20080330183951.E868B169E8B@codespeak.net> Author: cfbolz Date: Sun Mar 30 20:39:51 2008 New Revision: 53160 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/rgenop.py Log: implement genconst_from_frame_var in the ppc backend Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/rgenop.py Sun Mar 30 20:39:51 2008 @@ -1269,6 +1269,21 @@ assert isinstance(place, GenConst) return place.revealconst(T) + @staticmethod + @specialize.arg(0) + def genconst_from_frame_var(kind, base, info, index): + place = info[index] + if isinstance(place, StackInfo): + #print '!!!', base, place.offset + #print '???', [peek_word_at(base + place.offset + i) + # for i in range(-64, 65, 4)] + assert place.offset != 0 + value = peek_word_at(base + place.offset) + return IntConst(value) + else: + assert isinstance(place, GenConst) + return place + @staticmethod @specialize.arg(0) From fijal at codespeak.net Sun Mar 30 21:11:08 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 21:11:08 +0200 (CEST) Subject: [pypy-svn] r53161 - pypy/dist/pypy/lib/_ctypes Message-ID: <20080330191108.595CD169EAF@codespeak.net> Author: fijal Date: Sun Mar 30 21:11:05 2008 New Revision: 53161 Modified: pypy/dist/pypy/lib/_ctypes/function.py Log: fix support for functions from addresses, all tests are passing. Modified: pypy/dist/pypy/lib/_ctypes/function.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/function.py (original) +++ pypy/dist/pypy/lib/_ctypes/function.py Sun Mar 30 21:11:05 2008 @@ -32,12 +32,15 @@ def _getargtypes(self): return self._argtypes_ def _setargtypes(self, argtypes): + self._ptr = None self._argtypes_ = argtypes argtypes = property(_getargtypes, _setargtypes) def _getrestype(self): return self._restype_ def _setrestype(self, restype): + self._ptr = None + from ctypes import c_char_p if restype is int: from ctypes import c_int restype = c_int From fijal at codespeak.net Sun Mar 30 21:17:37 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 21:17:37 +0200 (CEST) Subject: [pypy-svn] r53162 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test Message-ID: <20080330191737.2FB14169ECA@codespeak.net> Author: fijal Date: Sun Mar 30 21:17:36 2008 New Revision: 53162 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py Log: skip all tests which are not supported Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py Sun Mar 30 21:17:36 2008 @@ -1,3 +1,4 @@ +import py from pypy.jit.codegen.ia32.rgenop import RI386GenOp from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTestsDirect from pypy.jit.codegen.test.rgenop_tests import AbstractRGenOpTestsCompile @@ -9,6 +10,31 @@ RGenOp = RI386GenOp from pypy.jit.codegen.i386.test.test_operation import RGenOpPacked + def skipped(self): + py.test.skip("unsupported") + + # frame access related + test_read_frame_var_direct = skipped + test_genconst_from_frame_var_direct = skipped + test_write_frame_place_direct = skipped + test_write_lots_of_frame_places_direct = skipped + test_read_frame_place_direct = skipped + test_frame_vars_like_the_frontend_direct = skipped + + # unsupported operations + test_genzeroconst = skipped + + # overflow + test_ovfcheck_adder_direct = skipped + test_ovfcheck1_direct = skipped + test_ovfcheck2_direct = skipped + + # casts + test_cast_direct = skipped + + # void returns + test_void_return = skipped + class TestRI386GenopCompile(AbstractRGenOpTestsCompile): RGenOp = RI386GenOp from pypy.jit.codegen.i386.test.test_operation import RGenOpPacked From fijal at codespeak.net Sun Mar 30 21:35:01 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 21:35:01 +0200 (CEST) Subject: [pypy-svn] r53163 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080330193501.9BE26169EC2@codespeak.net> Author: fijal Date: Sun Mar 30 21:35:00 2008 New Revision: 53163 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: port sigtoken to be more verbose from old ia32 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Sun Mar 30 21:35:00 2008 @@ -6,6 +6,7 @@ from pypy.jit.codegen.model import AbstractRGenOp, GenLabel, GenBuilder from pypy.jit.codegen.model import GenVar, GenConst, CodeGenSwitch from pypy.rlib import objectmodel +from pypy.rlib.unroll import unrolling_iterable from pypy.rpython.annlowlevel import llhelper WORD = 4 @@ -45,13 +46,30 @@ repr = __repr__ class IntVar(Var): - pass + ll_type = lltype.Signed + token = 'i' class BoolVar(Var): - pass + ll_type = lltype.Bool + token = 'b' class FloatVar(Var): - pass + ll_type = lltype.Float + token = 'f' + +LL_TO_GENVAR = {} +TOKEN_TO_GENVAR = {} +for value in locals().values(): + if hasattr(value, 'll_type'): + LL_TO_GENVAR[value.ll_type] = value.token + TOKEN_TO_GENVAR[value.token] = value + +UNROLLING_TOKEN_TO_GENVAR = unrolling_iterable(TOKEN_TO_GENVAR.items()) + +def token_to_genvar(i): + for tok, value in UNROLLING_TOKEN_TO_GENVAR: + if tok == i: + return value() ##class Const(GenConst): @@ -321,7 +339,7 @@ def _write_prologue(self, sigtoken): self._open() - numargs = sigtoken # for now + numargs = len(sigtoken[0]) #self.mc.BREAKPOINT() # self.stackdepth-1 is the return address; the arguments # come just before @@ -457,7 +475,7 @@ return self.returnvar(eax) def genop_call(self, sigtoken, gv_fnptr, args_gv): - numargs = sigtoken # for now + numargs = len(sigtoken[0]) MASK = CALL_ALIGN-1 if MASK: final_depth = self.stackdepth + numargs @@ -519,7 +537,7 @@ def finish_and_return(self, sigtoken, gv_returnvar): self._open() - initialstackdepth = self.rgenop._initial_stack_depth(sigtoken) + initialstackdepth = self.rgenop._initial_stack_depth(len(sigtoken[0])) self.mc.MOV(eax, gv_returnvar.operand(self)) self.mc.ADD(esp, imm(WORD * (self.stackdepth - initialstackdepth))) self.mc.RET() @@ -1020,13 +1038,14 @@ return Builder(self, stackdepth) def newgraph(self, sigtoken, name): - builder = self.newbuilder(self._initial_stack_depth(sigtoken)) + arg_tokens, res_token = sigtoken + builder = self.newbuilder(self._initial_stack_depth(len(arg_tokens))) builder._open() # Force builder to have an mc entrypoint = builder.mc.tell() inputargs_gv = builder._write_prologue(sigtoken) return builder, IntConst(entrypoint), inputargs_gv - def _initial_stack_depth(self, sigtoken): + def _initial_stack_depth(self, numargs): # If a stack depth is a multiple of CALL_ALIGN then the # arguments are correctly aligned for a call. We have to # precompute initialstackdepth to guarantee that. For OS/X the @@ -1034,7 +1053,6 @@ # arguments are pushed, i.e. just before the return address is # pushed by the CALL instruction. In other words, after # 'numargs' arguments have been pushed the stack is aligned: - numargs = sigtoken # for now MASK = CALL_ALIGN - 1 initialstackdepth = ((numargs+MASK)&~MASK) + 1 return initialstackdepth @@ -1107,11 +1125,8 @@ @staticmethod @specialize.memo() def sigToken(FUNCTYPE): - numargs = 0 - for ARG in FUNCTYPE.ARGS: - if ARG is not lltype.Void: - numargs += 1 - return numargs # for now + return ([LL_TO_GENVAR[arg] for arg in FUNCTYPE.ARGS if arg + is not lltype.Void], LL_TO_GENVAR[FUNCTYPE.RESULT]) @staticmethod def erasedType(T): From fijal at codespeak.net Sun Mar 30 22:01:02 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 22:01:02 +0200 (CEST) Subject: [pypy-svn] r53164 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080330200102.35E89169E2E@codespeak.net> Author: fijal Date: Sun Mar 30 22:00:57 2008 New Revision: 53164 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: Introduce a boolvar. This does not change anything actually, besides the fact that exists. This will allow in the future to keep track of bools in flags. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Sun Mar 30 22:00:57 2008 @@ -343,7 +343,7 @@ #self.mc.BREAKPOINT() # self.stackdepth-1 is the return address; the arguments # come just before - return [Var(self.stackdepth-2-n) for n in range(numargs)] + return [IntVar(self.stackdepth-2-n) for n in range(numargs)] def _close(self): self.closed = True @@ -383,7 +383,7 @@ op = mem(edx, offset) self.mc.MOVZX(eax, op) op = eax - return self.returnvar(op) + return self.returnintvar(op) def genop_setfield(self, (offset, fieldsize), gv_ptr, gv_value): self.mc.MOV(eax, gv_value.operand(self)) @@ -400,7 +400,7 @@ def genop_getsubstruct(self, (offset, fieldsize), gv_ptr): self.mc.MOV(edx, gv_ptr.operand(self)) self.mc.LEA(eax, mem(edx, offset)) - return self.returnvar(eax) + return self.returnintvar(eax) def itemaddr(self, base, arraytoken, gv_index): # uses ecx @@ -428,18 +428,18 @@ assert itemsize == 1 or itemsize == 2 self.mc.MOVZX(eax, op) op = eax - return self.returnvar(op) + return self.returnintvar(op) def genop_getarraysubstruct(self, arraytoken, gv_ptr, gv_index): self.mc.MOV(edx, gv_ptr.operand(self)) op = self.itemaddr(edx, arraytoken, gv_index) self.mc.LEA(eax, op) - return self.returnvar(eax) + return self.returnintvar(eax) def genop_getarraysize(self, arraytoken, gv_ptr): lengthoffset, startoffset, itemoffset = arraytoken self.mc.MOV(edx, gv_ptr.operand(self)) - return self.returnvar(mem(edx, lengthoffset)) + return self.returnintvar(mem(edx, lengthoffset)) def genop_setarrayitem(self, arraytoken, gv_ptr, gv_index, gv_value): self.mc.MOV(eax, gv_value.operand(self)) @@ -460,7 +460,7 @@ # XXX boehm only, no atomic/non atomic distinction for now self.push(imm(size)) self.mc.CALL(rel32(gc_malloc_fnaddr())) - return self.returnvar(eax) + return self.returnintvar(eax) def genop_malloc_varsize(self, varsizealloctoken, gv_size): # XXX boehm only, no atomic/non atomic distinction for now @@ -472,7 +472,7 @@ lengthoffset, _, _ = varsizealloctoken self.mc.MOV(ecx, gv_size.operand(self)) self.mc.MOV(mem(eax, lengthoffset), ecx) - return self.returnvar(eax) + return self.returnintvar(eax) def genop_call(self, sigtoken, gv_fnptr, args_gv): numargs = len(sigtoken[0]) @@ -497,11 +497,11 @@ else: self.mc.CALL(gv_fnptr.operand(self)) # XXX only for int return_kind, check calling conventions - return self.returnvar(eax) + return self.returnintvar(eax) def genop_same_as(self, gv_x): if gv_x.is_const: # must always return a var - return self.returnvar(gv_x.operand(self)) + return self.returnintvar(gv_x.operand(self)) else: return gv_x @@ -517,7 +517,7 @@ # turn constants into variables; also make copies of vars that # are duplicate in args_gv if not isinstance(gv, Var) or gv.stackpos in seen: - gv = args_gv[i] = self.returnvar(gv.operand(self)) + gv = args_gv[i] = self.returnintvar(gv.operand(self)) # remember the var's position in the stack arg_positions.append(gv.stackpos) seen[gv.stackpos] = None @@ -570,11 +570,17 @@ self.mc.PUSH(op) self.stackdepth += 1 - def returnvar(self, op): - res = Var(self.stackdepth) + def returnintvar(self, op): + res = IntVar(self.stackdepth) self.push(op) return res + def returnboolvar(self, op): + self.mc.MOVZX(eax, op) + res = BoolVar(self.stackdepth) + self.push(eax) + return res + @staticmethod def identity(gv_x): return gv_x @@ -584,91 +590,85 @@ def op_int_add(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.ADD(eax, gv_y.operand(self)) - return self.returnvar(eax) + return self.returnintvar(eax) def op_int_sub(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.SUB(eax, gv_y.operand(self)) - return self.returnvar(eax) + return self.returnintvar(eax) def op_int_mul(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.IMUL(eax, gv_y.operand(self)) - return self.returnvar(eax) + return self.returnintvar(eax) def op_int_floordiv(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.CDQ() self.mc.IDIV(gv_y.nonimmoperand(self, ecx)) - return self.returnvar(eax) + return self.returnintvar(eax) def op_int_mod(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.CDQ() self.mc.IDIV(gv_y.nonimmoperand(self, ecx)) - return self.returnvar(edx) + return self.returnintvar(edx) def op_int_and(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.AND(eax, gv_y.operand(self)) - return self.returnvar(eax) + return self.returnintvar(eax) def op_int_or(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.OR(eax, gv_y.operand(self)) - return self.returnvar(eax) + return self.returnintvar(eax) def op_int_xor(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.XOR(eax, gv_y.operand(self)) - return self.returnvar(eax) + return self.returnintvar(eax) def op_int_lt(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.CMP(eax, gv_y.operand(self)) self.mc.SETL(al) - self.mc.MOVZX(eax, al) - return self.returnvar(eax) + return self.returnboolvar(al) def op_int_le(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.CMP(eax, gv_y.operand(self)) self.mc.SETLE(al) - self.mc.MOVZX(eax, al) - return self.returnvar(eax) + return self.returnboolvar(al) def op_int_eq(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.CMP(eax, gv_y.operand(self)) self.mc.SETE(al) - self.mc.MOVZX(eax, al) - return self.returnvar(eax) + return self.returnboolvar(al) def op_int_ne(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.CMP(eax, gv_y.operand(self)) self.mc.SETNE(al) - self.mc.MOVZX(eax, al) - return self.returnvar(eax) + return self.returnboolvar(al) def op_int_gt(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.CMP(eax, gv_y.operand(self)) self.mc.SETG(al) - self.mc.MOVZX(eax, al) - return self.returnvar(eax) + return self.returnboolvar(al) def op_int_ge(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.CMP(eax, gv_y.operand(self)) self.mc.SETGE(al) - self.mc.MOVZX(eax, al) - return self.returnvar(eax) + return self.returnboolvar(al) def op_int_neg(self, gv_x): self.mc.MOV(eax, gv_x.operand(self)) self.mc.NEG(eax) - return self.returnvar(eax) + return self.returnintvar(eax) def op_int_abs(self, gv_x): self.mc.MOV(eax, gv_x.operand(self)) @@ -678,24 +678,24 @@ self.mc.SBB(eax, gv_x.operand(self)) self.mc.SBB(edx, edx) self.mc.XOR(eax, edx) - return self.returnvar(eax) + return self.returnintvar(eax) def op_int_invert(self, gv_x): self.mc.MOV(eax, gv_x.operand(self)) self.mc.NOT(eax) - return self.returnvar(eax) + return self.returnintvar(eax) def op_int_lshift(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.MOV(ecx, gv_y.operand(self)) # XXX check if ecx >= 32 self.mc.SHL(eax, cl) - return self.returnvar(eax) + return self.returnintvar(eax) def op_int_rshift(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.MOV(ecx, gv_y.operand(self)) # XXX check if ecx >= 32 self.mc.SAR(eax, cl) - return self.returnvar(eax) + return self.returnintvar(eax) op_uint_is_true = op_int_is_true op_uint_invert = op_int_invert @@ -705,33 +705,31 @@ def op_uint_mul(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.MUL(gv_y.nonimmoperand(self, edx)) - return self.returnvar(eax) + return self.returnintvar(eax) def op_uint_floordiv(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.XOR(edx, edx) self.mc.DIV(gv_y.nonimmoperand(self, ecx)) - return self.returnvar(eax) + return self.returnintvar(eax) def op_uint_mod(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.XOR(edx, edx) self.mc.DIV(gv_y.nonimmoperand(self, ecx)) - return self.returnvar(edx) + return self.returnintvar(edx) def op_uint_lt(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.CMP(eax, gv_y.operand(self)) self.mc.SETB(al) - self.mc.MOVZX(eax, al) - return self.returnvar(eax) + return self.returnboolvar(al) def op_uint_le(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.CMP(eax, gv_y.operand(self)) self.mc.SETBE(al) - self.mc.MOVZX(eax, al) - return self.returnvar(eax) + return self.returnboolvar(al) op_uint_eq = op_int_eq op_uint_ne = op_int_ne @@ -740,15 +738,13 @@ self.mc.MOV(eax, gv_x.operand(self)) self.mc.CMP(eax, gv_y.operand(self)) self.mc.SETA(al) - self.mc.MOVZX(eax, al) - return self.returnvar(eax) + return self.returnboolvar(al) def op_uint_ge(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) self.mc.CMP(eax, gv_y.operand(self)) self.mc.SETAE(al) - self.mc.MOVZX(eax, al) - return self.returnvar(eax) + return self.returnboolvar(al) op_uint_and = op_int_and op_uint_or = op_int_or @@ -759,19 +755,19 @@ self.mc.MOV(eax, gv_x.operand(self)) self.mc.MOV(ecx, gv_y.operand(self)) # XXX check if ecx >= 32 self.mc.SHR(eax, cl) - return self.returnvar(eax) + return self.returnintvar(eax) def op_bool_not(self, gv_x): self.mc.CMP(gv_x.operand(self), imm8(0)) self.mc.SETE(al) self.mc.MOVZX(eax, al) - return self.returnvar(eax) + return self.returnintvar(eax) def op_cast_bool_to_int(self, gv_x): self.mc.CMP(gv_x.operand(self), imm8(0)) self.mc.SETNE(al) self.mc.MOVZX(eax, al) - return self.returnvar(eax) + return self.returnintvar(eax) op_cast_bool_to_uint = op_cast_bool_to_int From cfbolz at codespeak.net Sun Mar 30 22:05:41 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 30 Mar 2008 22:05:41 +0200 (CEST) Subject: [pypy-svn] r53165 - pypy/branch/jit-hotpath/pypy/jit/timeshifter Message-ID: <20080330200541.A7491169DFC@codespeak.net> Author: cfbolz Date: Sun Mar 30 22:05:41 2008 New Revision: 53165 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Log: add repr Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Sun Mar 30 22:05:41 2008 @@ -845,6 +845,10 @@ self.write_fields = False # XXX what else is needed? + def __repr__(self): + return "" % ( + self.read_fields, self.write_fields) + class VirtualStruct(VirtualContainer): _attrs_ = "typedesc access_info content_boxes".split() From cfbolz at codespeak.net Sun Mar 30 22:07:42 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Sun, 30 Mar 2008 22:07:42 +0200 (CEST) Subject: [pypy-svn] r53166 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080330200742.55139169DFC@codespeak.net> Author: cfbolz Date: Sun Mar 30 22:07:41 2008 New Revision: 53166 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Log: add (commented out) check about what I would like to happen Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hotpath.py Sun Mar 30 22:07:41 2008 @@ -558,8 +558,7 @@ res = self.run(main, [3, 40], threshold=10, policy=POLICY) assert ''.join(res.chars) == " ".join([str(n) for n in range(40, 0, -1)]) - # XXX should check something about the produced code as well, but no - # clue what + # self.check_insns_in_loops(malloc=2) I would like this, but fails right now def test_loop_with_more_and_more_structs(self): myjitdriver = JitDriver(greens = [], From fijal at codespeak.net Sun Mar 30 23:06:46 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 23:06:46 +0200 (CEST) Subject: [pypy-svn] r53167 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080330210646.414C316852B@codespeak.net> Author: fijal Date: Sun Mar 30 23:06:45 2008 New Revision: 53167 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: refactoring to store different values on stack Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Sun Mar 30 23:06:45 2008 @@ -48,28 +48,33 @@ class IntVar(Var): ll_type = lltype.Signed token = 'i' + SIZE = 1 class BoolVar(Var): ll_type = lltype.Bool token = 'b' + SIZE = 1 class FloatVar(Var): ll_type = lltype.Float token = 'f' + SIZE = 2 LL_TO_GENVAR = {} TOKEN_TO_GENVAR = {} +TOKEN_TO_SIZE = {} for value in locals().values(): if hasattr(value, 'll_type'): LL_TO_GENVAR[value.ll_type] = value.token TOKEN_TO_GENVAR[value.token] = value + TOKEN_TO_SIZE[value.token] = value.SIZE UNROLLING_TOKEN_TO_GENVAR = unrolling_iterable(TOKEN_TO_GENVAR.items()) -def token_to_genvar(i): +def token_to_genvar(i, arg): for tok, value in UNROLLING_TOKEN_TO_GENVAR: if tok == i: - return value() + return value(arg) ##class Const(GenConst): @@ -337,13 +342,18 @@ def end(self): pass - def _write_prologue(self, sigtoken): + def _write_prologue(self, arg_tokens): self._open() - numargs = len(sigtoken[0]) #self.mc.BREAKPOINT() # self.stackdepth-1 is the return address; the arguments # come just before - return [IntVar(self.stackdepth-2-n) for n in range(numargs)] + n = 0 + result = [] + for arg in arg_tokens: + arg_gv = token_to_genvar(arg, self.stackdepth-2-n) + n += arg_gv.SIZE + result.append(arg_gv) + return result def _close(self): self.closed = True @@ -795,6 +805,8 @@ op_ptr_eq = op_int_eq op_ptr_ne = op_int_ne + def op_float_add(self, gv_x, gv_y): + xxx SIZE2SHIFT = {1: 0, 2: 1, @@ -1035,10 +1047,14 @@ def newgraph(self, sigtoken, name): arg_tokens, res_token = sigtoken - builder = self.newbuilder(self._initial_stack_depth(len(arg_tokens))) + inputargs_gv = [] + ofs = 0 + for argtoken in arg_tokens: + ofs += TOKEN_TO_SIZE[argtoken] + builder = self.newbuilder(self._initial_stack_depth(ofs)) builder._open() # Force builder to have an mc entrypoint = builder.mc.tell() - inputargs_gv = builder._write_prologue(sigtoken) + inputargs_gv = builder._write_prologue(arg_tokens) return builder, IntConst(entrypoint), inputargs_gv def _initial_stack_depth(self, numargs): From fijal at codespeak.net Sun Mar 30 23:12:30 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Sun, 30 Mar 2008 23:12:30 +0200 (CEST) Subject: [pypy-svn] r53168 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080330211230.1EC8416852B@codespeak.net> Author: fijal Date: Sun Mar 30 23:12:29 2008 New Revision: 53168 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: support for different consts (still, they don't do anything different) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Sun Mar 30 23:12:29 2008 @@ -101,7 +101,7 @@ ## revealconst._annspecialcase_ = 'specialize:arg(1)' -class IntConst(GenConst): +class Const(GenConst): def __init__(self, value): self.value = value @@ -132,6 +132,14 @@ def repr(self): return "const=$%s" % (self.value,) +class IntConst(Const): + pass + +class FloatConst(Const): + pass + +class BoolConst(Const): + pass ##class FnPtrConst(IntConst): ## def __init__(self, value, mc): @@ -1077,8 +1085,10 @@ T = lltype.typeOf(llvalue) if T is llmemory.Address: return AddrConst(llvalue) - elif isinstance(T, lltype.Primitive): - return IntConst(lltype.cast_primitive(lltype.Signed, llvalue)) + elif T is lltype.Signed: + return IntConst(llvalue) + elif T is lltype.Bool: + return BoolConst(llvalue) elif isinstance(T, lltype.Ptr): lladdr = llmemory.cast_ptr_to_adr(llvalue) if T.TO._gckind == 'gc': From antocuni at codespeak.net Sun Mar 30 23:43:58 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Sun, 30 Mar 2008 23:43:58 +0200 (CEST) Subject: [pypy-svn] r53169 - pypy/extradoc/talk/pycon-italy-2008 Message-ID: <20080330214358.00B0416852C@codespeak.net> Author: antocuni Date: Sun Mar 30 23:43:58 2008 New Revision: 53169 Added: pypy/extradoc/talk/pycon-italy-2008/ pypy/extradoc/talk/pycon-italy-2008/abstract.txt (contents, props changed) Log: the abstract for the talk I and Samuele will present at Pycon Italy Added: pypy/extradoc/talk/pycon-italy-2008/abstract.txt ============================================================================== --- (empty file) +++ pypy/extradoc/talk/pycon-italy-2008/abstract.txt Sun Mar 30 23:43:58 2008 @@ -0,0 +1,41 @@ +Alla Ricerca di Prestazioni e di Flessibilit?. PyPy ? l'arte di Generare Macchine Virtuali +------------------------------------------------------------------------------------------- + +Vorremmo tutti che il nostro linguaggio dinamico preferito fosse pi? +veloce, cos? da poterlo utilizzare in ancora pi? occasioni. + +Purtroppo, questo richiede un gran lavoro! + +Ci deve essere un modo migliore che non scrivere l'ennesimo interprete +in C o Java per implementare linguaggi dinamici in modo da permettere +al linguaggio stesso di cambiare e crescere pi? facilmente. + +PyPy ? un framework per implementare linguaggi dinamici che accetta +questa sfida; esso ci permette di implementare questi linguaggi +scrivendo un semplice interprete in un ricco sottoinsieme di Python; +questo significa far evolvere il nostro linguaggio richiede uno sforzo +ragionevole. + +Quindi, PyPy genera tutta una serie di macchine virtuali da un unico +sorgente, e supporta un'ampia gamma di piattaforme differenti, incluse +C/Posix, Java e .NET. Questo evita la maggior sorgente di +frammentazione all'interno di una comunit? legata ad un linguaggio +dinamico, ovvero la necessit? di avere implementazioni diverse per +diverse macchine virtuali. Significa anche che possiamo riutilizzare +lo stesso framework ed ottenere gli stessi vantaggi per implementare +tutta una serie di linguaggi anche molto diversi tra loro, come +Python, Prolog o Smalltalk. + +Il toolchain necessario per generare macchine virtuali si rivela utile +anche per altri scopi. Tradizionalmente, per implementare una +macchina virtuale occorre prendere importanti decisioni nelle +primissime fasi dello sviluppo, che quindi diventano pervasive +all'interno dell'intero codice sorgente, rendendo difficile se non +impossibile cambiarle successivamente. Sarebbe bello poter +sperimentare ad esempio diversi garbage collector, ma non se per fare +ci? ? necessario riscrivere tutto o quasi da zero per ognuno di essi. +Con PyPy, questo non ? necessario. + +Inoltre, ? anche possibile generare automaticamente un compilatore JIT +per il linguaggio in questione, dimostrando che ? possibile ottenere +un altro grado di flessibilit? senza rinunciare alla velocit?. From fijal at codespeak.net Mon Mar 31 00:29:38 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 00:29:38 +0200 (CEST) Subject: [pypy-svn] r53171 - pypy/branch/jit-hotpath/pypy/jit/codegen/i386 Message-ID: <20080330222938.95344168534@codespeak.net> Author: fijal Date: Mon Mar 31 00:29:38 2008 New Revision: 53171 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Log: fix the opcodes for x87 instructions (few of them) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386.py Mon Mar 31 00:29:38 2008 @@ -19,7 +19,7 @@ raise ValueError class FLOATREG(OPERAND): - width = 4 + width = 8 def __repr__(self): return '' % self.num @@ -222,6 +222,15 @@ dh = DH() bh = BH() +st0 = ST0() +st1 = ST1() +st2 = ST2() +st3 = ST3() +st4 = ST4() +st5 = ST5() +st6 = ST6() +st7 = ST7() + registers = [eax, ecx, edx, ebx, esp, ebp, esi, edi] registers8 = [al, cl, dl, bl, ah, ch, dh, bh] @@ -247,6 +256,9 @@ def mem(basereg, offset=0): return memSIB(basereg, None, 0, offset) +def mem64(basereg, offset=0): + return memSIB64(basereg, None, 0, offset) + def memSIB(base, index, scaleshift, offset): return _SIBencode(MODRM, base, index, scaleshift, offset) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Mon Mar 31 00:29:38 2008 @@ -436,15 +436,15 @@ # ------------------------- floating point instructions ------------------ -FLD = Instruction() -FLD.mode1(MODRM64, ['\xD9', modrm(1)]) +FLDL = Instruction() +FLDL.mode1(MODRM64, ['\xDD', modrm(1)]) FADD = Instruction() #FADD.mode1(MODRM64, ['\xDC', modrm(1)]) FADD.mode0(['\xDE\xC1']) -#FISTP = Instruction() -#FISTP.mode1(MODRM64, ['\xDF', modrm(1)]) +FSTPL = Instruction() +FSTPL.mode1(MODRM64, ['\xDD', orbyte(3<<3), modrm(1)]) # ------------------------- end of floating point ------------------------ From cfbolz at codespeak.net Mon Mar 31 01:20:23 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 31 Mar 2008 01:20:23 +0200 (CEST) Subject: [pypy-svn] r53172 - in pypy/branch/jit-hotpath/pypy/jit/timeshifter: . test Message-ID: <20080330232023.2E9CA168519@codespeak.net> Author: cfbolz Date: Mon Mar 31 01:20:21 2008 New Revision: 53172 Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py Log: move the AccessInfo to the PtrRedBox Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py Mon Mar 31 01:20:21 2008 @@ -217,7 +217,6 @@ def factory(self): vstruct = self.VirtualStructCls(self) - vstruct.access_info = AccessInfo() vstruct.content_boxes = [desc.makedefaultbox() for desc in self.fielddescs] box = rvalue.PtrRedBox(known_nonzero=True) @@ -789,7 +788,6 @@ def __init__(self, typedesc): self.typedesc = typedesc #self.fz_content_boxes initialized later - #self.access_info initialized later def exactmatch(self, vstruct, outgoingvarboxes, memo): assert isinstance(vstruct, VirtualContainer) @@ -830,7 +828,6 @@ contmemo[self] = ownbox vstruct = ownbox.content assert isinstance(vstruct, VirtualStruct) - vstruct.access_info = self.access_info self_boxes = self.fz_content_boxes for i in range(len(self_boxes)): fz_box = self_boxes[i] @@ -838,26 +835,13 @@ memo) return ownbox - -class AccessInfo(object): - def __init__(self): - self.read_fields = False - self.write_fields = False - # XXX what else is needed? - - def __repr__(self): - return "" % ( - self.read_fields, self.write_fields) - - class VirtualStruct(VirtualContainer): - _attrs_ = "typedesc access_info content_boxes".split() + _attrs_ = "typedesc content_boxes".split() allowed_in_virtualizable = True def __init__(self, typedesc): self.typedesc = typedesc - #self.access_info = ... set in factory #self.content_boxes = ... set in factory() #self.ownbox = ... set in factory() @@ -902,7 +886,6 @@ contmemo = memo.containers assert self not in contmemo # contmemo no longer used result = contmemo[self] = FrozenVirtualStruct(self.typedesc) - result.access_info = self.access_info frozens = [box.freeze(memo) for box in self.content_boxes] result.fz_content_boxes = frozens return result @@ -912,7 +895,6 @@ contmemo = memo.containers assert self not in contmemo # contmemo no longer used result = contmemo[self] = typedesc.VirtualStructCls(typedesc) - result.access_info = self.access_info result.content_boxes = [box.copy(memo) for box in self.content_boxes] result.ownbox = self.ownbox.copy(memo) @@ -928,11 +910,9 @@ self.ownbox = self.ownbox.replace(memo) def op_getfield(self, jitstate, fielddesc): - self.access_info.read_fields = True return self.content_boxes[fielddesc.fieldindex] def op_setfield(self, jitstate, fielddesc, valuebox): - self.access_info.write_fields = True self.content_boxes[fielddesc.fieldindex] = valuebox def op_getsubstruct(self, jitstate, fielddesc): @@ -1279,7 +1259,6 @@ memo.copyfields.append((gv_outside, fielddesc, box)) def op_getfield(self, jitstate, fielddesc): - self.access_info.read_fields = True typedesc = self.typedesc assert isinstance(typedesc, VirtualizableStructTypeDesc) gv_outside = self.content_boxes[-1].genvar @@ -1293,7 +1272,6 @@ return box def op_setfield(self, jitstate, fielddesc, valuebox): - self.access_info.write_fields = True typedesc = self.typedesc assert isinstance(typedesc, VirtualizableStructTypeDesc) fieldindex = fielddesc.fieldindex Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py Mon Mar 31 01:20:21 2008 @@ -240,6 +240,22 @@ return result +class AccessInfo(object): + def __init__(self): + self.read_fields = 0 + self.write_fields = 0 + # XXX what else is needed? + + def __repr__(self): + return "" % ( + self.read_fields, self.write_fields) + + def copy(self): + result = AccessInfo() + result.read_fields = self.read_fields + result.write_fields = self.write_fields + + class AbstractPtrRedBox(RedBox): """ Base class for PtrRedBox (lltype) and InstanceRedBox (ootype) @@ -252,6 +268,7 @@ if genvar is not None and genvar.is_const: known_nonzero = bool(self._revealconst(genvar)) self.known_nonzero = known_nonzero + self.access_info = AccessInfo() def setgenvar(self, newgenvar): RedBox.setgenvar(self, newgenvar) @@ -296,6 +313,8 @@ boxmemo[self] = result if self.content: result.content = self.content.copy(memo) + # XXX is this correct? + result.access_info = self.access_info assert isinstance(result, AbstractPtrRedBox) return result @@ -336,6 +355,7 @@ boxmemo[self] = result result.fz_partialcontent = content.partialfreeze(memo) return result + result.fz_access_info = self.access_info.copy() boxmemo[self] = result return result @@ -375,6 +395,7 @@ self.content.enter_block(incoming, memo) def op_getfield(self, jitstate, fielddesc): + self.access_info.read_fields += 1 self.learn_nonzeroness(jitstate, True) if self.content is not None: box = self.content.op_getfield(jitstate, fielddesc) @@ -387,6 +408,7 @@ return box def op_setfield(self, jitstate, fielddesc, valuebox): + self.access_info.write_fields += 1 self.learn_nonzeroness(jitstate, True) gv_ptr = self.genvar if gv_ptr: @@ -591,10 +613,9 @@ match = False if not memo.force_merge: if isinstance(box.content, VirtualContainer): - # heuristic: if a virtual is only written to, but never read + # heuristic: if a virtual is neither written to, nor read from # it might not be "important enough" to keep it virtual - if (box.content.access_info.write_fields and not - box.content.access_info.read_fields): + if not box.access_info.read_fields: return match raise DontMerge # XXX recursive data structures? return match @@ -628,8 +649,12 @@ exact = FrozenVar.exactmatch(self, box, outgoingvarboxes, memo) match = exact and partialdatamatch if not memo.force_merge and not match: + # heuristic: if a virtual is neither written to, nor read from + # it might not be "important enough" to keep it virtual from pypy.jit.timeshifter.rcontainer import VirtualContainer if isinstance(box.content, VirtualContainer): + if not box.access_info.read_fields: + return match raise DontMerge # XXX recursive data structures? return match @@ -639,7 +664,7 @@ def exactmatch(self, box, outgoingvarboxes, memo): assert isinstance(box, PtrRedBox) if box.genvar: - # XXX should we consider self.fz_content.access_info here too? + # XXX should we consider self.access_info here too? raise DontMerge else: assert box.content is not None Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py Mon Mar 31 01:20:21 2008 @@ -110,6 +110,7 @@ # do a getfield to prevent a merge box2 = oldbox.op_getfield(jitstate, self.fielddesc) assert box2 is constbox20 + assert oldbox.access_info.read_fields == 1 frozenbox = oldbox.freeze(rvalue.freeze_memo()) # check that ptrbox does not match the frozen virtual struct ever py.test.raises(DontMerge, self.match, frozenbox, ptrbox, [ptrbox]) From cfbolz at codespeak.net Mon Mar 31 01:39:55 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 31 Mar 2008 01:39:55 +0200 (CEST) Subject: [pypy-svn] r53173 - in pypy/branch/jit-hotpath/pypy/lang/prolog/interpreter: . test Message-ID: <20080330233955.D0F231684EE@codespeak.net> Author: cfbolz Date: Mon Mar 31 01:39:55 2008 New Revision: 53173 Modified: pypy/branch/jit-hotpath/pypy/lang/prolog/interpreter/engine.py pypy/branch/jit-hotpath/pypy/lang/prolog/interpreter/test/test_jit.py Log: kill portal jit stuff in the prolog interp, to be rewritten Modified: pypy/branch/jit-hotpath/pypy/lang/prolog/interpreter/engine.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/lang/prolog/interpreter/engine.py (original) +++ pypy/branch/jit-hotpath/pypy/lang/prolog/interpreter/engine.py Mon Mar 31 01:39:55 2008 @@ -3,7 +3,8 @@ from pypy.lang.prolog.interpreter.error import UnificationFailed, FunctionNotFound, \ CutException from pypy.lang.prolog.interpreter import error -from pypy.rlib.jit import hint, we_are_jitted, _is_early_constant, purefunction +from pypy.rlib.jit import hint, we_are_jitted, _is_early_constant, \ + purefunction, JitDriver from pypy.rlib.objectmodel import specialize from pypy.rlib.unroll import unrolling_iterable @@ -206,15 +207,6 @@ return builtin.call(self, query, continuation) return self.user_call(query, continuation, choice_point=False) - def _opaque_call(self, query, continuation): - from pypy.lang.prolog.builtin import builtins - signature = query.signature - builtin = builtins.get(signature, None) - if builtin is not None: - return builtin.call(self, query, continuation) - # do a real call - return self.user_call(query, continuation, choice_point=False) - def main_loop(self, where, query, continuation, rule=None): next = (DONE, None, None, None) hint(where, concrete=True) @@ -311,40 +303,7 @@ inline=False): if not choice_point: return (TRY_RULE, query, continuation, rule) - if not we_are_jitted(): - return self.portal_try_rule(rule, query, continuation, choice_point) - if inline: - return self.main_loop(TRY_RULE, query, continuation, rule) - #if _is_early_constant(rule): - # rule = hint(rule, promote=True) - # return self.portal_try_rule(rule, query, continuation, choice_point) - return self._opaque_try_rule(rule, query, continuation, choice_point) - - def _opaque_try_rule(self, rule, query, continuation, choice_point): - return self.portal_try_rule(rule, query, continuation, choice_point) - - def portal_try_rule(self, rule, query, continuation, choice_point): - hint(None, global_merge_point=True) - hint(choice_point, concrete=True) - if not choice_point: - return self._try_rule(rule, query, continuation) - where = TRY_RULE - next = (DONE, None, None, None) - hint(where, concrete=True) - hint(rule, concrete=True) - signature = hint(query.signature, promote=True) - while 1: - hint(None, global_merge_point=True) - if where == DONE: - return next - if rule is not None: - assert rule.signature == signature - next = self.dispatch_bytecode(where, query, continuation, rule) - where, query, continuation, rule = next - rule = hint(rule, promote=True) - if query is not None: - signature = hint(query.signature, promote=True) - where = hint(where, promote=True) + return self.main_loop(TRY_RULE, query, continuation, rule) def _try_rule(self, rule, query, continuation): rule = hint(rule, deepfreeze=True) Modified: pypy/branch/jit-hotpath/pypy/lang/prolog/interpreter/test/test_jit.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/lang/prolog/interpreter/test/test_jit.py (original) +++ pypy/branch/jit-hotpath/pypy/lang/prolog/interpreter/test/test_jit.py Mon Mar 31 01:39:55 2008 @@ -1,4 +1,5 @@ import py +py.test.skip("port me") from pypy.jit.timeshifter.test.test_portal import PortalTest, P_NOVIRTUAL from pypy.lang.prolog.interpreter import portal from pypy.lang.prolog.interpreter import engine, term @@ -6,7 +7,6 @@ POLICY = portal.PyrologHintAnnotatorPolicy() -py.test.skip() class TestPortal(PortalTest): small = False From fijal at codespeak.net Mon Mar 31 03:20:32 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 03:20:32 +0200 (CEST) Subject: [pypy-svn] r53174 - pypy/branch/jit-hotpath/pypy/jit/codegen/i386 Message-ID: <20080331012032.1C78D16850E@codespeak.net> Author: fijal Date: Mon Mar 31 03:20:30 2008 New Revision: 53174 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Log: add FSTL Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Mon Mar 31 03:20:30 2008 @@ -445,6 +445,8 @@ FSTPL = Instruction() FSTPL.mode1(MODRM64, ['\xDD', orbyte(3<<3), modrm(1)]) +FSTL = Instruction() +FSTL.mode1(MODRM64, ['\xDD', orbyte(2<<3), modrm(1)]) # ------------------------- end of floating point ------------------------ From fijal at codespeak.net Mon Mar 31 03:21:23 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 03:21:23 +0200 (CEST) Subject: [pypy-svn] r53175 - pypy/branch/jit-hotpath/pypy/jit/codegen Message-ID: <20080331012123.A393216850E@codespeak.net> Author: fijal Date: Mon Mar 31 03:21:22 2008 New Revision: 53175 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/model.py Log: ARGH! what is not tested is broken Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/model.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/model.py Mon Mar 31 03:21:22 2008 @@ -386,10 +386,10 @@ Python callable object, for testing purposes. """ from pypy.rpython.lltypesystem import lltype - from ctypes import cast, c_void_p, CFUNCTYPE, c_int, c_float + from ctypes import cast, c_void_p, CFUNCTYPE, c_int, c_double def _to_ctypes(t): #limited type support for now if t == lltype.Float: - return c_float + return c_double if t == lltype.Void: return None return c_int From fijal at codespeak.net Mon Mar 31 03:22:18 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 03:22:18 +0200 (CEST) Subject: [pypy-svn] r53176 - in pypy/branch/jit-hotpath/pypy/jit/codegen: ia32 test Message-ID: <20080331012218.8EF8F16850E@codespeak.net> Author: fijal Date: Mon Mar 31 03:22:18 2008 New Revision: 53176 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Log: Yay! First test for float passes. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 03:22:18 2008 @@ -8,6 +8,7 @@ from pypy.rlib import objectmodel from pypy.rlib.unroll import unrolling_iterable from pypy.rpython.annlowlevel import llhelper +from pypy.rpython.lltypesystem import rffi WORD = 4 DEBUG_CALL_ALIGN = True @@ -34,9 +35,6 @@ # self.stackpos = stackpos - def operand(self, builder): - return builder.stack_access(self.stackpos) - def nonimmoperand(self, builder, tmpregister): return self.operand(builder) @@ -46,16 +44,25 @@ repr = __repr__ class IntVar(Var): + def operand(self, builder): + return builder.stack_access(self.stackpos) + ll_type = lltype.Signed token = 'i' SIZE = 1 class BoolVar(Var): + def operand(self, builder): + return builder.stack_access(self.stackpos) + ll_type = lltype.Bool token = 'b' SIZE = 1 class FloatVar(Var): + def operand(self, builder): + return builder.stack_access64(self.stackpos) + ll_type = lltype.Float token = 'f' SIZE = 2 @@ -136,7 +143,19 @@ pass class FloatConst(Const): - pass + def __init__(self, floatval): + self.floatval = floatval + + def operand(self, builder): + # XXX this is terrible, let's make it rpython and stuff later + rawbuf = lltype.malloc(rffi.DOUBLEP.TO, 1, flavor='raw') + rawbuf[0] = self.floatval + one = rffi.cast(rffi.INTP, rawbuf)[0] + two = rffi.cast(rffi.INTP, rawbuf)[1] + oldpos = builder.stackdepth + 1 + builder.push(imm(two)) + builder.push(imm(one)) + return builder.stack_access64(oldpos) class BoolConst(Const): pass @@ -555,8 +574,12 @@ def finish_and_return(self, sigtoken, gv_returnvar): self._open() - initialstackdepth = self.rgenop._initial_stack_depth(len(sigtoken[0])) - self.mc.MOV(eax, gv_returnvar.operand(self)) + stackdepth = self.rgenop._compute_stack_depth(sigtoken) + initialstackdepth = self.rgenop._initial_stack_depth(stackdepth) + if isinstance(gv_returnvar, FloatVar) or isinstance(gv_returnvar, FloatConst): + self.mc.FLDL(gv_returnvar.operand(self)) + else: + self.mc.MOV(eax, gv_returnvar.operand(self)) self.mc.ADD(esp, imm(WORD * (self.stackdepth - initialstackdepth))) self.mc.RET() self._close() @@ -582,12 +605,20 @@ # ____________________________________________________________ def stack_access(self, stackpos): - return mem(esp, WORD * (self.stackdepth-1 - stackpos)) + return mem(esp, WORD * (self.stackdepth - 1 - stackpos)) + + def stack_access64(self, stackpos): + return mem64(esp, WORD * (self.stackdepth - 1 - stackpos)) def push(self, op): self.mc.PUSH(op) self.stackdepth += 1 + def pushfloat(self, op): + self.mc.SUB(esp, imm(WORD * FloatVar.SIZE)) + self.stackdepth += 2 + self.mc.FSTPL(op.operand(self)) + def returnintvar(self, op): res = IntVar(self.stackdepth) self.push(op) @@ -599,6 +630,11 @@ self.push(eax) return res + def returnfloatvar(self, op): + res = FloatVar(self.stackdepth) + self.pushfloat(res) + return res + @staticmethod def identity(gv_x): return gv_x @@ -814,7 +850,10 @@ op_ptr_ne = op_int_ne def op_float_add(self, gv_x, gv_y): - xxx + self.mc.FLDL(gv_x.operand(self)) + self.mc.FLDL(gv_y.operand(self)) + self.mc.FADD() + return self.returnfloatvar(st0) SIZE2SHIFT = {1: 0, 2: 1, @@ -1053,19 +1092,24 @@ def newbuilder(self, stackdepth): return Builder(self, stackdepth) - def newgraph(self, sigtoken, name): - arg_tokens, res_token = sigtoken - inputargs_gv = [] + def _compute_stack_depth(self, sigtoken): + arg_tokens, rettoken = sigtoken ofs = 0 for argtoken in arg_tokens: ofs += TOKEN_TO_SIZE[argtoken] + return ofs + TOKEN_TO_SIZE[rettoken] + + def newgraph(self, sigtoken, name): + arg_tokens, res_token = sigtoken + inputargs_gv = [] + ofs = self._compute_stack_depth(sigtoken) builder = self.newbuilder(self._initial_stack_depth(ofs)) builder._open() # Force builder to have an mc entrypoint = builder.mc.tell() inputargs_gv = builder._write_prologue(arg_tokens) return builder, IntConst(entrypoint), inputargs_gv - def _initial_stack_depth(self, numargs): + def _initial_stack_depth(self, stackdepth): # If a stack depth is a multiple of CALL_ALIGN then the # arguments are correctly aligned for a call. We have to # precompute initialstackdepth to guarantee that. For OS/X the @@ -1074,7 +1118,7 @@ # pushed by the CALL instruction. In other words, after # 'numargs' arguments have been pushed the stack is aligned: MASK = CALL_ALIGN - 1 - initialstackdepth = ((numargs+MASK)&~MASK) + 1 + initialstackdepth = ((stackdepth+MASK)&~MASK) return initialstackdepth def replay(self, label): @@ -1089,6 +1133,8 @@ return IntConst(llvalue) elif T is lltype.Bool: return BoolConst(llvalue) + elif T is lltype.Float: + return FloatConst(llvalue) elif isinstance(T, lltype.Ptr): lladdr = llmemory.cast_ptr_to_adr(llvalue) if T.TO._gckind == 'gc': Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Mon Mar 31 03:22:18 2008 @@ -10,6 +10,7 @@ rtyper = None GENOP_POLICY = MixLevelAnnotatorPolicy(PseudoAnnhelper()) +FLOATFUNC = lltype.FuncType([lltype.Float], lltype.Float) FUNC = lltype.FuncType([lltype.Signed], lltype.Signed) FUNC2 = lltype.FuncType([lltype.Signed]*2, lltype.Signed) FUNC3 = lltype.FuncType([lltype.Signed]*3, lltype.Signed) @@ -26,6 +27,17 @@ builder.end() return gv_add_one +def make_float_adder(rgenop, n): + # 'return x+n' + sigtoken = rgenop.sigToken(FLOATFUNC) + builder, gv_add_one, [gv_x] = rgenop.newgraph(sigtoken, "float_adder") + builder.start_writing() + c2 = rgenop.genconst(n) + gv_result = builder.genop2("float_add", gv_x, c2) + builder.finish_and_return(sigtoken, gv_result) + builder.end() + return gv_add_one + def get_adder_runner(RGenOp): def runner(x, y): rgenop = RGenOp() @@ -836,6 +848,10 @@ F1 = lltype.FuncType([lltype.Signed] * nb_args, RESULT) return self.RGenOp.get_python_callable(lltype.Ptr(F1), gv) + def cast_float(self, gv, nb_args): + F1 = lltype.FuncType([lltype.Float] * nb_args, lltype.Float) + return self.RGenOp.get_python_callable(lltype.Ptr(F1), gv) + class AbstractRGenOpTestsCompile(AbstractTestBase): def compile(self, runner, argtypes): return self.getcompiled(runner, argtypes, @@ -1043,6 +1059,13 @@ res = fnptr(37) assert res == 42 + def test_float_adder(self): + rgenop = self.RGenOp() + gv_add_5 = make_float_adder(rgenop, 3.2) + fnptr = self.cast_float(gv_add_5, 1) + res = fnptr(1.2) + assert res == 4.4 + def test_dummy_direct(self): rgenop = self.RGenOp() gv_dummyfn = make_dummy(rgenop) From fijal at codespeak.net Mon Mar 31 03:26:27 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 03:26:27 +0200 (CEST) Subject: [pypy-svn] r53177 - pypy/branch/jit-hotpath/pypy/jit/codegen/test Message-ID: <20080331012627.4DE8816851C@codespeak.net> Author: fijal Date: Mon Mar 31 03:26:26 2008 New Revision: 53177 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/operation_tests.py Log: before I forget this evilness Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/operation_tests.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/test/operation_tests.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/test/operation_tests.py Mon Mar 31 03:26:26 2008 @@ -4,14 +4,14 @@ from pypy.rpython.lltypesystem import lltype from pypy.rpython.lltypesystem.lloperation import llop from pypy.rlib.rarithmetic import r_uint, intmask, ovfcheck -from ctypes import cast, c_void_p, CFUNCTYPE, c_int, c_float +from ctypes import cast, c_void_p, CFUNCTYPE, c_int, c_double from pypy import conftest class OperationTests(object): @staticmethod def _to_ctypes(t): #limited type support for now if t is float: - return c_float + return c_double return c_int def rgen(self, ll_function, argtypes, rettype=int): #XXX get rettype from annotation From fijal at codespeak.net Mon Mar 31 04:50:10 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 04:50:10 +0200 (CEST) Subject: [pypy-svn] r53178 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test Message-ID: <20080331025010.8E4F9168508@codespeak.net> Author: fijal Date: Mon Mar 31 04:50:02 2008 New Revision: 53178 Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py (contents, props changed) Log: enable this test for ia32, mostly failing. Added: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py ============================================================================== --- (empty file) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py Mon Mar 31 04:50:02 2008 @@ -0,0 +1,49 @@ + +from pypy.rlib.objectmodel import specialize +from pypy.rpython.lltypesystem import lltype +from pypy.jit.codegen.test.operation_tests import OperationTests +from pypy.jit.codegen.ia32.rgenop import RI386GenOp +from pypy.rpython.memory.lltypelayout import convert_offset_to_int + +def conv(n): + if not isinstance(n, int): + if isinstance(n, tuple): + n = tuple(map(conv, n)) + else: + n = convert_offset_to_int(n) + return n + +class RGenOpPacked(RI386GenOp): + """Like RI386GenOp, but produces concrete offsets in the tokens + instead of llmemory.offsets. These numbers may not agree with + your C compiler's. + """ + + @staticmethod + @specialize.memo() + def fieldToken(T, name): + return conv(RI386GenOp.fieldToken(T, name)) + + @staticmethod + @specialize.memo() + def arrayToken(A): + return conv(RI386GenOp.arrayToken(A)) + + @staticmethod + @specialize.memo() + def allocToken(T): + return conv(RI386GenOp.allocToken(T)) + + @staticmethod + @specialize.memo() + def varsizeAllocToken(A): + return conv(RI386GenOp.varsizeAllocToken(A)) + +class I386TestMixin(object): + RGenOp = RGenOpPacked + +class TestOperation(I386TestMixin, OperationTests): + pass + + # for the individual tests see + # ====> ../../test/operation_tests.py From fijal at codespeak.net Mon Mar 31 04:51:39 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 04:51:39 +0200 (CEST) Subject: [pypy-svn] r53179 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080331025139.CB513168508@codespeak.net> Author: fijal Date: Mon Mar 31 04:51:38 2008 New Revision: 53179 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: Pass the first test of test_operation. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 04:51:38 2008 @@ -741,13 +741,25 @@ def op_int_lshift(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) - self.mc.MOV(ecx, gv_y.operand(self)) # XXX check if ecx >= 32 + self.mc.MOV(ecx, gv_y.operand(self)) self.mc.SHL(eax, cl) + self.mc.CMP(ecx, imm8(32)) + self.mc.SBB(ecx, ecx) + self.mc.AND(eax, ecx) return self.returnintvar(eax) def op_int_rshift(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) - self.mc.MOV(ecx, gv_y.operand(self)) # XXX check if ecx >= 32 + self.mc.MOV(ecx, imm8(31)) + if isinstance(gv_y, IntConst): + intval = gv_y.value + if intval < 0 or intval > 31: + intval = 31 + self.mc.MOV(cl, imm8(intval)) + else: + op2 = gv_y.operand(self) + self.mc.CMP(op2, ecx) + self.mc.CMOVBE(ecx, op2) self.mc.SAR(eax, cl) return self.returnintvar(eax) From fijal at codespeak.net Mon Mar 31 04:56:16 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 04:56:16 +0200 (CEST) Subject: [pypy-svn] r53180 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080331025616.704DE168508@codespeak.net> Author: fijal Date: Mon Mar 31 04:56:11 2008 New Revision: 53180 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: Pass another test (easy :) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 04:56:11 2008 @@ -75,6 +75,7 @@ LL_TO_GENVAR[value.ll_type] = value.token TOKEN_TO_GENVAR[value.token] = value TOKEN_TO_SIZE[value.token] = value.SIZE +LL_TO_GENVAR[lltype.Unsigned] = 'i' UNROLLING_TOKEN_TO_GENVAR = unrolling_iterable(TOKEN_TO_GENVAR.items()) @@ -1143,6 +1144,8 @@ return AddrConst(llvalue) elif T is lltype.Signed: return IntConst(llvalue) + elif T is lltype.Unsigned: + return IntConst(intmask(llvalue)) elif T is lltype.Bool: return BoolConst(llvalue) elif T is lltype.Float: From fijal at codespeak.net Mon Mar 31 05:11:02 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 05:11:02 +0200 (CEST) Subject: [pypy-svn] r53181 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080331031102.8CB3416850E@codespeak.net> Author: fijal Date: Mon Mar 31 05:10:57 2008 New Revision: 53181 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: * enable float tests * port few other Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 05:10:57 2008 @@ -820,8 +820,11 @@ def op_uint_rshift(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) - self.mc.MOV(ecx, gv_y.operand(self)) # XXX check if ecx >= 32 + self.mc.MOV(ecx, gv_y.operand(self)) self.mc.SHR(eax, cl) + self.mc.CMP(ecx, imm8(32)) + self.mc.SBB(ecx, ecx) + self.mc.AND(eax, ecx) return self.returnintvar(eax) def op_bool_not(self, gv_x): @@ -891,12 +894,12 @@ import py py.test.skip("must run in the main thread") try: - from ctypes import cast, c_void_p - from pypy.rpython.rctypes.tool import util + import ctypes + from ctypes import cast, c_void_p, util path = util.find_library('gc') if path is None: raise ImportError("Boehm (libgc) not found") - boehmlib = util.load_library(path) + boehmlib = ctypes.cdll.LoadLibrary(path) except ImportError, e: import py py.test.skip(str(e)) @@ -1146,6 +1149,9 @@ return IntConst(llvalue) elif T is lltype.Unsigned: return IntConst(intmask(llvalue)) + elif T is lltype.Char or T is lltype.UniChar: + # XXX char constant support??? + return IntConst(lltype.cast_primitive(lltype.Signed, llvalue)) elif T is lltype.Bool: return BoolConst(llvalue) elif T is lltype.Float: @@ -1201,8 +1207,6 @@ @staticmethod @specialize.memo() def kindToken(T): - if T is lltype.Float: - py.test.skip("not implemented: floats in the i386 back-end") return None # for now @staticmethod From fijal at codespeak.net Mon Mar 31 05:40:10 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 05:40:10 +0200 (CEST) Subject: [pypy-svn] r53182 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080331034010.0A60416850C@codespeak.net> Author: fijal Date: Mon Mar 31 05:40:10 2008 New Revision: 53182 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: make this a bit less horrible. rffi nicely fits in here :) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 05:40:10 2008 @@ -145,18 +145,13 @@ class FloatConst(Const): def __init__(self, floatval): - self.floatval = floatval + # never moves and never dies + self.rawbuf = lltype.malloc(rffi.DOUBLEP.TO, 1, flavor='raw', + immortal=True) + self.rawbuf[0] = floatval def operand(self, builder): - # XXX this is terrible, let's make it rpython and stuff later - rawbuf = lltype.malloc(rffi.DOUBLEP.TO, 1, flavor='raw') - rawbuf[0] = self.floatval - one = rffi.cast(rffi.INTP, rawbuf)[0] - two = rffi.cast(rffi.INTP, rawbuf)[1] - oldpos = builder.stackdepth + 1 - builder.push(imm(two)) - builder.push(imm(one)) - return builder.stack_access64(oldpos) + return heap64(rffi.cast(rffi.INT, self.rawbuf)) class BoolConst(Const): pass @@ -632,7 +627,7 @@ return res def returnfloatvar(self, op): - res = FloatVar(self.stackdepth) + res = FloatVar(self.stackdepth + 1) self.pushfloat(res) return res @@ -866,8 +861,8 @@ op_ptr_ne = op_int_ne def op_float_add(self, gv_x, gv_y): - self.mc.FLDL(gv_x.operand(self)) self.mc.FLDL(gv_y.operand(self)) + self.mc.FLDL(gv_x.operand(self)) self.mc.FADD() return self.returnfloatvar(st0) From fijal at codespeak.net Mon Mar 31 06:09:52 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 06:09:52 +0200 (CEST) Subject: [pypy-svn] r53183 - in pypy/branch/jit-hotpath/pypy/jit/codegen: i386 ia32 ia32/test Message-ID: <20080331040952.088201684C0@codespeak.net> Author: fijal Date: Mon Mar 31 06:09:45 2008 New Revision: 53183 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py Log: test_float_arithmetic passes. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386.py Mon Mar 31 06:09:45 2008 @@ -256,6 +256,12 @@ def mem(basereg, offset=0): return memSIB(basereg, None, 0, offset) +def heap(offset): + return memSIB(None, None, 0, offset) + +def heap64(offset): + return memSIB64(None, None, 0, offset) + def mem64(basereg, offset=0): return memSIB64(basereg, None, 0, offset) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Mon Mar 31 06:09:45 2008 @@ -440,9 +440,30 @@ FLDL.mode1(MODRM64, ['\xDD', modrm(1)]) FADD = Instruction() -#FADD.mode1(MODRM64, ['\xDC', modrm(1)]) FADD.mode0(['\xDE\xC1']) +FSUB = Instruction() +FSUB.mode0(['\xDE\xE9']) + +FMUL = Instruction() +FMUL.mode0(['\xDE\xC9']) + +FDIV = Instruction() +FDIV.mode0(['\xDE\xF9']) + +FCHS = Instruction() +FCHS.mode0(['\xD9\xE0']) + +FABS = Instruction() +FABS.mode0(['\xD9\xE1']) + +FTST = Instruction() +FTST.mode0(['\xD9\xE4']) + +# store status control word +FSTSW = Instruction() +FSTSW.mode0(['\xDF\xE0']) + FSTPL = Instruction() FSTPL.mode1(MODRM64, ['\xDD', orbyte(3<<3), modrm(1)]) FSTL = Instruction() Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 06:09:45 2008 @@ -626,6 +626,13 @@ self.push(eax) return res + def returnboolfloatvar(self): + self.mc.FSTSW() + self.mc.OR(eax, imm(4)) + res = BoolVar(self.stackdepth) + self.push(eax) + return res + def returnfloatvar(self, op): res = FloatVar(self.stackdepth + 1) self.pushfloat(res) @@ -866,6 +873,39 @@ self.mc.FADD() return self.returnfloatvar(st0) + def op_float_sub(self, gv_x, gv_y): + self.mc.FLDL(gv_x.operand(self)) + self.mc.FLDL(gv_y.operand(self)) + self.mc.FSUB() + return self.returnfloatvar(st0) + + def op_float_mul(self, gv_x, gv_y): + self.mc.FLDL(gv_x.operand(self)) + self.mc.FLDL(gv_y.operand(self)) + self.mc.FMUL() + return self.returnfloatvar(st0) + + def op_float_truediv(self, gv_x, gv_y): + self.mc.FLDL(gv_x.operand(self)) + self.mc.FLDL(gv_y.operand(self)) + self.mc.FDIV() + return self.returnfloatvar(st0) + + def op_float_neg(self, gv_x): + self.mc.FLDL(gv_x.operand(self)) + self.mc.FCHS() + return self.returnfloatvar(st0) + + def op_float_abs(self, gv_x): + self.mc.FLDL(gv_x.operand(self)) + self.mc.FABS() + return self.returnfloatvar(st0) + + def op_float_is_true(self, gv_x): + self.mc.FLDL(gv_x.operand(self)) + self.mc.FTST() + return self.returnboolfloatvar() + SIZE2SHIFT = {1: 0, 2: 1, 4: 2, Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py Mon Mar 31 06:09:45 2008 @@ -1,4 +1,5 @@ +import py from pypy.rlib.objectmodel import specialize from pypy.rpython.lltypesystem import lltype from pypy.jit.codegen.test.operation_tests import OperationTests @@ -43,7 +44,14 @@ RGenOp = RGenOpPacked class TestOperation(I386TestMixin, OperationTests): - pass + def test_float_cast(self): + py.test.skip("looks bogus to me") + + def test_ptr_comparison(self): + py.test.skip('unsupported') + + def test_is_true(self): + py.test.skip('xxx look at it') # for the individual tests see # ====> ../../test/operation_tests.py From fijal at codespeak.net Mon Mar 31 06:24:52 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 06:24:52 +0200 (CEST) Subject: [pypy-svn] r53184 - pypy/dist/pypy/lib Message-ID: <20080331042452.940731684F6@codespeak.net> Author: fijal Date: Mon Mar 31 06:24:50 2008 New Revision: 53184 Added: pypy/dist/pypy/lib/ctypes_configure (contents, props changed) Log: add a symlink to ctypes configure here. Will not work if someone has binary pypy dist, but who has such a thing... Added: pypy/dist/pypy/lib/ctypes_configure ============================================================================== --- (empty file) +++ pypy/dist/pypy/lib/ctypes_configure Mon Mar 31 06:24:50 2008 @@ -0,0 +1 @@ +link ../../ctypes_configure/ \ No newline at end of file From fijal at codespeak.net Mon Mar 31 06:28:05 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 06:28:05 +0200 (CEST) Subject: [pypy-svn] r53185 - pypy/dist/pypy/lib Message-ID: <20080331042805.7C7E71684FA@codespeak.net> Author: fijal Date: Mon Mar 31 06:28:04 2008 New Revision: 53185 Added: pypy/dist/pypy/lib/resource.py (contents, props changed) Log: (haypo) resource module using ctypes Added: pypy/dist/pypy/lib/resource.py ============================================================================== --- (empty file) +++ pypy/dist/pypy/lib/resource.py Mon Mar 31 06:28:04 2008 @@ -0,0 +1,167 @@ +from ctypes_support import standard_c_lib as libc +from ctypes_support import get_errno +from ctypes import Structure, c_int, c_long, byref +from errno import EINVAL, EPERM +from ctypes_configure.configure import configure, ExternalCompilationInfo, ConstantInteger, SimpleType + +_CONSTANTS = ( + 'RLIM_INFINITY', + 'RLIM_NLIMITS', + 'RLIMIT_CPU', + 'RLIMIT_FSIZE', + 'RLIMIT_DATA', + 'RLIMIT_STACK', + 'RLIMIT_CORE', + 'RLIMIT_RSS', + 'RLIMIT_NPROC', + 'RLIMIT_NOFILE', + 'RLIMIT_OFILE', + 'RLIMIT_MEMLOCK', + 'RLIMIT_AS', + 'RLIMIT_LOCKS', + 'RLIMIT_SIGPENDING', + 'RLIMIT_MSGQUEUE', + 'RLIMIT_NICE', + 'RLIMIT_RTPRIO', +# 'RLIMIT_VMEM', + 'RUSAGE_SELF', + 'RUSAGE_CHILDREN', +# 'RUSAGE_BOTH', +) + +# Read required libc functions +_getrusage = libc.getrusage +_getrlimit = libc.getrlimit +_setrlimit = libc.setrlimit +try: + _getpagesize = libc.getpagesize +except AttributeError: + from os import sysconf + _getpagesize = None + +# Setup our configure +class ResourceConfigure: + _compilation_info_ = ExternalCompilationInfo(includes=['sys/resource.h']) + rlim_t = SimpleType('rlim_t', c_int) +for key in _CONSTANTS: + setattr(ResourceConfigure, key, ConstantInteger(key)) + +# Configure constants and types +config = configure(ResourceConfigure) +rlim_t = config['rlim_t'] +for key in _CONSTANTS: + globals()[key] = config[key] +del config + +class ResourceError(OSError): + def __init__(self, errno): + OSError.__init__(self, errno) + +class timeval(Structure): + _fields_ = ( + ("tv_sec", c_int), + ("tv_usec", c_int), + ) + def __str__(self): + return "(%s, %s)" % (self.tv_sec, self.tv_usec) + + def __float__(self): + return self.tv_sec + self.tv_usec/1000000.0 + +class _struct_rusage(Structure): + _fields_ = ( + ("ru_utime", timeval), + ("ru_stime", timeval), + ("ru_maxrss", c_long), + ("ru_ixrss", c_long), + ("ru_idrss", c_long), + ("ru_isrss", c_long), + ("ru_minflt", c_long), + ("ru_majflt", c_long), + ("ru_nswap", c_long), + ("ru_inblock", c_long), + ("ru_oublock", c_long), + ("ru_msgsnd", c_long), + ("ru_msgrcv", c_long), + ("ru_nsignals", c_long), + ("ru_nvcsw", c_long), + ("ru_nivcsw", c_long), + ) + +class struct_rusage: + def __init__(self, ru): + self.ru_utime = float(ru.ru_utime) + self.ru_stime = float(ru.ru_stime) + self.ru_maxrss = ru.ru_maxrss + self.ru_ixrss = ru.ru_ixrss + self.ru_idrss = ru.ru_idrss + self.ru_isrss = ru.ru_isrss + self.ru_minflt = ru.ru_minflt + self.ru_majflt = ru.ru_majflt + self.ru_nswap = ru.ru_nswap + self.ru_inblock = ru.ru_inblock + self.ru_oublock = ru.ru_oublock + self.ru_msgsnd = ru.ru_msgsnd + self.ru_msgrcv = ru.ru_msgrcv + self.ru_nsignals = ru.ru_nsignals + self.ru_nvcsw = ru.ru_nvcsw + self.ru_nivcsw = ru.ru_nivcsw + +class rlimit(Structure): + _fields_ = ( + ("rlim_cur", rlim_t), + ("rlim_max", rlim_t), + ) + +def getrusage(who): + ru = _struct_rusage() + ret = _getrusage(who, byref(ru)) + if ret == -1: + errno = get_errno() + if errno == EINVAL: + raise ValueError("invalid who parameter") + raise ResourceError(errno) + return struct_rusage(ru) + +def getrlimit(resource): + if not(0 <= resource < RLIM_NLIMITS): + return ValueError("invalid resource specified") + + rlim = rlimit() + ret = _getrlimit(resource, byref(rlim)) + if ret == -1: + errno = get_errno() + raise ResourceError(errno) + return (rlim.rlim_cur, rlim.rlim_max) + +def setrlimit(resource, rlim): + if not(0 <= resource < RLIM_NLIMITS): + return ValueError("invalid resource specified") + rlim = rlimit(rlim[0], rlim[1]) + + ret = _setrlimit(resource, byref(rlim)) + if ret == -1: + errno = get_errno() + if errno == EINVAL: + return ValueError("current limit exceeds maximum limit") + elif errno == EPERM: + return ValueError("not allowed to raise maximum limit") + else: + raise ResourceError(errno) + +def getpagesize(): + pagesize = 0 + if _getpagesize: + return _getpagesize() + else: + try: + return sysconf("SC_PAGE_SIZE") + except ValueError: + # Irix 5.3 has _SC_PAGESIZE, but not _SC_PAGE_SIZE + return sysconf("SC_PAGESIZE") + +__all__ = _CONSTANTS + ( + 'ResourceError', 'timeval', 'struct_rusage', 'rlimit', + 'getrusage', 'getrlimit', 'setrlimit', 'getpagesize', +) + From fijal at codespeak.net Mon Mar 31 06:54:31 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 06:54:31 +0200 (CEST) Subject: [pypy-svn] r53186 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test Message-ID: <20080331045431.CDF481684FC@codespeak.net> Author: fijal Date: Mon Mar 31 06:54:28 2008 New Revision: 53186 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py Log: oops. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py Mon Mar 31 06:54:28 2008 @@ -8,7 +8,7 @@ class TestRI386GenopDirect(AbstractRGenOpTestsDirect): RGenOp = RI386GenOp - from pypy.jit.codegen.i386.test.test_operation import RGenOpPacked + from pypy.jit.codegen.ia32.test.test_operation import RGenOpPacked def skipped(self): py.test.skip("unsupported") @@ -37,7 +37,7 @@ class TestRI386GenopCompile(AbstractRGenOpTestsCompile): RGenOp = RI386GenOp - from pypy.jit.codegen.i386.test.test_operation import RGenOpPacked + from pypy.jit.codegen.ia32.test.test_operation import RGenOpPacked def setup_class(cls): py.test.skip("skip compilation tests") From fijal at codespeak.net Mon Mar 31 06:56:39 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 06:56:39 +0200 (CEST) Subject: [pypy-svn] r53187 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080331045639.2D90E168508@codespeak.net> Author: fijal Date: Mon Mar 31 06:56:38 2008 New Revision: 53187 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: support for void return (bits, more needed) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 06:56:38 2008 @@ -76,6 +76,7 @@ TOKEN_TO_GENVAR[value.token] = value TOKEN_TO_SIZE[value.token] = value.SIZE LL_TO_GENVAR[lltype.Unsigned] = 'i' +LL_TO_GENVAR[lltype.Void] = 'v' UNROLLING_TOKEN_TO_GENVAR = unrolling_iterable(TOKEN_TO_GENVAR.items()) @@ -1148,7 +1149,9 @@ ofs = 0 for argtoken in arg_tokens: ofs += TOKEN_TO_SIZE[argtoken] - return ofs + TOKEN_TO_SIZE[rettoken] + if rettoken != 'v': + return ofs + TOKEN_TO_SIZE[rettoken] + return ofs def newgraph(self, sigtoken, name): arg_tokens, res_token = sigtoken From fijal at codespeak.net Mon Mar 31 06:57:20 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 06:57:20 +0200 (CEST) Subject: [pypy-svn] r53188 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test Message-ID: <20080331045720.17063168508@codespeak.net> Author: fijal Date: Mon Mar 31 06:57:19 2008 New Revision: 53188 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py Log: skip this test as well Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py Mon Mar 31 06:57:19 2008 @@ -34,6 +34,7 @@ # void returns test_void_return = skipped + test_demo_f1_direct = skipped class TestRI386GenopCompile(AbstractRGenOpTestsCompile): RGenOp = RI386GenOp From arigo at codespeak.net Mon Mar 31 09:52:38 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 31 Mar 2008 09:52:38 +0200 (CEST) Subject: [pypy-svn] r53189 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test Message-ID: <20080331075238.F009F1684EF@codespeak.net> Author: arigo Date: Mon Mar 31 09:52:37 2008 New Revision: 53189 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py Log: Explain this failure. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py Mon Mar 31 09:52:37 2008 @@ -51,7 +51,12 @@ py.test.skip('unsupported') def test_is_true(self): - py.test.skip('xxx look at it') + # the backend currently uses "any integer != 0" to represent + # True. So functions that return a Bool will actually return an + # int which may have any 32-bit value != 0 for True, which is + # not what a typical C compiler expects about functions + # returning _Bool. + py.test.skip('in-progress') # for the individual tests see # ====> ../../test/operation_tests.py From arigo at codespeak.net Mon Mar 31 10:08:53 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 31 Mar 2008 10:08:53 +0200 (CEST) Subject: [pypy-svn] r53190 - in pypy/branch/jit-hotpath/pypy/jit/codegen/ia32: . test Message-ID: <20080331080853.73CC11684EF@codespeak.net> Author: arigo Date: Mon Mar 31 10:08:51 2008 New Revision: 53190 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py Log: Fix bool-returning operations by being more precise about what BoolVar can hold. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 10:08:51 2008 @@ -52,6 +52,7 @@ SIZE = 1 class BoolVar(Var): + # represents a boolean as an integer which *must* be exactly 0 or 1 def operand(self, builder): return builder.stack_access(self.stackpos) @@ -629,7 +630,7 @@ def returnboolfloatvar(self): self.mc.FSTSW() - self.mc.OR(eax, imm(4)) + self.mc.OR(eax, imm(4)) # ??? res = BoolVar(self.stackdepth) self.push(eax) return res @@ -643,7 +644,15 @@ def identity(gv_x): return gv_x - op_int_is_true = identity + def op_int_is_true(self, gv_x): + self.mc.CMP(gv_x.operand(self), imm8(0)) + self.mc.SETNE(al) + return self.returnboolvar(al) + + def op_ptr_iszero(self, gv_x): + self.mc.CMP(gv_x.operand(self), imm8(0)) + self.mc.SETE(al) + return self.returnboolvar(al) def op_int_add(self, gv_x, gv_y): self.mc.MOV(eax, gv_x.operand(self)) @@ -833,13 +842,10 @@ def op_bool_not(self, gv_x): self.mc.CMP(gv_x.operand(self), imm8(0)) self.mc.SETE(al) - self.mc.MOVZX(eax, al) - return self.returnintvar(eax) + return self.returnboolvar(al) def op_cast_bool_to_int(self, gv_x): - self.mc.CMP(gv_x.operand(self), imm8(0)) - self.mc.SETNE(al) - self.mc.MOVZX(eax, al) + self.mc.MOVZX(eax, gv_x.operand(self)) return self.returnintvar(eax) op_cast_bool_to_uint = op_cast_bool_to_int @@ -864,7 +870,6 @@ op_unichar_ne = op_int_ne op_ptr_nonzero = op_int_is_true - op_ptr_iszero = op_bool_not # for now op_ptr_eq = op_int_eq op_ptr_ne = op_int_ne Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py Mon Mar 31 10:08:51 2008 @@ -50,13 +50,5 @@ def test_ptr_comparison(self): py.test.skip('unsupported') - def test_is_true(self): - # the backend currently uses "any integer != 0" to represent - # True. So functions that return a Bool will actually return an - # int which may have any 32-bit value != 0 for True, which is - # not what a typical C compiler expects about functions - # returning _Bool. - py.test.skip('in-progress') - # for the individual tests see # ====> ../../test/operation_tests.py From arigo at codespeak.net Mon Mar 31 10:14:19 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 31 Mar 2008 10:14:19 +0200 (CEST) Subject: [pypy-svn] r53191 - in pypy/branch/jit-hotpath/pypy/jit/codegen: i386 ia32 ia32/test Message-ID: <20080331081419.DB9C51684EF@codespeak.net> Author: arigo Date: Mon Mar 31 10:14:19 2008 New Revision: 53191 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py Log: Fix by generating the same code as gcc. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Mon Mar 31 10:14:19 2008 @@ -434,6 +434,9 @@ BREAKPOINT.mode0(['\xCC']) BREAKPOINT.as_alias = "INT3" +SAHF = Instruction() +SAHF.mode0(['\x9E']) + # ------------------------- floating point instructions ------------------ FLDL = Instruction() Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 10:14:19 2008 @@ -630,10 +630,9 @@ def returnboolfloatvar(self): self.mc.FSTSW() - self.mc.OR(eax, imm(4)) # ??? - res = BoolVar(self.stackdepth) - self.push(eax) - return res + self.mc.SAHF() + self.mc.SETNZ(al) + return self.returnboolvar(al) def returnfloatvar(self, op): res = FloatVar(self.stackdepth + 1) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py Mon Mar 31 10:14:19 2008 @@ -44,9 +44,6 @@ RGenOp = RGenOpPacked class TestOperation(I386TestMixin, OperationTests): - def test_float_cast(self): - py.test.skip("looks bogus to me") - def test_ptr_comparison(self): py.test.skip('unsupported') From arigo at codespeak.net Mon Mar 31 10:23:09 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 31 Mar 2008 10:23:09 +0200 (CEST) Subject: [pypy-svn] r53192 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080331082309.C3B4E16846C@codespeak.net> Author: arigo Date: Mon Mar 31 10:23:09 2008 New Revision: 53192 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: Add XXX. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 10:23:09 2008 @@ -536,6 +536,7 @@ def genop_same_as(self, gv_x): if gv_x.is_const: # must always return a var + # XXX must return a var of the correct type return self.returnintvar(gv_x.operand(self)) else: return gv_x From arigo at codespeak.net Mon Mar 31 10:33:08 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 31 Mar 2008 10:33:08 +0200 (CEST) Subject: [pypy-svn] r53193 - in pypy/branch/jit-hotpath/pypy/jit: codegen codegen/dump codegen/i386 codegen/ia32/test codegen/llgraph codegen/llvm codegen/ppc codegen/test rainbow timeshifter Message-ID: <20080331083308.B3F4D1684C5@codespeak.net> Author: arigo Date: Mon Mar 31 10:33:07 2008 New Revision: 53193 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/graph2rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/llvm/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/model.py pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Log: Now that we removed the 'ptrkind' argument to the genop_ptr_*() methods, we don't need them any more at all: they can be handled by genop1() and genop2(), as they originally were. Kill kill! Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py Mon Mar 31 10:33:07 2008 @@ -142,40 +142,6 @@ self.rgenop.vname(gv_arg2))) return v1, v2 - def genop_ptr_iszero(self, gv_ptr): - v = self.llbuilder.genop_ptr_iszero(gv_ptr) - self.dump("%s = %s.genop_ptr_iszero(%s)" % ( - self.rgenop.vname(v), - self.name, - self.rgenop.vname(gv_ptr))) - return v - - def genop_ptr_nonzero(self, gv_ptr): - v = self.llbuilder.genop_ptr_nonzero(gv_ptr) - self.dump("%s = %s.genop_ptr_nonzero(%s)" % ( - self.rgenop.vname(v), - self.name, - self.rgenop.vname(gv_ptr))) - return v - - def genop_ptr_eq(self, gv_ptr1, gv_ptr2): - v = self.llbuilder.genop_ptr_eq(gv_ptr1, gv_ptr2) - self.dump("%s = %s.genop_ptr_eq(%s, %s)" % ( - self.rgenop.vname(v), - self.name, - self.rgenop.vname(gv_ptr1), - self.rgenop.vname(gv_ptr2))) - return v - - def genop_ptr_ne(self, gv_ptr1, gv_ptr2): - v = self.llbuilder.genop_ptr_ne(gv_ptr1, gv_ptr2) - self.dump("%s = %s.genop_ptr_ne(%s, %s)" % ( - self.rgenop.vname(v), - self.name, - self.rgenop.vname(gv_ptr1), - self.rgenop.vname(gv_ptr2))) - return v - def genop_cast_int_to_ptr(self, gv_int): v = self.llbuilder.genop_cast_int_to_ptr(gv_int) self.dump("%s = %s.genop_cast_int_to_ptr(%s)" % ( Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/graph2rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/graph2rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/graph2rgenop.py Mon Mar 31 10:33:07 2008 @@ -154,20 +154,6 @@ elif op.opname == 'same_as': gv_result = builder.genop_same_as(var2gv(op.args[0])) - elif op.opname == 'ptr_iszero': - gv_result = builder.genop_ptr_iszero(var2gv(op.args[0])) - - elif op.opname == 'ptr_nonzero': - gv_result = builder.genop_ptr_nonzero(var2gv(op.args[0])) - - elif op.opname == 'ptr_eq': - gv_result = builder.genop_ptr_eq(var2gv(op.args[0]), - var2gv(op.args[1])) - - elif op.opname == 'ptr_ne': - gv_result = builder.genop_ptr_ne(var2gv(op.args[0]), - var2gv(op.args[1])) - elif op.opname == 'cast_int_to_ptr': gv_result = builder.genop_cast_int_to_ptr(var2gv(op.args[0])) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py Mon Mar 31 10:33:07 2008 @@ -406,30 +406,6 @@ self.operations.append(op_excflag) return op, op_excflag - def genop_ptr_iszero(self, gv_ptr): - cls = getopclass1('ptr_iszero') - op = cls(gv_ptr) - self.operations.append(op) - return op - - def genop_ptr_nonzero(self, gv_ptr): - cls = getopclass1('ptr_nonzero') - op = cls(gv_ptr) - self.operations.append(op) - return op - - def genop_ptr_eq(self, gv_ptr1, gv_ptr2): - cls = getopclass2('ptr_eq') - op = cls(gv_ptr1, gv_ptr2) - self.operations.append(op) - return op - - def genop_ptr_ne(self, gv_ptr1, gv_ptr2): - cls = getopclass2('ptr_ne') - op = cls(gv_ptr1, gv_ptr2) - self.operations.append(op) - return op - def genop_cast_int_to_ptr(self, kind, gv_int): return gv_int # identity @@ -730,6 +706,7 @@ def sigToken(FUNCTYPE): numargs = 0 for ARG in FUNCTYPE.ARGS: + RI386GenOp.kindToken(ARG) # for the skip() if ARG is not lltype.Void: numargs += 1 return numargs # for now Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py Mon Mar 31 10:33:07 2008 @@ -44,8 +44,7 @@ RGenOp = RGenOpPacked class TestOperation(I386TestMixin, OperationTests): - def test_ptr_comparison(self): - py.test.skip('unsupported') + pass # for the individual tests see # ====> ../../test/operation_tests.py Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py Mon Mar 31 10:33:07 2008 @@ -265,37 +265,11 @@ "genop_same_as: bad currently_writing") return LLVar(llimpl.genop(self.b, 'same_as', [gv_value], gv_value.getkind().v)) - def genop_ptr_iszero(self, gv_ptr): - ll_assert(self.rgenop.currently_writing is self, - "genop_ptr_iszero: bad currently_writing") - return LLVar(llimpl.genop(self.b, 'ptr_iszero', [gv_ptr], gv_Bool.v)) - - def genop_ptr_nonzero(self, gv_ptr): - ll_assert(self.rgenop.currently_writing is self, - "genop_ptr_nonzero: bad currently_writing") - return LLVar(llimpl.genop(self.b, 'ptr_nonzero', [gv_ptr], gv_Bool.v)) - def genop_oononnull(self, gv_obj): ll_assert(self.rgenop.currently_writing is self, "genop_oononnull: bad currently_writing") return LLVar(llimpl.genop(self.b, 'oononnull', [gv_obj], gv_Bool.v)) - def genop_ptr_eq(self, gv_ptr1, gv_ptr2): - ll_assert(self.rgenop.currently_writing is self, - "genop_ptr_eq: bad currently_writing") - gv_PTRTYPE = gv_ptr1.getkind() - gv_ptr2 = LLVar(llimpl.cast(self.b, gv_PTRTYPE.v, gv_ptr2.v)) - return LLVar(llimpl.genop(self.b, 'ptr_eq', [gv_ptr1, gv_ptr2], - gv_Bool.v)) - - def genop_ptr_ne(self, gv_ptr1, gv_ptr2): - ll_assert(self.rgenop.currently_writing is self, - "genop_ptr_ne: bad currently_writing") - gv_PTRTYPE = gv_ptr1.getkind() - gv_ptr2 = LLVar(llimpl.cast(self.b, gv_PTRTYPE.v, gv_ptr2.v)) - return LLVar(llimpl.genop(self.b, 'ptr_ne', [gv_ptr1, gv_ptr2], - gv_Bool.v)) - def genop_cast_int_to_ptr(self, gv_PTRTYPE, gv_int): ll_assert(self.rgenop.currently_writing is self, "genop_cast_int_to_ptr: bad currently_writing") Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/llvm/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/llvm/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/llvm/rgenop.py Mon Mar 31 10:33:07 2008 @@ -516,18 +516,6 @@ def op_ptr_nonzero(self, gv_x): return self._is_true(gv_x, 'null') def op_ptr_iszero(self, gv_x): return self._is_false(gv_x, 'null') - def genop_ptr_iszero(self, kind, gv_ptr): - return self.op_ptr_iszero(gv_ptr) - - def genop_ptr_nonzero(self, kind, gv_ptr): - return self.op_ptr_nonzero(gv_ptr) - - def genop_ptr_eq(self, kind, gv_ptr1, gv_ptr2): - return self.op_ptr_eq(gv_ptr1, gv_ptr2) - - def genop_ptr_ne(self, kind, gv_ptr1, gv_ptr2): - return self.op_ptr_ne(gv_ptr1, gv_ptr2) - def op_float_is_true(self, gv_x): return self._is_true(gv_x, '0.0') #XXX fails for doubles def genop_getfield(self, fieldtoken, gv_ptr): Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/model.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/model.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/model.py Mon Mar 31 10:33:07 2008 @@ -90,10 +90,6 @@ ## def genop_call(self, sigtoken, gv_fnptr, args_gv): ## def genop_same_as(self, gv_x): ## def genop_debug_pdb(self): # may take an args_gv later -## def genop_ptr_iszero(self, gv_ptr) -## def genop_ptr_nonzero(self, gv_ptr) -## def genop_ptr_eq(self, gv_ptr1, gv_ptr2) -## def genop_ptr_ne(self, gv_ptr1, gv_ptr2) ## def genop_cast_int_to_ptr(self, kind, gv_int) # the other thing that happens for a given chunk is entering and @@ -443,18 +439,6 @@ def genraisingop2(self, opname, gv_arg1, gv_arg2): return dummy_var, dummy_var - def genop_ptr_iszero(self, gv_ptr): - return dummy_var - - def genop_ptr_nonzero(self, gv_ptr): - return dummy_var - - def genop_ptr_eq(self, gv_ptr1, gv_ptr2): - return dummy_var - - def genop_ptr_ne(self, gv_ptr1, gv_ptr2): - return dummy_var - def genop_getfield(self, fieldtoken, gv_ptr): return dummy_var Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/rgenop.py Mon Mar 31 10:33:07 2008 @@ -295,18 +295,6 @@ r = genmethod(gv_arg) return r - def genop_ptr_iszero(self, gv_ptr): - return self.op_ptr_iszero(gv_ptr) - - def genop_ptr_nonzero(self, gv_ptr): - return self.op_ptr_nonzero(gv_ptr) - - def genop_ptr_eq(self, gv_ptr1, gv_ptr2): - return self.op_ptr_eq(gv_ptr1, gv_ptr2) - - def genop_ptr_ne(self, gv_ptr1, gv_ptr2): - return self.op_ptr_ne(gv_ptr1, gv_ptr2) - def genop_call(self, sigtoken, gv_fnptr, args_gv): self.insns.append(insn.SpillCalleeSaves()) for i in range(len(args_gv)): Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Mon Mar 31 10:33:07 2008 @@ -2234,7 +2234,7 @@ [gv_fbp, gv_switchvar, gv_framebase]) gv_exc_type = default_builder.genop_getfield(exc_type_token, gv_exc_data) - gv_noexc = default_builder.genop_ptr_iszero(gv_exc_type) + gv_noexc = default_builder.genop1("ptr_iszero", gv_exc_type) excpath_builder = default_builder.jump_if_false(gv_noexc, []) default_builder.finish_and_goto(args_gv, L0) @@ -2253,7 +2253,8 @@ gv_dummyfnptr = rgenop.genconst(llmemory.NULL) signed_kind = rgenop.kindToken(lltype.Signed) bool_kind = rgenop.kindToken(lltype.Bool) - EXCDATA = lltype.GcStruct('EXCDATA', ('exc_type', llmemory.Address)) + FOO = lltype.GcStruct('FOO') + EXCDATA = lltype.GcStruct('EXCDATA', ('exc_type', lltype.Ptr(FOO))) exc_type_kind = rgenop.kindToken(llmemory.Address) exc_type_token = rgenop.fieldToken(EXCDATA, 'exc_type') gv_exc_data = rgenop.genconst(lltype.nullptr(EXCDATA)) Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/rhotpath.py Mon Mar 31 10:33:07 2008 @@ -356,7 +356,7 @@ # code was compiled and we should loop back to 'switchblock' to enter it, # or it may have set an exception. gv_exc_type = exceptiondesc.genop_get_exc_type(default_builder) - gv_noexc = default_builder.genop_ptr_iszero(gv_exc_type) + gv_noexc = default_builder.genop1("ptr_iszero", gv_exc_type) excpath_builder = default_builder.jump_if_false(gv_noexc, []) if check_exceptions: Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/typesystem.py Mon Mar 31 10:33:07 2008 @@ -33,10 +33,10 @@ return builder.genop_malloc_fixedsize(alloctoken) def genop_ptr_iszero(self, builder, argbox, gv_addr): - return builder.genop_ptr_iszero(gv_addr) + return builder.genop1("ptr_iszero", gv_addr) def genop_ptr_nonzero(self, builder, argbox, gv_addr): - return builder.genop_ptr_nonzero(gv_addr) + return builder.genop1("ptr_nonzero", gv_addr) def get_FuncType(self, ARGS, RESULT): FUNCTYPE = lltype.FuncType(ARGS, RESULT) Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/exception.py Mon Mar 31 10:33:07 2008 @@ -78,7 +78,7 @@ def gen_exc_occurred(self, builder): gv_etype = self.genop_get_exc_type(builder) - return builder.genop_ptr_nonzero(gv_etype) + return builder.genop1("ptr_nonzero", gv_etype) class OOTypeExceptionDesc(AbstractExceptionDesc): Modified: pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py Mon Mar 31 10:33:07 2008 @@ -273,9 +273,9 @@ gv_addr0 = argbox0.getgenvar(jitstate) gv_addr1 = argbox1.getgenvar(jitstate) if reverse: - gv_res = builder.genop_ptr_ne(gv_addr0, gv_addr1) + gv_res = builder.genop2("ptr_ne", gv_addr0, gv_addr1) else: - gv_res = builder.genop_ptr_eq(gv_addr0, gv_addr1) + gv_res = builder.genop2("ptr_eq", gv_addr0, gv_addr1) boolbox = rvalue.BoolRedBox(gv_res) boolbox.iftrue.append(booleffect.PtrEqualEffect(argbox0, argbox1, reverse)) return boolbox From arigo at codespeak.net Mon Mar 31 10:51:44 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 31 Mar 2008 10:51:44 +0200 (CEST) Subject: [pypy-svn] r53194 - pypy/branch/jit-hotpath/pypy/tool Message-ID: <20080331085144.9C0EA1684DA@codespeak.net> Author: arigo Date: Mon Mar 31 10:51:44 2008 New Revision: 53194 Modified: pypy/branch/jit-hotpath/pypy/tool/udir.py Log: This logic seems slightly broken - I end up with tons of different usession names in my /tmp, not just branch names. Anyway I prefer the old behavior by far, so with this checkin I can set PYPY_USESSION_BASENAME to a simple '-' and get it back. Modified: pypy/branch/jit-hotpath/pypy/tool/udir.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/tool/udir.py (original) +++ pypy/branch/jit-hotpath/pypy/tool/udir.py Mon Mar 31 10:51:44 2008 @@ -17,9 +17,11 @@ else: return basename.split('/')[-2] -try: - basename = '-' + svn_info(py.path.svnwc(py.magic.autopath().dirpath()).info().url) + '-' -except: - basename = '-' +basename = os.environ.get('PYPY_USESSION_BASENAME') +if not basename: + try: + basename = '-' + svn_info(py.path.svnwc(py.magic.autopath().dirpath()).info().url) + '-' + except: + basename = '-' udir = local.make_numbered_dir(prefix='usession' + basename, keep=3) From arigo at codespeak.net Mon Mar 31 11:06:18 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 31 Mar 2008 11:06:18 +0200 (CEST) Subject: [pypy-svn] r53195 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080331090618.B1D001684DA@codespeak.net> Author: arigo Date: Mon Mar 31 11:06:16 2008 New Revision: 53195 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: Adapt the tests for r53146. The one in test_hp_virtualizable is still failing, showing a real bug. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_interpreter.py Mon Mar 31 11:06:16 2008 @@ -670,6 +670,7 @@ res = self.run(ll_function, [], threshold=2) assert res.x == 123 + py.test.skip("XXX starting from r53146, 'res' is forced in each loop") self.check_insns_in_loops({'int_gt': 1, 'int_rshift': 1}) def test_plus_minus(self): Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Mon Mar 31 11:06:16 2008 @@ -614,11 +614,12 @@ res = self.run(main, [20, 11], 2) assert res == 42 - self.check_insns_in_loops(getfield=0, malloc=0) + self.check_insns_in_loops(getfield=0)#, malloc=0) + # XXX starting from r53146, 'e' and 'xy' are forced in each loop res = self.run(main, [20, 11], threshold=1) assert res == 42 - self.check_insns_in_loops(getfield=0, malloc=0) + self.check_insns_in_loops(getfield=0)#, malloc=0) def test_residual_doing_nothing(self): myjitdriver = JitDriver(greens = [], From arigo at codespeak.net Mon Mar 31 11:11:22 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 31 Mar 2008 11:11:22 +0200 (CEST) Subject: [pypy-svn] r53196 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080331091122.BF9691684DB@codespeak.net> Author: arigo Date: Mon Mar 31 11:11:22 2008 New Revision: 53196 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: Add a test. Passes, though. Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Mon Mar 31 11:11:22 2008 @@ -744,6 +744,41 @@ policy=StopAtXPolicy(g)) assert res == main(2, 20) + def test_escape_though_virtual_passed_to_residual(self): + myjitdriver = JitDriver(greens = [], + reds = ['x', 'y', 'i', 'res']) + + def g(e): + xy = e.xy + x = xy_get_x(xy) + y = xy_get_y(xy) + return x + y + + def f(x, y): + i = 1024 + while i > 0: + i >>= 1 + # + xy = lltype.malloc(XY) + xy.vable_access = lltype.nullptr(XY_ACCESS) + xy.x = x + xy.y = y + e = lltype.malloc(E) + e.xy = xy + res = g(e) + # + myjitdriver.jit_merge_point(res=res, i=i, x=x, y=y) + myjitdriver.can_enter_jit(res=res, i=i, x=x, y=y) + return res + + res = self.run(f, [2, 20], threshold=2, + policy=StopAtXPolicy(g)) + assert res == 22 + + res = self.run(f, [2, 20], threshold=1, + policy=StopAtXPolicy(g)) + assert res == 22 + def test_force_in_residual_red_call(self): myjitdriver = JitDriver(greens = [], reds = ['e', 'a', 'b', 'i', 'res']) From arigo at codespeak.net Mon Mar 31 11:18:29 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 31 Mar 2008 11:18:29 +0200 (CEST) Subject: [pypy-svn] r53197 - pypy/branch/jit-hotpath/pypy/jit/rainbow/test Message-ID: <20080331091829.168461684DB@codespeak.net> Author: arigo Date: Mon Mar 31 11:18:29 2008 New Revision: 53197 Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Log: Just skip this... Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/rainbow/test/test_hp_virtualizable.py Mon Mar 31 11:18:29 2008 @@ -586,6 +586,7 @@ self.check_insns_in_loops(getfield=3) def test_simple_escape_through_vstruct(self): + py.test.skip("not really supported") myjitdriver = JitDriver(greens = [], reds = ['i', 'e', 'x', 'y']) From arigo at codespeak.net Mon Mar 31 11:33:54 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 31 Mar 2008 11:33:54 +0200 (CEST) Subject: [pypy-svn] r53198 - in pypy/branch/jit-hotpath/pypy/jit/codegen/ia32: . test Message-ID: <20080331093354.4985E1684EB@codespeak.net> Author: arigo Date: Mon Mar 31 11:33:53 2008 New Revision: 53198 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py Log: Trivial fix for void returns. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 11:33:53 2008 @@ -577,7 +577,7 @@ initialstackdepth = self.rgenop._initial_stack_depth(stackdepth) if isinstance(gv_returnvar, FloatVar) or isinstance(gv_returnvar, FloatConst): self.mc.FLDL(gv_returnvar.operand(self)) - else: + elif gv_returnvar is not None: self.mc.MOV(eax, gv_returnvar.operand(self)) self.mc.ADD(esp, imm(WORD * (self.stackdepth - initialstackdepth))) self.mc.RET() Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py Mon Mar 31 11:33:53 2008 @@ -32,8 +32,7 @@ # casts test_cast_direct = skipped - # void returns - test_void_return = skipped + # lltype.Address in function arguments test_demo_f1_direct = skipped class TestRI386GenopCompile(AbstractRGenOpTestsCompile): From haypo at codespeak.net Mon Mar 31 15:31:34 2008 From: haypo at codespeak.net (haypo at codespeak.net) Date: Mon, 31 Mar 2008 15:31:34 +0200 (CEST) Subject: [pypy-svn] r53199 - pypy/dist/pypy/lib Message-ID: <20080331133134.514D1168487@codespeak.net> Author: haypo Date: Mon Mar 31 15:31:32 2008 New Revision: 53199 Modified: pypy/dist/pypy/lib/resource.py Log: Finish work on resource: add RLIMIT_VMEM and RUSAGE_BOTH; and all RLIMIT_* and RUSAGE_* constants are now optional Modified: pypy/dist/pypy/lib/resource.py ============================================================================== --- pypy/dist/pypy/lib/resource.py (original) +++ pypy/dist/pypy/lib/resource.py Mon Mar 31 15:31:32 2008 @@ -2,11 +2,15 @@ from ctypes_support import get_errno from ctypes import Structure, c_int, c_long, byref from errno import EINVAL, EPERM -from ctypes_configure.configure import configure, ExternalCompilationInfo, ConstantInteger, SimpleType +from ctypes_configure.configure import (configure, + ExternalCompilationInfo, ConstantInteger, DefinedConstantInteger, + SimpleType) _CONSTANTS = ( 'RLIM_INFINITY', 'RLIM_NLIMITS', +) +_OPTIONAL_CONSTANTS = ( 'RLIMIT_CPU', 'RLIMIT_FSIZE', 'RLIMIT_DATA', @@ -23,10 +27,11 @@ 'RLIMIT_MSGQUEUE', 'RLIMIT_NICE', 'RLIMIT_RTPRIO', -# 'RLIMIT_VMEM', + 'RLIMIT_VMEM', + + 'RUSAGE_BOTH', 'RUSAGE_SELF', 'RUSAGE_CHILDREN', -# 'RUSAGE_BOTH', ) # Read required libc functions @@ -42,15 +47,20 @@ # Setup our configure class ResourceConfigure: _compilation_info_ = ExternalCompilationInfo(includes=['sys/resource.h']) - rlim_t = SimpleType('rlim_t', c_int) + rlim_t = SimpleType('rlim_t') for key in _CONSTANTS: setattr(ResourceConfigure, key, ConstantInteger(key)) +for key in _OPTIONAL_CONSTANTS: + setattr(ResourceConfigure, key, DefinedConstantInteger(key)) # Configure constants and types config = configure(ResourceConfigure) rlim_t = config['rlim_t'] for key in _CONSTANTS: globals()[key] = config[key] +for key in _OPTIONAL_CONSTANTS: + if config[key] is not None: + globals()[key] = config[key] del config class ResourceError(OSError): @@ -160,7 +170,7 @@ # Irix 5.3 has _SC_PAGESIZE, but not _SC_PAGE_SIZE return sysconf("SC_PAGESIZE") -__all__ = _CONSTANTS + ( +__all__ = _CONSTANTS + _OPTIONAL_CONSTANTS + ( 'ResourceError', 'timeval', 'struct_rusage', 'rlimit', 'getrusage', 'getrlimit', 'setrlimit', 'getpagesize', ) From tverwaes at codespeak.net Mon Mar 31 16:04:30 2008 From: tverwaes at codespeak.net (tverwaes at codespeak.net) Date: Mon, 31 Mar 2008 16:04:30 +0200 (CEST) Subject: [pypy-svn] r53200 - pypy/branch/gameboy-emulator/pypy/lang/gameboy Message-ID: <20080331140430.C500216847B@codespeak.net> Author: tverwaes Date: Mon Mar 31 16:04:27 2008 New Revision: 53200 Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Log: made the code a bit clearer Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py ============================================================================== --- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py (original) +++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cpu.py Mon Mar 31 16:04:27 2008 @@ -599,13 +599,17 @@ # DAA 1 cycle def daa(self): delta = 0 - if ((self.f.get() & constants.H_FLAG) != 0 or (self.a.get() & 0x0F) > 0x09): + if self.isH(): delta |= 0x06 - if ((self.f.get() & constants.C_FLAG) != 0 or (self.a.get() & 0xF0) > 0x90): + if self.isC(): delta |= 0x60 - if ((self.a.get() & 0xF0) > 0x80 and (self.a.get() & 0x0F) > 0x09): + if (self.a.get() & 0x0F) > 0x09: + delta |= 0x06 + if (self.a.get() & 0xF0) > 0x80: + delta |= 0x60 + if (self.a.get() & 0xF0) > 0x90: delta |= 0x60 - if ((self.f.get() & constants.N_FLAG) == 0): + if not self.isN(): self.a.set((self.a.get() + delta) & 0xFF) # 1 cycle else: self.a.set((self.a.get() - delta) & 0xFF) # 1 cycle @@ -651,9 +655,11 @@ # CCF/SCF def ccf(self): + # Flip C-flag and keep Z-flag self.f.set((self.f.get() & (constants.Z_FLAG | constants.C_FLAG)) ^ constants.C_FLAG, False) def scf(self): + # Set C-flag to true and keep Z-flag self.f.set((self.f.get() & constants.Z_FLAG) | constants.C_FLAG, False) # NOP 1 cycle @@ -710,6 +716,12 @@ def isC(self): return (self.f.get() & constants.C_FLAG) != 0 + def isH(self): + return (self.f.get() & constants.H_FLAG) != 0 + + def isN(self): + return (self.f.get() & constants.N_FLAG) != 0 + # RET 4 cycles def ret(self): lo = self.pop() # 1 cycle @@ -825,7 +837,6 @@ return lambda s: function(s, registerOrGetter) def initialize_op_code_table(table): - print "" result = [None] * (0xFF+1) for entry in table: if (entry is None) or (len(entry) == 0) or entry[-1] is None: From cfbolz at codespeak.net Mon Mar 31 16:45:19 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 31 Mar 2008 16:45:19 +0200 (CEST) Subject: [pypy-svn] r53201 - pypy/branch/jit-merging-logic Message-ID: <20080331144519.80CC5168462@codespeak.net> Author: cfbolz Date: Mon Mar 31 16:45:19 2008 New Revision: 53201 Added: pypy/branch/jit-merging-logic/ - copied from r53200, pypy/branch/jit-hotpath/ Log: (arigo, cfbolz): make a short-lived branch for playing with the merging logic From cfbolz at codespeak.net Mon Mar 31 16:51:40 2008 From: cfbolz at codespeak.net (cfbolz at codespeak.net) Date: Mon, 31 Mar 2008 16:51:40 +0200 (CEST) Subject: [pypy-svn] r53202 - in pypy/branch/jit-merging-logic/pypy/jit/timeshifter: . test Message-ID: <20080331145140.EC063168464@codespeak.net> Author: cfbolz Date: Mon Mar 31 16:51:40 2008 New Revision: 53202 Added: pypy/branch/jit-merging-logic/pypy/jit/timeshifter/test/test_merging.py Modified: pypy/branch/jit-merging-logic/pypy/jit/timeshifter/rvalue.py Log: (arigo, cfbolz) First tests and start of the logic that avoids merges if we can detect that they would result in more promotions in the future generated machine code. Modified: pypy/branch/jit-merging-logic/pypy/jit/timeshifter/rvalue.py ============================================================================== --- pypy/branch/jit-merging-logic/pypy/jit/timeshifter/rvalue.py (original) +++ pypy/branch/jit-merging-logic/pypy/jit/timeshifter/rvalue.py Mon Mar 31 16:51:40 2008 @@ -14,8 +14,9 @@ def freeze_memo(): return Memo() -def exactmatch_memo(force_merge=False): +def exactmatch_memo(frozen_timestamp, force_merge=False): memo = Memo() + memo.frozen_timestamp = frozen_timestamp memo.partialdatamatch = {} memo.forget_nonzeroness = {} memo.force_merge=force_merge @@ -45,9 +46,17 @@ def _revealconst(self, gv): return gv.revealconst(ootype.Object) +class FutureUsage(object): + promote_timestamp = 0 + + def see_promote(self, timestamp): + if timestamp > self.promote_timestamp: + self.promote_timestamp = timestamp + class RedBox(object): - _attrs_ = ['genvar'] + _attrs_ = ['genvar', 'future_usage'] + future_usage = None def __init__(self, genvar=None): self.genvar = genvar # None or a genvar @@ -96,6 +105,11 @@ memo = memo.boxes return memo.setdefault(self, self) + def retrieve_future_usage(self): + if self.future_usage is None: + self.future_usage = FutureUsage() + return self.future_usage + def ll_redboxcls(TYPE): assert TYPE is not lltype.Void, "cannot make red boxes of voids" @@ -170,10 +184,11 @@ try: return memo[self] except KeyError: + future_usage = self.retrieve_future_usage() if self.is_constant(): - result = FrozenIntConst(self.genvar) + result = FrozenIntConst(future_usage, self.genvar) else: - result = FrozenIntVar() + result = FrozenIntVar(future_usage) memo[self] = result return result @@ -448,12 +463,20 @@ class FrozenValue(object): """An abstract value frozen in a saved state. """ + def __init__(self, future_usage): + self.future_usage = future_usage + def is_constant_equal(self, box): return False def is_constant_nullptr(self): return False + def check_timestamp(self, box, memo): + if (box.is_constant() and + self.future_usage.promote_timestamp > memo.frozen_timestamp): + raise DontMerge + class FrozenConst(FrozenValue): @@ -461,6 +484,7 @@ if self.is_constant_equal(box): return True else: + self.check_timestamp(box, memo) outgoingvarboxes.append(box) return False @@ -468,6 +492,7 @@ class FrozenVar(FrozenValue): def exactmatch(self, box, outgoingvarboxes, memo): + self.check_timestamp(box, memo) memo = memo.boxes if self not in memo: memo[self] = box @@ -482,7 +507,8 @@ class FrozenIntConst(FrozenConst): - def __init__(self, gv_const): + def __init__(self, future_usage, gv_const): + FrozenConst.__init__(self, future_usage) self.gv_const = gv_const def is_constant_equal(self, box): Added: pypy/branch/jit-merging-logic/pypy/jit/timeshifter/test/test_merging.py ============================================================================== --- (empty file) +++ pypy/branch/jit-merging-logic/pypy/jit/timeshifter/test/test_merging.py Mon Mar 31 16:51:40 2008 @@ -0,0 +1,87 @@ +""" [merge point including x] + promote(x) + then the frozen x has a futureusage + yes + isn't this example too easy? + I mean, in which case would we want to prevent a merge? + it's a start + no, it shows the essential bit + if x was initially a constant(5), then we don't want to merge with any other value + if x was initially a variable, then we don't want to merge with any constant at all +""" + +import py +from pypy.rpython.lltypesystem import lltype +from pypy.jit.timeshifter import rvalue, rcontainer +from pypy.jit.timeshifter.test.support import FakeJITState, FakeGenVar +from pypy.jit.timeshifter.test.support import FakeGenConst +from pypy.jit.timeshifter.test.support import signed_kind +from pypy.jit.timeshifter.test.support import vmalloc, makebox +from pypy.jit.timeshifter.test.support import getfielddesc + + +class TestMerging: + + def setup_class(cls): + cls.STRUCT = lltype.GcStruct("S", ("x", lltype.Signed)) + cls.fielddesc = getfielddesc(cls.STRUCT, "x") + FORWARD = lltype.GcForwardReference() + cls.NESTEDSTRUCT = lltype.GcStruct('dummy', ("foo", lltype.Signed), + ('next', lltype.Ptr(FORWARD))) + FORWARD.become(cls.NESTEDSTRUCT) + + def test_promote_const(self): + gc = FakeGenConst(42) + box = rvalue.IntRedBox(gc) + frozen = box.freeze(rvalue.freeze_memo()) + frozen_timestamp = 0 + assert box.future_usage is not None # attached by freeze() + box.future_usage.see_promote(timestamp=1) + + memo = rvalue.exactmatch_memo(frozen_timestamp=frozen_timestamp) + gv = FakeGenVar() + newbox = rvalue.IntRedBox(gv) + assert not frozen.exactmatch(newbox, [], memo) + + memo = rvalue.exactmatch_memo(frozen_timestamp=frozen_timestamp) + gc2 = FakeGenConst(43) + newbox = rvalue.IntRedBox(gc2) + py.test.raises(rvalue.DontMerge, frozen.exactmatch, newbox, [], memo) + + def test_promote_var(self): + gv = FakeGenVar() + box = rvalue.IntRedBox(gv) + frozen = box.freeze(rvalue.freeze_memo()) + frozen_timestamp = 0 + assert box.future_usage is not None # attached by freeze() + box.future_usage.see_promote(timestamp=1) + + memo = rvalue.exactmatch_memo(frozen_timestamp=frozen_timestamp) + gv2 = FakeGenVar() + newbox = rvalue.IntRedBox(gv2) + assert frozen.exactmatch(newbox, [], memo) + + memo = rvalue.exactmatch_memo(frozen_timestamp=frozen_timestamp) + gc = FakeGenConst(43) + newbox = rvalue.IntRedBox(gc) + py.test.raises(rvalue.DontMerge, frozen.exactmatch, newbox, [], memo) + + def test_promotebefore_freeze_const(self): + gc = FakeGenConst(42) + box = rvalue.IntRedBox(gc) + box.freeze(rvalue.freeze_memo()) + assert box.future_usage is not None # attached by freeze() + box.future_usage.see_promote(timestamp=1) + + frozen_timestamp = 2 + frozen = box.freeze(rvalue.freeze_memo()) + + memo = rvalue.exactmatch_memo(frozen_timestamp=frozen_timestamp) + gv = FakeGenVar() + newbox = rvalue.IntRedBox(gv) + assert not frozen.exactmatch(newbox, [], memo) + + memo = rvalue.exactmatch_memo(frozen_timestamp=frozen_timestamp) + gc2 = FakeGenConst(43) + newbox = rvalue.IntRedBox(gc2) + assert not frozen.exactmatch(newbox, [], memo) From fijal at genesilico.pl Mon Mar 31 17:23:52 2008 From: fijal at genesilico.pl (Maciek Fijalkowski) Date: Mon, 31 Mar 2008 17:23:52 +0200 Subject: [pypy-svn] r53194 - pypy/branch/jit-hotpath/pypy/tool In-Reply-To: <20080331085144.9C0EA1684DA@codespeak.net> References: <20080331085144.9C0EA1684DA@codespeak.net> Message-ID: <47F10208.2030500@genesilico.pl> arigo at codespeak.net wrote: > Author: arigo > Date: Mon Mar 31 10:51:44 2008 > New Revision: 53194 > > Modified: > pypy/branch/jit-hotpath/pypy/tool/udir.py > Log: > This logic seems slightly broken - I end up with tons of different > usession names in my /tmp, not just branch names. Anyway I prefer > the old behavior by far, so with this checkin I can set > PYPY_USESSION_BASENAME to a simple '-' and get it back. > > > Modified: pypy/branch/jit-hotpath/pypy/tool/udir.py > ============================================================================== > --- pypy/branch/jit-hotpath/pypy/tool/udir.py (original) > +++ pypy/branch/jit-hotpath/pypy/tool/udir.py Mon Mar 31 10:51:44 2008 > @@ -17,9 +17,11 @@ > else: > return basename.split('/')[-2] > > -try: > - basename = '-' + svn_info(py.path.svnwc(py.magic.autopath().dirpath()).info().url) + '-' > -except: > - basename = '-' > +basename = os.environ.get('PYPY_USESSION_BASENAME') > +if not basename: > + try: > + basename = '-' + svn_info(py.path.svnwc(py.magic.autopath().dirpath()).info().url) + '-' > + except: > + basename = '-' > > udir = local.make_numbered_dir(prefix='usession' + basename, keep=3) > _______________________________________________ > pypy-svn mailing list > pypy-svn at codespeak.net > http://codespeak.net/mailman/listinfo/pypy-svn > > :. > > That's because it contained tons of bugs and over checkins you got different dirs :-( I hope it's fixed by now :. From arigo at codespeak.net Mon Mar 31 18:05:27 2008 From: arigo at codespeak.net (arigo at codespeak.net) Date: Mon, 31 Mar 2008 18:05:27 +0200 (CEST) Subject: [pypy-svn] r53203 - pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test Message-ID: <20080331160527.1E7FC16844E@codespeak.net> Author: arigo Date: Mon Mar 31 18:05:26 2008 New Revision: 53203 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_portal.py Log: This test was already ported! :-) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_portal.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_portal.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_portal.py Mon Mar 31 18:05:26 2008 @@ -1,5 +1,4 @@ import py, os, sys -py.test.skip("port me") from pypy.annotation import model as annmodel from pypy.rlib.unroll import unrolling_iterable from pypy.translator.c.genc import CStandaloneBuilder From fijal at codespeak.net Mon Mar 31 19:13:46 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 19:13:46 +0200 (CEST) Subject: [pypy-svn] r53204 - pypy/branch/jit-hotpath/pypy/jit/codegen/i386 Message-ID: <20080331171346.AF006168465@codespeak.net> Author: fijal Date: Mon Mar 31 19:13:44 2008 New Revision: 53204 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Log: * fix names * use the same encoding as gnu asm (it uses \xF1 for first register instead of \xF9, both are correct) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Mon Mar 31 19:13:44 2008 @@ -423,6 +423,7 @@ TEST.mode2(MODRM, REG, ['\x85', register(2,8), modrm(1)]) TEST.mode2(EAX, IMM32, ['\xA9', immediate(2)]) TEST.mode2(MODRM, IMM32, ['\xF7', orbyte(0<<3), modrm(1), immediate(2)]) +#TEST.mode2(REG8, IMM8, ['\xF6', register(2,8,'b'), modrm(2, 'b')]) INT = Instruction() INT.mode1(IMM8, ['\xCD', immediate(1, 'b')]) @@ -446,13 +447,13 @@ FADD.mode0(['\xDE\xC1']) FSUB = Instruction() -FSUB.mode0(['\xDE\xE9']) +FSUB.mode0(['\xDE\xE1']) FMUL = Instruction() FMUL.mode0(['\xDE\xC9']) FDIV = Instruction() -FDIV.mode0(['\xDE\xF9']) +FDIV.mode0(['\xDE\xF1']) FCHS = Instruction() FCHS.mode0(['\xD9\xE0']) @@ -464,8 +465,11 @@ FTST.mode0(['\xD9\xE4']) # store status control word -FSTSW = Instruction() -FSTSW.mode0(['\xDF\xE0']) +FNSTSW = Instruction() +FNSTSW.mode0(['\xDF\xE0']) + +FUCOMP = Instruction() +FUCOMP.mode0(['\xDD\xE9']) FSTPL = Instruction() FSTPL.mode1(MODRM64, ['\xDD', orbyte(3<<3), modrm(1)]) From fijal at codespeak.net Mon Mar 31 19:25:24 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 19:25:24 +0200 (CEST) Subject: [pypy-svn] r53205 - pypy/branch/jit-hotpath/pypy/jit/codegen/i386 Message-ID: <20080331172524.B346E16805D@codespeak.net> Author: fijal Date: Mon Mar 31 19:25:24 2008 New Revision: 53205 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Log: working TEST mode, although not that one that I want Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Mon Mar 31 19:25:24 2008 @@ -423,7 +423,7 @@ TEST.mode2(MODRM, REG, ['\x85', register(2,8), modrm(1)]) TEST.mode2(EAX, IMM32, ['\xA9', immediate(2)]) TEST.mode2(MODRM, IMM32, ['\xF7', orbyte(0<<3), modrm(1), immediate(2)]) -#TEST.mode2(REG8, IMM8, ['\xF6', register(2,8,'b'), modrm(2, 'b')]) +TEST.mode2(AL, IMM8, ['\xA8', immediate(2,'b')]) INT = Instruction() INT.mode1(IMM8, ['\xCD', immediate(1, 'b')]) From fijal at codespeak.net Mon Mar 31 19:38:48 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 19:38:48 +0200 (CEST) Subject: [pypy-svn] r53206 - pypy/branch/jit-hotpath/pypy/jit/codegen/i386 Message-ID: <20080331173848.168FA1684C0@codespeak.net> Author: fijal Date: Mon Mar 31 19:38:47 2008 New Revision: 53206 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Log: another test mode Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Mon Mar 31 19:38:47 2008 @@ -423,7 +423,8 @@ TEST.mode2(MODRM, REG, ['\x85', register(2,8), modrm(1)]) TEST.mode2(EAX, IMM32, ['\xA9', immediate(2)]) TEST.mode2(MODRM, IMM32, ['\xF7', orbyte(0<<3), modrm(1), immediate(2)]) -TEST.mode2(AL, IMM8, ['\xA8', immediate(2,'b')]) +TEST.mode2(AL, IMM8, ['\xA8', immediate(2,'b')]) +TEST.mode2(REG8, IMM8, ['\xF6', register(1,1,'b'), '\xC0', immediate(2,'b')]) INT = Instruction() INT.mode1(IMM8, ['\xCD', immediate(1, 'b')]) From fijal at codespeak.net Mon Mar 31 19:43:29 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 19:43:29 +0200 (CEST) Subject: [pypy-svn] r53207 - pypy/branch/jit-hotpath/pypy/jit/codegen/i386 Message-ID: <20080331174329.DE05216845C@codespeak.net> Author: fijal Date: Mon Mar 31 19:43:29 2008 New Revision: 53207 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Log: fix warnings. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Mon Mar 31 19:43:29 2008 @@ -444,17 +444,17 @@ FLDL = Instruction() FLDL.mode1(MODRM64, ['\xDD', modrm(1)]) -FADD = Instruction() -FADD.mode0(['\xDE\xC1']) +FADDP = Instruction() +FADDP.mode0(['\xDE\xC1']) -FSUB = Instruction() -FSUB.mode0(['\xDE\xE1']) +FSUBP = Instruction() +FSUBP.mode0(['\xDE\xE1']) -FMUL = Instruction() -FMUL.mode0(['\xDE\xC9']) +FMULP = Instruction() +FMULP.mode0(['\xDE\xC9']) -FDIV = Instruction() -FDIV.mode0(['\xDE\xF1']) +FDIVP = Instruction() +FDIVP.mode0(['\xDE\xF1']) FCHS = Instruction() FCHS.mode0(['\xD9\xE0']) @@ -472,6 +472,9 @@ FUCOMP = Instruction() FUCOMP.mode0(['\xDD\xE9']) +FUCOMPP = Instruction() +FUCOMPP.mode0(['\xDA\xE9']) + FSTPL = Instruction() FSTPL.mode1(MODRM64, ['\xDD', orbyte(3<<3), modrm(1)]) FSTL = Instruction() From fijal at codespeak.net Mon Mar 31 19:56:19 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 19:56:19 +0200 (CEST) Subject: [pypy-svn] r53208 - in pypy/branch/jit-hotpath/pypy/jit/codegen/ia32: . test Message-ID: <20080331175619.E0207168467@codespeak.net> Author: fijal Date: Mon Mar 31 19:56:16 2008 New Revision: 53208 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py Log: support for float comparisons + some small fixes in naming scheme Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 19:56:16 2008 @@ -147,6 +147,8 @@ class FloatConst(Const): def __init__(self, floatval): + # XXX we should take more care who is creating this and + # eventually release this buffer # never moves and never dies self.rawbuf = lltype.malloc(rffi.DOUBLEP.TO, 1, flavor='raw', immortal=True) @@ -629,12 +631,6 @@ self.push(eax) return res - def returnboolfloatvar(self): - self.mc.FSTSW() - self.mc.SAHF() - self.mc.SETNZ(al) - return self.returnboolvar(al) - def returnfloatvar(self, op): res = FloatVar(self.stackdepth + 1) self.pushfloat(res) @@ -876,25 +872,25 @@ def op_float_add(self, gv_x, gv_y): self.mc.FLDL(gv_y.operand(self)) self.mc.FLDL(gv_x.operand(self)) - self.mc.FADD() + self.mc.FADDP() return self.returnfloatvar(st0) def op_float_sub(self, gv_x, gv_y): - self.mc.FLDL(gv_x.operand(self)) self.mc.FLDL(gv_y.operand(self)) - self.mc.FSUB() + self.mc.FLDL(gv_x.operand(self)) + self.mc.FSUBP() return self.returnfloatvar(st0) def op_float_mul(self, gv_x, gv_y): self.mc.FLDL(gv_x.operand(self)) self.mc.FLDL(gv_y.operand(self)) - self.mc.FMUL() + self.mc.FMULP() return self.returnfloatvar(st0) def op_float_truediv(self, gv_x, gv_y): - self.mc.FLDL(gv_x.operand(self)) self.mc.FLDL(gv_y.operand(self)) - self.mc.FDIV() + self.mc.FLDL(gv_x.operand(self)) + self.mc.FDIVP() return self.returnfloatvar(st0) def op_float_neg(self, gv_x): @@ -910,7 +906,51 @@ def op_float_is_true(self, gv_x): self.mc.FLDL(gv_x.operand(self)) self.mc.FTST() - return self.returnboolfloatvar() + self.mc.FNSTSW() + self.mc.SAHF() + self.mc.SETNZ(al) + return self.returnboolvar(al) + + def _load_float_ctword(self, gv_x, gv_y): + self.mc.FLDL(gv_x.operand(self)) + self.mc.FLDL(gv_y.operand(self)) + self.mc.FUCOMPP() + self.mc.FNSTSW() + + @specialize.arg(3) + def _float_compare(self, gv_x, gv_y, immval): + self._load_float_ctword(gv_x, gv_y) + self.mc.TEST(ah, imm8(immval)) + self.mc.SETE(al) + return self.returnboolvar(al) + + def op_float_lt(self, gv_x, gv_y): + return self._float_compare(gv_x, gv_y, 69) + + def op_float_le(self, gv_x, gv_y): + return self._float_compare(gv_x, gv_y, 5) + + def op_float_eq(self, gv_x, gv_y): + self._load_float_ctword(gv_x, gv_y) + self.mc.SAHF() + self.mc.SETE(al) + self.mc.SETNP(dl) + self.mc.AND(edx, eax) + return self.returnboolvar(al) + + def op_float_ne(self, gv_x, gv_y): + self._load_float_ctword(gv_x, gv_y) + self.mc.SAHF() + self.mc.SETNE(al) + self.mc.SETP(dl) + self.mc.OR(edx, eax) + return self.returnboolvar(al) + + def op_float_gt(self, gv_x, gv_y): + return self._float_compare(gv_y, gv_x, 69) + + def op_float_ge(self, gv_x, gv_y): + return self._float_compare(gv_y, gv_x, 5) SIZE2SHIFT = {1: 0, 2: 1, Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_operation.py Mon Mar 31 19:56:16 2008 @@ -45,6 +45,5 @@ class TestOperation(I386TestMixin, OperationTests): pass - # for the individual tests see # ====> ../../test/operation_tests.py From antocuni at codespeak.net Mon Mar 31 21:05:46 2008 From: antocuni at codespeak.net (antocuni at codespeak.net) Date: Mon, 31 Mar 2008 21:05:46 +0200 (CEST) Subject: [pypy-svn] r53209 - in pypy/branch/jit-hotpath/pypy/rpython/ootypesystem: . test Message-ID: <20080331190546.D27E8168069@codespeak.net> Author: antocuni Date: Mon Mar 31 21:05:44 2008 New Revision: 53209 Modified: pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ootype.py pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/test/test_ootype.py Log: add a way to fish the class of a method given an ootype.Meth type (only works for BuiltinADTType so far) Modified: pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ootype.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ootype.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ootype.py Mon Mar 31 21:05:44 2008 @@ -266,6 +266,8 @@ class Meth(StaticMethod): + SELFTYPE = None + def __init__(self, args, result): StaticMethod.__init__(self, args, result) @@ -330,7 +332,9 @@ for name, meth in self._GENERIC_METHODS.iteritems(): args = [self._specialize_type(arg, generic_types) for arg in meth.ARGS] result = self._specialize_type(meth.RESULT, generic_types) - methods[name] = Meth(args, result) + METH = Meth(args, result) + METH.SELFTYPE = self + methods[name] = METH self._METHODS = frozendict(methods) self._can_raise = tuple(can_raise) Modified: pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/test/test_ootype.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/test/test_ootype.py (original) +++ pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/test/test_ootype.py Mon Mar 31 21:05:44 2008 @@ -207,6 +207,11 @@ c = new(C) assert c.foo(c) == 42 +def test_method_selftype(): + LIST = List(Signed) + _, meth = LIST._lookup('ll_setitem_fast') + METH = typeOf(meth) + assert METH.SELFTYPE is LIST def test_explicit_name_clash(): C = Instance("test", ROOT, {}) From fijal at codespeak.net Mon Mar 31 21:56:08 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 21:56:08 +0200 (CEST) Subject: [pypy-svn] r53210 - pypy/dist/pypy/lib/_ctypes Message-ID: <20080331195608.DA090168410@codespeak.net> Author: fijal Date: Mon Mar 31 21:56:06 2008 New Revision: 53210 Modified: pypy/dist/pypy/lib/_ctypes/function.py Log: leave a comment. We need to find a guy who sets _needs_free but does not set _buffer Modified: pypy/dist/pypy/lib/_ctypes/function.py ============================================================================== --- pypy/dist/pypy/lib/_ctypes/function.py (original) +++ pypy/dist/pypy/lib/_ctypes/function.py Mon Mar 31 21:56:06 2008 @@ -164,6 +164,9 @@ def __del__(self): if self._needs_free: + # XXX we need to find a bad guy here + if self._buffer is None: + return self._buffer.free() self._buffer = None if isinstance(self._ptr, _rawffi.CallbackPtr): From fijal at codespeak.net Mon Mar 31 21:57:03 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 21:57:03 +0200 (CEST) Subject: [pypy-svn] r53211 - pypy/branch/jit-hotpath/pypy/jit/codegen/test Message-ID: <20080331195703.326EC168422@codespeak.net> Author: fijal Date: Mon Mar 31 21:57:02 2008 New Revision: 53211 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Log: add a simple float loop Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/test/rgenop_tests.py Mon Mar 31 21:57:02 2008 @@ -16,6 +16,7 @@ FUNC3 = lltype.FuncType([lltype.Signed]*3, lltype.Signed) FUNC5 = lltype.FuncType([lltype.Signed]*5, lltype.Signed) FUNC27= lltype.FuncType([lltype.Signed]*27, lltype.Signed) +FUNCMIX = lltype.FuncType([lltype.Signed, lltype.Float], lltype.Float) def make_adder(rgenop, n): # 'return x+n' @@ -169,6 +170,49 @@ return res return branching_runner +def make_float_loop(rgenop): + """ + def f(x, y): + i = 0 + res = 0.0 + while i < x: + res -= -y * float(i) + i += 1 + return res + """ + sigtoken = rgenop.sigToken(FUNCMIX) + builder, gv_loopfn, [gv_x, gv_y] = rgenop.newgraph(sigtoken, + "floatloop") + builder.start_writing() + args_gv = [gv_x, gv_y, rgenop.genconst(0), rgenop.genconst(0.0)] + loopblock = builder.enter_next_block(args_gv) + [gv_x, gv_y, gv_i, gv_res] = args_gv + + gv_cond = builder.genop2("int_lt", gv_i, gv_x) + bodybuilder = builder.jump_if_true(gv_cond, args_gv) + + builder.finish_and_return(sigtoken, gv_res) + + bodybuilder.start_writing() + gv_y1 = bodybuilder.genop1("float_neg", gv_y) + gv_i1 = bodybuilder.genop1("cast_int_to_float", gv_i) + gv_v0 = bodybuilder.genop2("float_mul", gv_y1, gv_i1) + gv_res0 = bodybuilder.genop2("float_sub", gv_res, gv_v0) + gv_i2 = bodybuilder.genop2("int_add", gv_i, rgenop.genconst(1)) + bodybuilder.finish_and_goto([gv_x, gv_y, gv_i2, gv_res0], loopblock) + builder.end() + return gv_loopfn + +def get_float_loop_runner(RGenOp): + def float_loop_runner(x, y): + rgenop = RGenOp() + gv_floatloopfn = make_float_loop(rgenop) + floatfn = gv_floatloopfn.revealconst(lltype.Ptr(FUNC2)) + res = floatfn(x, y) + keepalive_until_here(rgenop) # to keep the code blocks alive + return res + return float_loop_runner + # loop start block def loop_start(rgenop, builder, gv_x, gv_y): args_gv = [gv_x, gv_y, rgenop.genconst(1)] @@ -852,6 +896,10 @@ F1 = lltype.FuncType([lltype.Float] * nb_args, lltype.Float) return self.RGenOp.get_python_callable(lltype.Ptr(F1), gv) + def cast_whatever(self, gv, ARGS, RESULT=lltype.Signed): + F1 = lltype.FuncType(ARGS, RESULT) + return self.RGenOp.get_python_callable(lltype.Ptr(F1), gv) + class AbstractRGenOpTestsCompile(AbstractTestBase): def compile(self, runner, argtypes): return self.getcompiled(runner, argtypes, @@ -1066,6 +1114,22 @@ res = fnptr(1.2) assert res == 4.4 + def test_float_loop_direct(self): + def f(x, y): + i = 0 + res = 0.0 + while i < x: + res -= -y * float(i) + i += 1 + return res + + rgenop = self.RGenOp() + gv_float = make_float_loop(rgenop) + fnptr = self.cast_whatever(gv_float, [lltype.Signed, lltype.Float], + lltype.Float) + res = fnptr(5, 1.3) + assert res == f(5, 1.3) + def test_dummy_direct(self): rgenop = self.RGenOp() gv_dummyfn = make_dummy(rgenop) From fijal at codespeak.net Mon Mar 31 22:49:37 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 22:49:37 +0200 (CEST) Subject: [pypy-svn] r53212 - pypy/branch/jit-hotpath/pypy/jit/codegen/i386 Message-ID: <20080331204937.032D9168480@codespeak.net> Author: fijal Date: Mon Mar 31 22:49:36 2008 New Revision: 53212 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Log: I'm not sure how to go about it. We need m32int instead of modrm... Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Mon Mar 31 22:49:36 2008 @@ -480,6 +480,9 @@ FSTL = Instruction() FSTL.mode1(MODRM64, ['\xDD', orbyte(2<<3), modrm(1)]) +FISTP = Instruction() +FISTP.mode1(MODRM, ['xDB', orbyte(3<<3), modrm(1)]) + # ------------------------- end of floating point ------------------------ UD2 = Instruction() # reserved as an illegal instruction From fijal at codespeak.net Mon Mar 31 23:00:24 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 23:00:24 +0200 (CEST) Subject: [pypy-svn] r53213 - pypy/branch/jit-hotpath/pypy/jit/codegen/i386 Message-ID: <20080331210024.C9E051684C9@codespeak.net> Author: fijal Date: Mon Mar 31 23:00:20 2008 New Revision: 53213 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Log: Ooops... we really need some tests Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Mon Mar 31 23:00:20 2008 @@ -481,7 +481,7 @@ FSTL.mode1(MODRM64, ['\xDD', orbyte(2<<3), modrm(1)]) FISTP = Instruction() -FISTP.mode1(MODRM, ['xDB', orbyte(3<<3), modrm(1)]) +FISTP.mode1(MODRM, ['\xDB', orbyte(3<<3), modrm(1)]) # ------------------------- end of floating point ------------------------ From fijal at codespeak.net Mon Mar 31 23:08:10 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 23:08:10 +0200 (CEST) Subject: [pypy-svn] r53214 - pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test Message-ID: <20080331210810.232251684CD@codespeak.net> Author: fijal Date: Mon Mar 31 23:08:09 2008 New Revision: 53214 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_auto_encoding.py Log: Evil hack. Please look how we can go about this. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_auto_encoding.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_auto_encoding.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_auto_encoding.py Mon Mar 31 23:08:09 2008 @@ -85,6 +85,9 @@ def modrm_tests(): return i386.registers + [pick1(i386.memSIB) for i in range(COUNT2)] +def modrm_noreg_tests(): + return [pick1(i386.memSIB) for i in range(COUNT2)] + def modrm64_tests(): return [pick1(i386.memSIB64) for i in range(COUNT2)] @@ -187,7 +190,11 @@ def rec_test_all(instrname, modes, args=[]): if modes: m = modes[0] - lst = tests[m]() + # XXX evil hack + if instrname.startswith('F') and m is i386.MODRM: + lst = modrm_noreg_tests() + else: + lst = tests[m]() random.shuffle(lst) result = [] for extra in lst: From fijal at codespeak.net Mon Mar 31 23:11:44 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 23:11:44 +0200 (CEST) Subject: [pypy-svn] r53215 - pypy/branch/jit-hotpath/pypy/jit/codegen/i386 Message-ID: <20080331211144.B46B61684D3@codespeak.net> Author: fijal Date: Mon Mar 31 23:11:44 2008 New Revision: 53215 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Log: FILD instruction Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py Mon Mar 31 23:11:44 2008 @@ -483,6 +483,9 @@ FISTP = Instruction() FISTP.mode1(MODRM, ['\xDB', orbyte(3<<3), modrm(1)]) +FILD = Instruction() +FILD.mode1(MODRM, ['\xDB', orbyte(0<<3), modrm(1)]) + # ------------------------- end of floating point ------------------------ UD2 = Instruction() # reserved as an illegal instruction From fijal at codespeak.net Mon Mar 31 23:15:36 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 23:15:36 +0200 (CEST) Subject: [pypy-svn] r53216 - pypy/branch/jit-hotpath/pypy/jit/codegen/test Message-ID: <20080331211536.BAAB01684D5@codespeak.net> Author: fijal Date: Mon Mar 31 23:15:36 2008 New Revision: 53216 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/operation_tests.py Log: some more float-related tests Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/test/operation_tests.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/test/operation_tests.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/test/operation_tests.py Mon Mar 31 23:15:36 2008 @@ -141,6 +141,28 @@ assert fp(-12, -12) == fn(-12, -12), op assert fp(-12, -13) == fn(-12, -13), op + def test_float_comparison(self): + for op, fn in [('bool(x < y)', lambda x, y: bool(x < y)), + ('bool(x <= y)', lambda x, y: bool(x <= y)), + ('bool(x == y)', lambda x, y: bool(x == y)), + ('bool(x != y)', lambda x, y: bool(x != y)), + ('bool(x > y)', lambda x, y: bool(x > y)), + ('bool(x >= y)', lambda x, y: bool(x >= y)), + ]: + fp = self.rgen(fn, [float, float], bool) + assert fp(12., 11.) == fn(12., 11.), op + assert fp(12., 12.) == fn(12., 12.), op + assert fp(12., 13.) == fn(12., 13.), op + assert fp(-12., 11.) == fn(-12., 11.), op + assert fp(-12., 12.) == fn(-12., 12.), op + assert fp(-12., 13.) == fn(-12., 13.), op + assert fp(12., -11.) == fn(12., -11.), op + assert fp(12., -12.) == fn(12., -12.), op + assert fp(12., -13.) == fn(12., -13.), op + assert fp(-12., -11.) == fn(-12., -11.), op + assert fp(-12., -12.) == fn(-12., -12.), op + assert fp(-12., -13.) == fn(-12., -13.), op + def test_unsigned_comparison(self): for op, fn in [('int(x < y)', lambda x, y: int(x < y)), ('int(x <= y)', lambda x, y: int(x <= y)), @@ -323,12 +345,18 @@ def test_float_cast(self): #because of different rettype for op, fn in [('bool(x)', lambda x: bool(x)), ('bool(2.0 - x)', lambda x: bool(x - 2.0)), + ('int(x)', lambda x: int(x)), ]: fp = self.rgen(fn, [float], bool) assert fp(6.0) == fn(6.0), op assert fp(2.0) == fn(2.0), op assert fp(0.0) == fn(0.0), op assert fp(-2.0) == fn(-2.0), op + assert fp(1.3) == fn(1.3), op + for op, fn in [('float(x)', lambda x: float(x)), + ('float(2.0-x)', lambda x: float(2.0-x))]: + fp2 = self.rgen(fn, [int], float) + assert fp2(2) == fn(2) def test_constants_in_mul(self): for op in ['x * y', 'y * x']: From fijal at codespeak.net Mon Mar 31 23:16:17 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 23:16:17 +0200 (CEST) Subject: [pypy-svn] r53217 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080331211617.C651D1684D4@codespeak.net> Author: fijal Date: Mon Mar 31 23:16:17 2008 New Revision: 53217 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: pass casting tests and friends (still gcc is checking something in control word, need to investigate) Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 23:16:17 2008 @@ -47,6 +47,9 @@ def operand(self, builder): return builder.stack_access(self.stackpos) + def newvar(self, builder): + return builder.returnintvar(self.operand(builder)) + ll_type = lltype.Signed token = 'i' SIZE = 1 @@ -56,6 +59,9 @@ def operand(self, builder): return builder.stack_access(self.stackpos) + def newvar(self, builder): + return builder.returnboolvar(self.operand(builder)) + ll_type = lltype.Bool token = 'b' SIZE = 1 @@ -64,6 +70,9 @@ def operand(self, builder): return builder.stack_access64(self.stackpos) + def newvar(self, builder): + return builder.returnfloatvar(self.operand(builder)) + ll_type = lltype.Float token = 'f' SIZE = 2 @@ -143,7 +152,8 @@ return "const=$%s" % (self.value,) class IntConst(Const): - pass + def newvar(self, builder): + return builder.returnintvar(self.operand(builder)) class FloatConst(Const): def __init__(self, floatval): @@ -154,11 +164,15 @@ immortal=True) self.rawbuf[0] = floatval + def newvar(self, builder): + return builder.returnfloatvar(self.operand(builder)) + def operand(self, builder): return heap64(rffi.cast(rffi.INT, self.rawbuf)) class BoolConst(Const): - pass + def newvar(self, builder): + return builder.returnboolvar(self.operand(builder)) ##class FnPtrConst(IntConst): ## def __init__(self, value, mc): @@ -538,8 +552,7 @@ def genop_same_as(self, gv_x): if gv_x.is_const: # must always return a var - # XXX must return a var of the correct type - return self.returnintvar(gv_x.operand(self)) + return gv_x.newvar(self) else: return gv_x @@ -555,7 +568,7 @@ # turn constants into variables; also make copies of vars that # are duplicate in args_gv if not isinstance(gv, Var) or gv.stackpos in seen: - gv = args_gv[i] = self.returnintvar(gv.operand(self)) + gv = args_gv[i] = gv.newvar(self) # remember the var's position in the stack arg_positions.append(gv.stackpos) seen[gv.stackpos] = None @@ -952,6 +965,18 @@ def op_float_ge(self, gv_x, gv_y): return self._float_compare(gv_y, gv_x, 5) + def op_cast_float_to_int(self, gv_x): + self.mc.FLDL(gv_x.operand(self)) + self.mc.SUB(esp, imm(WORD)) + self.stackdepth += 1 + res = IntVar(self.stackdepth) + self.mc.FISTP(res.operand(self)) + return res + + def op_cast_int_to_float(self, gv_x): + self.mc.FILD(gv_x.operand(self)) + return self.returnfloatvar(st0) + SIZE2SHIFT = {1: 0, 2: 1, 4: 2, From fijal at codespeak.net Mon Mar 31 23:16:34 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 23:16:34 +0200 (CEST) Subject: [pypy-svn] r53218 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080331211634.3E6171684D4@codespeak.net> Author: fijal Date: Mon Mar 31 23:16:33 2008 New Revision: 53218 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: leave the comment. Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 23:16:33 2008 @@ -966,6 +966,7 @@ return self._float_compare(gv_y, gv_x, 5) def op_cast_float_to_int(self, gv_x): + # XXX gcc is also checking something in control word self.mc.FLDL(gv_x.operand(self)) self.mc.SUB(esp, imm(WORD)) self.stackdepth += 1 @@ -974,6 +975,7 @@ return res def op_cast_int_to_float(self, gv_x): + # XXX gcc is also checking something in control word self.mc.FILD(gv_x.operand(self)) return self.returnfloatvar(st0) From fijal at codespeak.net Mon Mar 31 23:54:02 2008 From: fijal at codespeak.net (fijal at codespeak.net) Date: Mon, 31 Mar 2008 23:54:02 +0200 (CEST) Subject: [pypy-svn] r53219 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32 Message-ID: <20080331215402.F1A9216845E@codespeak.net> Author: fijal Date: Mon Mar 31 23:53:59 2008 New Revision: 53219 Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Log: leave a comment not to forget Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py ============================================================================== --- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py (original) +++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py Mon Mar 31 23:53:59 2008 @@ -1028,6 +1028,8 @@ ## target.stackdepth, ## target.arg_positions)) + # XXX rewrite in a float-friendly way + N = target.stackdepth if builder.stackdepth < N: builder.mc.SUB(esp, imm(WORD * (N - builder.stackdepth)))