[pypy-svn] r65007 - pypy/branch/pyjitpl5/pypy/jit/metainterp/doc

[benjamin at codespeak.net]

Author: benjamin
Date: Sun May  3 20:07:35 2009
New Revision: 65007

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/doc/warmspot.txt
Log:
update

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/doc/warmspot.txt
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/doc/warmspot.txt	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/doc/warmspot.txt	Sun May  3 20:07:35 2009
@@ -3,25 +3,24 @@
 
 We introduce two jit hints:
 
-can_enter_jit(**keys)
+jit_merge_point(**keys)
 
 and
 
-can_leave_jit()
+can_enter_jit(**keys)
 
-In case of python interpreter, can_enter_jit is invoked at
-a place where app-level jump takes place (JUMP_ABSOLUTE opcode)
-and can_leave_jit is invoked at the beginning of the main interpreter
-loop.
+In case of python interpreter, can_enter_jit is invoked at a place where
+app-level jump takes place (JUMP_ABSOLUTE opcode) and jit_merge_point is
+invoked at the beginning of the main interpreter loop.
 
 The interpreter starts from running normally, without generating any
 assembler at all. When it encounters can_enter_jit with exactly the same
 key enough number of times, it starts tracing (the "slow" path of pyjitpl),
-until it finds out efficient loop (XXX or loop at all?).
+until it finds a loop to compile.
 
 Next time we run the efficient loop (assembler code) and we encounter
-failing guard, we use JIT without tracing (ie compiling and executing
-one instruction at a time, but not doing anything more) for fast
-"get out of here" until we encounter can_leave_jit (end of the opcode usually),
-where we completely exit jit.
+failing guard, we use JIT without tracing (ie compiling and executing one
+instruction at a time, but not doing anything more) for fast "get out of
+here" until we encounter jit_merge_point (end of the opcode usually), where
+we completely exit jit.