cpython-lru_cache-weakref: Python/ceval.c annotate

annotate Python/ceval.c @ 41769:b29d71d43c80

Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror PyString_Concat() and PyString_ConcatAndDel() (the name PyUnicode_Concat() was already taken). Change PyObject_Repr() to always return a unicode object. Update all repr implementations to return unicode objects. Add a function PyObject_ReprStr8() that calls PyObject_Repr() and converts the result to an 8bit string. Use PyObject_ReprStr8() where using PyObject_Repr() can't be done straightforward.

author	Walter Dörwald <walter@livinglogic.de>
date	Fri, 18 May 2007 17:15:44 +0000
parents	00c02c4488ce
children	24b60622b944

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 119 diff changeset	1
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	2 /* Execute compiled code */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	4 /* XXX TO DO:
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	5 XXX speed up searching for keywords by using a dictionary
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	6 XXX document it!
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	7 */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	8
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	9 /* enable more aggressive intra-module optimizations, where available */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	10 #define PY_LOCAL_AGGRESSIVE
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	11
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	12 #include "Python.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	13
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	14 #include "code.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	15 #include "frameobject.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	16 #include "eval.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	17 #include "opcode.h"
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	18 #include "structmember.h"
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	19
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1391 diff changeset	20 #include <ctype.h>
aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1391 diff changeset	21
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	22 #ifndef WITH_TSC
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	23
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	24 #define READ_TIMESTAMP(var)
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	25
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	26 #else
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	27
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	28 typedef unsigned long long uint64;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	29
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	30 #if defined(__ppc__) /* <- Don't know if this is the correct symbol; this
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	31 section should work for GCC on any PowerPC platform,
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	32 irrespective of OS. POWER? Who knows :-) */
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	33
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	34 #define READ_TIMESTAMP(var) ppc_getcounter(&var)
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	35
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	36 static void
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	37 ppc_getcounter(uint64 *v)
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	38 {
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	39 register unsigned long tbu, tb, tbu2;
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	40
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	41 loop:
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	42 asm volatile ("mftbu %0" : "=r" (tbu) );
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	43 asm volatile ("mftb %0" : "=r" (tb) );
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	44 asm volatile ("mftbu %0" : "=r" (tbu2));
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	45 if (__builtin_expect(tbu != tbu2, 0)) goto loop;
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	46
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	47 /* The slightly peculiar way of writing the next lines is
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	48 compiled better by GCC than any other way I tried. */
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	49 ((long*)(v))[0] = tbu;
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	50 ((long*)(v))[1] = tb;
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	51 }
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	52
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	53 #else /* this is for linux/x86 (and probably any other GCC/x86 combo) */
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	54
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	55 #define READ_TIMESTAMP(val) \
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	56 __asm__ __volatile__("rdtsc" : "=A" (val))
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	57
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	58 #endif
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	59
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	60 void dump_tsc(int opcode, int ticked, uint64 inst0, uint64 inst1,
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	61 uint64 loop0, uint64 loop1, uint64 intr0, uint64 intr1)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	62 {
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	63 uint64 intr, inst, loop;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	64 PyThreadState *tstate = PyThreadState_Get();
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	65 if (!tstate->interp->tscdump)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	66 return;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	67 intr = intr1 - intr0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	68 inst = inst1 - inst0 - intr;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	69 loop = loop1 - loop0 - intr;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	70 fprintf(stderr, "opcode=%03d t=%d inst=%06lld loop=%06lld\n",
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	71 opcode, ticked, inst, loop);
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	72 }
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	73
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	74 #endif
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	75
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	76 /* Turn this on if your compiler chokes on the big switch: */
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	77 /* #define CASE_TOO_BIG 1 */
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	78
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4667 diff changeset	79 #ifdef Py_DEBUG
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	80 /* For debugging the interpreter: */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	81 #define LLTRACE 1 /* Low-level trace feature */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	82 #define CHECKEXC 1 /* Double-check exception checking */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	83 #endif
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	84
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	85 typedef PyObject (callproc)(PyObject , PyObject , PyObject *);
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	86
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	87 /* Forward declarations */
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	88 #ifdef WITH_TSC
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	89 static PyObject * call_function(PyObject **, int, uint64, uint64*);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	90 #else
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	91 static PyObject * call_function(PyObject ***, int);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	92 #endif
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	93 static PyObject * fast_function(PyObject , PyObject **, int, int, int);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	94 static PyObject * do_call(PyObject , PyObject **, int, int);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	95 static PyObject * ext_do_call(PyObject , PyObject **, int, int, int);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	96 static PyObject * update_keyword_args(PyObject , int, PyObject *,PyObject );
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	97 static PyObject * update_star_args(int, int, PyObject , PyObject **);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	98 static PyObject * load_args(PyObject ***, int);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	99 #define CALL_FLAG_VAR 1
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	100 #define CALL_FLAG_KW 2
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	101
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	102 #ifdef LLTRACE
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	103 static int lltrace;
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	104 static int prtrace(PyObject , char );
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	105 #endif
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	106 static int call_trace(Py_tracefunc, PyObject , PyFrameObject ,
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	107 int, PyObject *);
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	108 static void call_trace_protected(Py_tracefunc, PyObject *,
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	109 PyFrameObject , int, PyObject );
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	110 static void call_exc_trace(Py_tracefunc, PyObject , PyFrameObject );
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	111 static int maybe_call_line_trace(Py_tracefunc, PyObject *,
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	112 PyFrameObject , int , int , int );
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	113
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	114 static PyObject * apply_slice(PyObject , PyObject , PyObject *);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	115 static int assign_slice(PyObject , PyObject ,
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	116 PyObject , PyObject );
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	117 static PyObject * cmp_outcome(int, PyObject , PyObject );
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	118 static PyObject * import_from(PyObject , PyObject );
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	119 static int import_all_from(PyObject , PyObject );
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	120 static void set_exc_info(PyThreadState , PyObject , PyObject , PyObject );
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	121 static void reset_exc_info(PyThreadState *);
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	122 static void format_exc_check_arg(PyObject , char , PyObject *);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	123 static PyObject * string_concatenate(PyObject , PyObject ,
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	124 PyFrameObject , unsigned char );
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	125
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	126 #define NAME_ERROR_MSG \
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	127 "name '%.200s' is not defined"
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	128 #define GLOBAL_NAME_ERROR_MSG \
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	129 "global name '%.200s' is not defined"
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	130 #define UNBOUNDLOCAL_ERROR_MSG \
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	131 "local variable '%.200s' referenced before assignment"
17494 a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	132 #define UNBOUNDFREE_ERROR_MSG \
a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	133 "free variable '%.200s' referenced before assignment" \
a34293ced63b Change error message raised when free variable is not yet bound. It Jeremy Hylton <jeremy@alum.mit.edu> parents: 17490 diff changeset	134 " in enclosing scope"
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	135
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	136 /* Dynamic execution profile */
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	137 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	138 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	139 static long dxpairs[257][256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	140 #define dxp dxpairs[256]
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	141 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	142 static long dxp[256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	143 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	144 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	145
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	146 /* Function call profile */
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	147 #ifdef CALL_PROFILE
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	148 #define PCALL_NUM 11
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	149 static int pcall[PCALL_NUM];
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	150
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	151 #define PCALL_ALL 0
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	152 #define PCALL_FUNCTION 1
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	153 #define PCALL_FAST_FUNCTION 2
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	154 #define PCALL_FASTER_FUNCTION 3
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	155 #define PCALL_METHOD 4
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	156 #define PCALL_BOUND_METHOD 5
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	157 #define PCALL_CFUNCTION 6
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	158 #define PCALL_TYPE 7
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	159 #define PCALL_GENERATOR 8
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	160 #define PCALL_OTHER 9
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	161 #define PCALL_POP 10
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	162
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	163 /* Notes about the statistics
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	164
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	165 PCALL_FAST stats
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	166
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	167 FAST_FUNCTION means no argument tuple needs to be created.
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	168 FASTER_FUNCTION means that the fast-path frame setup code is used.
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	169
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	170 If there is a method call where the call can be optimized by changing
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	171 the argument tuple and calling the function directly, it gets recorded
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	172 twice.
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	173
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	174 As a result, the relationship among the statistics appears to be
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	175 PCALL_ALL == PCALL_FUNCTION + PCALL_METHOD - PCALL_BOUND_METHOD +
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	176 PCALL_CFUNCTION + PCALL_TYPE + PCALL_GENERATOR + PCALL_OTHER
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	177 PCALL_FUNCTION > PCALL_FAST_FUNCTION > PCALL_FASTER_FUNCTION
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	178 PCALL_METHOD > PCALL_BOUND_METHOD
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	179 */
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	180
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	181 #define PCALL(POS) pcall[POS]++
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	182
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	183 PyObject *
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	184 PyEval_GetCallStats(PyObject *self)
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	185 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	186 return Py_BuildValue("iiiiiiiiiii",
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	187 pcall[0], pcall[1], pcall[2], pcall[3],
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	188 pcall[4], pcall[5], pcall[6], pcall[7],
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	189 pcall[8], pcall[9], pcall[10]);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	190 }
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	191 #else
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	192 #define PCALL(O)
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	193
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	194 PyObject *
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	195 PyEval_GetCallStats(PyObject *self)
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	196 {
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	197 Py_INCREF(Py_None);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	198 return Py_None;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	199 }
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	200 #endif
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	201
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	202
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	203 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	204
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	205 #ifdef HAVE_ERRNO_H
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	206 #include <errno.h>
10530 d834ecdf8c26 Changes by Mark Hammond for Windows CE. Mostly of the form Guido van Rossum <guido@python.org> parents: 10363 diff changeset	207 #endif
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9048 diff changeset	208 #include "pythread.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	209
29643 fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	210 static PyThread_type_lock interpreter_lock = 0; /* This is the GIL */
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	211 static long main_thread = 0;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	212
33715 a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	213 int
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	214 PyEval_ThreadsInitialized(void)
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	215 {
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	216 return interpreter_lock != 0;
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	217 }
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	218
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	219 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	220 PyEval_InitThreads(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	221 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	222 if (interpreter_lock)
1179 9ae65ee09735 Various changes. Sjoerd Mullender <sjoerd@acm.org> parents: 1132 diff changeset	223 return;
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	224 interpreter_lock = PyThread_allocate_lock();
877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	225 PyThread_acquire_lock(interpreter_lock, 1);
877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	226 main_thread = PyThread_get_thread_ident();
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	227 }
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	228
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	229 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	230 PyEval_AcquireLock(void)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	231 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	232 PyThread_acquire_lock(interpreter_lock, 1);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	233 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	234
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	235 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	236 PyEval_ReleaseLock(void)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	237 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	238 PyThread_release_lock(interpreter_lock);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	239 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	240
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	241 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	242 PyEval_AcquireThread(PyThreadState *tstate)
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	243 {
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	244 if (tstate == NULL)
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	245 Py_FatalError("PyEval_AcquireThread: NULL new thread state");
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28556 diff changeset	246 /* Check someone has called PyEval_InitThreads() to create the lock */
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28556 diff changeset	247 assert(interpreter_lock);
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	248 PyThread_acquire_lock(interpreter_lock, 1);
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	249 if (PyThreadState_Swap(tstate) != NULL)
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	250 Py_FatalError(
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	251 "PyEval_AcquireThread: non-NULL old thread state");
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	252 }
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	253
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	254 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	255 PyEval_ReleaseThread(PyThreadState *tstate)
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	256 {
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	257 if (tstate == NULL)
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	258 Py_FatalError("PyEval_ReleaseThread: NULL thread state");
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	259 if (PyThreadState_Swap(NULL) != tstate)
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	260 Py_FatalError("PyEval_ReleaseThread: wrong thread state");
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	261 PyThread_release_lock(interpreter_lock);
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	262 }
14225 cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	263
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	264 /* This function is called from PyOS_AfterFork to ensure that newly
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	265 created child processes don't hold locks referring to threads which
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	266 are not running in the child process. (This could also be done using
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	267 pthread_atfork mechanism, at least for the pthreads implementation.) */
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	268
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	269 void
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	270 PyEval_ReInitThreads(void)
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	271 {
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	272 if (!interpreter_lock)
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	273 return;
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	274 /*XXX Can't use PyThread_free_lock here because it does too
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	275 much error-checking. Doing this cleanly would require
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	276 adding a new function to each thread_*.h. Instead, just
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	277 create a new lock and waste a little bit of memory */
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	278 interpreter_lock = PyThread_allocate_lock();
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	279 PyThread_acquire_lock(interpreter_lock, 1);
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	280 main_thread = PyThread_get_thread_ident();
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	281 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	282 #endif
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	283
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	284 /* Functions save_thread and restore_thread are always defined so
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	285 dynamically loaded modules needn't be compiled separately for use
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	286 with and without threads: */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	287
5846 852a1fa62a7c PyEval_SaveThread() and PyEval_RestoreThread() now return/take a Guido van Rossum <guido@python.org> parents: 5829 diff changeset	288 PyThreadState *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	289 PyEval_SaveThread(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	290 {
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	291 PyThreadState *tstate = PyThreadState_Swap(NULL);
21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	292 if (tstate == NULL)
21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	293 Py_FatalError("PyEval_SaveThread: NULL tstate");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	294 #ifdef WITH_THREAD
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	295 if (interpreter_lock)
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	296 PyThread_release_lock(interpreter_lock);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	297 #endif
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	298 return tstate;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	299 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	300
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	301 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	302 PyEval_RestoreThread(PyThreadState *tstate)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	303 {
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	304 if (tstate == NULL)
21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	305 Py_FatalError("PyEval_RestoreThread: NULL tstate");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	306 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	307 if (interpreter_lock) {
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	308 int err = errno;
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	309 PyThread_acquire_lock(interpreter_lock, 1);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	310 errno = err;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	311 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	312 #endif
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	313 PyThreadState_Swap(tstate);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	314 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	315
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	316
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	317 /* Mechanism whereby asynchronously executing callbacks (e.g. UNIX
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	318 signal handlers or Mac I/O completion routines) can schedule calls
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	319 to a function to be called synchronously.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	320 The synchronous function is called with one void* argument.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	321 It should return 0 for success or -1 for failure -- failure should
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	322 be accompanied by an exception.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	323
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	324 If registry succeeds, the registry function returns 0; if it fails
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	325 (e.g. due to too many pending calls) it returns -1 (without setting
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	326 an exception condition).
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	327
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	328 Note that because registry may occur from within signal handlers,
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	329 or other asynchronous events, calling malloc() is unsafe!
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	330
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	331 #ifdef WITH_THREAD
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	332 Any thread can schedule pending calls, but only the main thread
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	333 will execute them.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	334 #endif
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	335
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	336 XXX WARNING! ASYNCHRONOUSLY EXECUTING CODE!
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	337 There are two possible race conditions:
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	338 (1) nested asynchronous registry calls;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	339 (2) registry calls made while pending calls are being processed.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	340 While (1) is very unlikely, (2) is a real possibility.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	341 The current code is safe against (2), but not against (1).
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	342 The safety against (2) is derived from the fact that only one
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	343 thread (the main thread) ever takes things out of the queue.
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	344
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	345 XXX Darn! With the advent of thread state, we should have an array
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	346 of pending calls per thread in the thread state! Later...
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	347 */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	348
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	349 #define NPENDINGCALLS 32
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	350 static struct {
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	351 int (func)(void );
4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	352 void *arg;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	353 } pendingcalls[NPENDINGCALLS];
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	354 static volatile int pendingfirst = 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	355 static volatile int pendinglast = 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	356 static volatile int things_to_do = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	357
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	358 int
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	359 Py_AddPendingCall(int (func)(void ), void *arg)
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	360 {
32526 78bd25b42d46 This closes patch: Michael W. Hudson <mwh@python.net> parents: 32463 diff changeset	361 static volatile int busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	362 int i, j;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	363 /* XXX Begin critical section */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	364 /* XXX If you want this to be safe against nested
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	365 XXX asynchronous calls, you'll have to work harder! */
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	366 if (busy)
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	367 return -1;
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	368 busy = 1;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	369 i = pendinglast;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	370 j = (i + 1) % NPENDINGCALLS;
24284 d8909792005a SF patch 552161 - Py_AddPendingCall doesn't unlock on fail (Daniel Guido van Rossum <guido@python.org> parents: 24283 diff changeset	371 if (j == pendingfirst) {
d8909792005a SF patch 552161 - Py_AddPendingCall doesn't unlock on fail (Daniel Guido van Rossum <guido@python.org> parents: 24283 diff changeset	372 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	373 return -1; /* Queue full */
24284 d8909792005a SF patch 552161 - Py_AddPendingCall doesn't unlock on fail (Daniel Guido van Rossum <guido@python.org> parents: 24283 diff changeset	374 }
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	375 pendingcalls[i].func = func;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	376 pendingcalls[i].arg = arg;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	377 pendinglast = j;
25108 3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	378
3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	379 _Py_Ticker = 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	380 things_to_do = 1; /* Signal main loop */
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	381 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	382 /* XXX End critical section */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	383 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	384 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	385
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	386 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	387 Py_MakePendingCalls(void)
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	388 {
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	389 static int busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	390 #ifdef WITH_THREAD
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	391 if (main_thread && PyThread_get_thread_ident() != main_thread)
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	392 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	393 #endif
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	394 if (busy)
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	395 return 0;
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	396 busy = 1;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	397 things_to_do = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	398 for (;;) {
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	399 int i;
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	400 int (func)(void );
4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	401 void *arg;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	402 i = pendingfirst;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	403 if (i == pendinglast)
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	404 break; /* Queue empty */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	405 func = pendingcalls[i].func;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	406 arg = pendingcalls[i].arg;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	407 pendingfirst = (i + 1) % NPENDINGCALLS;
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	408 if (func(arg) < 0) {
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	409 busy = 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	410 things_to_do = 1; /* We're not done yet */
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	411 return -1;
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	412 }
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	413 }
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	414 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	415 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	416 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	417
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	418
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	419 /* The interpreter's recursion limit */
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	420
34863 71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	421 #ifndef Py_DEFAULT_RECURSION_LIMIT
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	422 #define Py_DEFAULT_RECURSION_LIMIT 1000
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	423 #endif
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	424 static int recursion_limit = Py_DEFAULT_RECURSION_LIMIT;
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	425 int _Py_CheckRecursionLimit = Py_DEFAULT_RECURSION_LIMIT;
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	426
14348 6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	427 int
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	428 Py_GetRecursionLimit(void)
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	429 {
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	430 return recursion_limit;
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	431 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	432
14348 6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	433 void
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	434 Py_SetRecursionLimit(int new_limit)
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	435 {
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	436 recursion_limit = new_limit;
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	437 _Py_CheckRecursionLimit = recursion_limit;
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	438 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	439
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	440 /* the macro Py_EnterRecursiveCall() only calls _Py_CheckRecursiveCall()
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	441 if the recursion_depth reaches _Py_CheckRecursionLimit.
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	442 If USE_STACKCHECK, the macro decrements _Py_CheckRecursionLimit
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	443 to guarantee that _Py_CheckRecursiveCall() is regularly called.
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	444 Without USE_STACKCHECK, there is no need for this. */
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	445 int
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	446 _Py_CheckRecursiveCall(char *where)
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	447 {
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	448 PyThreadState *tstate = PyThreadState_GET();
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	449
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	450 #ifdef USE_STACKCHECK
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	451 if (PyOS_CheckStack()) {
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	452 --tstate->recursion_depth;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	453 PyErr_SetString(PyExc_MemoryError, "Stack overflow");
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	454 return -1;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	455 }
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	456 #endif
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	457 if (tstate->recursion_depth > recursion_limit) {
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	458 --tstate->recursion_depth;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	459 PyErr_Format(PyExc_RuntimeError,
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	460 "maximum recursion depth exceeded%s",
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	461 where);
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	462 return -1;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	463 }
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	464 _Py_CheckRecursionLimit = recursion_limit;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	465 return 0;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	466 }
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	467
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	468 /* Status code for main loop (reason for stack unwind) */
31875 1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	469 enum why_code {
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	470 WHY_NOT = 0x0001, /* No error */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	471 WHY_EXCEPTION = 0x0002, /* Exception occurred */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	472 WHY_RERAISE = 0x0004, /* Exception re-raised by 'finally' */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	473 WHY_RETURN = 0x0008, /* 'return' statement */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	474 WHY_BREAK = 0x0010, /* 'break' statement */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	475 WHY_CONTINUE = 0x0020, /* 'continue' statement */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	476 WHY_YIELD = 0x0040 /* 'yield' operator */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	477 };
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	478
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	479 static enum why_code do_raise(PyObject , PyObject , PyObject *);
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	480 static int unpack_iterable(PyObject , int, int, PyObject *);
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	481
25108 3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	482 /* for manipulating the thread switch and periodic "stuff" - used to be
3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	483 per thread, now just a pair o' globals */
25109 00b6dd414b80 Bump default check interval to 100 instructions. Computers are much faster Skip Montanaro <skip@pobox.com> parents: 25108 diff changeset	484 int _Py_CheckInterval = 100;
00b6dd414b80 Bump default check interval to 100 instructions. Computers are much faster Skip Montanaro <skip@pobox.com> parents: 25108 diff changeset	485 volatile int _Py_Ticker = 100;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	486
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	487 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	488 PyEval_EvalCode(PyCodeObject co, PyObject globals, PyObject *locals)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	489 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	490 return PyEval_EvalCodeEx(co,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	491 globals, locals,
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	492 (PyObject **)NULL, 0,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	493 (PyObject **)NULL, 0,
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	494 (PyObject **)NULL, 0,
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	495 NULL, NULL);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	496 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	497
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	498
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	499 /* Interpreter main loop */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	500
32421 485d2ef43419 Patch #966493: Cleanup generator/eval_frame exposure. Martin v. Löwis <martin@v.loewis.de> parents: 32412 diff changeset	501 PyObject *
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	502 PyEval_EvalFrame(PyFrameObject *f) {
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	503 /* This is for backward compatibility with extension modules that
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	504 used this API; core interpreter code should call PyEval_EvalFrameEx() */
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	505 return PyEval_EvalFrameEx(f, 0);
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	506 }
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	507
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	508 PyObject *
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	509 PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	510 {
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	511 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	512 int lastopcode = 0;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	513 #endif
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	514 register PyObject *stack_pointer; / Next free slot in value stack */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	515 register unsigned char *next_instr;
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	516 register int opcode; /* Current opcode */
e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	517 register int oparg; /* Current opcode argument, if any */
31875 1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	518 register enum why_code why; /* Reason for block stack unwind */
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	519 register int err; /* Error status -- nonzero if error */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	520 register PyObject x; / Result object -- NULL if error */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	521 register PyObject v; / Temporary objects popped off stack */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	522 register PyObject *w;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	523 register PyObject *u;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	524 register PyObject *t;
16355 e4420c2468f9 Remove f_closure slot of frameobject and use f_localsplus instead. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16257 diff changeset	525 register PyObject fastlocals, freevars;
9513 350f24180dcb Whoops! One the "redundant" initializations removed by Vladimir in Guido van Rossum <guido@python.org> parents: 9490 diff changeset	526 PyObject retval = NULL; / Return value */
9671 1d40bc25703a Use PyThreadState_GET() macro. Guido van Rossum <guido@python.org> parents: 9591 diff changeset	527 PyThreadState *tstate = PyThreadState_GET();
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	528 PyCodeObject *co;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	529
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	530 /* when tracing we set things up so that
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	531
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	532 not (instr_lb <= current_bytecode_offset < instr_ub)
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	533
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	534 is true when the line being executed has changed. The
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	535 initial values are such as to make this false the first
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	536 time it is tested. */
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	537 int instr_ub = -1, instr_lb = 0, instr_prev = -1;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	538
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9203 diff changeset	539 unsigned char *first_instr;
24545 d2f41c8a81f0 small speedup for constant and name access Skip Montanaro <skip@pobox.com> parents: 24284 diff changeset	540 PyObject *names;
d2f41c8a81f0 small speedup for constant and name access Skip Montanaro <skip@pobox.com> parents: 24284 diff changeset	541 PyObject *consts;
35745 407c3dacbd7c Fix some mods that got dropped from the AST merge Neal Norwitz <nnorwitz@gmail.com> parents: 35742 diff changeset	542 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	543 /* Make it easier to find out where we are with a debugger */
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	544 char *filename;
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	545 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	546
24232 e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	547 /* Tuple access macros */
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	548
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	549 #ifndef Py_DEBUG
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	550 #define GETITEM(v, i) PyTuple_GET_ITEM((PyTupleObject *)(v), (i))
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	551 #else
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	552 #define GETITEM(v, i) PyTuple_GetItem((v), (i))
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	553 #endif
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	554
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	555 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	556 /* Use Pentium timestamp counter to mark certain events:
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	557 inst0 -- beginning of switch statement for opcode dispatch
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	558 inst1 -- end of switch statement (may be skipped)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	559 loop0 -- the top of the mainloop
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	560 loop1 -- place where control returns again to top of mainloop
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	561 (may be skipped)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	562 intr1 -- beginning of long interruption
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	563 intr2 -- end of long interruption
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	564
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	565 Many opcodes call out to helper C functions. In some cases, the
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	566 time in those functions should be counted towards the time for the
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	567 opcode, but not in all cases. For example, a CALL_FUNCTION opcode
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	568 calls another Python function; there's no point in charge all the
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	569 bytecode executed by the called function to the caller.
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	570
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	571 It's hard to make a useful judgement statically. In the presence
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	572 of operator overloading, it's impossible to tell if a call will
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	573 execute new Python code or not.
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	574
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	575 It's a case-by-case judgement. I'll use intr1 for the following
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	576 cases:
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	577
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	578 IMPORT_STAR
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	579 IMPORT_FROM
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	580 CALL_FUNCTION (and friends)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	581
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	582 */
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	583 uint64 inst0, inst1, loop0, loop1, intr0 = 0, intr1 = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	584 int ticked = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	585
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	586 READ_TIMESTAMP(inst0);
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	587 READ_TIMESTAMP(inst1);
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	588 READ_TIMESTAMP(loop0);
683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	589 READ_TIMESTAMP(loop1);
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	590
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	591 /* shut up the compiler */
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	592 opcode = 0;
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	593 #endif
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	594
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	595 /* Code access macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	596
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	597 #define INSTR_OFFSET() ((int)(next_instr - first_instr))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	598 #define NEXTOP() (*next_instr++)
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	599 #define NEXTARG() (next_instr += 2, (next_instr[-1]<<8) + next_instr[-2])
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	600 #define PEEKARG() ((next_instr[2]<<8) + next_instr[1])
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9203 diff changeset	601 #define JUMPTO(x) (next_instr = first_instr + (x))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	602 #define JUMPBY(x) (next_instr += (x))
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	603
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	604 /* OpCode prediction macros
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	605 Some opcodes tend to come in pairs thus making it possible to predict
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	606 the second code when the first is run. For example, COMPARE_OP is often
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	607 followed by JUMP_IF_FALSE or JUMP_IF_TRUE. And, those opcodes are often
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	608 followed by a POP_TOP.
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	609
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	610 Verifying the prediction costs a single high-speed test of register
28303 470504ef578b Fix comment and whitespace. Raymond Hettinger <python@rcn.com> parents: 28302 diff changeset	611 variable against a constant. If the pairing was good, then the
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	612 processor has a high likelihood of making its own successful branch
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	613 prediction which results in a nearly zero overhead transition to the
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	614 next opcode.
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	615
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	616 A successful prediction saves a trip through the eval-loop including
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	617 its two unpredictable branches, the HASARG test and the switch-case.
31487 f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	618
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	619 If collecting opcode statistics, turn off prediction so that
9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	620 statistics are accurately maintained (the predictions bypass
31487 f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	621 the opcode frequency counter updates).
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	622 */
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	623
31487 f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	624 #ifdef DYNAMIC_EXECUTION_PROFILE
f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	625 #define PREDICT(op) if (0) goto PRED_##op
f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	626 #else
28303 470504ef578b Fix comment and whitespace. Raymond Hettinger <python@rcn.com> parents: 28302 diff changeset	627 #define PREDICT(op) if (*next_instr == op) goto PRED_##op
31487 f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	628 #endif
f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	629
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	630 #define PREDICTED(op) PRED_##op: next_instr++
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	631 #define PREDICTED_WITH_ARG(op) PRED_##op: oparg = PEEKARG(); next_instr += 3
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	632
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	633 /* Stack manipulation macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	634
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	635 /* The stack can grow at most MAXINT deep, as co_nlocals and
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	636 co_stacksize are ints. */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	637 #define STACK_LEVEL() ((int)(stack_pointer - f->f_valuestack))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	638 #define EMPTY() (STACK_LEVEL() == 0)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	639 #define TOP() (stack_pointer[-1])
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	640 #define SECOND() (stack_pointer[-2])
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	641 #define THIRD() (stack_pointer[-3])
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	642 #define FOURTH() (stack_pointer[-4])
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	643 #define SET_TOP(v) (stack_pointer[-1] = (v))
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	644 #define SET_SECOND(v) (stack_pointer[-2] = (v))
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	645 #define SET_THIRD(v) (stack_pointer[-3] = (v))
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	646 #define SET_FOURTH(v) (stack_pointer[-4] = (v))
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	647 #define BASIC_STACKADJ(n) (stack_pointer += n)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	648 #define BASIC_PUSH(v) (*stack_pointer++ = (v))
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	649 #define BASIC_POP() (*--stack_pointer)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	650
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	651 #ifdef LLTRACE
20492 bf4ff05eab52 For debug build, check that the stack pointer never exceeds the stack size. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20438 diff changeset	652 #define PUSH(v) { (void)(BASIC_PUSH(v), \
bf4ff05eab52 For debug build, check that the stack pointer never exceeds the stack size. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20438 diff changeset	653 lltrace && prtrace(TOP(), "push")); \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	654 assert(STACK_LEVEL() <= co->co_stacksize); }
20409 b98185c882e4 Suppress a bunch of "value computed is not used" warnings when building in Fred Drake <fdrake@acm.org> parents: 20275 diff changeset	655 #define POP() ((void)(lltrace && prtrace(TOP(), "pop")), BASIC_POP())
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	656 #define STACKADJ(n) { (void)(BASIC_STACKADJ(n), \
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	657 lltrace && prtrace(TOP(), "stackadj")); \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	658 assert(STACK_LEVEL() <= co->co_stacksize); }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	659 #define EXT_POP(STACK_POINTER) (lltrace && prtrace((STACK_POINTER)[-1], "ext_pop"), *--(STACK_POINTER))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	660 #else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	661 #define PUSH(v) BASIC_PUSH(v)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	662 #define POP() BASIC_POP()
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	663 #define STACKADJ(n) BASIC_STACKADJ(n)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	664 #define EXT_POP(STACK_POINTER) (*--(STACK_POINTER))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	665 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	666
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	667 /* Local variable macros */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	668
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	669 #define GETLOCAL(i) (fastlocals[i])
22621 830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	670
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	671 /* The SETLOCAL() macro must not DECREF the local variable in-place and
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	672 then store the new value; it must copy the old value to a temporary
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	673 value, then store the new value, and then DECREF the temporary value.
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	674 This is because it is possible that during the DECREF the frame is
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	675 accessed by other code (e.g. a __del__ method or gc.collect()) and the
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	676 variable would be pointing to already-freed memory. */
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	677 #define SETLOCAL(i, value) do { PyObject *tmp = GETLOCAL(i); \
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	678 GETLOCAL(i) = value; \
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of Guido van Rossum <guido@python.org> parents: 22499 diff changeset	679 Py_XDECREF(tmp); } while (0)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	680
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	681 /* Start of code */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	682
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	683 if (f == NULL)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	684 return NULL;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	685
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	686 /* push frame */
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	687 if (Py_EnterRecursiveCall(""))
30782 f51dc9026e4d oh dear. Wrong manipulation. Committed a version of ceval.c from my Armin Rigo <arigo@tunes.org> parents: 30781 diff changeset	688 return NULL;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	689
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	690 tstate->frame = f;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	691
19692 04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	692 if (tstate->use_tracing) {
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	693 if (tstate->c_tracefunc != NULL) {
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	694 /* tstate->c_tracefunc, if defined, is a
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	695 function that will be called on every entry
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	696 to a code block. Its return value, if not
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	697 None, is a function that will be called at
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	698 the start of each executed line of code.
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	699 (Actually, the function must return itself
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	700 in order to continue tracing.) The trace
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	701 functions are called with three arguments:
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	702 a pointer to the current frame, a string
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	703 indicating why the function is called, and
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	704 an argument which depends on the situation.
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	705 The global trace function is also called
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	706 whenever an exception is detected. */
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	707 if (call_trace(tstate->c_tracefunc, tstate->c_traceobj,
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	708 f, PyTrace_CALL, Py_None)) {
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	709 /* Trace function raised an error */
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	710 goto exit_eval_frame;
19692 04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	711 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	712 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	713 if (tstate->c_profilefunc != NULL) {
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	714 /* Similar for c_profilefunc, except it needn't
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	715 return itself and isn't called for "line" events */
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	716 if (call_trace(tstate->c_profilefunc,
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	717 tstate->c_profileobj,
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	718 f, PyTrace_CALL, Py_None)) {
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	719 /* Profile function raised an error */
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	720 goto exit_eval_frame;
19692 04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	721 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	722 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	723 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	724
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	725 co = f->f_code;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	726 names = co->co_names;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	727 consts = co->co_consts;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	728 fastlocals = f->f_localsplus;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	729 freevars = f->f_localsplus + co->co_nlocals;
35126 70681267a74a Fix signedness of various char variables to stop causing a warning under gcc 4. Brett Cannon <bcannon@gmail.com> parents: 35125 diff changeset	730 first_instr = (unsigned char*) PyString_AS_STRING(co->co_code);
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	731 /* An explanation is in order for the next line.
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	732
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	733 f->f_lasti now refers to the index of the last instruction
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	734 executed. You might think this was obvious from the name, but
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	735 this wasn't always true before 2.3! PyFrame_New now sets
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	736 f->f_lasti to -1 (i.e. the index before the first instruction)
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	737 and YIELD_VALUE doesn't fiddle with f_lasti any more. So this
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	738 does work. Promise.
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	739
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	740 When the PREDICT() macros are enabled, some opcode pairs follow in
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	741 direct succession without updating f->f_lasti. A successful
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	742 prediction effectively links the two codes together as if they
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	743 were a single new opcode; accordingly,f->f_lasti will point to
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	744 the first code in the pair (for instance, GET_ITER followed by
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	745 FOR_ITER is effectively a single opcode and f->f_lasti will point
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	746 at to the beginning of the combined pair.)
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	747 */
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	748 next_instr = first_instr + f->f_lasti + 1;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	749 stack_pointer = f->f_stacktop;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	750 assert(stack_pointer != NULL);
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	751 f->f_stacktop = NULL; /* remains NULL unless yield suspends frame */
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	752
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	753 #ifdef LLTRACE
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	754 lltrace = PyDict_GetItemString(f->f_globals, "__lltrace__") != NULL;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	755 #endif
35745 407c3dacbd7c Fix some mods that got dropped from the AST merge Neal Norwitz <nnorwitz@gmail.com> parents: 35742 diff changeset	756 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	757 filename = PyString_AsString(co->co_filename);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	758 #endif
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	759
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	760 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	761 err = 0;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	762 x = Py_None; /* Not a reference, just anything non-NULL */
15152 ed49a67869e9 Remove the last gcc -Wall warning about possible use of an uninitialized Fred Drake <fdrake@acm.org> parents: 15151 diff changeset	763 w = NULL;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	764
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	765 if (throwflag) { /* support for generator.throw() */
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	766 why = WHY_EXCEPTION;
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	767 goto on_error;
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	768 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	769
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	770 for (;;) {
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	771 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	772 if (inst1 == 0) {
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	773 /* Almost surely, the opcode executed a break
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	774 or a continue, preventing inst1 from being set
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	775 on the way out of the loop.
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	776 */
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	777 READ_TIMESTAMP(inst1);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	778 loop1 = inst1;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	779 }
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	780 dump_tsc(opcode, ticked, inst0, inst1, loop0, loop1,
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	781 intr0, intr1);
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	782 ticked = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	783 inst1 = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	784 intr0 = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	785 intr1 = 0;
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	786 READ_TIMESTAMP(loop0);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	787 #endif
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	788 assert(stack_pointer >= f->f_valuestack); /* else underflow */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	789 assert(STACK_LEVEL() <= co->co_stacksize); /* else overflow */
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	790
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	791 /* Do periodic things. Doing this every time through
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	792 the loop would add too much overhead, so we do it
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	793 only every Nth instruction. We also do it if
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	794 ``things_to_do'' is set, i.e. when an asynchronous
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	795 event needs attention (e.g. a signal handler or
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	796 async I/O handler); see Py_AddPendingCall() and
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	797 Py_MakePendingCalls() above. */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	798
25108 3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	799 if (--_Py_Ticker < 0) {
29643 fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	800 if (*next_instr == SETUP_FINALLY) {
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	801 /* Make the last opcode before
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	802 a try: finally: block uninterruptable. */
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	803 goto fast_next_opcode;
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	804 }
25108 3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	805 _Py_Ticker = _Py_CheckInterval;
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	806 tstate->tick_counter++;
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	807 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	808 ticked = 1;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	809 #endif
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	810 if (things_to_do) {
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	811 if (Py_MakePendingCalls() < 0) {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	812 why = WHY_EXCEPTION;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	813 goto on_error;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	814 }
34020 be370abb020f Hye-Shik Chang's fix for Bug 875692. Kurt B. Kaiser <kbk@shore.net> parents: 33715 diff changeset	815 if (things_to_do)
be370abb020f Hye-Shik Chang's fix for Bug 875692. Kurt B. Kaiser <kbk@shore.net> parents: 33715 diff changeset	816 /* MakePendingCalls() didn't succeed.
be370abb020f Hye-Shik Chang's fix for Bug 875692. Kurt B. Kaiser <kbk@shore.net> parents: 33715 diff changeset	817 Force early re-execution of this
be370abb020f Hye-Shik Chang's fix for Bug 875692. Kurt B. Kaiser <kbk@shore.net> parents: 33715 diff changeset	818 "periodic" code, possibly after
be370abb020f Hye-Shik Chang's fix for Bug 875692. Kurt B. Kaiser <kbk@shore.net> parents: 33715 diff changeset	819 a thread switch */
be370abb020f Hye-Shik Chang's fix for Bug 875692. Kurt B. Kaiser <kbk@shore.net> parents: 33715 diff changeset	820 _Py_Ticker = 0;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	821 }
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	822 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	823 if (interpreter_lock) {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	824 /* Give another thread a chance */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	825
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	826 if (PyThreadState_Swap(NULL) != tstate)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	827 Py_FatalError("ceval: tstate mix-up");
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	828 PyThread_release_lock(interpreter_lock);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	829
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	830 /* Other threads may run now */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	831
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	832 PyThread_acquire_lock(interpreter_lock, 1);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	833 if (PyThreadState_Swap(tstate) != NULL)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	834 Py_FatalError("ceval: orphan tstate");
29643 fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	835
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	836 /* Check for thread interrupts */
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	837
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	838 if (tstate->async_exc != NULL) {
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	839 x = tstate->async_exc;
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	840 tstate->async_exc = NULL;
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	841 PyErr_SetNone(x);
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	842 Py_DECREF(x);
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	843 why = WHY_EXCEPTION;
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	844 goto on_error;
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 29349 diff changeset	845 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	846 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	847 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	848 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	849
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	850 fast_next_opcode:
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	851 f->f_lasti = INSTR_OFFSET();
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	852
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	853 /* line-by-line tracing support */
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	854
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	855 if (tstate->c_tracefunc != NULL && !tstate->tracing) {
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	856 /* see maybe_call_line_trace
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	857 for expository comments */
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	858 f->f_stacktop = stack_pointer;
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	859
28886 af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	860 err = maybe_call_line_trace(tstate->c_tracefunc,
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	861 tstate->c_traceobj,
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	862 f, &instr_lb, &instr_ub,
9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	863 &instr_prev);
28886 af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	864 /* Reload possibly changed frame fields */
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	865 JUMPTO(f->f_lasti);
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	866 if (f->f_stacktop != NULL) {
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	867 stack_pointer = f->f_stacktop;
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	868 f->f_stacktop = NULL;
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	869 }
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	870 if (err) {
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	871 /* trace function raised an exception */
964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	872 goto on_error;
964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	873 }
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	874 }
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	875
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	876 /* Extract opcode and argument */
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	877
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	878 opcode = NEXTOP();
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	879 oparg = 0; /* allows oparg to be stored in a register because
e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	880 it doesn't have to be remembered across a full loop */
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	881 if (HAS_ARG(opcode))
310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	882 oparg = NEXTARG();
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	883 dispatch_opcode:
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	884 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	885 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	886 dxpairs[lastopcode][opcode]++;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	887 lastopcode = opcode;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	888 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	889 dxp[opcode]++;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	890 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	891
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	892 #ifdef LLTRACE
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	893 /* Instruction tracing */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	894
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	895 if (lltrace) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	896 if (HAS_ARG(opcode)) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	897 printf("%d: %d, %d\n",
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	898 f->f_lasti, opcode, oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	899 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	900 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	901 printf("%d: %d\n",
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	902 f->f_lasti, opcode);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	903 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	904 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	905 #endif
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	906
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	907 /* Main switch on opcode */
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	908 READ_TIMESTAMP(inst0);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	909
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	910 switch (opcode) {
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	911
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	912 /* BEWARE!
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	913 It is essential that any operation that fails sets either
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	914 x to NULL, err to nonzero, or why to anything but WHY_NOT,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	915 and that no operation that succeeds does this! */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	916
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	917 /* case STOP_CODE: this is an error! */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	918
32395 6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32359 diff changeset	919 case NOP:
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32359 diff changeset	920 goto fast_next_opcode;
6bc6abba8659 Install two code generation optimizations that depend on NOP. Raymond Hettinger <python@rcn.com> parents: 32359 diff changeset	921
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	922 case LOAD_FAST:
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	923 x = GETLOCAL(oparg);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	924 if (x != NULL) {
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	925 Py_INCREF(x);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	926 PUSH(x);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	927 goto fast_next_opcode;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	928 }
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	929 format_exc_check_arg(PyExc_UnboundLocalError,
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	930 UNBOUNDLOCAL_ERROR_MSG,
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	931 PyTuple_GetItem(co->co_varnames, oparg));
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	932 break;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	933
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	934 case LOAD_CONST:
24545 d2f41c8a81f0 small speedup for constant and name access Skip Montanaro <skip@pobox.com> parents: 24284 diff changeset	935 x = GETITEM(consts, oparg);
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	936 Py_INCREF(x);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	937 PUSH(x);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	938 goto fast_next_opcode;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	939
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	940 PREDICTED_WITH_ARG(STORE_FAST);
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	941 case STORE_FAST:
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	942 v = POP();
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	943 SETLOCAL(oparg, v);
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	944 goto fast_next_opcode;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	945
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	946 PREDICTED(POP_TOP);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	947 case POP_TOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	948 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	949 Py_DECREF(v);
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	950 goto fast_next_opcode;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	951
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	952 case ROT_TWO:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	953 v = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	954 w = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	955 SET_TOP(w);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	956 SET_SECOND(v);
28296 7654c24decc4 SF patch #701907: More use of fast_next_opcode Raymond Hettinger <python@rcn.com> parents: 28121 diff changeset	957 goto fast_next_opcode;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	958
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	959 case ROT_THREE:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	960 v = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	961 w = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	962 x = THIRD();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	963 SET_TOP(w);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	964 SET_SECOND(x);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	965 SET_THIRD(v);
28296 7654c24decc4 SF patch #701907: More use of fast_next_opcode Raymond Hettinger <python@rcn.com> parents: 28121 diff changeset	966 goto fast_next_opcode;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	967
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	968 case ROT_FOUR:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	969 u = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	970 v = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	971 w = THIRD();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	972 x = FOURTH();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	973 SET_TOP(v);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	974 SET_SECOND(w);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	975 SET_THIRD(x);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	976 SET_FOURTH(u);
28296 7654c24decc4 SF patch #701907: More use of fast_next_opcode Raymond Hettinger <python@rcn.com> parents: 28121 diff changeset	977 goto fast_next_opcode;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	978
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	979 case DUP_TOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	980 v = TOP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	981 Py_INCREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	982 PUSH(v);
28296 7654c24decc4 SF patch #701907: More use of fast_next_opcode Raymond Hettinger <python@rcn.com> parents: 28121 diff changeset	983 goto fast_next_opcode;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	984
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	985 case DUP_TOPX:
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	986 if (oparg == 2) {
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	987 x = TOP();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	988 Py_INCREF(x);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	989 w = SECOND();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	990 Py_INCREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	991 STACKADJ(2);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	992 SET_TOP(x);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	993 SET_SECOND(w);
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	994 goto fast_next_opcode;
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	995 } else if (oparg == 3) {
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	996 x = TOP();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	997 Py_INCREF(x);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	998 w = SECOND();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	999 Py_INCREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1000 v = THIRD();
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1001 Py_INCREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1002 STACKADJ(3);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1003 SET_TOP(x);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1004 SET_SECOND(w);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1005 SET_THIRD(v);
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	1006 goto fast_next_opcode;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1007 }
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	1008 Py_FatalError("invalid argument to DUP_TOPX"
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	1009 " (bytecode corruption?)");
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1010 break;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1011
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1012 case UNARY_POSITIVE:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1013 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1014 x = PyNumber_Positive(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1015 Py_DECREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1016 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1017 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1018 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1019
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1020 case UNARY_NEGATIVE:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1021 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1022 x = PyNumber_Negative(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1023 Py_DECREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1024 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1025 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1026 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1027
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1028 case UNARY_NOT:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1029 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1030 err = PyObject_IsTrue(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1031 Py_DECREF(v);
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1032 if (err == 0) {
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1033 Py_INCREF(Py_True);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1034 SET_TOP(Py_True);
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1035 continue;
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1036 }
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1037 else if (err > 0) {
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1038 Py_INCREF(Py_False);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1039 SET_TOP(Py_False);
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1040 err = 0;
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1041 continue;
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1042 }
27243 3afbd55fb18f Replaced POP() with STACKADJ(-1) on lines where the result wasn't used. Raymond Hettinger <python@rcn.com> parents: 27201 diff changeset	1043 STACKADJ(-1);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1044 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1045
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1046 case UNARY_INVERT:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1047 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1048 x = PyNumber_Invert(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1049 Py_DECREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1050 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1051 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1052 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1053
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	1054 case BINARY_POWER:
36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	1055 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1056 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1057 x = PyNumber_Power(v, w, Py_None);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1058 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1059 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1060 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1061 if (x != NULL) continue;
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	1062 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1063
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1064 case BINARY_MULTIPLY:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1065 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1066 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1067 x = PyNumber_Multiply(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1068 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1069 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1070 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1071 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1072 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1073
21251 45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	1074 case BINARY_TRUE_DIVIDE:
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1075 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1076 v = TOP();
21251 45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	1077 x = PyNumber_TrueDivide(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1078 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1079 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1080 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1081 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1082 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1083
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1084 case BINARY_FLOOR_DIVIDE:
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1085 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1086 v = TOP();
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1087 x = PyNumber_FloorDivide(v, w);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1088 Py_DECREF(v);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1089 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1090 SET_TOP(x);
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1091 if (x != NULL) continue;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1092 break;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1093
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1094 case BINARY_MODULO:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1095 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1096 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1097 x = PyNumber_Remainder(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1098 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1099 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1100 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1101 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1102 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1103
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1104 case BINARY_ADD:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1105 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1106 v = TOP();
20273 2269cb371e05 Get rid of unique local ISSTRICTINT macro in favor of std PyInt_CheckExact. Tim Peters <tim.peters@gmail.com> parents: 20257 diff changeset	1107 if (PyInt_CheckExact(v) && PyInt_CheckExact(w)) {
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1108 /* INLINE: int + int */
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1109 register long a, b, i;
9591 7f90736701a3 Use PyInt_AS_LONG macro instead of explicit inlining. Guido van Rossum <guido@python.org> parents: 9513 diff changeset	1110 a = PyInt_AS_LONG(v);
7f90736701a3 Use PyInt_AS_LONG macro instead of explicit inlining. Guido van Rossum <guido@python.org> parents: 9513 diff changeset	1111 b = PyInt_AS_LONG(w);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1112 i = a + b;
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1113 if ((i^a) < 0 && (i^b) < 0)
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1114 goto slow_add;
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1115 x = PyInt_FromLong(i);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1116 }
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1117 else if (PyString_CheckExact(v) &&
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1118 PyString_CheckExact(w)) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1119 x = string_concatenate(v, w, f, next_instr);
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1120 /* string_concatenate consumed the ref to v */
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1121 goto skip_decref_vx;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1122 }
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1123 else {
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1124 slow_add:
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1125 x = PyNumber_Add(v, w);
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1126 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1127 Py_DECREF(v);
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1128 skip_decref_vx:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1129 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1130 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1131 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1132 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1133
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1134 case BINARY_SUBTRACT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1135 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1136 v = TOP();
20273 2269cb371e05 Get rid of unique local ISSTRICTINT macro in favor of std PyInt_CheckExact. Tim Peters <tim.peters@gmail.com> parents: 20257 diff changeset	1137 if (PyInt_CheckExact(v) && PyInt_CheckExact(w)) {
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1138 /* INLINE: int - int */
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1139 register long a, b, i;
9591 7f90736701a3 Use PyInt_AS_LONG macro instead of explicit inlining. Guido van Rossum <guido@python.org> parents: 9513 diff changeset	1140 a = PyInt_AS_LONG(v);
7f90736701a3 Use PyInt_AS_LONG macro instead of explicit inlining. Guido van Rossum <guido@python.org> parents: 9513 diff changeset	1141 b = PyInt_AS_LONG(w);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1142 i = a - b;
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1143 if ((i^a) < 0 && (i^~b) < 0)
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1144 goto slow_sub;
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1145 x = PyInt_FromLong(i);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1146 }
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1147 else {
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1148 slow_sub:
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1149 x = PyNumber_Subtract(v, w);
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1150 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1151 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1152 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1153 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1154 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1155 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1156
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1157 case BINARY_SUBSCR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1158 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1159 v = TOP();
20275 167e7f98b51f Introduced the oddly-missing PyList_CheckExact(), and used it to replace Tim Peters <tim.peters@gmail.com> parents: 20273 diff changeset	1160 if (PyList_CheckExact(v) && PyInt_CheckExact(w)) {
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1161 /* INLINE: list[int] */
36803 8eaf9531a2de Use Py_ssize_t since we are working with list size below Neal Norwitz <nnorwitz@gmail.com> parents: 36756 diff changeset	1162 Py_ssize_t i = PyInt_AsSsize_t(w);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1163 if (i < 0)
8652 97a1108b0eb2 # In case BINARY_SUBSCR, use proper PyList_GET* macros instead of inlining. Guido van Rossum <guido@python.org> parents: 8651 diff changeset	1164 i += PyList_GET_SIZE(v);
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1165 if (i >= 0 && i < PyList_GET_SIZE(v)) {
8652 97a1108b0eb2 # In case BINARY_SUBSCR, use proper PyList_GET* macros instead of inlining. Guido van Rossum <guido@python.org> parents: 8651 diff changeset	1166 x = PyList_GET_ITEM(v, i);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1167 Py_INCREF(x);
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1168 }
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1169 else
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1170 goto slow_get;
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1171 }
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1172 else
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1173 slow_get:
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1174 x = PyObject_GetItem(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1175 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1176 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1177 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1178 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1179 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1180
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1181 case BINARY_LSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1182 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1183 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1184 x = PyNumber_Lshift(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1185 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1186 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1187 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1188 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1189 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1190
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1191 case BINARY_RSHIFT:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1192 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1193 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1194 x = PyNumber_Rshift(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1195 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1196 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1197 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1198 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1199 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1200
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1201 case BINARY_AND:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1202 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1203 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1204 x = PyNumber_And(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1205 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1206 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1207 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1208 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1209 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1210
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1211 case BINARY_XOR:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1212 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1213 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1214 x = PyNumber_Xor(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1215 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1216 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1217 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1218 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1219 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1220
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1221 case BINARY_OR:
b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1222 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1223 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1224 x = PyNumber_Or(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1225 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1226 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1227 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1228 if (x != NULL) continue;
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1229 break;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1230
31618 bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1231 case LIST_APPEND:
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1232 w = POP();
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1233 v = POP();
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1234 err = PyList_Append(v, w);
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1235 Py_DECREF(v);
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1236 Py_DECREF(w);
31649 243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	1237 if (err == 0) {
243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	1238 PREDICT(JUMP_ABSOLUTE);
243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	1239 continue;
243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	1240 }
31618 bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1241 break;
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1242
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1243 case SET_ADD:
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1244 w = POP();
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1245 v = POP();
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1246 err = PySet_Add(v, w);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1247 Py_DECREF(v);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1248 Py_DECREF(w);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1249 if (err == 0) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1250 PREDICT(JUMP_ABSOLUTE);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1251 continue;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1252 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1253 break;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1254
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1255 case INPLACE_POWER:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1256 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1257 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1258 x = PyNumber_InPlacePower(v, w, Py_None);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1259 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1260 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1261 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1262 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1263 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1264
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1265 case INPLACE_MULTIPLY:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1266 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1267 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1268 x = PyNumber_InPlaceMultiply(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1269 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1270 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1271 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1272 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1273 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1274
21537 ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1275 case INPLACE_TRUE_DIVIDE:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1276 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1277 v = TOP();
21537 ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1278 x = PyNumber_InPlaceTrueDivide(v, w);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1279 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1280 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1281 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1282 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1283 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1284
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1285 case INPLACE_FLOOR_DIVIDE:
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1286 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1287 v = TOP();
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1288 x = PyNumber_InPlaceFloorDivide(v, w);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1289 Py_DECREF(v);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1290 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1291 SET_TOP(x);
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1292 if (x != NULL) continue;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1293 break;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1294
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1295 case INPLACE_MODULO:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1296 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1297 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1298 x = PyNumber_InPlaceRemainder(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1299 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1300 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1301 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1302 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1303 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1304
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1305 case INPLACE_ADD:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1306 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1307 v = TOP();
20273 2269cb371e05 Get rid of unique local ISSTRICTINT macro in favor of std PyInt_CheckExact. Tim Peters <tim.peters@gmail.com> parents: 20257 diff changeset	1308 if (PyInt_CheckExact(v) && PyInt_CheckExact(w)) {
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1309 /* INLINE: int + int */
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1310 register long a, b, i;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1311 a = PyInt_AS_LONG(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1312 b = PyInt_AS_LONG(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1313 i = a + b;
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1314 if ((i^a) < 0 && (i^b) < 0)
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1315 goto slow_iadd;
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1316 x = PyInt_FromLong(i);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1317 }
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1318 else if (PyString_CheckExact(v) &&
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1319 PyString_CheckExact(w)) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1320 x = string_concatenate(v, w, f, next_instr);
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1321 /* string_concatenate consumed the ref to v */
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1322 goto skip_decref_v;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1323 }
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1324 else {
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1325 slow_iadd:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1326 x = PyNumber_InPlaceAdd(v, w);
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1327 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1328 Py_DECREF(v);
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1329 skip_decref_v:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1330 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1331 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1332 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1333 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1334
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1335 case INPLACE_SUBTRACT:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1336 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1337 v = TOP();
20273 2269cb371e05 Get rid of unique local ISSTRICTINT macro in favor of std PyInt_CheckExact. Tim Peters <tim.peters@gmail.com> parents: 20257 diff changeset	1338 if (PyInt_CheckExact(v) && PyInt_CheckExact(w)) {
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1339 /* INLINE: int - int */
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1340 register long a, b, i;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1341 a = PyInt_AS_LONG(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1342 b = PyInt_AS_LONG(w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1343 i = a - b;
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1344 if ((i^a) < 0 && (i^~b) < 0)
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1345 goto slow_isub;
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1346 x = PyInt_FromLong(i);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1347 }
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1348 else {
c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1349 slow_isub:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1350 x = PyNumber_InPlaceSubtract(v, w);
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1351 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1352 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1353 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1354 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1355 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1356 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1357
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1358 case INPLACE_LSHIFT:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1359 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1360 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1361 x = PyNumber_InPlaceLshift(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1362 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1363 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1364 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1365 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1366 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1367
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1368 case INPLACE_RSHIFT:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1369 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1370 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1371 x = PyNumber_InPlaceRshift(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1372 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1373 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1374 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1375 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1376 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1377
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1378 case INPLACE_AND:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1379 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1380 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1381 x = PyNumber_InPlaceAnd(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1382 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1383 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1384 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1385 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1386 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1387
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1388 case INPLACE_XOR:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1389 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1390 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1391 x = PyNumber_InPlaceXor(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1392 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1393 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1394 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1395 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1396 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1397
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1398 case INPLACE_OR:
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1399 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1400 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1401 x = PyNumber_InPlaceOr(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1402 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1403 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1404 SET_TOP(x);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1405 if (x != NULL) continue;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1406 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1407
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1408 case SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1409 case SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1410 case SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1411 case SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1412 if ((opcode-SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1413 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1414 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1415 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1416 if ((opcode-SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1417 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1418 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1419 v = NULL;
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1420 u = TOP();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1421 x = apply_slice(u, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1422 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1423 Py_XDECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1424 Py_XDECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1425 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1426 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1427 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1428
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1429 case STORE_SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1430 case STORE_SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1431 case STORE_SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1432 case STORE_SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1433 if ((opcode-STORE_SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1434 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1435 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1436 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1437 if ((opcode-STORE_SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1438 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1439 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1440 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1441 u = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1442 t = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1443 err = assign_slice(u, v, w, t); /* u[v:w] = t */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1444 Py_DECREF(t);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1445 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1446 Py_XDECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1447 Py_XDECREF(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1448 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1449 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1450
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1451 case DELETE_SLICE+0:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1452 case DELETE_SLICE+1:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1453 case DELETE_SLICE+2:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1454 case DELETE_SLICE+3:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1455 if ((opcode-DELETE_SLICE) & 2)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1456 w = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1457 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1458 w = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1459 if ((opcode-DELETE_SLICE) & 1)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1460 v = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1461 else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1462 v = NULL;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1463 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1464 err = assign_slice(u, v, w, (PyObject *)NULL);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1465 /* del u[v:w] */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1466 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1467 Py_XDECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1468 Py_XDECREF(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1469 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1470 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1471
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1472 case STORE_SUBSCR:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1473 w = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1474 v = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1475 u = THIRD();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1476 STACKADJ(-3);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1477 /* v[w] = u */
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1478 err = PyObject_SetItem(v, w, u);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1479 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1480 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1481 Py_DECREF(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1482 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1483 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1484
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1485 case DELETE_SUBSCR:
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1486 w = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1487 v = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1488 STACKADJ(-2);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1489 /* del v[w] */
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1490 err = PyObject_DelItem(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1491 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1492 Py_DECREF(w);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1493 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1494 break;
14100 2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1495
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1496 case PRINT_EXPR:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1497 v = POP();
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1498 w = PySys_GetObject("displayhook");
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1499 if (w == NULL) {
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1500 PyErr_SetString(PyExc_RuntimeError,
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1501 "lost sys.displayhook");
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1502 err = -1;
15814 faaf9f10d849 Fixed bugs noted by Greg Stein Moshe Zadka <moshez@math.huji.ac.il> parents: 15811 diff changeset	1503 x = NULL;
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1504 }
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1505 if (err == 0) {
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 29669 diff changeset	1506 x = PyTuple_Pack(1, v);
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1507 if (x == NULL)
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1508 err = -1;
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1509 }
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1510 if (err == 0) {
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1511 w = PyEval_CallObject(w, x);
15814 faaf9f10d849 Fixed bugs noted by Greg Stein Moshe Zadka <moshez@math.huji.ac.il> parents: 15811 diff changeset	1512 Py_XDECREF(w);
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1513 if (w == NULL)
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1514 err = -1;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1515 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1516 Py_DECREF(v);
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1517 Py_XDECREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1518 break;
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1519
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1520 #ifdef CASE_TOO_BIG
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1521 default: switch (opcode) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1522 #endif
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1523 case RAISE_VARARGS:
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1524 u = v = w = NULL;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1525 switch (oparg) {
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1526 case 3:
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1527 u = POP(); /* traceback */
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1528 /* Fallthrough */
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1529 case 2:
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1530 v = POP(); /* value */
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1531 /* Fallthrough */
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1532 case 1:
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1533 w = POP(); /* exc */
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	1534 case 0: /* Fallthrough */
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1535 why = do_raise(w, v, u);
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1536 break;
999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1537 default:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1538 PyErr_SetString(PyExc_SystemError,
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1539 "bad RAISE_VARARGS oparg");
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1540 why = WHY_EXCEPTION;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	1541 break;
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1542 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1543 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1544
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1545 case STORE_LOCALS:
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1546 x = POP();
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1547 v = f->f_locals;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1548 Py_XDECREF(v);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1549 f->f_locals = x;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1550 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1551
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1552 case RETURN_VALUE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1553 retval = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1554 why = WHY_RETURN;
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1555 goto fast_block_end;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1556
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	1557 case YIELD_VALUE:
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	1558 retval = POP();
18237 f02605b8fdc1 PyFrameObject: rename f_stackbottom to f_stacktop, since it points to Tim Peters <tim.peters@gmail.com> parents: 18195 diff changeset	1559 f->f_stacktop = stack_pointer;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	1560 why = WHY_YIELD;
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1561 goto fast_yield;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	1562
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1563 case POP_BLOCK:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1564 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1565 PyTryBlock *b = PyFrame_BlockPop(f);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1566 while (STACK_LEVEL() > b->b_level) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1567 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1568 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1569 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1570 }
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1571 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1572
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1573 case END_FINALLY:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1574 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1575 if (PyInt_Check(v)) {
31875 1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	1576 why = (enum why_code) PyInt_AS_LONG(v);
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	1577 assert(why != WHY_YIELD);
31900 0265bf9912ea Some (but not all) of the why code bitfield tests ran faster as Raymond Hettinger <python@rcn.com> parents: 31894 diff changeset	1578 if (why == WHY_RETURN \|\|
0265bf9912ea Some (but not all) of the why code bitfield tests ran faster as Raymond Hettinger <python@rcn.com> parents: 31894 diff changeset	1579 why == WHY_CONTINUE)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1580 retval = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1581 }
40942 4b9d0dac79cc You can no longer catch non-BaseException objects; TypeError is raised if such Brett Cannon <bcannon@gmail.com> parents: 40937 diff changeset	1582 else if (PyExceptionClass_Check(v)) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1583 w = POP();
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	1584 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1585 PyErr_Restore(v, w, u);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1586 why = WHY_RERAISE;
2872 d3b07ba3e12d fix bogus DECREF in finally clause Guido van Rossum <guido@python.org> parents: 2866 diff changeset	1587 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1588 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1589 else if (v != Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1590 PyErr_SetString(PyExc_SystemError,
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1591 "'finally' pops bad exception");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1592 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1593 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1594 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1595 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1596
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1597 case LOAD_BUILD_CLASS:
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1598 x = PyDict_GetItemString(f->f_builtins,
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1599 "__build_class__");
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1600 if (x == NULL) {
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1601 PyErr_SetString(PyExc_ImportError,
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1602 "__build_class__ not found");
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1603 break;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1604 }
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1605 Py_INCREF(x);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1606 PUSH(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1607 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1608
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1609 case STORE_NAME:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1610 w = GETITEM(names, oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1611 v = POP();
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1612 if ((x = f->f_locals) != NULL) {
32890 b8c2aa2be19a Completed the patch for Bug #215126. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	1613 if (PyDict_CheckExact(x))
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1614 err = PyDict_SetItem(x, w, v);
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1615 else
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1616 err = PyObject_SetItem(x, w, v);
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1617 Py_DECREF(v);
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1618 if (err == 0) continue;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1619 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1620 }
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1621 PyErr_Format(PyExc_SystemError,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1622 "no locals found when storing %s",
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1623 PyObject_REPR(w));
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1624 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1625
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1626 case DELETE_NAME:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1627 w = GETITEM(names, oparg);
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1628 if ((x = f->f_locals) != NULL) {
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1629 if ((err = PyObject_DelItem(x, w)) != 0)
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1630 format_exc_check_arg(PyExc_NameError,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1631 NAME_ERROR_MSG ,w);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1632 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1633 }
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1634 PyErr_Format(PyExc_SystemError,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1635 "no locals when deleting %s",
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1636 PyObject_REPR(w));
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1637 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1638
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	1639 PREDICTED_WITH_ARG(UNPACK_SEQUENCE);
13930 4eaa463c031a Merge UNPACK_LIST and UNPACK_TUPLE into a single UNPACK_SEQUENCE, since they Thomas Wouters <thomas@python.org> parents: 13881 diff changeset	1640 case UNPACK_SEQUENCE:
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1641 v = POP();
31630 b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1642 if (PyTuple_CheckExact(v) && PyTuple_GET_SIZE(v) == oparg) {
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1643 PyObject *items = ((PyTupleObject )v)->ob_item;
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1644 while (oparg--) {
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1645 w = items[oparg];
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1646 Py_INCREF(w);
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1647 PUSH(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1648 }
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1649 Py_DECREF(v);
4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1650 continue;
31630 b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1651 } else if (PyList_CheckExact(v) && PyList_GET_SIZE(v) == oparg) {
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1652 PyObject *items = ((PyListObject )v)->ob_item;
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1653 while (oparg--) {
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1654 w = items[oparg];
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1655 Py_INCREF(w);
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1656 PUSH(w);
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1657 }
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1658 } else if (unpack_iterable(v, oparg, -1,
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	1659 stack_pointer + oparg)) {
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	1660 stack_pointer += oparg;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	1661 } else {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	1662 /* unpack_iterable() raised an exception */
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1663 why = WHY_EXCEPTION;
20183 c6b6189a8397 SF bug [#466173] unpack TypeError unclear Tim Peters <tim.peters@gmail.com> parents: 20114 diff changeset	1664 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1665 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1666 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1667
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1668 case UNPACK_EX:
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1669 {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1670 int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1671 v = POP();
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1672
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1673 if (unpack_iterable(v, oparg & 0xFF, oparg >> 8,
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1674 stack_pointer + totalargs)) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1675 stack_pointer += totalargs;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1676 } else {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1677 why = WHY_EXCEPTION;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1678 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1679 Py_DECREF(v);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1680 break;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1681 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1682
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1683 case STORE_ATTR:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1684 w = GETITEM(names, oparg);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1685 v = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1686 u = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1687 STACKADJ(-2);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1688 err = PyObject_SetAttr(v, w, u); /* v.w = u */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1689 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1690 Py_DECREF(u);
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1691 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1692 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1693
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1694 case DELETE_ATTR:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1695 w = GETITEM(names, oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1696 v = POP();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1697 err = PyObject_SetAttr(v, w, (PyObject *)NULL);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1698 /* del v.w */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1699 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1700 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1701
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1702 case STORE_GLOBAL:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1703 w = GETITEM(names, oparg);
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1704 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1705 err = PyDict_SetItem(f->f_globals, w, v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1706 Py_DECREF(v);
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1707 if (err == 0) continue;
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1708 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1709
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1710 case DELETE_GLOBAL:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1711 w = GETITEM(names, oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1712 if ((err = PyDict_DelItem(f->f_globals, w)) != 0)
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1713 format_exc_check_arg(
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1714 PyExc_NameError, GLOBAL_NAME_ERROR_MSG, w);
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1715 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1716
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1717 case LOAD_NAME:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1718 w = GETITEM(names, oparg);
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1719 if ((v = f->f_locals) == NULL) {
16017 7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 15948 diff changeset	1720 PyErr_Format(PyExc_SystemError,
7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 15948 diff changeset	1721 "no locals when loading %s",
16394 f700e6b8de1f Undo recent change that banned using import to bind a global, as per Jeremy Hylton <jeremy@alum.mit.edu> parents: 16365 diff changeset	1722 PyObject_REPR(w));
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1723 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1724 }
32900 ac73f6662e11 Fix for the unfortunate fact that PyDict_GetItem and PyObject_GetItem Michael W. Hudson <mwh@python.net> parents: 32890 diff changeset	1725 if (PyDict_CheckExact(v)) {
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1726 x = PyDict_GetItem(v, w);
32900 ac73f6662e11 Fix for the unfortunate fact that PyDict_GetItem and PyObject_GetItem Michael W. Hudson <mwh@python.net> parents: 32890 diff changeset	1727 Py_XINCREF(x);
ac73f6662e11 Fix for the unfortunate fact that PyDict_GetItem and PyObject_GetItem Michael W. Hudson <mwh@python.net> parents: 32890 diff changeset	1728 }
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1729 else {
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1730 x = PyObject_GetItem(v, w);
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1731 if (x == NULL && PyErr_Occurred()) {
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1732 if (!PyErr_ExceptionMatches(PyExc_KeyError))
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1733 break;
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1734 PyErr_Clear();
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1735 }
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1736 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1737 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1738 x = PyDict_GetItem(f->f_globals, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1739 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1740 x = PyDict_GetItem(f->f_builtins, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1741 if (x == NULL) {
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1742 format_exc_check_arg(
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1743 PyExc_NameError,
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1744 NAME_ERROR_MSG ,w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1745 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1746 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1747 }
32900 ac73f6662e11 Fix for the unfortunate fact that PyDict_GetItem and PyObject_GetItem Michael W. Hudson <mwh@python.net> parents: 32890 diff changeset	1748 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1749 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1750 PUSH(x);
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1751 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1752
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1753 case LOAD_GLOBAL:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1754 w = GETITEM(names, oparg);
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1755 if (PyString_CheckExact(w)) {
24900 2cdf3d0dfabd Add a warning comment to the LOAD_GLOBAL inline code. Guido van Rossum <guido@python.org> parents: 24899 diff changeset	1756 /* Inline the PyDict_GetItem() calls.
2cdf3d0dfabd Add a warning comment to the LOAD_GLOBAL inline code. Guido van Rossum <guido@python.org> parents: 24899 diff changeset	1757 WARNING: this is an extreme speed hack.
2cdf3d0dfabd Add a warning comment to the LOAD_GLOBAL inline code. Guido van Rossum <guido@python.org> parents: 24899 diff changeset	1758 Do not try this at home. */
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1759 long hash = ((PyStringObject *)w)->ob_shash;
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1760 if (hash != -1) {
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1761 PyDictObject *d;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1762 PyDictEntry *e;
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1763 d = (PyDictObject *)(f->f_globals);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1764 e = d->ma_lookup(d, w, hash);
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1765 if (e == NULL) {
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1766 x = NULL;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1767 break;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1768 }
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1769 x = e->me_value;
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1770 if (x != NULL) {
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1771 Py_INCREF(x);
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1772 PUSH(x);
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1773 continue;
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1774 }
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1775 d = (PyDictObject *)(f->f_builtins);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1776 e = d->ma_lookup(d, w, hash);
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1777 if (e == NULL) {
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1778 x = NULL;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1779 break;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1780 }
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1781 x = e->me_value;
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1782 if (x != NULL) {
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1783 Py_INCREF(x);
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1784 PUSH(x);
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1785 continue;
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1786 }
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1787 goto load_global_error;
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1788 }
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1789 }
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1790 /* This is the un-inlined version of the code above */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1791 x = PyDict_GetItem(f->f_globals, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1792 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1793 x = PyDict_GetItem(f->f_builtins, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1794 if (x == NULL) {
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1795 load_global_error:
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	1796 format_exc_check_arg(
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1797 PyExc_NameError,
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	1798 GLOBAL_NAME_ERROR_MSG, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1799 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1800 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1801 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1802 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1803 PUSH(x);
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1804 continue;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1805
1262 f820e6917f07 Changes to speed up local variables enormously, by avoiding dictionary Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1806 case DELETE_FAST:
8318 ec87b62466d3 DELETE_FAST should issue an exception when the local variable is undefined. Guido van Rossum <guido@python.org> parents: 7982 diff changeset	1807 x = GETLOCAL(oparg);
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1808 if (x != NULL) {
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1809 SETLOCAL(oparg, NULL);
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1810 continue;
8318 ec87b62466d3 DELETE_FAST should issue an exception when the local variable is undefined. Guido van Rossum <guido@python.org> parents: 7982 diff changeset	1811 }
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1812 format_exc_check_arg(
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1813 PyExc_UnboundLocalError,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1814 UNBOUNDLOCAL_ERROR_MSG,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1815 PyTuple_GetItem(co->co_varnames, oparg)
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1816 );
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1817 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1818
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1819 case LOAD_CLOSURE:
16355 e4420c2468f9 Remove f_closure slot of frameobject and use f_localsplus instead. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16257 diff changeset	1820 x = freevars[oparg];
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1821 Py_INCREF(x);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1822 PUSH(x);
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1823 if (x != NULL) continue;
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1824 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1825
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1826 case LOAD_DEREF:
16355 e4420c2468f9 Remove f_closure slot of frameobject and use f_localsplus instead. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16257 diff changeset	1827 x = freevars[oparg];
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1828 w = PyCell_Get(x);
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1829 if (w != NULL) {
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1830 PUSH(w);
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1831 continue;
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1832 }
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1833 err = -1;
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1834 /* Don't stomp existing exception */
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1835 if (PyErr_Occurred())
16453 2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	1836 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1837 if (oparg < PyTuple_GET_SIZE(co->co_cellvars)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1838 v = PyTuple_GET_ITEM(co->co_cellvars,
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1839 oparg);
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1840 format_exc_check_arg(
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1841 PyExc_UnboundLocalError,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1842 UNBOUNDLOCAL_ERROR_MSG,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1843 v);
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1844 } else {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1845 v = PyTuple_GET_ITEM(
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1846 co->co_freevars,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1847 oparg - PyTuple_GET_SIZE(co->co_cellvars));
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1848 format_exc_check_arg(
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1849 PyExc_NameError,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1850 UNBOUNDFREE_ERROR_MSG,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1851 v);
16453 2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	1852 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1853 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1854
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1855 case STORE_DEREF:
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1856 w = POP();
16355 e4420c2468f9 Remove f_closure slot of frameobject and use f_localsplus instead. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16257 diff changeset	1857 x = freevars[oparg];
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1858 PyCell_Set(x, w);
17034 ba81d79dc3a3 Variety of small INC/DECREF patches that fix reported memory leaks Jeremy Hylton <jeremy@alum.mit.edu> parents: 16631 diff changeset	1859 Py_DECREF(w);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1860 continue;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	1861
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1862 case BUILD_TUPLE:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1863 x = PyTuple_New(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1864 if (x != NULL) {
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	1865 for (; --oparg >= 0;) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1866 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1867 PyTuple_SET_ITEM(x, oparg, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1868 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1869 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1870 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1871 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1872 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1873
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1874 case BUILD_LIST:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1875 x = PyList_New(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1876 if (x != NULL) {
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	1877 for (; --oparg >= 0;) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1878 w = POP();
8811 e58a614fb8e4 In BUILD_LIST, use PyList_SET_ITEM() instead of PyList_SetItem(); and Guido van Rossum <guido@python.org> parents: 8652 diff changeset	1879 PyList_SET_ITEM(x, oparg, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1880 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1881 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1882 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1883 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1884 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1885
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1886 case BUILD_SET:
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1887 x = PySet_New(NULL);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1888 if (x != NULL) {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1889 for (; --oparg >= 0;) {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1890 w = POP();
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1891 if (err == 0)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1892 err = PySet_Add(x, w);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1893 Py_DECREF(w);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1894 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1895 if (err != 0) {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1896 Py_DECREF(x);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1897 break;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1898 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1899 PUSH(x);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1900 continue;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1901 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1902 break;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1903
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1904 case BUILD_MAP:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1905 x = PyDict_New();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1906 PUSH(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1907 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1908 break;
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	1909
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	1910 case MAKE_BYTES:
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	1911 w = POP();
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	1912 if (PyString_Check(w))
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	1913 x = PyBytes_FromStringAndSize(
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	1914 PyString_AS_STRING(w),
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	1915 PyString_GET_SIZE(w));
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	1916 else
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	1917 x = NULL;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	1918 Py_DECREF(w);
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	1919 PUSH(x);
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	1920 if (x != NULL) continue;
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	1921 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1922
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1923 case LOAD_ATTR:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1924 w = GETITEM(names, oparg);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1925 v = TOP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1926 x = PyObject_GetAttr(v, w);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1927 Py_DECREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1928 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	1929 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1930 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1931
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1932 case COMPARE_OP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1933 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1934 v = TOP();
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	1935 if (PyInt_CheckExact(w) && PyInt_CheckExact(v)) {
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1936 /* INLINE: cmp(int, int) */
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1937 register long a, b;
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1938 register int res;
9591 7f90736701a3 Use PyInt_AS_LONG macro instead of explicit inlining. Guido van Rossum <guido@python.org> parents: 9513 diff changeset	1939 a = PyInt_AS_LONG(v);
7f90736701a3 Use PyInt_AS_LONG macro instead of explicit inlining. Guido van Rossum <guido@python.org> parents: 9513 diff changeset	1940 b = PyInt_AS_LONG(w);
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1941 switch (oparg) {
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1942 case PyCmp_LT: res = a < b; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1943 case PyCmp_LE: res = a <= b; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1944 case PyCmp_EQ: res = a == b; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1945 case PyCmp_NE: res = a != b; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1946 case PyCmp_GT: res = a > b; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1947 case PyCmp_GE: res = a >= b; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1948 case PyCmp_IS: res = v == w; break;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	1949 case PyCmp_IS_NOT: res = v != w; break;
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1950 default: goto slow_compare;
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1951 }
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1952 x = res ? Py_True : Py_False;
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1953 Py_INCREF(x);
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1954 }
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1955 else {
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1956 slow_compare:
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1957 x = cmp_outcome(oparg, v, w);
f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1958 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1959 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1960 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1961 SET_TOP(x);
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	1962 if (x == NULL) break;
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	1963 PREDICT(JUMP_IF_FALSE);
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	1964 PREDICT(JUMP_IF_TRUE);
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	1965 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1966
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1967 case IMPORT_NAME:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1968 w = GETITEM(names, oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1969 x = PyDict_GetItemString(f->f_builtins, "__import__");
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1970 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1971 PyErr_SetString(PyExc_ImportError,
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1972 "__import__ not found");
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1973 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1974 }
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1975 v = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1976 u = TOP();
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1977 if (PyInt_AsLong(u) != -1 \|\| PyErr_Occurred())
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1978 w = PyTuple_Pack(5,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1979 w,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1980 f->f_globals,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1981 f->f_locals == NULL ?
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1982 Py_None : f->f_locals,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1983 v,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1984 u);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1985 else
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1986 w = PyTuple_Pack(4,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1987 w,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1988 f->f_globals,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1989 f->f_locals == NULL ?
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1990 Py_None : f->f_locals,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1991 v);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	1992 Py_DECREF(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1993 Py_DECREF(u);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1994 if (w == NULL) {
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1995 u = POP();
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1996 x = NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1997 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	1998 }
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	1999 READ_TIMESTAMP(intr0);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2000 x = PyEval_CallObject(x, w);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2001 READ_TIMESTAMP(intr1);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2002 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2003 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2004 if (x != NULL) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2005 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2006
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2007 case IMPORT_STAR:
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2008 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2009 PyFrame_FastToLocals(f);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2010 if ((x = f->f_locals) == NULL) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2011 PyErr_SetString(PyExc_SystemError,
16017 7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 15948 diff changeset	2012 "no locals found during 'import *'");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2013 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2014 }
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2015 READ_TIMESTAMP(intr0);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2016 err = import_all_from(x, v);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2017 READ_TIMESTAMP(intr1);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2018 PyFrame_LocalsToFast(f, 0);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2019 Py_DECREF(v);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2020 if (err == 0) continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2021 break;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2022
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2023 case IMPORT_FROM:
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	2024 w = GETITEM(names, oparg);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2025 v = TOP();
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2026 READ_TIMESTAMP(intr0);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2027 x = import_from(v, w);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2028 READ_TIMESTAMP(intr1);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2029 PUSH(x);
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2030 if (x != NULL) continue;
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2031 break;
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2032
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2033 case JUMP_FORWARD:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2034 JUMPBY(oparg);
29349 2f731c57cdc6 Use fast_next_opcode shortcut for forward jump opcodes (it's safe and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 29339 diff changeset	2035 goto fast_next_opcode;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2036
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2037 PREDICTED_WITH_ARG(JUMP_IF_FALSE);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2038 case JUMP_IF_FALSE:
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2039 w = TOP();
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2040 if (w == Py_True) {
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2041 PREDICT(POP_TOP);
29349 2f731c57cdc6 Use fast_next_opcode shortcut for forward jump opcodes (it's safe and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 29339 diff changeset	2042 goto fast_next_opcode;
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2043 }
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2044 if (w == Py_False) {
fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2045 JUMPBY(oparg);
29349 2f731c57cdc6 Use fast_next_opcode shortcut for forward jump opcodes (it's safe and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 29339 diff changeset	2046 goto fast_next_opcode;
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2047 }
fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2048 err = PyObject_IsTrue(w);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2049 if (err > 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2050 err = 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2051 else if (err == 0)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2052 JUMPBY(oparg);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2053 else
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2054 break;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2055 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2056
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2057 PREDICTED_WITH_ARG(JUMP_IF_TRUE);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2058 case JUMP_IF_TRUE:
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2059 w = TOP();
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2060 if (w == Py_False) {
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2061 PREDICT(POP_TOP);
29349 2f731c57cdc6 Use fast_next_opcode shortcut for forward jump opcodes (it's safe and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 29339 diff changeset	2062 goto fast_next_opcode;
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2063 }
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2064 if (w == Py_True) {
fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2065 JUMPBY(oparg);
29349 2f731c57cdc6 Use fast_next_opcode shortcut for forward jump opcodes (it's safe and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 29339 diff changeset	2066 goto fast_next_opcode;
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2067 }
fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2068 err = PyObject_IsTrue(w);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2069 if (err > 0) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2070 err = 0;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2071 JUMPBY(oparg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2072 }
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2073 else if (err == 0)
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2074 ;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2075 else
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2076 break;
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2077 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2078
31649 243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	2079 PREDICTED_WITH_ARG(JUMP_ABSOLUTE);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2080 case JUMP_ABSOLUTE:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2081 JUMPTO(oparg);
29337 f9495815c18f Don't use fast_next_opcode for JUMP_* opcodes. This fixes the problem Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 28886 diff changeset	2082 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2083
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2084 case GET_ITER:
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2085 /* before: [obj]; after [getiter(obj)] */
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2086 v = TOP();
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2087 x = PyObject_GetIter(v);
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2088 Py_DECREF(v);
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2089 if (x != NULL) {
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2090 SET_TOP(x);
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	2091 PREDICT(FOR_ITER);
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	2092 continue;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2093 }
27243 3afbd55fb18f Replaced POP() with STACKADJ(-1) on lines where the result wasn't used. Raymond Hettinger <python@rcn.com> parents: 27201 diff changeset	2094 STACKADJ(-1);
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2095 break;
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2096
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	2097 PREDICTED_WITH_ARG(FOR_ITER);
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2098 case FOR_ITER:
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2099 /* before: [iter]; after: [iter, iter()] or [] */
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2100 v = TOP();
31646 83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2101 x = (*v->ob_type->tp_iternext)(v);
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	2102 if (x != NULL) {
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	2103 PUSH(x);
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	2104 PREDICT(STORE_FAST);
b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	2105 PREDICT(UNPACK_SEQUENCE);
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	2106 continue;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2107 }
31646 83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2108 if (PyErr_Occurred()) {
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2109 if (!PyErr_ExceptionMatches(PyExc_StopIteration))
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2110 break;
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2111 PyErr_Clear();
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17600 diff changeset	2112 }
31646 83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2113 /* iterator ended normally */
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2114 x = v = POP();
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2115 Py_DECREF(v);
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2116 JUMPBY(oparg);
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2117 continue;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2118
31647 d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2119 case BREAK_LOOP:
d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2120 why = WHY_BREAK;
d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2121 goto fast_block_end;
d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2122
d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2123 case CONTINUE_LOOP:
d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2124 retval = PyInt_FromLong(oparg);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2125 if (!retval) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2126 x = NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2127 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2128 }
31647 d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2129 why = WHY_CONTINUE;
d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2130 goto fast_block_end;
d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2131
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2132 case SETUP_LOOP:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2133 case SETUP_EXCEPT:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2134 case SETUP_FINALLY:
40742 f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	2135 /* NOTE: If you add any new block-setup opcodes that are
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	2136 not try/except/finally handlers, you may need to
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	2137 update the PyGen_NeedsFinalizing() function. */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2138
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2139 PyFrame_BlockSetup(f, opcode, INSTR_OFFSET() + oparg,
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2140 STACK_LEVEL());
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2141 continue;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2142
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2143 case WITH_CLEANUP:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2144 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2145 /* TOP is the context.__exit__ bound method.
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2146 Below that are 1-3 values indicating how/why
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2147 we entered the finally clause:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2148 - SECOND = None
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2149 - (SECOND, THIRD) = (WHY_{RETURN,CONTINUE}), retval
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2150 - SECOND = WHY_*; no retval below it
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2151 - (SECOND, THIRD, FOURTH) = exc_info()
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2152 In the last case, we must call
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2153 TOP(SECOND, THIRD, FOURTH)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2154 otherwise we must call
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2155 TOP(None, None, None)
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 36712 diff changeset	2156
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 36712 diff changeset	2157 In addition, if the stack represents an exception,
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2158 and the function call returns a 'true' value, we
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2159 "zap" this information, to prevent END_FINALLY from
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2160 re-raising the exception. (But non-local gotos
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2161 should still be resumed.)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2162 */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2163
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2164 x = TOP();
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2165 u = SECOND();
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2166 if (PyInt_Check(u) \|\| u == Py_None) {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2167 u = v = w = Py_None;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2168 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2169 else {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2170 v = THIRD();
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2171 w = FOURTH();
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2172 }
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2173 /* XXX Not the fastest way to call it... */
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2174 x = PyObject_CallFunctionObjArgs(x, u, v, w, NULL);
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2175 if (x == NULL)
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2176 break; /* Go to error exit */
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2177 if (u != Py_None && PyObject_IsTrue(x)) {
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2178 /* There was an exception and a true return */
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2179 Py_DECREF(x);
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2180 x = TOP(); /* Again */
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2181 STACKADJ(-3);
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 36712 diff changeset	2182 Py_INCREF(Py_None);
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2183 SET_TOP(Py_None);
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2184 Py_DECREF(x);
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2185 Py_DECREF(u);
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2186 Py_DECREF(v);
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2187 Py_DECREF(w);
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2188 } else {
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2189 /* Let END_FINALLY do its thing */
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2190 Py_DECREF(x);
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2191 x = POP();
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2192 Py_DECREF(x);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2193 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2194 break;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2195 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2196
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	2197 case CALL_FUNCTION:
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2198 {
e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2199 PyObject **sp;
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	2200 PCALL(PCALL_ALL);
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2201 sp = stack_pointer;
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2202 #ifdef WITH_TSC
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2203 x = call_function(&sp, oparg, &intr0, &intr1);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2204 #else
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2205 x = call_function(&sp, oparg);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2206 #endif
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2207 stack_pointer = sp;
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	2208 PUSH(x);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	2209 if (x != NULL)
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	2210 continue;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	2211 break;
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2212 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2213
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2214 case CALL_FUNCTION_VAR:
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2215 case CALL_FUNCTION_KW:
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2216 case CALL_FUNCTION_VAR_KW:
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	2217 {
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2218 int na = oparg & 0xff;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2219 int nk = (oparg>>8) & 0xff;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2220 int flags = (opcode - CALL_FUNCTION) & 3;
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2221 int n = na + 2 * nk;
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2222 PyObject *pfunc, func, **sp;
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	2223 PCALL(PCALL_ALL);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2224 if (flags & CALL_FLAG_VAR)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2225 n++;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2226 if (flags & CALL_FLAG_KW)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2227 n++;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2228 pfunc = stack_pointer - n - 1;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2229 func = *pfunc;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2230
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2231 if (PyMethod_Check(func)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2232 && PyMethod_GET_SELF(func) != NULL) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2233 PyObject *self = PyMethod_GET_SELF(func);
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2234 Py_INCREF(self);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2235 func = PyMethod_GET_FUNCTION(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2236 Py_INCREF(func);
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2237 Py_DECREF(*pfunc);
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2238 *pfunc = self;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2239 na++;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2240 n++;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2241 } else
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2242 Py_INCREF(func);
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2243 sp = stack_pointer;
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2244 READ_TIMESTAMP(intr0);
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2245 x = ext_do_call(func, &sp, flags, na, nk);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2246 READ_TIMESTAMP(intr1);
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2247 stack_pointer = sp;
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2248 Py_DECREF(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2249
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2250 while (stack_pointer > pfunc) {
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2251 w = POP();
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2252 Py_DECREF(w);
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2253 }
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2254 PUSH(x);
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2255 if (x != NULL)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2256 continue;
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2257 break;
2813 999b5bdc18ce 3rd arg for raise; INCOMPLETE keyword parameter passing (currently f(kw=value) is seen as f('kw', value)) Guido van Rossum <guido@python.org> parents: 2612 diff changeset	2258 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2259
40943 c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2260 case MAKE_CLOSURE:
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2261 case MAKE_FUNCTION:
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2262 {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2263 int posdefaults = oparg & 0xff;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2264 int kwdefaults = (oparg>>8) & 0xff;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2265 int num_annotations = (oparg >> 16) & 0x7fff;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2266
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2267 v = POP(); /* code object */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2268 x = PyFunction_New(v, f->f_globals);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2269 Py_DECREF(v);
40943 c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2270
c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2271 if (x != NULL && opcode == MAKE_CLOSURE) {
c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2272 v = POP();
c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2273 err = PyFunction_SetClosure(x, v);
c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2274 Py_DECREF(v);
c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2275 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2276
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2277 if (x != NULL && num_annotations > 0) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2278 Py_ssize_t name_ix;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2279 u = POP(); /* names of args with annotations */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2280 v = PyDict_New();
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2281 if (v == NULL) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2282 Py_DECREF(x);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2283 x = NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2284 break;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2285 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2286 name_ix = PyTuple_Size(u);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2287 assert(num_annotations == name_ix+1);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2288 while (name_ix > 0) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2289 --name_ix;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2290 t = PyTuple_GET_ITEM(u, name_ix);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2291 w = POP();
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2292 /* XXX(nnorwitz): check for errors */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2293 PyDict_SetItem(v, t, w);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2294 Py_DECREF(w);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2295 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2296
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2297 err = PyFunction_SetAnnotations(x, v);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2298 Py_DECREF(v);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2299 Py_DECREF(u);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2300 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2301
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2302 /* XXX Maybe this should be a separate opcode? */
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2303 if (x != NULL && posdefaults > 0) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2304 v = PyTuple_New(posdefaults);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2305 if (v == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2306 Py_DECREF(x);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2307 x = NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2308 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2309 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2310 while (--posdefaults >= 0) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2311 w = POP();
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2312 PyTuple_SET_ITEM(v, posdefaults, w);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2313 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2314 err = PyFunction_SetDefaults(x, v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2315 Py_DECREF(v);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2316 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2317 if (x != NULL && kwdefaults > 0) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2318 v = PyDict_New();
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2319 if (v == NULL) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2320 Py_DECREF(x);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2321 x = NULL;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2322 break;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2323 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2324 while (--kwdefaults >= 0) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2325 w = POP(); /* default value */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2326 u = POP(); /* kw only arg name */
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2327 /* XXX(nnorwitz): check for errors */
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2328 PyDict_SetItem(v, u, w);
40927 93f582803733 Fix a refleak in the MAKE_FUNCTION opcode in ceval.c. Georg Brandl <georg@python.org> parents: 40894 diff changeset	2329 Py_DECREF(w);
93f582803733 Fix a refleak in the MAKE_FUNCTION opcode in ceval.c. Georg Brandl <georg@python.org> parents: 40894 diff changeset	2330 Py_DECREF(u);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2331 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2332 err = PyFunction_SetKwDefaults(x, v);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2333 Py_DECREF(v);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2334 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2335 PUSH(x);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2336 break;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2337 }
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2338
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2339 case BUILD_SLICE:
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2340 if (oparg == 3)
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2341 w = POP();
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2342 else
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2343 w = NULL;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2344 v = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2345 u = TOP();
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	2346 x = PySlice_New(u, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2347 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2348 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2349 Py_XDECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2350 SET_TOP(x);
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2351 if (x != NULL) continue;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2352 break;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2353
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	2354 case EXTENDED_ARG:
21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	2355 opcode = NEXTOP();
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	2356 oparg = oparg<<16 \| NEXTARG();
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	2357 goto dispatch_opcode;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2358
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2359 default:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2360 fprintf(stderr,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2361 "XXX lineno: %d, opcode: %d\n",
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	2362 PyCode_Addr2Line(f->f_code, f->f_lasti),
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	2363 opcode);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2364 PyErr_SetString(PyExc_SystemError, "unknown opcode");
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2365 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2366 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2367
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2368 #ifdef CASE_TOO_BIG
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2369 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2370 #endif
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2371
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2372 } /* switch */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2373
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2374 on_error:
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2375
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2376 READ_TIMESTAMP(inst1);
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2377
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2378 /* Quickly continue if no error occurred */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2379
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2380 if (why == WHY_NOT) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2381 if (err == 0 && x != NULL) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2382 #ifdef CHECKEXC
10363 4daab7a9f566 Always test for an error return (usually NULL or -1) without setting Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2383 /* This check is expensive! */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2384 if (PyErr_Occurred())
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2385 fprintf(stderr,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2386 "XXX undetected error\n");
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2387 else {
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2388 #endif
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2389 READ_TIMESTAMP(loop1);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2390 continue; /* Normal, fast path */
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2391 #ifdef CHECKEXC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2392 }
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2393 #endif
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2394 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2395 why = WHY_EXCEPTION;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2396 x = Py_None;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2397 err = 0;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2398 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2399
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2400 /* Double-check exception status */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2401
31900 0265bf9912ea Some (but not all) of the why code bitfield tests ran faster as Raymond Hettinger <python@rcn.com> parents: 31894 diff changeset	2402 if (why == WHY_EXCEPTION \|\| why == WHY_RERAISE) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2403 if (!PyErr_Occurred()) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2404 PyErr_SetString(PyExc_SystemError,
10363 4daab7a9f566 Always test for an error return (usually NULL or -1) without setting Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2405 "error return without exception set");
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2406 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2407 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2408 }
10363 4daab7a9f566 Always test for an error return (usually NULL or -1) without setting Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2409 #ifdef CHECKEXC
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2410 else {
10363 4daab7a9f566 Always test for an error return (usually NULL or -1) without setting Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2411 /* This check is expensive! */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2412 if (PyErr_Occurred()) {
30861 c89fd7eaf875 Make undetected error on stack unwind a fatal error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30801 diff changeset	2413 char buf[1024];
c89fd7eaf875 Make undetected error on stack unwind a fatal error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30801 diff changeset	2414 sprintf(buf, "Stack unwind with exception "
c89fd7eaf875 Make undetected error on stack unwind a fatal error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30801 diff changeset	2415 "set and why=%d", why);
c89fd7eaf875 Make undetected error on stack unwind a fatal error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30801 diff changeset	2416 Py_FatalError(buf);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2417 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2418 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2419 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2420
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2421 /* Log traceback info if this is a real exception */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2422
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2423 if (why == WHY_EXCEPTION) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2424 PyTraceBack_Here(f);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2425
20247 a4d328d50897 Rationalize the events passed to the profiler (no changes for the tracer). Fred Drake <fdrake@acm.org> parents: 20183 diff changeset	2426 if (tstate->c_tracefunc != NULL)
a4d328d50897 Rationalize the events passed to the profiler (no changes for the tracer). Fred Drake <fdrake@acm.org> parents: 20183 diff changeset	2427 call_exc_trace(tstate->c_tracefunc,
a4d328d50897 Rationalize the events passed to the profiler (no changes for the tracer). Fred Drake <fdrake@acm.org> parents: 20183 diff changeset	2428 tstate->c_traceobj, f);
9513 350f24180dcb Whoops! One the "redundant" initializations removed by Vladimir in Guido van Rossum <guido@python.org> parents: 9490 diff changeset	2429 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2430
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2431 /* For the rest, treat WHY_RERAISE as WHY_EXCEPTION */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2432
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2433 if (why == WHY_RERAISE)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2434 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2435
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2436 /* Unwind stacks if a (pseudo) exception occurred */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2437
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2438 fast_block_end:
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2439 while (why != WHY_NOT && f->f_iblock > 0) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2440 PyTryBlock *b = PyFrame_BlockPop(f);
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2441
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2442 assert(why != WHY_YIELD);
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2443 if (b->b_type == SETUP_LOOP && why == WHY_CONTINUE) {
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2444 /* For a continue inside a try block,
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2445 don't pop the block for the loop. */
20064 ef3034a60a3e Don't swap the arguments to PyFrame_BlockSetup when recreating the recently Thomas Wouters <thomas@python.org> parents: 20012 diff changeset	2446 PyFrame_BlockSetup(f, b->b_type, b->b_handler,
ef3034a60a3e Don't swap the arguments to PyFrame_BlockSetup when recreating the recently Thomas Wouters <thomas@python.org> parents: 20012 diff changeset	2447 b->b_level);
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2448 why = WHY_NOT;
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2449 JUMPTO(PyInt_AS_LONG(retval));
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2450 Py_DECREF(retval);
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2451 break;
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2452 }
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2453
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2454 while (STACK_LEVEL() > b->b_level) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2455 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2456 Py_XDECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2457 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2458 if (b->b_type == SETUP_LOOP && why == WHY_BREAK) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2459 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2460 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2461 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2462 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2463 if (b->b_type == SETUP_FINALLY \|\|
4594 41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2464 (b->b_type == SETUP_EXCEPT &&
41857075d45b Change the Don Beaudry hack into the Don B + Jim F hack; now, if any Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2465 why == WHY_EXCEPTION)) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2466 if (why == WHY_EXCEPTION) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2467 PyObject exc, val, *tb;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2468 PyErr_Fetch(&exc, &val, &tb);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2469 if (val == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2470 val = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2471 Py_INCREF(val);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2472 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2473 /* Make the raw exception data
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2474 available to the handler,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2475 so a program can emulate the
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2476 Python main loop. Don't do
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2477 this for 'finally'. */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2478 if (b->b_type == SETUP_EXCEPT) {
6185 32aacd753f34 eval_code2(), set_exc_info(): Call PyErr_NormalizeException() the Barry Warsaw <barry@python.org> parents: 6160 diff changeset	2479 PyErr_NormalizeException(
32aacd753f34 eval_code2(), set_exc_info(): Call PyErr_NormalizeException() the Barry Warsaw <barry@python.org> parents: 6160 diff changeset	2480 &exc, &val, &tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2481 set_exc_info(tstate,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2482 exc, val, tb);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2483 }
20114 233f9606ba8e Prevent a NULL pointer from being pushed onto the stack. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20064 diff changeset	2484 if (tb == NULL) {
233f9606ba8e Prevent a NULL pointer from being pushed onto the stack. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20064 diff changeset	2485 Py_INCREF(Py_None);
233f9606ba8e Prevent a NULL pointer from being pushed onto the stack. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20064 diff changeset	2486 PUSH(Py_None);
233f9606ba8e Prevent a NULL pointer from being pushed onto the stack. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20064 diff changeset	2487 } else
233f9606ba8e Prevent a NULL pointer from being pushed onto the stack. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20064 diff changeset	2488 PUSH(tb);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2489 PUSH(val);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2490 PUSH(exc);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2491 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2492 else {
31874 c88d4610f283 Coded WHY flags as bitfields (taking inspiration from tp_flags). Raymond Hettinger <python@rcn.com> parents: 31872 diff changeset	2493 if (why & (WHY_RETURN \| WHY_CONTINUE))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2494 PUSH(retval);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2495 v = PyInt_FromLong((long)why);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2496 PUSH(v);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2497 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2498 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2499 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2500 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2501 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2502 } /* unwind stack */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2503
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2504 /* End the loop if we still have an error (or return) */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2505
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2506 if (why != WHY_NOT)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2507 break;
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	2508 READ_TIMESTAMP(loop1);
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2509
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2510 } /* main loop */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2511
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2512 assert(why != WHY_YIELD);
9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2513 /* Pop remaining stack entries. */
9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2514 while (!EMPTY()) {
9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2515 v = POP();
9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2516 Py_XDECREF(v);
21270 97709fd8fda0 Fix for SF bug #489671 (Neil Norwitz): memory leak in test_richcmp. Guido van Rossum <guido@python.org> parents: 21252 diff changeset	2517 }
97709fd8fda0 Fix for SF bug #489671 (Neil Norwitz): memory leak in test_richcmp. Guido van Rossum <guido@python.org> parents: 21252 diff changeset	2518
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2519 if (why != WHY_RETURN)
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2520 retval = NULL;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2521
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2522 fast_yield:
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2523 if (tstate->use_tracing) {
35345 700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2524 if (tstate->c_tracefunc) {
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2525 if (why == WHY_RETURN \|\| why == WHY_YIELD) {
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2526 if (call_trace(tstate->c_tracefunc,
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2527 tstate->c_traceobj, f,
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2528 PyTrace_RETURN, retval)) {
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2529 Py_XDECREF(retval);
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2530 retval = NULL;
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2531 why = WHY_EXCEPTION;
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2532 }
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2533 }
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2534 else if (why == WHY_EXCEPTION) {
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2535 call_trace_protected(tstate->c_tracefunc,
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2536 tstate->c_traceobj, f,
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	2537 PyTrace_RETURN, NULL);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2538 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2539 }
20247 a4d328d50897 Rationalize the events passed to the profiler (no changes for the tracer). Fred Drake <fdrake@acm.org> parents: 20183 diff changeset	2540 if (tstate->c_profilefunc) {
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2541 if (why == WHY_EXCEPTION)
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2542 call_trace_protected(tstate->c_profilefunc,
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2543 tstate->c_profileobj, f,
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	2544 PyTrace_RETURN, NULL);
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2545 else if (call_trace(tstate->c_profilefunc,
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2546 tstate->c_profileobj, f,
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	2547 PyTrace_RETURN, retval)) {
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2548 Py_XDECREF(retval);
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2549 retval = NULL;
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2550 why = WHY_EXCEPTION;
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2551 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	2552 }
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2553 }
5023 75c1ee882a4a Kill all local variables on function return. This closes a gigantic Guido van Rossum <guido@python.org> parents: 5021 diff changeset	2554
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2555 if (tstate->frame->f_exc_type != NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2556 reset_exc_info(tstate);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2557 else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2558 assert(tstate->frame->f_exc_value == NULL);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2559 assert(tstate->frame->f_exc_traceback == NULL);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2560 }
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2561
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2562 /* pop frame */
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	2563 exit_eval_frame:
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	2564 Py_LeaveRecursiveCall();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2565 tstate->frame = f->f_back;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2566
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2567 return retval;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2568 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2569
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2570 /* This is gonna seem real weird, but if you put some other code between
32421 485d2ef43419 Patch #966493: Cleanup generator/eval_frame exposure. Martin v. Löwis <martin@v.loewis.de> parents: 32412 diff changeset	2571 PyEval_EvalFrame() and PyEval_EvalCodeEx() you will need to adjust
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2572 the test in the if statements in Misc/gdbinit (pystack and pystackv). */
31606 fd2103ae6f29 Add pystack definition to Misc/gdbinit with some explanation of its behavior Skip Montanaro <skip@pobox.com> parents: 31514 diff changeset	2573
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	2574 PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	2575 PyEval_EvalCodeEx(PyCodeObject co, PyObject globals, PyObject *locals,
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2576 PyObject args, int argcount, PyObject kws, int kwcount,
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2577 PyObject *defs, int defcount, PyObject kwdefs, PyObject *closure)
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2578 {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2579 register PyFrameObject *f;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2580 register PyObject *retval = NULL;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2581 register PyObject fastlocals, freevars;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2582 PyThreadState *tstate = PyThreadState_GET();
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2583 PyObject x, u;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2584
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2585 if (globals == NULL) {
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2586 PyErr_SetString(PyExc_SystemError,
19198 3c1c9948ff65 Remove much dead code from ceval.c Jeremy Hylton <jeremy@alum.mit.edu> parents: 19158 diff changeset	2587 "PyEval_EvalCodeEx: NULL globals");
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2588 return NULL;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2589 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2590
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	2591 assert(tstate != NULL);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	2592 assert(globals != NULL);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	2593 f = PyFrame_New(tstate, co, globals, locals);
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2594 if (f == NULL)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2595 return NULL;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2596
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2597 fastlocals = f->f_localsplus;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2598 freevars = f->f_localsplus + co->co_nlocals;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2599
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2600 if (co->co_argcount > 0 \|\|
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2601 co->co_kwonlyargcount > 0 \|\|
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2602 co->co_flags & (CO_VARARGS \| CO_VARKEYWORDS)) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2603 int i;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2604 int n = argcount;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2605 PyObject *kwdict = NULL;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2606 if (co->co_flags & CO_VARKEYWORDS) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2607 kwdict = PyDict_New();
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2608 if (kwdict == NULL)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2609 goto fail;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2610 i = co->co_argcount + co->co_kwonlyargcount;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2611 if (co->co_flags & CO_VARARGS)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2612 i++;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2613 SETLOCAL(i, kwdict);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2614 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2615 if (argcount > co->co_argcount) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2616 if (!(co->co_flags & CO_VARARGS)) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2617 PyErr_Format(PyExc_TypeError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2618 "%.200s() takes %s %d "
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2619 "%spositional argument%s (%d given)",
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2620 PyString_AsString(co->co_name),
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2621 defcount ? "at most" : "exactly",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2622 co->co_argcount,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2623 kwcount ? "non-keyword " : "",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2624 co->co_argcount == 1 ? "" : "s",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2625 argcount);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2626 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2627 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2628 n = co->co_argcount;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2629 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2630 for (i = 0; i < n; i++) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2631 x = args[i];
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2632 Py_INCREF(x);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2633 SETLOCAL(i, x);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2634 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2635 if (co->co_flags & CO_VARARGS) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2636 u = PyTuple_New(argcount - n);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2637 if (u == NULL)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2638 goto fail;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2639 SETLOCAL(co->co_argcount + co->co_kwonlyargcount, u);
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2640 for (i = n; i < argcount; i++) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2641 x = args[i];
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2642 Py_INCREF(x);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2643 PyTuple_SET_ITEM(u, i-n, x);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2644 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2645 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2646 for (i = 0; i < kwcount; i++) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2647 PyObject keyword = kws[2i];
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2648 PyObject value = kws[2i + 1];
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2649 int j;
41558 29ae667f3239 Checkpoint. Manipulated things so that string literals are always Guido van Rossum <guido@python.org> parents: 41554 diff changeset	2650 if (keyword == NULL \|\| !(PyString_Check(keyword) \|\| PyUnicode_Check(keyword))) {
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2651 PyErr_Format(PyExc_TypeError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2652 "%.200s() keywords must be strings",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2653 PyString_AsString(co->co_name));
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2654 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2655 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2656 /* XXX slow -- speed up using dictionary? */
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2657 for (j = 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2658 j < co->co_argcount + co->co_kwonlyargcount;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2659 j++) {
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2660 PyObject *nm = PyTuple_GET_ITEM(
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2661 co->co_varnames, j);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2662 int cmp = PyObject_RichCompareBool(
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2663 keyword, nm, Py_EQ);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2664 if (cmp > 0)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2665 break;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2666 else if (cmp < 0)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2667 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2668 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2669 /* Check errors from Compare */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2670 if (PyErr_Occurred())
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2671 goto fail;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2672 if (j >= co->co_argcount + co->co_kwonlyargcount) {
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2673 if (kwdict == NULL) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2674 PyErr_Format(PyExc_TypeError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2675 "%.200s() got an unexpected "
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2676 "keyword argument '%.400s'",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2677 PyString_AsString(co->co_name),
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2678 PyString_AsString(keyword));
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2679 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2680 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2681 PyDict_SetItem(kwdict, keyword, value);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2682 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2683 else {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2684 if (GETLOCAL(j) != NULL) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2685 PyErr_Format(PyExc_TypeError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2686 "%.200s() got multiple "
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2687 "values for keyword "
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2688 "argument '%.400s'",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2689 PyString_AsString(co->co_name),
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2690 PyString_AsString(keyword));
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2691 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2692 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2693 Py_INCREF(value);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2694 SETLOCAL(j, value);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2695 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2696 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2697 if (co->co_kwonlyargcount > 0) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2698 for (i = co->co_argcount;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2699 i < co->co_argcount + co->co_kwonlyargcount;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2700 i++) {
40381 259d26900861 Make it compile with older compilers. Guido van Rossum <guido@python.org> parents: 40215 diff changeset	2701 PyObject name, def;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2702 if (GETLOCAL(i) != NULL)
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2703 continue;
40381 259d26900861 Make it compile with older compilers. Guido van Rossum <guido@python.org> parents: 40215 diff changeset	2704 name = PyTuple_GET_ITEM(co->co_varnames, i);
259d26900861 Make it compile with older compilers. Guido van Rossum <guido@python.org> parents: 40215 diff changeset	2705 def = NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2706 if (kwdefs != NULL)
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2707 def = PyDict_GetItem(kwdefs, name);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2708 if (def != NULL) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2709 Py_INCREF(def);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2710 SETLOCAL(i, def);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2711 continue;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2712 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2713 PyErr_Format(PyExc_TypeError,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2714 "%.200s() needs "
40729 ffb9580f967b Fix minor grammar typo. Brett Cannon <bcannon@gmail.com> parents: 40626 diff changeset	2715 "keyword-only argument %s",
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2716 PyString_AsString(co->co_name),
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2717 PyString_AsString(name));
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2718 goto fail;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2719 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2720 }
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2721 if (argcount < co->co_argcount) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2722 int m = co->co_argcount - defcount;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2723 for (i = argcount; i < m; i++) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2724 if (GETLOCAL(i) == NULL) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2725 PyErr_Format(PyExc_TypeError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2726 "%.200s() takes %s %d "
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2727 "%spositional argument%s "
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2728 "(%d given)",
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2729 PyString_AsString(co->co_name),
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2730 ((co->co_flags & CO_VARARGS) \|\|
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2731 defcount) ? "at least"
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2732 : "exactly",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2733 m, kwcount ? "non-keyword " : "",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2734 m == 1 ? "" : "s", i);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2735 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2736 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2737 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2738 if (n > m)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2739 i = n - m;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2740 else
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2741 i = 0;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2742 for (; i < defcount; i++) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2743 if (GETLOCAL(m+i) == NULL) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2744 PyObject *def = defs[i];
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2745 Py_INCREF(def);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2746 SETLOCAL(m+i, def);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2747 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2748 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2749 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2750 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2751 else {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2752 if (argcount > 0 \|\| kwcount > 0) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2753 PyErr_Format(PyExc_TypeError,
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2754 "%.200s() takes no arguments (%d given)",
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2755 PyString_AsString(co->co_name),
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2756 argcount + kwcount);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2757 goto fail;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2758 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2759 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2760 /* Allocate and initialize storage for cell vars, and copy free
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2761 vars into frame. This isn't too efficient right now. */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2762 if (PyTuple_GET_SIZE(co->co_cellvars)) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2763 int i, j, nargs, found;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2764 char cellname, argname;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2765 PyObject *c;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2766
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2767 nargs = co->co_argcount;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2768 if (co->co_flags & CO_VARARGS)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2769 nargs++;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2770 if (co->co_flags & CO_VARKEYWORDS)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2771 nargs++;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2772
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2773 /* Initialize each cell var, taking into account
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2774 cell vars that are initialized from arguments.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2775
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2776 Should arrange for the compiler to put cellvars
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2777 that are arguments at the beginning of the cellvars
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2778 list so that we can march over it more efficiently?
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2779 */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2780 for (i = 0; i < PyTuple_GET_SIZE(co->co_cellvars); ++i) {
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2781 cellname = PyString_AS_STRING(
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2782 PyTuple_GET_ITEM(co->co_cellvars, i));
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2783 found = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	2784 for (j = 0; j < nargs; j++) {
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2785 argname = PyString_AS_STRING(
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2786 PyTuple_GET_ITEM(co->co_varnames, j));
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2787 if (strcmp(cellname, argname) == 0) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2788 c = PyCell_New(GETLOCAL(j));
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2789 if (c == NULL)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2790 goto fail;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2791 GETLOCAL(co->co_nlocals + i) = c;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2792 found = 1;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2793 break;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2794 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2795 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2796 if (found == 0) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2797 c = PyCell_New(NULL);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2798 if (c == NULL)
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2799 goto fail;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2800 SETLOCAL(co->co_nlocals + i, c);
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2801 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2802 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2803 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2804 if (PyTuple_GET_SIZE(co->co_freevars)) {
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2805 int i;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2806 for (i = 0; i < PyTuple_GET_SIZE(co->co_freevars); ++i) {
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2807 PyObject *o = PyTuple_GET_ITEM(closure, i);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2808 Py_INCREF(o);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2809 freevars[PyTuple_GET_SIZE(co->co_cellvars) + i] = o;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2810 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2811 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2812
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2813 if (co->co_flags & CO_GENERATOR) {
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	2814 /* Don't need to keep the reference to f_back, it will be set
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	2815 * when the generator is resumed. */
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	2816 Py_XDECREF(f->f_back);
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	2817 f->f_back = NULL;
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	2818
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	2819 PCALL(PCALL_GENERATOR);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	2820
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	2821 /* Create a new generator that owns the ready to run frame
990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	2822 * and return that as the value. */
32175 8ee5a56b8031 Patch #957398: Add public API for Generator Object/Type. Martin v. Löwis <martin@v.loewis.de> parents: 31900 diff changeset	2823 return PyGen_New(f);
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2824 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2825
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	2826 retval = PyEval_EvalFrameEx(f,0);
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2827
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2828 fail: /* Jump here from prelude on failure */
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2829
21058 9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2830 /* decref'ing the frame can cause __del__ methods to get invoked,
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2831 which can call back into Python. While we're done with the
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2832 current Python frame (f), the associated C stack is still in use,
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2833 so recursion_depth must be boosted for the duration.
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2834 */
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2835 assert(tstate != NULL);
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2836 ++tstate->recursion_depth;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2837 Py_DECREF(f);
21058 9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	2838 --tstate->recursion_depth;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2839 return retval;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2840 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2841
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	2842
28121 c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2843 /* Implementation notes for set_exc_info() and reset_exc_info():
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2844
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2845 - Below, 'exc_ZZZ' stands for 'exc_type', 'exc_value' and
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2846 'exc_traceback'. These always travel together.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2847
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2848 - tstate->curexc_ZZZ is the "hot" exception that is set by
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2849 PyErr_SetString(), cleared by PyErr_Clear(), and so on.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2850
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2851 - Once an exception is caught by an except clause, it is transferred
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2852 from tstate->curexc_ZZZ to tstate->exc_ZZZ, from which sys.exc_info()
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2853 can pick it up. This is the primary task of set_exc_info().
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2854 XXX That can't be right: set_exc_info() doesn't look at tstate->curexc_ZZZ.
28121 c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2855
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2856 - Now let me explain the complicated dance with frame->f_exc_ZZZ.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2857
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2858 Long ago, when none of this existed, there were just a few globals:
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2859 one set corresponding to the "hot" exception, and one set
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2860 corresponding to sys.exc_ZZZ. (Actually, the latter weren't C
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2861 globals; they were simply stored as sys.exc_ZZZ. For backwards
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2862 compatibility, they still are!) The problem was that in code like
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2863 this:
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2864
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2865 try:
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2866 "something that may fail"
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2867 except "some exception":
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2868 "do something else first"
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2869 "print the exception from sys.exc_ZZZ."
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2870
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2871 if "do something else first" invoked something that raised and caught
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2872 an exception, sys.exc_ZZZ were overwritten. That was a frequent
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2873 cause of subtle bugs. I fixed this by changing the semantics as
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2874 follows:
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2875
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2876 - Within one frame, sys.exc_ZZZ will hold the last exception caught
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2877 in that frame.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2878
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2879 - But initially, and as long as no exception is caught in a given
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2880 frame, sys.exc_ZZZ will hold the last exception caught in the
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2881 previous frame (or the frame before that, etc.).
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2882
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2883 The first bullet fixed the bug in the above example. The second
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2884 bullet was for backwards compatibility: it was (and is) common to
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2885 have a function that is called when an exception is caught, and to
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2886 have that function access the caught exception via sys.exc_ZZZ.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2887 (Example: traceback.print_exc()).
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2888
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2889 At the same time I fixed the problem that sys.exc_ZZZ weren't
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2890 thread-safe, by introducing sys.exc_info() which gets it from tstate;
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2891 but that's really a separate improvement.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2892
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2893 The reset_exc_info() function in ceval.c restores the tstate->exc_ZZZ
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2894 variables to what they were before the current frame was called. The
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2895 set_exc_info() function saves them on the frame so that
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2896 reset_exc_info() can restore them. The invariant is that
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2897 frame->f_exc_ZZZ is NULL iff the current frame never caught an
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2898 exception (where "catching" an exception applies only to successful
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2899 except clauses); and if the current frame ever caught an exception,
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2900 frame->f_exc_ZZZ is the exception that was stored in tstate->exc_ZZZ
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2901 at the start of the current frame.
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2902
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2903 */
c24a23b1f198 Added implementation notes for [re]set_exc_info(). Guido van Rossum <guido@python.org> parents: 28086 diff changeset	2904
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2905 static void
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2906 set_exc_info(PyThreadState *tstate,
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2907 PyObject type, PyObject value, PyObject *tb)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2908 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2909 PyFrameObject *frame = tstate->frame;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2910 PyObject tmp_type, tmp_value, *tmp_tb;
6147 b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	2911
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2912 assert(type != NULL);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2913 assert(frame != NULL);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2914 if (frame->f_exc_type == NULL) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2915 assert(frame->f_exc_value == NULL);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2916 assert(frame->f_exc_traceback == NULL);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2917 /* This frame didn't catch an exception before. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2918 /* Save previous exception of this thread in this frame. */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2919 if (tstate->exc_type == NULL) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2920 /* XXX Why is this set to Py_None? */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2921 Py_INCREF(Py_None);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2922 tstate->exc_type = Py_None;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2923 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2924 Py_INCREF(tstate->exc_type);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2925 Py_XINCREF(tstate->exc_value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2926 Py_XINCREF(tstate->exc_traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2927 frame->f_exc_type = tstate->exc_type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2928 frame->f_exc_value = tstate->exc_value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2929 frame->f_exc_traceback = tstate->exc_traceback;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2930 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2931 /* Set new exception for this thread. */
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2932 tmp_type = tstate->exc_type;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2933 tmp_value = tstate->exc_value;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2934 tmp_tb = tstate->exc_traceback;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2935 Py_INCREF(type);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2936 Py_XINCREF(value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2937 Py_XINCREF(tb);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2938 tstate->exc_type = type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2939 tstate->exc_value = value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2940 tstate->exc_traceback = tb;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2941 Py_XDECREF(tmp_type);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2942 Py_XDECREF(tmp_value);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2943 Py_XDECREF(tmp_tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2944 /* For b/w compatibility */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2945 PySys_SetObject("exc_type", type);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2946 PySys_SetObject("exc_value", value);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2947 PySys_SetObject("exc_traceback", tb);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2948 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2949
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2950 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2951 reset_exc_info(PyThreadState *tstate)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2952 {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2953 PyFrameObject *frame;
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2954 PyObject tmp_type, tmp_value, *tmp_tb;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2955
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2956 /* It's a precondition that the thread state's frame caught an
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2957 * exception -- verify in a debug build.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2958 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2959 assert(tstate != NULL);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2960 frame = tstate->frame;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2961 assert(frame != NULL);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2962 assert(frame->f_exc_type != NULL);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2963
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2964 /* Copy the frame's exception info back to the thread state. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2965 tmp_type = tstate->exc_type;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2966 tmp_value = tstate->exc_value;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2967 tmp_tb = tstate->exc_traceback;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2968 Py_INCREF(frame->f_exc_type);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2969 Py_XINCREF(frame->f_exc_value);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2970 Py_XINCREF(frame->f_exc_traceback);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2971 tstate->exc_type = frame->f_exc_type;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2972 tstate->exc_value = frame->f_exc_value;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2973 tstate->exc_traceback = frame->f_exc_traceback;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2974 Py_XDECREF(tmp_type);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2975 Py_XDECREF(tmp_value);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2976 Py_XDECREF(tmp_tb);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2977
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2978 /* For b/w compatibility */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2979 PySys_SetObject("exc_type", frame->f_exc_type);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2980 PySys_SetObject("exc_value", frame->f_exc_value);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2981 PySys_SetObject("exc_traceback", frame->f_exc_traceback);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2982
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2983 /* Clear the frame's exception info. */
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2984 tmp_type = frame->f_exc_type;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2985 tmp_value = frame->f_exc_value;
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2986 tmp_tb = frame->f_exc_traceback;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2987 frame->f_exc_type = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2988 frame->f_exc_value = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2989 frame->f_exc_traceback = NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2990 Py_DECREF(tmp_type);
5557 4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2991 Py_XDECREF(tmp_value);
4329e4077cf3 Plug leak of stack frame object in exception handling code. Guido van Rossum <guido@python.org> parents: 5551 diff changeset	2992 Py_XDECREF(tmp_tb);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2993 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2994
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2995 /* Logic for the raise statement (too complicated for inlining).
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2996 This consumes a reference count to each of its arguments. */
31875 1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	2997 static enum why_code
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2998 do_raise(PyObject type, PyObject value, PyObject *tb)
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	2999 {
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3000 if (type == NULL) {
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3001 /* Reraise */
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	3002 PyThreadState *tstate = PyThreadState_GET();
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3003 type = tstate->exc_type == NULL ? Py_None : tstate->exc_type;
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3004 value = tstate->exc_value;
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3005 tb = tstate->exc_traceback;
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3006 Py_XINCREF(type);
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3007 Py_XINCREF(value);
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3008 Py_XINCREF(tb);
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3009 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3010
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3011 /* We support the following forms of raise:
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3012 raise <class>, <classinstance>
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3013 raise <class>, <argument tuple>
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3014 raise <class>, None
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3015 raise <class>, <argument>
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3016 raise <classinstance>, None
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3017 raise <string>, <object>
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3018 raise <string>, None
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3019
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3020 An omitted second argument is the same as None.
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3021
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3022 In addition, raise <tuple>, <anything> is the same as
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3023 raising the tuple's first item (and it better have one!);
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3024 this rule is applied recursively.
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3025
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3026 Finally, an optional third argument can be supplied, which
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3027 gives the traceback to be substituted (useful when
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3028 re-raising an exception after examining it). */
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3029
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3030 /* First, check the traceback argument, replacing None with
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3031 NULL. */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3032 if (tb == Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3033 Py_DECREF(tb);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3034 tb = NULL;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3035 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3036 else if (tb != NULL && !PyTraceBack_Check(tb)) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3037 PyErr_SetString(PyExc_TypeError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	3038 "raise: arg 3 must be a traceback or None");
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3039 goto raise_error;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3040 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3041
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3042 /* Next, replace a missing value with None */
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3043 if (value == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3044 value = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3045 Py_INCREF(value);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3046 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3047
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3048 /* Next, repeatedly, replace a tuple exception with its first item */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3049 while (PyTuple_Check(type) && PyTuple_Size(type) > 0) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3050 PyObject *tmp = type;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3051 type = PyTuple_GET_ITEM(type, 0);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3052 Py_INCREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3053 Py_DECREF(tmp);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3054 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3055
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36926 diff changeset	3056 if (PyExceptionClass_Check(type))
6147 b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	3057 PyErr_NormalizeException(&type, &value, &tb);
b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	3058
36751 8e04de2480e4 PEP 352 implementation. Creates a new base class, BaseException, which has an Brett Cannon <bcannon@gmail.com> parents: 36737 diff changeset	3059 else if (PyExceptionInstance_Check(type)) {
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3060 /* Raising an instance. The value should be a dummy. */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3061 if (value != Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3062 PyErr_SetString(PyExc_TypeError,
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3063 "instance exception may not have a separate value");
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3064 goto raise_error;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3065 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3066 else {
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3067 /* Normalize to raise <class>, <instance> */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3068 Py_DECREF(value);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3069 value = type;
36751 8e04de2480e4 PEP 352 implementation. Creates a new base class, BaseException, which has an Brett Cannon <bcannon@gmail.com> parents: 36737 diff changeset	3070 type = PyExceptionInstance_Class(type);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3071 Py_INCREF(type);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3072 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3073 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3074 else {
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3075 /* Not something you can raise. You get an exception
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3076 anyway, just not what you specified :-) */
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36926 diff changeset	3077 PyErr_SetString(PyExc_TypeError,
49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36926 diff changeset	3078 "exceptions must derive from BaseException");
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3079 goto raise_error;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3080 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3081 PyErr_Restore(type, value, tb);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3082 if (tb == NULL)
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3083 return WHY_EXCEPTION;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3084 else
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3085 return WHY_RERAISE;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3086 raise_error:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3087 Py_XDECREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3088 Py_XDECREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3089 Py_XDECREF(tb);
4667 c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3090 return WHY_EXCEPTION;
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3091 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function. Guido van Rossum <guido@python.org> parents: 4594 diff changeset	3092
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3093 /* Iterate v argcnt times and store the results on the stack (via decreasing
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3094 sp). Return 1 for success, 0 if error.
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3095
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3096 If argcntafter == -1, do a simple unpack. If it is >= 0, do an unpack
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3097 with a variable target.
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3098 */
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3099
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3100 static int
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3101 unpack_iterable(PyObject v, int argcnt, int argcntafter, PyObject *sp)
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3102 {
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3103 int i = 0, j = 0;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3104 Py_ssize_t ll = 0;
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3105 PyObject it; / iter(v) */
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3106 PyObject *w;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3107 PyObject l = NULL; / variable list */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3108
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3109 assert(v != NULL);
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3110
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3111 it = PyObject_GetIter(v);
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3112 if (it == NULL)
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3113 goto Error;
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3114
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3115 for (; i < argcnt; i++) {
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3116 w = PyIter_Next(it);
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3117 if (w == NULL) {
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3118 /* Iterator done, via error or exhaustion. */
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3119 if (!PyErr_Occurred()) {
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3120 PyErr_Format(PyExc_ValueError,
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3121 "need more than %d value%s to unpack",
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3122 i, i == 1 ? "" : "s");
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3123 }
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3124 goto Error;
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3125 }
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3126 *--sp = w;
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3127 }
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3128
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3129 if (argcntafter == -1) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3130 /* We better have exhausted the iterator now. */
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3131 w = PyIter_Next(it);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3132 if (w == NULL) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3133 if (PyErr_Occurred())
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3134 goto Error;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3135 Py_DECREF(it);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3136 return 1;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3137 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3138 Py_DECREF(w);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3139 PyErr_SetString(PyExc_ValueError, "too many values to unpack");
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3140 goto Error;
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3141 }
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3142
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3143 l = PySequence_List(it);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3144 if (l == NULL)
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3145 goto Error;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3146 *--sp = l;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3147 i++;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3148
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3149 ll = PyList_GET_SIZE(l);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3150 if (ll < argcntafter) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3151 PyErr_Format(PyExc_ValueError, "need more than %zd values to unpack",
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3152 argcnt + ll);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3153 goto Error;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3154 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3155
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3156 /* Pop the "after-variable" args off the list. */
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3157 for (j = argcntafter; j > 0; j--, i++) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3158 *--sp = PyList_GET_ITEM(l, ll - j);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3159 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3160 /* Resize the list. */
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3161 ((PyListObject *)l)->ob_size = ll - argcntafter;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3162 Py_DECREF(it);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3163 return 1;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3164
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3165 Error:
6160 79592761b331 unpack_sequence(): In finally clause, watch out for Py_DECREF Barry Warsaw <barry@python.org> parents: 6157 diff changeset	3166 for (; i > 0; i--, sp++)
79592761b331 unpack_sequence(): In finally clause, watch out for Py_DECREF Barry Warsaw <barry@python.org> parents: 6157 diff changeset	3167 Py_DECREF(*sp);
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3168 Py_XDECREF(it);
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3169 return 0;
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3170 }
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3171
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3172
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3173 #ifdef LLTRACE
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3174 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3175 prtrace(PyObject v, char str)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3176 {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3177 printf("%s ", str);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3178 if (PyObject_Print(v, stdout, 0) != 0)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3179 PyErr_Clear(); /* Don't know what else to do */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3180 printf("\n");
12579 978253542076 Add useless 'return 1' to prtrace() to shut up VC++. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	3181 return 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3182 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3183 #endif
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3184
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3185 static void
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3186 call_exc_trace(Py_tracefunc func, PyObject self, PyFrameObject f)
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3187 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3188 PyObject type, value, traceback, arg;
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3189 int err;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3190 PyErr_Fetch(&type, &value, &traceback);
815 6508c93f9472 Test for NULL coming out of err_get() in call_exc_trace() Guido van Rossum <guido@python.org> parents: 814 diff changeset	3191 if (value == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3192 value = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3193 Py_INCREF(value);
815 6508c93f9472 Test for NULL coming out of err_get() in call_exc_trace() Guido van Rossum <guido@python.org> parents: 814 diff changeset	3194 }
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 29669 diff changeset	3195 arg = PyTuple_Pack(3, type, value, traceback);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	3196 if (arg == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3197 PyErr_Restore(type, value, traceback);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	3198 return;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	3199 }
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3200 err = call_trace(func, self, f, PyTrace_EXCEPTION, arg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3201 Py_DECREF(arg);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	3202 if (err == 0)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3203 PyErr_Restore(type, value, traceback);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	3204 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3205 Py_XDECREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3206 Py_XDECREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3207 Py_XDECREF(traceback);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3208 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3209 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3210
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3211 static void
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3212 call_trace_protected(Py_tracefunc func, PyObject obj, PyFrameObject frame,
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3213 int what, PyObject *arg)
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3214 {
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3215 PyObject type, value, *traceback;
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3216 int err;
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3217 PyErr_Fetch(&type, &value, &traceback);
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3218 err = call_trace(func, obj, frame, what, arg);
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3219 if (err == 0)
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3220 PyErr_Restore(type, value, traceback);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3221 else {
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3222 Py_XDECREF(type);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3223 Py_XDECREF(value);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3224 Py_XDECREF(traceback);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3225 }
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3226 }
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3227
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3228 static int
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3229 call_trace(Py_tracefunc func, PyObject obj, PyFrameObject frame,
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3230 int what, PyObject *arg)
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3231 {
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3232 register PyThreadState *tstate = frame->f_tstate;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3233 int result;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3234 if (tstate->tracing)
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3235 return 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3236 tstate->tracing++;
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3237 tstate->use_tracing = 0;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3238 result = func(obj, frame, what, arg);
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3239 tstate->use_tracing = ((tstate->c_tracefunc != NULL)
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3240 \|\| (tstate->c_profilefunc != NULL));
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3241 tstate->tracing--;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3242 return result;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3243 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3244
28556 78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3245 PyObject *
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3246 _PyEval_CallTracing(PyObject func, PyObject args)
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3247 {
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3248 PyFrameObject *frame = PyEval_GetFrame();
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3249 PyThreadState *tstate = frame->f_tstate;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3250 int save_tracing = tstate->tracing;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3251 int save_use_tracing = tstate->use_tracing;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3252 PyObject *result;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3253
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3254 tstate->tracing = 0;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3255 tstate->use_tracing = ((tstate->c_tracefunc != NULL)
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3256 \|\| (tstate->c_profilefunc != NULL));
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3257 result = PyObject_Call(func, args, NULL);
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3258 tstate->tracing = save_tracing;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3259 tstate->use_tracing = save_use_tracing;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3260 return result;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3261 }
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3262
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3263 static int
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3264 maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	3265 PyFrameObject frame, int instr_lb, int *instr_ub,
9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	3266 int *instr_prev)
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3267 {
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3268 int result = 0;
964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3269
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3270 /* If the last instruction executed isn't in the current
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3271 instruction window, reset the window. If the last
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3272 instruction happens to fall at the start of a line or if it
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3273 represents a jump backwards, call the trace function.
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3274 */
25078 be2868a63ed5 Further SET_LINENO reomval fixes. See comments in patch #587933. Michael W. Hudson <mwh@python.net> parents: 24978 diff changeset	3275 if ((frame->f_lasti < instr_lb \|\| frame->f_lasti >= instr_ub)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3276 int line;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3277 PyAddrPair bounds;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3278
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3279 line = PyCode_CheckLineNumber(frame->f_code, frame->f_lasti,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3280 &bounds);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3281 if (line >= 0) {
25207 1e46da1e6522 A slight change to SET_LINENO-less tracing. Michael W. Hudson <mwh@python.net> parents: 25109 diff changeset	3282 frame->f_lineno = line;
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3283 result = call_trace(func, obj, frame,
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3284 PyTrace_LINE, Py_None);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3285 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3286 *instr_lb = bounds.ap_lower;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3287 *instr_ub = bounds.ap_upper;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3288 }
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	3289 else if (frame->f_lasti <= *instr_prev) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3290 result = call_trace(func, obj, frame, PyTrace_LINE, Py_None);
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	3291 }
9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	3292 *instr_prev = frame->f_lasti;
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3293 return result;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3294 }
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3295
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3296 void
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3297 PyEval_SetProfile(Py_tracefunc func, PyObject *arg)
18136 4cb34314bd97 Instead of initializing & interning the strings passed to the profile Fred Drake <fdrake@acm.org> parents: 18128 diff changeset	3298 {
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	3299 PyThreadState *tstate = PyThreadState_GET();
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3300 PyObject *temp = tstate->c_profileobj;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3301 Py_XINCREF(arg);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3302 tstate->c_profilefunc = NULL;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3303 tstate->c_profileobj = NULL;
35125 cdec978b916c Add comments about PyThreadState and the usage of its fields. Brett Cannon <bcannon@gmail.com> parents: 34863 diff changeset	3304 /* Must make sure that tracing is not ignored if 'temp' is freed */
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3305 tstate->use_tracing = tstate->c_tracefunc != NULL;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3306 Py_XDECREF(temp);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3307 tstate->c_profilefunc = func;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3308 tstate->c_profileobj = arg;
35125 cdec978b916c Add comments about PyThreadState and the usage of its fields. Brett Cannon <bcannon@gmail.com> parents: 34863 diff changeset	3309 /* Flag that tracing or profiling is turned on */
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3310 tstate->use_tracing = (func != NULL) \|\| (tstate->c_tracefunc != NULL);
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3311 }
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3312
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3313 void
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3314 PyEval_SetTrace(Py_tracefunc func, PyObject *arg)
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3315 {
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	3316 PyThreadState *tstate = PyThreadState_GET();
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3317 PyObject *temp = tstate->c_traceobj;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3318 Py_XINCREF(arg);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3319 tstate->c_tracefunc = NULL;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3320 tstate->c_traceobj = NULL;
35125 cdec978b916c Add comments about PyThreadState and the usage of its fields. Brett Cannon <bcannon@gmail.com> parents: 34863 diff changeset	3321 /* Must make sure that profiling is not ignored if 'temp' is freed */
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3322 tstate->use_tracing = tstate->c_profilefunc != NULL;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3323 Py_XDECREF(temp);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3324 tstate->c_tracefunc = func;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3325 tstate->c_traceobj = arg;
35125 cdec978b916c Add comments about PyThreadState and the usage of its fields. Brett Cannon <bcannon@gmail.com> parents: 34863 diff changeset	3326 /* Flag that tracing or profiling is turned on */
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3327 tstate->use_tracing = ((func != NULL)
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3328 \|\| (tstate->c_profilefunc != NULL));
18136 4cb34314bd97 Instead of initializing & interning the strings passed to the profile Fred Drake <fdrake@acm.org> parents: 18128 diff changeset	3329 }
4cb34314bd97 Instead of initializing & interning the strings passed to the profile Fred Drake <fdrake@acm.org> parents: 18128 diff changeset	3330
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3331 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3332 PyEval_GetBuiltins(void)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3333 {
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3334 PyFrameObject *current_frame = PyEval_GetFrame();
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3335 if (current_frame == NULL)
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	3336 return PyThreadState_GET()->interp->builtins;
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3337 else
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3338 return current_frame->f_builtins;
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3339 }
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3340
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3341 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3342 PyEval_GetLocals(void)
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3343 {
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3344 PyFrameObject *current_frame = PyEval_GetFrame();
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3345 if (current_frame == NULL)
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3346 return NULL;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3347 PyFrame_FastToLocals(current_frame);
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3348 return current_frame->f_locals;
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3349 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3350
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3351 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3352 PyEval_GetGlobals(void)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3353 {
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3354 PyFrameObject *current_frame = PyEval_GetFrame();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3355 if (current_frame == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3356 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3357 else
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3358 return current_frame->f_globals;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3359 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3360
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3361 PyFrameObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3362 PyEval_GetFrame(void)
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3363 {
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	3364 PyThreadState *tstate = PyThreadState_GET();
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3365 return _PyThreadState_GetFrame(tstate);
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3366 }
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3367
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3368 int
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3369 PyEval_MergeCompilerFlags(PyCompilerFlags *cf)
17124 a8301d4ed2b1 If a code object is compiled with nested scopes, define the CO_NESTED flag. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17114 diff changeset	3370 {
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3371 PyFrameObject *current_frame = PyEval_GetFrame();
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27712 diff changeset	3372 int result = cf->cf_flags != 0;
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3373
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3374 if (current_frame != NULL) {
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3375 const int codeflags = current_frame->f_code->co_flags;
19350 5b6a6d7d44ae ceval, PyEval_MergeCompilerFlags: wasn't merging in the Tim Peters <tim.peters@gmail.com> parents: 19301 diff changeset	3376 const int compilerflags = codeflags & PyCF_MASK;
5b6a6d7d44ae ceval, PyEval_MergeCompilerFlags: wasn't merging in the Tim Peters <tim.peters@gmail.com> parents: 19301 diff changeset	3377 if (compilerflags) {
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3378 result = 1;
19350 5b6a6d7d44ae ceval, PyEval_MergeCompilerFlags: wasn't merging in the Tim Peters <tim.peters@gmail.com> parents: 19301 diff changeset	3379 cf->cf_flags \|= compilerflags;
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3380 }
22468 eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22398 diff changeset	3381 #if 0 /* future keyword */
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3382 if (codeflags & CO_GENERATOR_ALLOWED) {
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3383 result = 1;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3384 cf->cf_flags \|= CO_GENERATOR_ALLOWED;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3385 }
22468 eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22398 diff changeset	3386 #endif
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3387 }
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3388 return result;
17124 a8301d4ed2b1 If a code object is compiled with nested scopes, define the CO_NESTED flag. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17114 diff changeset	3389 }
a8301d4ed2b1 If a code object is compiled with nested scopes, define the CO_NESTED flag. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17114 diff changeset	3390
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3391
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3392 /* External interface to call any callable object.
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3393 The arg must be a tuple or NULL. */
314 e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	3394
6206 77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3395 #undef PyEval_CallObject
77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3396 /* for backward compatibility: export this interface */
77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3397
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3398 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3399 PyEval_CallObject(PyObject func, PyObject arg)
314 e83852d1a5e2 Add interface to call a Python function (or other callable) object Guido van Rossum <guido@python.org> parents: 312 diff changeset	3400 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3401 return PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3402 }
6206 77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3403 #define PyEval_CallObject(func,arg) \
77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3404 PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3405
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3406 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3407 PyEval_CallObjectWithKeywords(PyObject func, PyObject arg, PyObject *kw)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3408 {
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3409 PyObject *result;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3410
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36803 diff changeset	3411 if (arg == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3412 arg = PyTuple_New(0);
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36803 diff changeset	3413 if (arg == NULL)
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36803 diff changeset	3414 return NULL;
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36803 diff changeset	3415 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3416 else if (!PyTuple_Check(arg)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3417 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3418 "argument list must be a tuple");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3419 return NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3420 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3421 else
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3422 Py_INCREF(arg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3423
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3424 if (kw != NULL && !PyDict_Check(kw)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3425 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3426 "keyword list must be a dictionary");
12440 d47460b1a679 Charles Waldman writes: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	3427 Py_DECREF(arg);
2894 4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	3428 return NULL;
4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	3429 }
4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	3430
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3431 result = PyObject_Call(func, arg, kw);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3432 Py_DECREF(arg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3433 return result;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3434 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3435
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35745 diff changeset	3436 const char *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3437 PyEval_GetFuncName(PyObject *func)
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3438 {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3439 if (PyMethod_Check(func))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3440 return PyEval_GetFuncName(PyMethod_GET_FUNCTION(func));
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3441 else if (PyFunction_Check(func))
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3442 return PyString_AsString(((PyFunctionObject*)func)->func_name);
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3443 else if (PyCFunction_Check(func))
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3444 return ((PyCFunctionObject*)func)->m_ml->ml_name;
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3445 else
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3446 return func->ob_type->tp_name;
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3447 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3448
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35745 diff changeset	3449 const char *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3450 PyEval_GetFuncDesc(PyObject *func)
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3451 {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3452 if (PyMethod_Check(func))
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3453 return "()";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3454 else if (PyFunction_Check(func))
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3455 return "()";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3456 else if (PyCFunction_Check(func))
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3457 return "()";
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3458 else
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3459 return " object";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3460 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3461
26141 6ce9228a3da2 Make private functions static so we don't pollute the namespace Neal Norwitz <nnorwitz@gmail.com> parents: 26110 diff changeset	3462 static void
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3463 err_args(PyObject *func, int flags, int nargs)
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3464 {
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3465 if (flags & METH_NOARGS)
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3466 PyErr_Format(PyExc_TypeError,
24978 b1ab4e8d7d9c The error messages in err_args() -- which is only called when the Guido van Rossum <guido@python.org> parents: 24916 diff changeset	3467 "%.200s() takes no arguments (%d given)",
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3468 ((PyCFunctionObject *)func)->m_ml->ml_name,
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3469 nargs);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3470 else
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3471 PyErr_Format(PyExc_TypeError,
24978 b1ab4e8d7d9c The error messages in err_args() -- which is only called when the Guido van Rossum <guido@python.org> parents: 24916 diff changeset	3472 "%.200s() takes exactly one argument (%d given)",
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3473 ((PyCFunctionObject *)func)->m_ml->ml_name,
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3474 nargs);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3475 }
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3476
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3477 #define C_TRACE(x, call) \
32409 77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3478 if (tstate->use_tracing && tstate->c_profilefunc) { \
77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3479 if (call_trace(tstate->c_profilefunc, \
77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3480 tstate->c_profileobj, \
77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3481 tstate->frame, PyTrace_C_CALL, \
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3482 func)) { \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3483 x = NULL; \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3484 } \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3485 else { \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3486 x = call; \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3487 if (tstate->c_profilefunc != NULL) { \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3488 if (x == NULL) { \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3489 call_trace_protected(tstate->c_profilefunc, \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3490 tstate->c_profileobj, \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3491 tstate->frame, PyTrace_C_EXCEPTION, \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3492 func); \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3493 /* XXX should pass (type, value, tb) */ \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3494 } else { \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3495 if (call_trace(tstate->c_profilefunc, \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3496 tstate->c_profileobj, \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3497 tstate->frame, PyTrace_C_RETURN, \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3498 func)) { \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3499 Py_DECREF(x); \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3500 x = NULL; \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3501 } \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3502 } \
31796 1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3503 } \
32409 77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3504 } \
77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3505 } else { \
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3506 x = call; \
31796 1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3507 }
1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3508
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3509 static PyObject *
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3510 call_function(PyObject ***pp_stack, int oparg
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3511 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3512 , uint64* pintr0, uint64* pintr1
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3513 #endif
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3514 )
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3515 {
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3516 int na = oparg & 0xff;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3517 int nk = (oparg>>8) & 0xff;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3518 int n = na + 2 * nk;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3519 PyObject *pfunc = (pp_stack) - n - 1;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3520 PyObject func = pfunc;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3521 PyObject x, w;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3522
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3523 /* Always dispatch PyCFunction first, because these are
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3524 presumed to be the most frequent callable object.
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3525 */
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3526 if (PyCFunction_Check(func) && nk == 0) {
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3527 int flags = PyCFunction_GET_FLAGS(func);
32412 393c15c0c5a4 Get ceval.c to compile again by moving declarations before other statments. Raymond Hettinger <python@rcn.com> parents: 32409 diff changeset	3528 PyThreadState *tstate = PyThreadState_GET();
393c15c0c5a4 Get ceval.c to compile again by moving declarations before other statments. Raymond Hettinger <python@rcn.com> parents: 32409 diff changeset	3529
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3530 PCALL(PCALL_CFUNCTION);
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3531 if (flags & (METH_NOARGS \| METH_O)) {
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3532 PyCFunction meth = PyCFunction_GET_FUNCTION(func);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3533 PyObject *self = PyCFunction_GET_SELF(func);
31796 1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3534 if (flags & METH_NOARGS && na == 0) {
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3535 C_TRACE(x, (*meth)(self,NULL));
31796 1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3536 }
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3537 else if (flags & METH_O && na == 1) {
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3538 PyObject arg = EXT_POP(pp_stack);
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3539 C_TRACE(x, (*meth)(self,arg));
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3540 Py_DECREF(arg);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3541 }
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3542 else {
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3543 err_args(func, flags, na);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3544 x = NULL;
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3545 }
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3546 }
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3547 else {
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3548 PyObject *callargs;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3549 callargs = load_args(pp_stack, na);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	3550 READ_TIMESTAMP(*pintr0);
35609 23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3551 C_TRACE(x, PyCFunction_Call(func,callargs,NULL));
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	3552 READ_TIMESTAMP(*pintr1);
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3553 Py_XDECREF(callargs);
9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3554 }
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3555 } else {
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3556 if (PyMethod_Check(func) && PyMethod_GET_SELF(func) != NULL) {
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3557 /* optimize access to bound methods */
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3558 PyObject *self = PyMethod_GET_SELF(func);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3559 PCALL(PCALL_METHOD);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3560 PCALL(PCALL_BOUND_METHOD);
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3561 Py_INCREF(self);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3562 func = PyMethod_GET_FUNCTION(func);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3563 Py_INCREF(func);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3564 Py_DECREF(*pfunc);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3565 *pfunc = self;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3566 na++;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3567 n++;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3568 } else
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3569 Py_INCREF(func);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	3570 READ_TIMESTAMP(*pintr0);
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3571 if (PyFunction_Check(func))
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3572 x = fast_function(func, pp_stack, n, na, nk);
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3573 else
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3574 x = do_call(func, pp_stack, na, nk);
34442 683719e04218 Change the name of the macro used by --with-tsc builds to the less Michael W. Hudson <mwh@python.net> parents: 34371 diff changeset	3575 READ_TIMESTAMP(*pintr1);
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3576 Py_DECREF(func);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3577 }
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3578
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3579 /* Clear the stack of the function object. Also removes
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3580 the arguments in case they weren't consumed already
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	3581 (fast_function() and err_args() leave them on the stack).
36756 d0ca6302dd3c Put back the essence of Jeremy's original XXX comment. Thomas Wouters <thomas@python.org> parents: 36751 diff changeset	3582 */
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3583 while ((*pp_stack) > pfunc) {
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3584 w = EXT_POP(*pp_stack);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3585 Py_DECREF(w);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3586 PCALL(PCALL_POP);
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3587 }
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3588 return x;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3589 }
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3590
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3591 /* The fast_function() function optimize calls for which no argument
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3592 tuple is necessary; the objects are passed directly from the stack.
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3593 For the simplest case -- a function that takes only positional
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3594 arguments and is called with only positional arguments -- it
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3595 inlines the most primitive frame setup code from
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3596 PyEval_EvalCodeEx(), which vastly reduces the checks that must be
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3597 done before evaluating the frame.
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3598 */
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3599
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3600 static PyObject *
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3601 fast_function(PyObject func, PyObject **pp_stack, int n, int na, int nk)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3602 {
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3603 PyCodeObject co = (PyCodeObject )PyFunction_GET_CODE(func);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3604 PyObject *globals = PyFunction_GET_GLOBALS(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3605 PyObject *argdefs = PyFunction_GET_DEFAULTS(func);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3606 PyObject *kwdefs = PyFunction_GET_KW_DEFAULTS(func);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3607 PyObject **d = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3608 int nd = 0;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3609
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3610 PCALL(PCALL_FUNCTION);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3611 PCALL(PCALL_FAST_FUNCTION);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3612 if (argdefs == NULL && co->co_argcount == n &&
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3613 co->co_kwonlyargcount == 0 && nk==0 &&
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3614 co->co_flags == (CO_OPTIMIZED \| CO_NEWLOCALS \| CO_NOFREE)) {
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3615 PyFrameObject *f;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3616 PyObject *retval = NULL;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3617 PyThreadState *tstate = PyThreadState_GET();
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3618 PyObject fastlocals, stack;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3619 int i;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3620
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3621 PCALL(PCALL_FASTER_FUNCTION);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3622 assert(globals != NULL);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3623 /* XXX Perhaps we should create a specialized
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3624 PyFrame_New() that doesn't take locals, but does
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3625 take builtins without sanity checking them.
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3626 */
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3627 assert(tstate != NULL);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3628 f = PyFrame_New(tstate, co, globals, NULL);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3629 if (f == NULL)
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3630 return NULL;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3631
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3632 fastlocals = f->f_localsplus;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3633 stack = (*pp_stack) - n;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3634
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3635 for (i = 0; i < n; i++) {
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3636 Py_INCREF(*stack);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3637 fastlocals[i] = *stack++;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3638 }
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	3639 retval = PyEval_EvalFrameEx(f,0);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3640 ++tstate->recursion_depth;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3641 Py_DECREF(f);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3642 --tstate->recursion_depth;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3643 return retval;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3644 }
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3645 if (argdefs != NULL) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3646 d = &PyTuple_GET_ITEM(argdefs, 0);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3647 nd = ((PyTupleObject *)argdefs)->ob_size;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3648 }
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3649 return PyEval_EvalCodeEx(co, globals,
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3650 (PyObject )NULL, (pp_stack)-n, na,
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3651 (pp_stack)-2nk, nk, d, nd, kwdefs,
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3652 PyFunction_GET_CLOSURE(func));
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3653 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3654
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3655 static PyObject *
15899 152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15830 diff changeset	3656 update_keyword_args(PyObject orig_kwdict, int nk, PyObject **pp_stack,
152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15830 diff changeset	3657 PyObject *func)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3658 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3659 PyObject *kwdict = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3660 if (orig_kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3661 kwdict = PyDict_New();
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3662 else {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3663 kwdict = PyDict_Copy(orig_kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3664 Py_DECREF(orig_kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3665 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3666 if (kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3667 return NULL;
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	3668 while (--nk >= 0) {
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3669 int err;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3670 PyObject value = EXT_POP(pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3671 PyObject key = EXT_POP(pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3672 if (PyDict_GetItem(kwdict, key) != NULL) {
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3673 PyErr_Format(PyExc_TypeError,
15899 152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15830 diff changeset	3674 "%.200s%s got multiple values "
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3675 "for keyword argument '%.200s'",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3676 PyEval_GetFuncName(func),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3677 PyEval_GetFuncDesc(func),
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3678 PyString_AsString(key));
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3679 Py_DECREF(key);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3680 Py_DECREF(value);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3681 Py_DECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3682 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3683 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3684 err = PyDict_SetItem(kwdict, key, value);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3685 Py_DECREF(key);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3686 Py_DECREF(value);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3687 if (err) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3688 Py_DECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3689 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3690 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3691 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3692 return kwdict;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3693 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3694
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3695 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3696 update_star_args(int nstack, int nstar, PyObject *stararg,
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3697 PyObject ***pp_stack)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3698 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3699 PyObject callargs, w;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3700
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3701 callargs = PyTuple_New(nstack + nstar);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3702 if (callargs == NULL) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3703 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3704 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3705 if (nstar) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3706 int i;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3707 for (i = 0; i < nstar; i++) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3708 PyObject *a = PyTuple_GET_ITEM(stararg, i);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3709 Py_INCREF(a);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3710 PyTuple_SET_ITEM(callargs, nstack + i, a);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3711 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3712 }
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	3713 while (--nstack >= 0) {
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3714 w = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3715 PyTuple_SET_ITEM(callargs, nstack, w);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3716 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3717 return callargs;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3718 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3719
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3720 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3721 load_args(PyObject ***pp_stack, int na)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3722 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3723 PyObject *args = PyTuple_New(na);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3724 PyObject *w;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3725
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3726 if (args == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3727 return NULL;
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	3728 while (--na >= 0) {
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3729 w = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3730 PyTuple_SET_ITEM(args, na, w);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3731 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3732 return args;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3733 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3734
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3735 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3736 do_call(PyObject func, PyObject **pp_stack, int na, int nk)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3737 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3738 PyObject *callargs = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3739 PyObject *kwdict = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3740 PyObject *result = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3741
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3742 if (nk > 0) {
15899 152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15830 diff changeset	3743 kwdict = update_keyword_args(NULL, nk, pp_stack, func);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3744 if (kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3745 goto call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3746 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3747 callargs = load_args(pp_stack, na);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3748 if (callargs == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3749 goto call_fail;
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3750 #ifdef CALL_PROFILE
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3751 /* At this point, we have to look at the type of func to
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3752 update the call stats properly. Do it here so as to avoid
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3753 exposing the call stats machinery outside ceval.c
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3754 */
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3755 if (PyFunction_Check(func))
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3756 PCALL(PCALL_FUNCTION);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3757 else if (PyMethod_Check(func))
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3758 PCALL(PCALL_METHOD);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3759 else if (PyType_Check(func))
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3760 PCALL(PCALL_TYPE);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3761 else
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3762 PCALL(PCALL_OTHER);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3763 #endif
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3764 result = PyObject_Call(func, callargs, kwdict);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3765 call_fail:
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3766 Py_XDECREF(callargs);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3767 Py_XDECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3768 return result;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3769 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3770
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3771 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3772 ext_do_call(PyObject func, PyObject **pp_stack, int flags, int na, int nk)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3773 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3774 int nstar = 0;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3775 PyObject *callargs = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3776 PyObject *stararg = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3777 PyObject *kwdict = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3778 PyObject *result = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3779
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3780 if (flags & CALL_FLAG_KW) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3781 kwdict = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3782 if (!(kwdict && PyDict_Check(kwdict))) {
15899 152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15830 diff changeset	3783 PyErr_Format(PyExc_TypeError,
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3784 "%s%s argument after ** "
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3785 "must be a dictionary",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3786 PyEval_GetFuncName(func),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3787 PyEval_GetFuncDesc(func));
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3788 goto ext_call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3789 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3790 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3791 if (flags & CALL_FLAG_VAR) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3792 stararg = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3793 if (!PyTuple_Check(stararg)) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3794 PyObject *t = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3795 t = PySequence_Tuple(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3796 if (t == NULL) {
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3797 if (PyErr_ExceptionMatches(PyExc_TypeError)) {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3798 PyErr_Format(PyExc_TypeError,
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3799 "%s%s argument after * "
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3800 "must be a sequence",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3801 PyEval_GetFuncName(func),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3802 PyEval_GetFuncDesc(func));
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3803 }
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3804 goto ext_call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3805 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3806 Py_DECREF(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3807 stararg = t;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3808 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3809 nstar = PyTuple_GET_SIZE(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3810 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3811 if (nk > 0) {
15899 152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15830 diff changeset	3812 kwdict = update_keyword_args(kwdict, nk, pp_stack, func);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3813 if (kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3814 goto ext_call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3815 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3816 callargs = update_star_args(na, nstar, stararg, pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3817 if (callargs == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3818 goto ext_call_fail;
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3819 #ifdef CALL_PROFILE
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3820 /* At this point, we have to look at the type of func to
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3821 update the call stats properly. Do it here so as to avoid
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3822 exposing the call stats machinery outside ceval.c
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3823 */
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3824 if (PyFunction_Check(func))
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3825 PCALL(PCALL_FUNCTION);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3826 else if (PyMethod_Check(func))
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3827 PCALL(PCALL_METHOD);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3828 else if (PyType_Check(func))
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3829 PCALL(PCALL_TYPE);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3830 else
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3831 PCALL(PCALL_OTHER);
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3832 #endif
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3833 result = PyObject_Call(func, callargs, kwdict);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3834 ext_call_fail:
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3835 Py_XDECREF(callargs);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3836 Py_XDECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3837 Py_XDECREF(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3838 return result;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3839 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3840
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3841 /* Extract a slice index from a PyInt or PyLong or an object with the
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3842 nb_index slot defined, and store in *pi.
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3843 Silently reduce values larger than PY_SSIZE_T_MAX to PY_SSIZE_T_MAX,
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3844 and silently boost values less than -PY_SSIZE_T_MAX-1 to -PY_SSIZE_T_MAX-1.
36558 d3685f9b7b71 Remove size constraints in SLICE opcodes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	3845 Return 0 on error, 1 on success.
21440 30efe46f8e3c _PyEval_SliceIndex(): Repaired the comments, and added XXX comments Tim Peters <tim.peters@gmail.com> parents: 21398 diff changeset	3846 */
21441 05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks Tim Peters <tim.peters@gmail.com> parents: 21440 diff changeset	3847 /* Note: If v is NULL, return success without storing into *pi. This
05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks Tim Peters <tim.peters@gmail.com> parents: 21440 diff changeset	3848 is because_PyEval_SliceIndex() is called by apply_slice(), which can be
05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks Tim Peters <tim.peters@gmail.com> parents: 21440 diff changeset	3849 called by the SLICE opcode with v and/or w equal to NULL.
21440 30efe46f8e3c _PyEval_SliceIndex(): Repaired the comments, and added XXX comments Tim Peters <tim.peters@gmail.com> parents: 21398 diff changeset	3850 */
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	3851 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	3852 _PyEval_SliceIndex(PyObject v, Py_ssize_t pi)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3853 {
21441 05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks Tim Peters <tim.peters@gmail.com> parents: 21440 diff changeset	3854 if (v != NULL) {
36558 d3685f9b7b71 Remove size constraints in SLICE opcodes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	3855 Py_ssize_t x;
40626 4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40582 diff changeset	3856 if (PyInt_CheckExact(v)) {
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3857 /* XXX(nnorwitz): I think PyInt_AS_LONG is correct,
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3858 however, it looks like it should be AsSsize_t.
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3859 There should be a comment here explaining why.
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3860 */
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3861 x = PyInt_AS_LONG(v);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3862 }
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3863 else if (PyIndex_Check(v)) {
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3864 x = PyNumber_AsSsize_t(v, NULL);
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3865 if (x == -1 && PyErr_Occurred())
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3866 return 0;
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3867 }
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3868 else {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3869 PyErr_SetString(PyExc_TypeError,
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3870 "slice indices must be integers or "
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3871 "None or have an __index__ method");
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	3872 return 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3873 }
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3874 *pi = x;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3875 }
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	3876 return 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3877 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3878
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3879 #undef ISINDEX
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3880 #define ISINDEX(x) ((x) == NULL \|\| \
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3881 PyInt_Check(x) \|\| PyLong_Check(x) \|\| PyIndex_Check(x))
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3882
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3883 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3884 apply_slice(PyObject u, PyObject v, PyObject w) / return u[v:w] */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3885 {
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3886 PyTypeObject *tp = u->ob_type;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3887 PySequenceMethods *sq = tp->tp_as_sequence;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3888
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	3889 if (sq && sq->sq_slice && ISINDEX(v) && ISINDEX(w)) {
36558 d3685f9b7b71 Remove size constraints in SLICE opcodes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	3890 Py_ssize_t ilow = 0, ihigh = PY_SSIZE_T_MAX;
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3891 if (!_PyEval_SliceIndex(v, &ilow))
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3892 return NULL;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3893 if (!_PyEval_SliceIndex(w, &ihigh))
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3894 return NULL;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3895 return PySequence_GetSlice(u, ilow, ihigh);
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3896 }
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3897 else {
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3898 PyObject *slice = PySlice_New(v, w, NULL);
21171 2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3899 if (slice != NULL) {
2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3900 PyObject *res = PyObject_GetItem(u, slice);
2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3901 Py_DECREF(slice);
2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3902 return res;
2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3903 }
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3904 else
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3905 return NULL;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3906 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3907 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3908
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3909 static int
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3910 assign_slice(PyObject u, PyObject v, PyObject w, PyObject x)
3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3911 /* u[v:w] = x */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3912 {
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3913 PyTypeObject *tp = u->ob_type;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3914 PySequenceMethods *sq = tp->tp_as_sequence;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3915
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	3916 if (sq && sq->sq_ass_slice && ISINDEX(v) && ISINDEX(w)) {
36558 d3685f9b7b71 Remove size constraints in SLICE opcodes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	3917 Py_ssize_t ilow = 0, ihigh = PY_SSIZE_T_MAX;
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3918 if (!_PyEval_SliceIndex(v, &ilow))
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3919 return -1;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3920 if (!_PyEval_SliceIndex(w, &ihigh))
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3921 return -1;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3922 if (x == NULL)
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3923 return PySequence_DelSlice(u, ilow, ihigh);
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3924 else
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3925 return PySequence_SetSlice(u, ilow, ihigh, x);
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3926 }
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3927 else {
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3928 PyObject *slice = PySlice_New(v, w, NULL);
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3929 if (slice != NULL) {
21171 2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3930 int res;
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3931 if (x != NULL)
21171 2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3932 res = PyObject_SetItem(u, slice, x);
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3933 else
21171 2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3934 res = PyObject_DelItem(u, slice);
2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3935 Py_DECREF(slice);
2458cbcc1dd3 Fix the final two issues in Armin Rigo's SF bug #488477: apply_slice() Guido van Rossum <guido@python.org> parents: 21170 diff changeset	3936 return res;
19369 8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3937 }
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3938 else
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3939 return -1;
8c2a29b7548e Fix SF bug #443600: Guido van Rossum <guido@python.org> parents: 19350 diff changeset	3940 }
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3941 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3942
40946 d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3943 #define CANNOT_CATCH_MSG "catching classes that do not inherit from"\
d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3944 "BaseException is not allowed"
40942 4b9d0dac79cc You can no longer catch non-BaseException objects; TypeError is raised if such Brett Cannon <bcannon@gmail.com> parents: 40937 diff changeset	3945
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3946 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3947 cmp_outcome(int op, register PyObject v, register PyObject w)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3948 {
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3949 int res = 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3950 switch (op) {
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3951 case PyCmp_IS:
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3952 res = (v == w);
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3953 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3954 case PyCmp_IS_NOT:
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3955 res = (v != w);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3956 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3957 case PyCmp_IN:
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3958 res = PySequence_Contains(w, v);
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3959 if (res < 0)
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3960 return NULL;
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3961 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3962 case PyCmp_NOT_IN:
8403 c4df8b6637b6 Moved cmp_member() to abstract.c, as PySequence_Contains() [with Guido van Rossum <guido@python.org> parents: 8328 diff changeset	3963 res = PySequence_Contains(w, v);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3964 if (res < 0)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3965 return NULL;
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	3966 res = !res;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3967 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3968 case PyCmp_EXC_MATCH:
40742 f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3969 if (PyTuple_Check(w)) {
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3970 Py_ssize_t i, length;
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3971 length = PyTuple_Size(w);
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3972 for (i = 0; i < length; i += 1) {
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3973 PyObject *exc = PyTuple_GET_ITEM(w, i);
40946 d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3974 if (!PyExceptionClass_Check(exc)) {
d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3975 PyErr_SetString(PyExc_TypeError,
d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3976 CANNOT_CATCH_MSG);
40942 4b9d0dac79cc You can no longer catch non-BaseException objects; TypeError is raised if such Brett Cannon <bcannon@gmail.com> parents: 40937 diff changeset	3977 return NULL;
40742 f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3978 }
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3979 }
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3980 }
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3981 else {
40946 d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3982 if (!PyExceptionClass_Check(w)) {
d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3983 PyErr_SetString(PyExc_TypeError,
d976c9a63111 Make it so TypeError is raised if an instance of an object is put in an Brett Cannon <bcannon@gmail.com> parents: 40943 diff changeset	3984 CANNOT_CATCH_MSG);
40942 4b9d0dac79cc You can no longer catch non-BaseException objects; TypeError is raised if such Brett Cannon <bcannon@gmail.com> parents: 40937 diff changeset	3985 return NULL;
40742 f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3986 }
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	3987 }
6147 b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	3988 res = PyErr_GivenExceptionMatches(v, w);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3989 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3990 default:
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3991 return PyObject_RichCompare(v, w, op);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3992 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3993 v = res ? Py_True : Py_False;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3994 Py_INCREF(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3995 return v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3996 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3997
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3998 static PyObject *
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	3999 import_from(PyObject v, PyObject name)
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4000 {
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4001 PyObject *x;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4002
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4003 x = PyObject_GetAttr(v, name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4004 if (x == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4005 PyErr_Format(PyExc_ImportError,
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4006 "cannot import name %.230s",
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4007 PyString_AsString(name));
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4008 }
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4009 return x;
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4010 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	4011
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4012 static int
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4013 import_all_from(PyObject locals, PyObject v)
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4014 {
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4015 PyObject *all = PyObject_GetAttrString(v, "__all__");
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4016 PyObject dict, name, *value;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4017 int skip_leading_underscores = 0;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4018 int pos, err;
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4019
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4020 if (all == NULL) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4021 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4022 return -1; /* Unexpected error */
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4023 PyErr_Clear();
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4024 dict = PyObject_GetAttrString(v, "__dict__");
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4025 if (dict == NULL) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4026 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4027 return -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4028 PyErr_SetString(PyExc_ImportError,
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4029 "from-import-* object has no __dict__ and no __all__");
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4030 return -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4031 }
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4032 all = PyMapping_Keys(dict);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4033 Py_DECREF(dict);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4034 if (all == NULL)
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4035 return -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4036 skip_leading_underscores = 1;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	4037 }
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4038
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4039 for (pos = 0, err = 0; ; pos++) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4040 name = PySequence_GetItem(all, pos);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4041 if (name == NULL) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4042 if (!PyErr_ExceptionMatches(PyExc_IndexError))
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4043 err = -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4044 else
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4045 PyErr_Clear();
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4046 break;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4047 }
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4048 if (skip_leading_underscores &&
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4049 PyString_Check(name) &&
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4050 PyString_AS_STRING(name)[0] == '_')
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4051 {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4052 Py_DECREF(name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4053 continue;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4054 }
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4055 value = PyObject_GetAttr(v, name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4056 if (value == NULL)
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4057 err = -1;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	4058 else if (PyDict_CheckExact(locals))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	4059 err = PyDict_SetItem(locals, name, value);
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4060 else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	4061 err = PyObject_SetItem(locals, name, value);
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4062 Py_DECREF(name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4063 Py_XDECREF(value);
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4064 if (err != 0)
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4065 break;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4066 }
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4067 Py_DECREF(all);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4068 return err;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4069 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4070
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	4071 static void
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4072 format_exc_check_arg(PyObject exc, char format_str, PyObject *obj)
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4073 {
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4074 char *obj_str;
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4075
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4076 if (!obj)
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4077 return;
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4078
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4079 obj_str = PyString_AsString(obj);
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4080 if (!obj_str)
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4081 return;
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4082
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4083 PyErr_Format(exc, format_str, obj_str);
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4084 }
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4085
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4086 static PyObject *
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4087 string_concatenate(PyObject v, PyObject w,
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4088 PyFrameObject f, unsigned char next_instr)
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4089 {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4090 /* This function implements 'variable += expr' when both arguments
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4091 are strings. */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4092 Py_ssize_t v_len = PyString_GET_SIZE(v);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4093 Py_ssize_t w_len = PyString_GET_SIZE(w);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4094 Py_ssize_t new_len = v_len + w_len;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4095 if (new_len < 0) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4096 PyErr_SetString(PyExc_OverflowError,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4097 "strings are too large to concat");
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4098 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4099 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4100
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4101 if (v->ob_refcnt == 2) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4102 /* In the common case, there are 2 references to the value
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4103 * stored in 'variable' when the += is performed: one on the
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4104 * value stack (in 'v') and one still stored in the 'variable'.
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4105 * We try to delete the variable now to reduce the refcnt to 1.
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4106 */
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4107 switch (*next_instr) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4108 case STORE_FAST:
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4109 {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4110 int oparg = PEEKARG();
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4111 PyObject **fastlocals = f->f_localsplus;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4112 if (GETLOCAL(oparg) == v)
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4113 SETLOCAL(oparg, NULL);
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4114 break;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4115 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4116 case STORE_DEREF:
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4117 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4118 PyObject **freevars = f->f_localsplus + f->f_code->co_nlocals;
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4119 PyObject *c = freevars[PEEKARG()];
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4120 if (PyCell_GET(c) == v)
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4121 PyCell_Set(c, NULL);
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4122 break;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4123 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4124 case STORE_NAME:
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4125 {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4126 PyObject *names = f->f_code->co_names;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4127 PyObject *name = GETITEM(names, PEEKARG());
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4128 PyObject *locals = f->f_locals;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4129 if (PyDict_CheckExact(locals) &&
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4130 PyDict_GetItem(locals, name) == v) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4131 if (PyDict_DelItem(locals, name) != 0) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4132 PyErr_Clear();
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4133 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4134 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4135 break;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4136 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4137 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4138 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4139
33030 8607ac2f81c8 This was quite a dark bug in my recent in-place string concatenation Armin Rigo <arigo@tunes.org> parents: 32974 diff changeset	4140 if (v->ob_refcnt == 1 && !PyString_CHECK_INTERNED(v)) {
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4141 /* Now we own the last reference to 'v', so we can resize it
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4142 * in-place.
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4143 */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4144 if (_PyString_Resize(&v, new_len) != 0) {
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4145 /* XXX if _PyString_Resize() fails, 'v' has been
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4146 * deallocated so it cannot be put back into 'variable'.
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4147 * The MemoryError is raised when there is no value in
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4148 * 'variable', which might (very remotely) be a cause
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4149 * of incompatibilities.
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4150 */
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4151 return NULL;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4152 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4153 /* copy 'w' into the newly allocated area of 'v' */
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4154 memcpy(PyString_AS_STRING(v) + v_len,
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4155 PyString_AS_STRING(w), w_len);
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4156 return v;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4157 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4158 else {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4159 /* When in-place resizing is not an option. */
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4160 PyString_Concat(&v, w);
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4161 return v;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4162 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4163 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4164
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4165 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4166
20438 08d7a6756bfe make getarray static - it's only called from ceval.c and is not an Skip Montanaro <skip@pobox.com> parents: 20409 diff changeset	4167 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	4168 getarray(long a[256])
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4169 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4170 int i;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4171 PyObject *l = PyList_New(256);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4172 if (l == NULL) return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4173 for (i = 0; i < 256; i++) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4174 PyObject *x = PyInt_FromLong(a[i]);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4175 if (x == NULL) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4176 Py_DECREF(l);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4177 return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4178 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4179 PyList_SetItem(l, i, x);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4180 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4181 for (i = 0; i < 256; i++)
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4182 a[i] = 0;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4183 return l;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4184 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4185
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4186 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	4187 _Py_GetDXProfile(PyObject self, PyObject args)
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4188 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4189 #ifndef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4190 return getarray(dxp);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4191 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4192 int i;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4193 PyObject *l = PyList_New(257);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4194 if (l == NULL) return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4195 for (i = 0; i < 257; i++) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4196 PyObject *x = getarray(dxpairs[i]);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4197 if (x == NULL) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4198 Py_DECREF(l);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4199 return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4200 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4201 PyList_SetItem(l, i, x);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4202 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4203 return l;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4204 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4205 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4206
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4207 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/ceval.c @ 41769:b29d71d43c80