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

annotate Python/ceval.c @ 58664:993f703a61ba

Merged revisions 77484,77487,77561,77570,77593,77603,77608,77667,77702-77703,77739,77858,77887,77889 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77484 | skip.montanaro | 2010-01-13 19:12:34 -0600 (Wed, 13 Jan 2010) | 4 lines Update PyEval_EvalFrame to PyEval_EvalFrameEx. This looks to have been done partially before. Also add a comment describing how this might have to work with different versions of the interpreter. ........ r77487 | ezio.melotti | 2010-01-14 05:34:10 -0600 (Thu, 14 Jan 2010) | 1 line Fixed typo ........ r77561 | georg.brandl | 2010-01-17 02:42:30 -0600 (Sun, 17 Jan 2010) | 1 line #7699: improve datetime docs: straightforward linking to strftime/strptime section, mark classmethods as such. ........ r77570 | georg.brandl | 2010-01-17 06:14:42 -0600 (Sun, 17 Jan 2010) | 1 line Add note about usage of STRINGLIB_EMPTY. ........ r77593 | georg.brandl | 2010-01-17 17:33:53 -0600 (Sun, 17 Jan 2010) | 1 line Fix internal reference. ........ r77603 | benjamin.peterson | 2010-01-18 17:07:56 -0600 (Mon, 18 Jan 2010) | 8 lines data descriptors do not override the class dictionary if __get__ is not defined Adjust documentation and add a test to verify this behavior. See http://mail.python.org/pipermail/python-dev/2010-January/095637.html for discussion. ........ r77608 | gregory.p.smith | 2010-01-19 02:19:03 -0600 (Tue, 19 Jan 2010) | 6 lines Do not compile stubs for the sha2 series hashes in the openssl hashlib module when the openssl version is too old to support them. That leads both compiled code bloat and to unittests attempting to test implementations that don't exist for comparison purposes on such platforms. ........ r77667 | mark.dickinson | 2010-01-21 12:32:27 -0600 (Thu, 21 Jan 2010) | 1 line Add two more test_strtod test values. ........ r77702 | georg.brandl | 2010-01-23 02:43:31 -0600 (Sat, 23 Jan 2010) | 1 line #7762: fix refcount annotation of PyUnicode_Tailmatch(). ........ r77703 | georg.brandl | 2010-01-23 02:47:54 -0600 (Sat, 23 Jan 2010) | 1 line #7725: fix referencing issue. ........ r77739 | benjamin.peterson | 2010-01-24 21:52:52 -0600 (Sun, 24 Jan 2010) | 1 line mention from_float() in error message ........ r77858 | georg.brandl | 2010-01-30 11:57:48 -0600 (Sat, 30 Jan 2010) | 1 line #7802: fix invalid example (heh). ........ r77887 | georg.brandl | 2010-01-31 12:51:49 -0600 (Sun, 31 Jan 2010) | 5 lines Fix-up ftplib documentation: move exception descriptions to toplevel, not inside a class remove attribution in "versionadded" spell and grammar check docstring of FTP_TLS ........ r77889 | michael.foord | 2010-01-31 13:59:26 -0600 (Sun, 31 Jan 2010) | 1 line Minor modification to unittest documentation. ........

author	Benjamin Peterson <benjamin@python.org>
date	Wed, 03 Feb 2010 02:35:45 +0000
parents	fdd6484f1210
children	83c8dfb54421

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
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	31 section should work for GCC on any PowerPC
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	32 platform, irrespective of OS.
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	33 POWER? Who knows :-) */
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	34
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	35 #define READ_TIMESTAMP(var) ppc_getcounter(&var)
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	36
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	37 static void
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	38 ppc_getcounter(uint64 *v)
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	39 {
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	40 register unsigned long tbu, tb, tbu2;
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	41
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	42 loop:
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	43 asm volatile ("mftbu %0" : "=r" (tbu) );
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	44 asm volatile ("mftb %0" : "=r" (tb) );
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	45 asm volatile ("mftbu %0" : "=r" (tbu2));
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	46 if (__builtin_expect(tbu != tbu2, 0)) goto loop;
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	47
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	48 /* 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	49 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	50 ((long*)(v))[0] = tbu;
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	51 ((long*)(v))[1] = tb;
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	52 }
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	53
57004 5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	54 #elif defined(__i386__)
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	55
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	56 /* this is for linux/x86 (and probably any other GCC/x86 combo) */
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	57
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	58 #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	59 __asm__ __volatile__("rdtsc" : "=A" (val))
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	60
57004 5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	61 #elif defined(__x86_64__)
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	62
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	63 /* for gcc/x86_64, the "A" constraint in DI mode means either rax or rdx;
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	64 not edx:eax as it does for i386. Since rdtsc puts its result in edx:eax
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	65 even in 64-bit mode, we need to use "a" and "d" for the lower and upper
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	66 32-bit pieces of the result. */
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	67
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	68 #define READ_TIMESTAMP(val) \
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	69 __asm__ __volatile__("rdtsc" : \
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	70 "=a" (((int)&(val))[0]), "=d" (((int)&(val))[1]));
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	71
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	72
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	73 #else
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	74
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	75 #error "Don't know how to implement timestamp counter for this architecture"
5a99003c9b83 Merged revisions 75982 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56356 diff changeset	76
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	77 #endif
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	78
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	79 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	80 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	81 {
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	82 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	83 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	84 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	85 return;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	86 intr = intr1 - intr0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	87 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	88 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	89 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	90 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	91 }
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	92
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	93 #endif
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	94
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	95 /* 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	96 /* #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	97
4839 4567e158d20c Rename DEBUG macro to Py_DEBUG Guido van Rossum <guido@python.org> parents: 4667 diff changeset	98 #ifdef Py_DEBUG
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	99 /* For debugging the interpreter: */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	100 #define LLTRACE 1 /* Low-level trace feature */
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	101 #define CHECKEXC 1 /* Double-check exception checking */
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	102 #endif
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	103
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	104 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	105
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	106 /* Forward declarations */
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	107 #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	108 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	109 #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	110 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	111 #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	112 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	113 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	114 static PyObject * ext_do_call(PyObject , PyObject **, int, int, int);
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	115 static PyObject * update_keyword_args(PyObject , int, PyObject **,
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	116 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 * 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	118 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	119 #define CALL_FLAG_VAR 1
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	120 #define CALL_FLAG_KW 2
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	121
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	122 #ifdef LLTRACE
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	123 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	124 static int prtrace(PyObject , char );
746 6c0f16008bd9 lint (added prototypes for all static fns) Guido van Rossum <guido@python.org> parents: 708 diff changeset	125 #endif
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	126 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	127 int, PyObject *);
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	128 static int 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	129 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	130 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	131 static int maybe_call_line_trace(Py_tracefunc, PyObject *,
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	132 PyFrameObject , int , int , int );
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	133
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	134 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	135 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	136 static int import_all_from(PyObject , PyObject );
42860 bf1a53cc6e65 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	137 static void format_exc_check_arg(PyObject , const char , PyObject *);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	138 static PyObject * unicode_concatenate(PyObject , PyObject ,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	139 PyFrameObject , unsigned char );
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	140 static PyObject * special_lookup(PyObject , char , PyObject **);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	141
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	142 #define NAME_ERROR_MSG \
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	143 "name '%.200s' is not defined"
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	144 #define GLOBAL_NAME_ERROR_MSG \
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	145 "global name '%.200s' is not defined"
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	146 #define UNBOUNDLOCAL_ERROR_MSG \
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15166 diff changeset	147 "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	148 #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	149 "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	150 " in enclosing scope"
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	151
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	152 /* Dynamic execution profile */
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	153 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	154 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	155 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	156 #define dxp dxpairs[256]
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	157 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	158 static long dxp[256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	159 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	160 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	161
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	162 /* 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	163 #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	164 #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	165 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	166
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	167 #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	168 #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	169 #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	170 #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	171 #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	172 #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	173 #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	174 #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	175 #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	176 #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	177 #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	178
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	179 /* 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	180
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	181 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	182
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	183 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	184 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	185
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	186 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	187 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	188 twice.
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	189
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	190 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	191 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	192 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	193 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	194 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	195 */
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 #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	198
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	199 PyObject *
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	200 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	201 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	202 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	203 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	204 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	205 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	206 }
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	207 #else
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	208 #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	209
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	210 PyObject *
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	211 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	212 {
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	213 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	214 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	215 }
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	216 #endif
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	217
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	218
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	219 #define COMPUTE_EVAL_BREAKER() \
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	220 (eval_breaker = gil_drop_request \| pendingcalls_to_do \| pending_async_exc)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	221
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	222 #define SET_GIL_DROP_REQUEST() \
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	223 do { gil_drop_request = 1; eval_breaker = 1; } while (0)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	224
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	225 #define RESET_GIL_DROP_REQUEST() \
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	226 do { gil_drop_request = 0; COMPUTE_EVAL_BREAKER(); } while (0)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	227
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	228 #define SIGNAL_PENDING_CALLS() \
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	229 do { pendingcalls_to_do = 1; eval_breaker = 1; } while (0)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	230
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	231 #define UNSIGNAL_PENDING_CALLS() \
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	232 do { pendingcalls_to_do = 0; COMPUTE_EVAL_BREAKER(); } while (0)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	233
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	234 #define SIGNAL_ASYNC_EXC() \
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	235 do { pending_async_exc = 1; eval_breaker = 1; } while (0)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	236
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	237 #define UNSIGNAL_ASYNC_EXC() \
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	238 do { pending_async_exc = 0; COMPUTE_EVAL_BREAKER(); } while (0)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	239
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	240
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	241 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	242
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	243 #ifdef HAVE_ERRNO_H
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	244 #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	245 #endif
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9048 diff changeset	246 #include "pythread.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	247
50839 75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	248 static PyThread_type_lock pending_lock = 0; /* for pending calls */
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	249 static long main_thread = 0;
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	250 /* This single variable consolidates all requests to break out of the fast path
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	251 in the eval loop. */
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	252 static volatile int eval_breaker = 0;
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	253 /* Request for droppping the GIL */
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	254 static volatile int gil_drop_request = 0;
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	255 /* Request for running pending calls */
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	256 static volatile int pendingcalls_to_do = 0;
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	257 /* Request for looking at the `async_exc` field of the current thread state */
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	258 static volatile int pending_async_exc = 0;
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	259
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	260 #include "ceval_gil.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	261
33715 a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	262 int
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	263 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	264 {
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	265 return gil_created();
33715 a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	266 }
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Tim Peters <tim.peters@gmail.com> parents: 33501 diff changeset	267
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	268 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	269 PyEval_InitThreads(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	270 {
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	271 if (gil_created())
1179 9ae65ee09735 Various changes. Sjoerd Mullender <sjoerd@acm.org> parents: 1132 diff changeset	272 return;
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	273 create_gil();
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	274 take_gil(PyThreadState_GET());
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9671 diff changeset	275 main_thread = PyThread_get_thread_ident();
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	276 if (!pending_lock)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	277 pending_lock = PyThread_allocate_lock();
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	278 }
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	279
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	280 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	281 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	282 {
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	283 PyThreadState *tstate = PyThreadState_GET();
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	284 if (tstate == NULL)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	285 Py_FatalError("PyEval_AcquireLock: current thread state is NULL");
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	286 take_gil(tstate);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	287 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	288
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	289 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	290 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	291 {
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	292 /* This function must succeed when the current thread state is NULL.
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	293 We therefore avoid PyThreadState_GET() which dumps a fatal error
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	294 in debug mode.
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	295 */
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	296 drop_gil(_PyThreadState_Current);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	297 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	298
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	299 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	300 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	301 {
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	302 if (tstate == NULL)
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	303 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	304 /* Check someone has called PyEval_InitThreads() to create the lock */
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	305 assert(gil_created());
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	306 take_gil(tstate);
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	307 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	308 Py_FatalError(
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	309 "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	310 }
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	311
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	312 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	313 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	314 {
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	315 if (tstate == NULL)
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	316 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	317 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	318 Py_FatalError("PyEval_ReleaseThread: wrong thread state");
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	319 drop_gil(tstate);
5865 9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef Guido van Rossum <guido@python.org> parents: 5846 diff changeset	320 }
14225 cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	321
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	322 /* 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	323 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	324 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	325 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	326
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	327 void
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	328 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	329 {
48516 eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	330 PyObject threading, result;
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	331 PyThreadState *tstate = PyThreadState_GET();
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	332
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	333 if (!gil_created())
14225 cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	334 return;
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	335 /*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	336 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	337 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	338 create a new lock and waste a little bit of memory */
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	339 recreate_gil();
50839 75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	340 pending_lock = PyThread_allocate_lock();
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	341 take_gil(tstate);
14225 cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	342 main_thread = PyThread_get_thread_ident();
48516 eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	343
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	344 /* Update the threading module with the new state.
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	345 */
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	346 tstate = PyThreadState_GET();
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	347 threading = PyMapping_GetItemString(tstate->interp->modules,
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	348 "threading");
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	349 if (threading == NULL) {
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	350 /* threading not imported */
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	351 PyErr_Clear();
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	352 return;
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	353 }
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	354 result = PyObject_CallMethod(threading, "_after_fork", NULL);
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	355 if (result == NULL)
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	356 PyErr_WriteUnraisable(threading);
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	357 else
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	358 Py_DECREF(result);
eefb98379644 Merger 65032 to py3k Jesse Noller <jnoller@gmail.com> parents: 48494 diff changeset	359 Py_DECREF(threading);
14225 cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a Guido van Rossum <guido@python.org> parents: 14163 diff changeset	360 }
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	361
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	362 #else
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	363 static int eval_breaker = 0;
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	364 static int gil_drop_request = 0;
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	365 static int pending_async_exc = 0;
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	366 #endif /* WITH_THREAD */
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	367
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	368 /* This function is used to signal that async exceptions are waiting to be
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	369 raised, therefore it is also useful in non-threaded builds. */
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	370
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	371 void
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	372 _PyEval_SignalAsyncExc(void)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	373 {
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	374 SIGNAL_ASYNC_EXC();
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	375 }
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	376
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	377 /* Functions save_thread and restore_thread are always defined so
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	378 dynamically loaded modules needn't be compiled separately for use
c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	379 with and without threads: */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	380
5846 852a1fa62a7c PyEval_SaveThread() and PyEval_RestoreThread() now return/take a Guido van Rossum <guido@python.org> parents: 5829 diff changeset	381 PyThreadState *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	382 PyEval_SaveThread(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	383 {
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	384 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	385 if (tstate == NULL)
21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	386 Py_FatalError("PyEval_SaveThread: NULL tstate");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	387 #ifdef WITH_THREAD
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	388 if (gil_created())
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	389 drop_gil(tstate);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	390 #endif
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	391 return tstate;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	392 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	393
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	394 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	395 PyEval_RestoreThread(PyThreadState *tstate)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	396 {
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	397 if (tstate == NULL)
21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	398 Py_FatalError("PyEval_RestoreThread: NULL tstate");
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	399 #ifdef WITH_THREAD
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	400 if (gil_created()) {
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	401 int err = errno;
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	402 take_gil(tstate);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	403 errno = err;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	404 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	405 #endif
6365 21b93d98926b Change PyEval_SaveThread() and PyEval_RestoreThread() to always do the Guido van Rossum <guido@python.org> parents: 6243 diff changeset	406 PyThreadState_Swap(tstate);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	407 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	408
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	409
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	410 /* 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	411 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	412 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	413 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	414 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	415 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	416
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	417 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	418 (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	419 an exception condition).
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	420
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	421 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	422 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	423
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	424 #ifdef WITH_THREAD
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	425 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	426 will execute them.
50839 75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	427 There is no facility to schedule calls to a particular thread, but
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	428 that should be easy to change, should that ever be required. In
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	429 that case, the static variables here should go into the python
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	430 threadstate.
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	431 #endif
50839 75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	432 */
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	433
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	434 #ifdef WITH_THREAD
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	435
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	436 /* The WITH_THREAD implementation is thread-safe. It allows
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	437 scheduling to be made from any thread, and even from an executing
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	438 callback.
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	439 */
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	440
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	441 #define NPENDINGCALLS 32
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	442 static struct {
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	443 int (func)(void );
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	444 void *arg;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	445 } pendingcalls[NPENDINGCALLS];
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	446 static int pendingfirst = 0;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	447 static int pendinglast = 0;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	448 static char pendingbusy = 0;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	449
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	450 int
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	451 Py_AddPendingCall(int (func)(void ), void *arg)
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	452 {
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	453 int i, j, result=0;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	454 PyThread_type_lock lock = pending_lock;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	455
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	456 /* try a few times for the lock. Since this mechanism is used
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	457 * for signal handling (on the main thread), there is a (slim)
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	458 * chance that a signal is delivered on the same thread while we
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	459 * hold the lock during the Py_MakePendingCalls() function.
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	460 * This avoids a deadlock in that case.
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	461 * Note that signals can be delivered on any thread. In particular,
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	462 * on Windows, a SIGINT is delivered on a system-created worker
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	463 * thread.
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	464 * We also check for lock being NULL, in the unlikely case that
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	465 * this function is called before any bytecode evaluation takes place.
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	466 */
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	467 if (lock != NULL) {
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	468 for (i = 0; i<100; i++) {
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	469 if (PyThread_acquire_lock(lock, NOWAIT_LOCK))
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	470 break;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	471 }
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	472 if (i == 100)
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	473 return -1;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	474 }
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	475
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	476 i = pendinglast;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	477 j = (i + 1) % NPENDINGCALLS;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	478 if (j == pendingfirst) {
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	479 result = -1; /* Queue full */
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	480 } else {
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	481 pendingcalls[i].func = func;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	482 pendingcalls[i].arg = arg;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	483 pendinglast = j;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	484 }
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	485 /* signal main loop */
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	486 SIGNAL_PENDING_CALLS();
50839 75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	487 if (lock != NULL)
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	488 PyThread_release_lock(lock);
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	489 return result;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	490 }
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	491
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	492 int
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	493 Py_MakePendingCalls(void)
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	494 {
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	495 int i;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	496 int r = 0;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	497
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	498 if (!pending_lock) {
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	499 /* initial allocation of the lock */
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	500 pending_lock = PyThread_allocate_lock();
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	501 if (pending_lock == NULL)
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	502 return -1;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	503 }
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	504
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	505 /* only service pending calls on main thread */
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	506 if (main_thread && PyThread_get_thread_ident() != main_thread)
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	507 return 0;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	508 /* don't perform recursive pending calls */
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	509 if (pendingbusy)
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	510 return 0;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	511 pendingbusy = 1;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	512 /* perform a bounded number of calls, in case of recursion */
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	513 for (i=0; i<NPENDINGCALLS; i++) {
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	514 int j;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	515 int (func)(void );
50840 29edf26b9c23 fix compiler warning Benjamin Peterson <benjamin@python.org> parents: 50839 diff changeset	516 void *arg = NULL;
50839 75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	517
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	518 /* pop one item off the queue while holding the lock */
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	519 PyThread_acquire_lock(pending_lock, WAIT_LOCK);
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	520 j = pendingfirst;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	521 if (j == pendinglast) {
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	522 func = NULL; /* Queue empty */
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	523 } else {
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	524 func = pendingcalls[j].func;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	525 arg = pendingcalls[j].arg;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	526 pendingfirst = (j + 1) % NPENDINGCALLS;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	527 }
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	528 if (pendingfirst != pendinglast)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	529 SIGNAL_PENDING_CALLS();
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	530 else
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	531 UNSIGNAL_PENDING_CALLS();
50839 75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	532 PyThread_release_lock(pending_lock);
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	533 /* having released the lock, perform the callback */
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	534 if (func == NULL)
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	535 break;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	536 r = func(arg);
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	537 if (r)
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	538 break;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	539 }
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	540 pendingbusy = 0;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	541 return r;
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	542 }
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	543
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	544 #else /* if ! defined WITH_THREAD */
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	545
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	546 /*
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	547 WARNING! ASYNCHRONOUSLY EXECUTING CODE!
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	548 This code is used for signal handling in python that isn't built
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	549 with WITH_THREAD.
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	550 Don't use this implementation when Py_AddPendingCalls() can happen
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	551 on a different thread!
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	552
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	553 There are two possible race conditions:
50839 75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	554 (1) nested asynchronous calls to Py_AddPendingCall()
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	555 (2) AddPendingCall() calls made while pending calls are being processed.
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	556
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	557 (1) is very unlikely because typically signal delivery
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	558 is blocked during signal handling. So it should be impossible.
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	559 (2) is a real possibility.
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	560 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	561 The safety against (2) is derived from the fact that only one
50839 75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	562 thread is present, interrupted by signals, and that the critical
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	563 section is protected with the "busy" variable. On Windows, which
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	564 delivers SIGINT on a system thread, this does not hold and therefore
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	565 Windows really shouldn't use this version.
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	566 The two threads could theoretically wiggle around the "busy" variable.
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	567 */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	568
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	569 #define NPENDINGCALLS 32
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	570 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	571 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	572 void *arg;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	573 } pendingcalls[NPENDINGCALLS];
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	574 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	575 static volatile int pendinglast = 0;
50839 75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	576 static volatile int pendingcalls_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	577
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	578 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	579 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	580 {
32526 78bd25b42d46 This closes patch: Michael W. Hudson <mwh@python.net> parents: 32463 diff changeset	581 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	582 int i, j;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	583 /* XXX Begin critical section */
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	584 if (busy)
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	585 return -1;
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	586 busy = 1;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	587 i = pendinglast;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	588 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	589 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	590 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	591 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	592 }
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	593 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	594 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	595 pendinglast = j;
25108 3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 25078 diff changeset	596
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	597 SIGNAL_PENDING_CALLS();
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	598 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	599 /* 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	600 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	601 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	602
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	603 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	604 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	605 {
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	606 static int busy = 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	607 if (busy)
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	608 return 0;
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	609 busy = 1;
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	610 UNSIGNAL_PENDING_CALLS();
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	611 for (;;) {
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	612 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	613 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	614 void *arg;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	615 i = pendingfirst;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	616 if (i == pendinglast)
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	617 break; /* Queue empty */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	618 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	619 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	620 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	621 if (func(arg) < 0) {
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	622 busy = 0;
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	623 SIGNAL_PENDING_CALLS(); /* 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	624 return -1;
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	625 }
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	626 }
1914 893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to Guido van Rossum <guido@python.org> parents: 1887 diff changeset	627 busy = 0;
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	628 return 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	629 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	630
50839 75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	631 #endif /* WITH_THREAD */
75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	632
1887 e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions Guido van Rossum <guido@python.org> parents: 1846 diff changeset	633
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	634 /* The interpreter's recursion limit */
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	635
34863 71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	636 #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	637 #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	638 #endif
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define Hye-Shik Chang <hyeshik@gmail.com> parents: 34442 diff changeset	639 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	640 int _Py_CheckRecursionLimit = Py_DEFAULT_RECURSION_LIMIT;
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	641
14348 6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	642 int
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	643 Py_GetRecursionLimit(void)
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	644 {
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	645 return recursion_limit;
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	646 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	647
14348 6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	648 void
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide) Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 14333 diff changeset	649 Py_SetRecursionLimit(int new_limit)
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	650 {
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	651 recursion_limit = new_limit;
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	652 _Py_CheckRecursionLimit = recursion_limit;
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	653 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14268 diff changeset	654
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	655 /* the macro Py_EnterRecursiveCall() only calls _Py_CheckRecursiveCall()
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	656 if the recursion_depth reaches _Py_CheckRecursionLimit.
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	657 If USE_STACKCHECK, the macro decrements _Py_CheckRecursionLimit
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	658 to guarantee that _Py_CheckRecursiveCall() is regularly called.
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	659 Without USE_STACKCHECK, there is no need for this. */
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	660 int
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	661 _Py_CheckRecursiveCall(char *where)
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	662 {
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	663 PyThreadState *tstate = PyThreadState_GET();
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	664
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	665 #ifdef USE_STACKCHECK
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	666 if (PyOS_CheckStack()) {
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	667 --tstate->recursion_depth;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	668 PyErr_SetString(PyExc_MemoryError, "Stack overflow");
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	669 return -1;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	670 }
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	671 #endif
48986 22ab106e3186 Issue #3697: "Fatal Python error: Cannot recover from stack overflow" Antoine Pitrou <solipsis@pitrou.net> parents: 48887 diff changeset	672 _Py_CheckRecursionLimit = recursion_limit;
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	673 if (tstate->recursion_critical)
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	674 /* Somebody asked that we don't check for recursion. */
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	675 return 0;
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	676 if (tstate->overflowed) {
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	677 if (tstate->recursion_depth > recursion_limit + 50) {
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	678 /* Overflowing while handling an overflow. Give up. */
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	679 Py_FatalError("Cannot recover from stack overflow.");
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	680 }
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	681 return 0;
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	682 }
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	683 if (tstate->recursion_depth > recursion_limit) {
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	684 --tstate->recursion_depth;
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	685 tstate->overflowed = 1;
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	686 PyErr_Format(PyExc_RuntimeError,
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	687 "maximum recursion depth exceeded%s",
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	688 where);
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	689 return -1;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	690 }
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	691 return 0;
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	692 }
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	693
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	694 /* 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	695 enum why_code {
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	696 WHY_NOT = 0x0001, /* No error */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	697 WHY_EXCEPTION = 0x0002, /* Exception occurred */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	698 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	699 WHY_RETURN = 0x0008, /* 'return' statement */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	700 WHY_BREAK = 0x0010, /* 'break' statement */
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	701 WHY_CONTINUE = 0x0020, /* 'continue' statement */
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	702 WHY_YIELD = 0x0040, /* 'yield' operator */
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	703 WHY_SILENCED = 0x0080 /* Exception silenced by 'with' */
31875 1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	704 };
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes). Raymond Hettinger <python@rcn.com> parents: 31874 diff changeset	705
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	706 static enum why_code do_raise(PyObject , PyObject );
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	707 static int unpack_iterable(PyObject , int, int, PyObject *);
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	708
50045 ba8fe3a40a5b Merged revisions 67494 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 48986 diff changeset	709 /* Records whether tracing is on for any thread. Counts the number of
ba8fe3a40a5b Merged revisions 67494 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 48986 diff changeset	710 threads for which tstate->c_tracefunc is non-NULL, so if the value
ba8fe3a40a5b Merged revisions 67494 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 48986 diff changeset	711 is 0, we know we don't have to check this thread's c_tracefunc.
ba8fe3a40a5b Merged revisions 67494 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 48986 diff changeset	712 This speeds up the if statement in PyEval_EvalFrameEx() after
ba8fe3a40a5b Merged revisions 67494 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 48986 diff changeset	713 fast_next_opcode*/
ba8fe3a40a5b Merged revisions 67494 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 48986 diff changeset	714 static int _Py_TracingPossible = 0;
ba8fe3a40a5b Merged revisions 67494 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 48986 diff changeset	715
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	716
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	717
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	718 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	719 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	720 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	721 return PyEval_EvalCodeEx(co,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	722 globals, locals,
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	723 (PyObject **)NULL, 0,
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	724 (PyObject **)NULL, 0,
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	725 (PyObject **)NULL, 0,
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	726 NULL, NULL);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	727 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	728
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	729
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	730 /* Interpreter main loop */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	731
32421 485d2ef43419 Patch #966493: Cleanup generator/eval_frame exposure. Martin v. Löwis <martin@v.loewis.de> parents: 32412 diff changeset	732 PyObject *
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	733 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	734 /* This is for backward compatibility with extension modules that
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	735 used this API; core interpreter code should call
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	736 PyEval_EvalFrameEx() */
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	737 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	738 }
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	739
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	740 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	741 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	742 {
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	743 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	744 int lastopcode = 0;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	745 #endif
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	746 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	747 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	748 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	749 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	750 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	751 register int err; /* Error status -- nonzero if error */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	752 register PyObject x; / Result object -- NULL if error */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	753 register PyObject v; / Temporary objects popped off stack */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	754 register PyObject *w;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	755 register PyObject *u;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	756 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	757 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	758 PyObject retval = NULL; / Return value */
9671 1d40bc25703a Use PyThreadState_GET() macro. Guido van Rossum <guido@python.org> parents: 9591 diff changeset	759 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	760 PyCodeObject *co;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	761
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	762 /* when tracing we set things up so that
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	763
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	764 not (instr_lb <= current_bytecode_offset < instr_ub)
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	765
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	766 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	767 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	768 time it is tested. */
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	769 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	770
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 9203 diff changeset	771 unsigned char *first_instr;
24545 d2f41c8a81f0 small speedup for constant and name access Skip Montanaro <skip@pobox.com> parents: 24284 diff changeset	772 PyObject *names;
d2f41c8a81f0 small speedup for constant and name access Skip Montanaro <skip@pobox.com> parents: 24284 diff changeset	773 PyObject *consts;
35745 407c3dacbd7c Fix some mods that got dropped from the AST merge Neal Norwitz <nnorwitz@gmail.com> parents: 35742 diff changeset	774 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	775 /* 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	776 char *filename;
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	777 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	778
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	779 /* Computed GOTOs, or
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	780 the-optimization-commonly-but-improperly-known-as-"threaded code"
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	781 using gcc's labels-as-values extension
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	782 (http://gcc.gnu.org/onlinedocs/gcc/Labels-as-Values.html).
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	783
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	784 The traditional bytecode evaluation loop uses a "switch" statement, which
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	785 decent compilers will optimize as a single indirect branch instruction
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	786 combined with a lookup table of jump addresses. However, since the
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	787 indirect jump instruction is shared by all opcodes, the CPU will have a
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	788 hard time making the right prediction for where to jump next (actually,
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	789 it will be always wrong except in the uncommon case of a sequence of
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	790 several identical opcodes).
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	791
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	792 "Threaded code" in contrast, uses an explicit jump table and an explicit
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	793 indirect jump instruction at the end of each opcode. Since the jump
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	794 instruction is at a different address for each opcode, the CPU will make a
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	795 separate prediction for each of these instructions, which is equivalent to
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	796 predicting the second opcode of each opcode pair. These predictions have
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	797 a much better chance to turn out valid, especially in small bytecode loops.
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	798
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	799 A mispredicted branch on a modern CPU flushes the whole pipeline and
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	800 can cost several CPU cycles (depending on the pipeline depth),
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	801 and potentially many more instructions (depending on the pipeline width).
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	802 A correctly predicted branch, however, is nearly free.
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	803
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	804 At the time of this writing, the "threaded code" version is up to 15-20%
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	805 faster than the normal "switch" version, depending on the compiler and the
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	806 CPU architecture.
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	807
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	808 We disable the optimization if DYNAMIC_EXECUTION_PROFILE is defined,
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	809 because it would render the measurements invalid.
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	810
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	811
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	812 NOTE: care must be taken that the compiler doesn't try to "optimize" the
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	813 indirect jumps by sharing them between all opcodes. Such optimizations
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	814 can be disabled on gcc by using the -fno-gcse flag (or possibly
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	815 -fno-crossjumping).
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	816 */
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	817
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	818 #if defined(USE_COMPUTED_GOTOS) && defined(DYNAMIC_EXECUTION_PROFILE)
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	819 #undef USE_COMPUTED_GOTOS
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	820 #endif
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	821
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	822 #ifdef USE_COMPUTED_GOTOS
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	823 /* Import the static jump table */
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	824 #include "opcode_targets.h"
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	825
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	826 /* This macro is used when several opcodes defer to the same implementation
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	827 (e.g. SETUP_LOOP, SETUP_FINALLY) */
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	828 #define TARGET_WITH_IMPL(op, impl) \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	829 TARGET_##op: \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	830 opcode = op; \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	831 if (HAS_ARG(op)) \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	832 oparg = NEXTARG(); \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	833 case op: \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	834 goto impl; \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	835
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	836 #define TARGET(op) \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	837 TARGET_##op: \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	838 opcode = op; \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	839 if (HAS_ARG(op)) \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	840 oparg = NEXTARG(); \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	841 case op:
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	842
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	843
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	844 #define DISPATCH() \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	845 { \
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	846 if (!eval_breaker) { \
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	847 FAST_DISPATCH(); \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	848 } \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	849 continue; \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	850 }
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	851
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	852 #ifdef LLTRACE
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	853 #define FAST_DISPATCH() \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	854 { \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	855 if (!lltrace && !_Py_TracingPossible) { \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	856 f->f_lasti = INSTR_OFFSET(); \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	857 goto opcode_targets[next_instr++]; \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	858 } \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	859 goto fast_next_opcode; \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	860 }
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	861 #else
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	862 #define FAST_DISPATCH() \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	863 { \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	864 if (!_Py_TracingPossible) { \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	865 f->f_lasti = INSTR_OFFSET(); \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	866 goto opcode_targets[next_instr++]; \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	867 } \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	868 goto fast_next_opcode; \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	869 }
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	870 #endif
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	871
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	872 #else
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	873 #define TARGET(op) \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	874 case op:
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	875 #define TARGET_WITH_IMPL(op, impl) \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	876 /* silence compiler warnings about `impl` unused */ \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	877 if (0) goto impl; \
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	878 case op:
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	879 #define DISPATCH() continue
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	880 #define FAST_DISPATCH() goto fast_next_opcode
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	881 #endif
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	882
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	883
24232 e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	884 /* 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	885
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	886 #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	887 #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	888 #else
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	889 #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	890 #endif
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c Neal Norwitz <nnorwitz@gmail.com> parents: 24190 diff changeset	891
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	892 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	893 /* 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	894 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	895 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	896 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	897 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	898 (may be skipped)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	899 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	900 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	901
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	902 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	903 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	904 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	905 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	906 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	907
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	908 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	909 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	910 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	911
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	912 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	913 cases:
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	914
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	915 IMPORT_STAR
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	916 IMPORT_FROM
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	917 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	918
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	919 */
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	920 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	921 int ticked = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	922
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	923 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	924 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	925 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	926 READ_TIMESTAMP(loop1);
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	927
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	928 /* shut up the compiler */
f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 33030 diff changeset	929 opcode = 0;
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	930 #endif
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	931
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	932 /* Code access macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	933
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	934 #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	935 #define NEXTOP() (*next_instr++)
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	936 #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	937 #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	938 #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	939 #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	940
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	941 /* OpCode prediction macros
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	942 Some opcodes tend to come in pairs thus making it possible to
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	943 predict the second code when the first is run. For example,
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	944 COMPARE_OP is often followed by JUMP_IF_FALSE or JUMP_IF_TRUE. And,
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	945 those opcodes are often followed by a POP_TOP.
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	946
48494 aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	947 Verifying the prediction costs a single high-speed test of a register
28303 470504ef578b Fix comment and whitespace. Raymond Hettinger <python@rcn.com> parents: 28302 diff changeset	948 variable against a constant. If the pairing was good, then the
48494 aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	949 processor's own internal branch predication has a high likelihood of
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	950 success, resulting in a nearly zero-overhead transition to the
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	951 next opcode. A successful prediction saves a trip through the eval-loop
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	952 including its two unpredictable branches, the HAS_ARG test and the
48494 aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	953 switch-case. Combined with the processor's internal branch prediction,
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	954 a successful PREDICT has the effect of making the two opcodes run as if
48494 aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	955 they were a single new opcode with the bodies combined.
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	956
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	957 If collecting opcode statistics, your choices are to either keep the
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	958 predictions turned-on and interpret the results as if some opcodes
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	959 had been combined or turn-off predictions so that the opcode frequency
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 47729 diff changeset	960 counter updates for both opcodes.
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	961
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	962 Opcode prediction is disabled with threaded code, since the latter allows
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	963 the CPU to record separate branch prediction information for each
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	964 opcode.
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	965
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	966 */
8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	967
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	968 #if defined(DYNAMIC_EXECUTION_PROFILE) \|\| defined(USE_COMPUTED_GOTOS)
31487 f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	969 #define PREDICT(op) if (0) goto PRED_##op
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	970 #define PREDICTED(op) PRED_##op:
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	971 #define PREDICTED_WITH_ARG(op) PRED_##op:
31487 f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction Raymond Hettinger <python@rcn.com> parents: 31462 diff changeset	972 #else
28303 470504ef578b Fix comment and whitespace. Raymond Hettinger <python@rcn.com> parents: 28302 diff changeset	973 #define PREDICT(op) if (*next_instr == op) goto PRED_##op
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	974 #define PREDICTED(op) PRED_##op: next_instr++
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	975 #define PREDICTED_WITH_ARG(op) PRED_##op: oparg = PEEKARG(); next_instr += 3
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	976 #endif
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	977
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	978
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	979 /* Stack manipulation macros */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	980
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	981 /* 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	982 co_stacksize are ints. */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	983 #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	984 #define EMPTY() (STACK_LEVEL() == 0)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	985 #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	986 #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	987 #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	988 #define FOURTH() (stack_pointer[-4])
54908 aa950f7962fd Merged revisions 73614-73615 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54905 diff changeset	989 #define PEEK(n) (stack_pointer[-(n)])
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	990 #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	991 #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	992 #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	993 #define SET_FOURTH(v) (stack_pointer[-4] = (v))
54908 aa950f7962fd Merged revisions 73614-73615 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54905 diff changeset	994 #define SET_VALUE(n, v) (stack_pointer[-(n)] = (v))
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	995 #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	996 #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	997 #define BASIC_POP() (*--stack_pointer)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	998
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	999 #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	1000 #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	1001 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	1002 assert(STACK_LEVEL() <= co->co_stacksize); }
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1003 #define POP() ((void)(lltrace && prtrace(TOP(), "pop")), \
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1004 BASIC_POP())
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1005 #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	1006 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	1007 assert(STACK_LEVEL() <= co->co_stacksize); }
44310 e70acbf26cda Merged revisions 59488-59511 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44187 diff changeset	1008 #define EXT_POP(STACK_POINTER) ((void)(lltrace && \
e70acbf26cda Merged revisions 59488-59511 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44187 diff changeset	1009 prtrace((STACK_POINTER)[-1], "ext_pop")), \
e70acbf26cda Merged revisions 59488-59511 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44187 diff changeset	1010 *--(STACK_POINTER))
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1011 #else
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1012 #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	1013 #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	1014 #define STACKADJ(n) BASIC_STACKADJ(n)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	1015 #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	1016 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1017
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1018 /* Local variable macros */
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1019
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1020 #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	1021
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	1022 /* 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	1023 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	1024 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	1025 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	1026 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	1027 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	1028 #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	1029 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	1030 Py_XDECREF(tmp); } while (0)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1031
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1032
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1033 #define UNWIND_BLOCK(b) \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1034 while (STACK_LEVEL() > (b)->b_level) { \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1035 PyObject *v = POP(); \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1036 Py_XDECREF(v); \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1037 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1038
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1039 #define UNWIND_EXCEPT_HANDLER(b) \
47729 ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1040 { \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1041 PyObject type, value, *traceback; \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1042 assert(STACK_LEVEL() >= (b)->b_level + 3); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1043 while (STACK_LEVEL() > (b)->b_level + 3) { \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1044 value = POP(); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1045 Py_XDECREF(value); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1046 } \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1047 type = tstate->exc_type; \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1048 value = tstate->exc_value; \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1049 traceback = tstate->exc_traceback; \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1050 tstate->exc_type = POP(); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1051 tstate->exc_value = POP(); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1052 tstate->exc_traceback = POP(); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1053 Py_XDECREF(type); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1054 Py_XDECREF(value); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1055 Py_XDECREF(traceback); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1056 }
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1057
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1058 #define SAVE_EXC_STATE() \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1059 { \
47729 ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1060 PyObject type, value, *traceback; \
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1061 Py_XINCREF(tstate->exc_type); \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1062 Py_XINCREF(tstate->exc_value); \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1063 Py_XINCREF(tstate->exc_traceback); \
47729 ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1064 type = f->f_exc_type; \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1065 value = f->f_exc_value; \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1066 traceback = f->f_exc_traceback; \
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1067 f->f_exc_type = tstate->exc_type; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1068 f->f_exc_value = tstate->exc_value; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1069 f->f_exc_traceback = tstate->exc_traceback; \
47729 ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1070 Py_XDECREF(type); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1071 Py_XDECREF(value); \
ee2823e1f23b improvements to the fix for #3114 Benjamin Peterson <benjamin@python.org> parents: 47724 diff changeset	1072 Py_XDECREF(traceback); \
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1073 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1074
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1075 #define SWAP_EXC_STATE() \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1076 { \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1077 PyObject *tmp; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1078 tmp = tstate->exc_type; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1079 tstate->exc_type = f->f_exc_type; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1080 f->f_exc_type = tmp; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1081 tmp = tstate->exc_value; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1082 tstate->exc_value = f->f_exc_value; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1083 f->f_exc_value = tmp; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1084 tmp = tstate->exc_traceback; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1085 tstate->exc_traceback = f->f_exc_traceback; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1086 f->f_exc_traceback = tmp; \
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1087 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1088
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1089 /* Start of code */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1090
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	1091 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	1092 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	1093
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	1094 /* push frame */
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	1095 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	1096 return NULL;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1097
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	1098 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	1099
19692 04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	1100 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	1101 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	1102 /* 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	1103 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	1104 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	1105 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	1106 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	1107 (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	1108 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	1109 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	1110 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	1111 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	1112 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	1113 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	1114 whenever an exception is detected. */
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	1115 if (call_trace_protected(tstate->c_tracefunc,
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	1116 tstate->c_traceobj,
73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	1117 f, PyTrace_CALL, Py_None)) {
19692 04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	1118 /* Trace function raised an error */
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	1119 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	1120 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	1121 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	1122 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	1123 /* 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	1124 return itself and isn't called for "line" events */
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	1125 if (call_trace_protected(tstate->c_profilefunc,
73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	1126 tstate->c_profileobj,
73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	1127 f, PyTrace_CALL, Py_None)) {
19692 04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	1128 /* Profile function raised an error */
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	1129 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	1130 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	1131 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	1132 }
04218e85b156 Move call_trace(..., PyTrace_CALL, ...) call to top of eval_frame. That Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19611 diff changeset	1133
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1134 co = f->f_code;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1135 names = co->co_names;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1136 consts = co->co_consts;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1137 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	1138 freevars = f->f_localsplus + co->co_nlocals;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46725 diff changeset	1139 first_instr = (unsigned char*) PyBytes_AS_STRING(co->co_code);
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1140 /* 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	1141
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1142 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	1143 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	1144 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	1145 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	1146 and YIELD_VALUE doesn't fiddle with f_lasti any more. So this
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	1147 does work. Promise.
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	1148
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	1149 When the PREDICT() macros are enabled, some opcode pairs follow in
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	1150 direct succession without updating f->f_lasti. A successful
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40529 diff changeset	1151 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	1152 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	1153 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	1154 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	1155 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	1156 */
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1157 next_instr = first_instr + f->f_lasti + 1;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1158 stack_pointer = f->f_stacktop;
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1159 assert(stack_pointer != NULL);
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1160 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	1161
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1162 if (f->f_code->co_flags & CO_GENERATOR) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1163 if (f->f_exc_type != NULL && f->f_exc_type != Py_None) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1164 /* We were in an except handler when we left,
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1165 restore the exception state which was put aside
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1166 (see YIELD_VALUE). */
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1167 SWAP_EXC_STATE();
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1168 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1169 else {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1170 SAVE_EXC_STATE();
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1171 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1172 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1173
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	1174 #ifdef LLTRACE
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	1175 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	1176 #endif
35745 407c3dacbd7c Fix some mods that got dropped from the AST merge Neal Norwitz <nnorwitz@gmail.com> parents: 35742 diff changeset	1177 #if defined(Py_DEBUG) \|\| defined(LLTRACE)
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48574 diff changeset	1178 filename = _PyUnicode_AsString(co->co_filename);
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	1179 #endif
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1180
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1181 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1182 err = 0;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1183 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	1184 w = NULL;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1185
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	1186 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	1187 why = WHY_EXCEPTION;
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	1188 goto on_error;
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	1189 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1190
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1191 for (;;) {
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	1192 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	1193 if (inst1 == 0) {
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	1194 /* 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	1195 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	1196 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	1197 */
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	1198 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	1199 loop1 = inst1;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	1200 }
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	1201 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	1202 intr0, intr1);
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	1203 ticked = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	1204 inst1 = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	1205 intr0 = 0;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	1206 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	1207 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	1208 #endif
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	1209 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	1210 assert(STACK_LEVEL() <= co->co_stacksize); /* else overflow */
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	1211
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1212 /* 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	1213 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	1214 only every Nth instruction. We also do it if
50839 75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	1215 ``pendingcalls_to_do'' is set, i.e. when an asynchronous
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	1216 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	1217 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	1218 Py_MakePendingCalls() above. */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1219
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1220 if (eval_breaker) {
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	1221 if (*next_instr == SETUP_FINALLY) {
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	1222 /* Make the last opcode before
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	1223 a try: finally: block uninterruptable. */
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	1224 goto fast_next_opcode;
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	1225 }
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1226 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	1227 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	1228 ticked = 1;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	1229 #endif
50839 75009d4863c9 Merged revisions 68460 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50211 diff changeset	1230 if (pendingcalls_to_do) {
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1231 if (Py_MakePendingCalls() < 0) {
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1232 why = WHY_EXCEPTION;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1233 goto on_error;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1234 }
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	1235 }
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1236 if (gil_drop_request) {
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	1237 #ifdef WITH_THREAD
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	1238 /* Give another thread a chance */
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	1239 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	1240 Py_FatalError("ceval: tstate mix-up");
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1241 drop_gil(tstate);
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1242
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	1243 /* Other threads may run now */
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1244
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1245 take_gil(tstate);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5911 diff changeset	1246 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	1247 Py_FatalError("ceval: orphan tstate");
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1248 #endif
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	1249 }
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1250 /* Check for asynchronous exceptions. */
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1251 if (tstate->async_exc != NULL) {
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1252 x = tstate->async_exc;
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1253 tstate->async_exc = NULL;
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1254 UNSIGNAL_ASYNC_EXC();
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1255 PyErr_SetNone(x);
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1256 Py_DECREF(x);
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1257 why = WHY_EXCEPTION;
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1258 goto on_error;
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 57004 diff changeset	1259 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1260 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: 815 diff changeset	1261
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	1262 fast_next_opcode:
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1263 f->f_lasti = INSTR_OFFSET();
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1264
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1265 /* line-by-line tracing support */
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1266
50045 ba8fe3a40a5b Merged revisions 67494 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 48986 diff changeset	1267 if (_Py_TracingPossible &&
ba8fe3a40a5b Merged revisions 67494 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 48986 diff changeset	1268 tstate->c_tracefunc != NULL && !tstate->tracing) {
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1269 /* see maybe_call_line_trace
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1270 for expository comments */
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1271 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	1272
28886 af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	1273 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	1274 tstate->c_traceobj,
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	1275 f, &instr_lb, &instr_ub,
9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	1276 &instr_prev);
28886 af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	1277 /* Reload possibly changed frame fields */
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	1278 JUMPTO(f->f_lasti);
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	1279 if (f->f_stacktop != NULL) {
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	1280 stack_pointer = f->f_stacktop;
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	1281 f->f_stacktop = NULL;
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	1282 }
af53729d3cdd Armin Rigo's fix & test for Michael W. Hudson <mwh@python.net> parents: 28759 diff changeset	1283 if (err) {
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	1284 /* trace function raised an exception */
964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	1285 goto on_error;
964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	1286 }
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1287 }
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 26079 diff changeset	1288
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1289 /* Extract opcode and argument */
1016 a41e3ba5b47d Add some debugging features if DEBUG defined Guido van Rossum <guido@python.org> parents: 974 diff changeset	1290
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1291 opcode = NEXTOP();
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	1292 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	1293 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	1294 if (HAS_ARG(opcode))
310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	1295 oparg = NEXTARG();
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	1296 dispatch_opcode:
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1297 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1298 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1299 dxpairs[lastopcode][opcode]++;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1300 lastopcode = opcode;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1301 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1302 dxp[opcode]++;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	1303 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1304
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1305 #ifdef LLTRACE
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1306 /* Instruction tracing */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1307
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	1308 if (lltrace) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1309 if (HAS_ARG(opcode)) {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1310 printf("%d: %d, %d\n",
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	1311 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	1312 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1313 else {
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1314 printf("%d: %d\n",
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	1315 f->f_lasti, opcode);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1316 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1317 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1318 #endif
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	1319
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1320 /* 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	1321 READ_TIMESTAMP(inst0);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	1322
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1323 switch (opcode) {
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1324
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1325 /* BEWARE!
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1326 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	1327 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	1328 and that no operation that succeeds does this! */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1329
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1330 /* case STOP_CODE: this is an error! */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1331
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1332 TARGET(NOP)
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1333 FAST_DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1334
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1335 TARGET(LOAD_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	1336 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	1337 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	1338 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	1339 PUSH(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1340 FAST_DISPATCH();
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	1341 }
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	1342 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	1343 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	1344 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	1345 break;
052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	1346
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1347 TARGET(LOAD_CONST)
24545 d2f41c8a81f0 small speedup for constant and name access Skip Montanaro <skip@pobox.com> parents: 24284 diff changeset	1348 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	1349 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	1350 PUSH(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1351 FAST_DISPATCH();
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	1352
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	1353 PREDICTED_WITH_ARG(STORE_FAST);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1354 TARGET(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	1355 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	1356 SETLOCAL(oparg, v);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1357 FAST_DISPATCH();
21974 052efc06520a Move some opcodes to top of big eval_frame switch statement. Skip Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21935 diff changeset	1358
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1359 TARGET(POP_TOP)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1360 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1361 Py_DECREF(v);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1362 FAST_DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1363
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1364 TARGET(ROT_TWO)
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1365 v = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1366 w = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1367 SET_TOP(w);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1368 SET_SECOND(v);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1369 FAST_DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1370
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1371 TARGET(ROT_THREE)
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1372 v = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1373 w = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1374 x = THIRD();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1375 SET_TOP(w);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1376 SET_SECOND(x);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1377 SET_THIRD(v);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1378 FAST_DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1379
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1380 TARGET(ROT_FOUR)
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1381 u = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1382 v = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1383 w = THIRD();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1384 x = FOURTH();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1385 SET_TOP(v);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1386 SET_SECOND(w);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1387 SET_THIRD(x);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1388 SET_FOURTH(u);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1389 FAST_DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1390
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1391 TARGET(DUP_TOP)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1392 v = TOP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1393 Py_INCREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1394 PUSH(v);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1395 FAST_DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1396
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1397 TARGET(DUP_TOPX)
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	1398 if (oparg == 2) {
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1399 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	1400 Py_INCREF(x);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1401 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	1402 Py_INCREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1403 STACKADJ(2);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1404 SET_TOP(x);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1405 SET_SECOND(w);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1406 FAST_DISPATCH();
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	1407 } 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	1408 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	1409 Py_INCREF(x);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1410 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	1411 Py_INCREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1412 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	1413 Py_INCREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1414 STACKADJ(3);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1415 SET_TOP(x);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1416 SET_SECOND(w);
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1417 SET_THIRD(v);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1418 FAST_DISPATCH();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1419 }
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	1420 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	1421 " (bytecode corruption?)");
50112 abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	1422 /* Never returns, so don't bother to set why. */
15151 ca9f6a8e9885 Attempt to fix bogus gcc -Wall warnings reported by Marc-Andre Lemburg, Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1423 break;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1424
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1425 TARGET(UNARY_POSITIVE)
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1426 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1427 x = PyNumber_Positive(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1428 Py_DECREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1429 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1430 if (x != NULL) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1431 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1432
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1433 TARGET(UNARY_NEGATIVE)
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1434 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1435 x = PyNumber_Negative(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1436 Py_DECREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1437 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1438 if (x != NULL) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1439 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1440
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1441 TARGET(UNARY_NOT)
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1442 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1443 err = PyObject_IsTrue(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1444 Py_DECREF(v);
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1445 if (err == 0) {
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1446 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	1447 SET_TOP(Py_True);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1448 DISPATCH();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1449 }
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1450 else if (err > 0) {
10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1451 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	1452 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	1453 err = 0;
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1454 DISPATCH();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1455 }
27243 3afbd55fb18f Replaced POP() with STACKADJ(-1) on lines where the result wasn't used. Raymond Hettinger <python@rcn.com> parents: 27201 diff changeset	1456 STACKADJ(-1);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1457 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1458
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1459 TARGET(UNARY_INVERT)
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1460 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1461 x = PyNumber_Invert(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1462 Py_DECREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1463 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1464 if (x != NULL) DISPATCH();
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1465 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1466
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1467 TARGET(BINARY_POWER)
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	1468 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1469 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1470 x = PyNumber_Power(v, w, Py_None);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1471 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1472 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1473 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1474 if (x != NULL) DISPATCH();
3324 36920bbd81a8 changes for complex and power (*) operator Guido van Rossum <guido@python.org>* parents: 3294 diff changeset	1475 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1476
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1477 TARGET(BINARY_MULTIPLY)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1478 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1479 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1480 x = PyNumber_Multiply(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1481 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1482 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1483 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1484 if (x != NULL) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1485 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1486
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1487 TARGET(BINARY_TRUE_DIVIDE)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1488 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1489 v = TOP();
21251 45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21171 diff changeset	1490 x = PyNumber_TrueDivide(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);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1493 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1494 if (x != NULL) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1495 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1496
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1497 TARGET(BINARY_FLOOR_DIVIDE)
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1498 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1499 v = TOP();
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1500 x = PyNumber_FloorDivide(v, w);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1501 Py_DECREF(v);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1502 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1503 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1504 if (x != NULL) DISPATCH();
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1505 break;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1506
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1507 TARGET(BINARY_MODULO)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1508 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1509 v = TOP();
51872 3722ce458318 Merged revisions 69811,69947 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51853 diff changeset	1510 if (PyUnicode_CheckExact(v))
3722ce458318 Merged revisions 69811,69947 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51853 diff changeset	1511 x = PyUnicode_Format(v, w);
3722ce458318 Merged revisions 69811,69947 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51853 diff changeset	1512 else
3722ce458318 Merged revisions 69811,69947 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51853 diff changeset	1513 x = PyNumber_Remainder(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1514 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1515 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1516 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1517 if (x != NULL) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1518 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1519
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1520 TARGET(BINARY_ADD)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1521 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1522 v = TOP();
44156 fb84bd9500a4 Remove special-casing of integer operations, to stop Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	1523 if (PyUnicode_CheckExact(v) &&
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1524 PyUnicode_CheckExact(w)) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1525 x = unicode_concatenate(v, w, f, next_instr);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1526 /* unicode_concatenate consumed the ref to v */
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1527 goto skip_decref_vx;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1528 }
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1529 else {
5829 f1127d6fcd74 Huge speedup by inlining some common integer operations: Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1530 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	1531 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1532 Py_DECREF(v);
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1533 skip_decref_vx:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1534 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1535 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1536 if (x != NULL) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1537 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1538
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1539 TARGET(BINARY_SUBTRACT)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1540 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1541 v = TOP();
44156 fb84bd9500a4 Remove special-casing of integer operations, to stop Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	1542 x = PyNumber_Subtract(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1543 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1544 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1545 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1546 if (x != NULL) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1547 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1548
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1549 TARGET(BINARY_SUBSCR)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1550 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1551 v = TOP();
44156 fb84bd9500a4 Remove special-casing of integer operations, to stop Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	1552 x = PyObject_GetItem(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1553 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1554 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1555 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1556 if (x != NULL) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1557 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1558
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1559 TARGET(BINARY_LSHIFT)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1560 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1561 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1562 x = PyNumber_Lshift(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1563 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1564 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1565 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1566 if (x != NULL) DISPATCH();
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1567 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1568
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1569 TARGET(BINARY_RSHIFT)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1570 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1571 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1572 x = PyNumber_Rshift(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1573 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1574 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1575 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1576 if (x != NULL) DISPATCH();
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1577 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1578
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1579 TARGET(BINARY_AND)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1580 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1581 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1582 x = PyNumber_And(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1583 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1584 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1585 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1586 if (x != NULL) DISPATCH();
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1587 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1588
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1589 TARGET(BINARY_XOR)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1590 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1591 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1592 x = PyNumber_Xor(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1593 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1594 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1595 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1596 if (x != NULL) DISPATCH();
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1597 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1598
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1599 TARGET(BINARY_OR)
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1600 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1601 v = TOP();
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1602 x = PyNumber_Or(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1603 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1604 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1605 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1606 if (x != NULL) DISPATCH();
409 b5fe6482072f Added shift and mask ops. Guido van Rossum <guido@python.org> parents: 401 diff changeset	1607 break;
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1608
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1609 TARGET(LIST_APPEND)
31618 bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1610 w = POP();
54908 aa950f7962fd Merged revisions 73614-73615 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54905 diff changeset	1611 v = PEEK(oparg);
31618 bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1612 err = PyList_Append(v, w);
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1613 Py_DECREF(w);
31649 243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	1614 if (err == 0) {
243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	1615 PREDICT(JUMP_ABSOLUTE);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1616 DISPATCH();
31649 243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	1617 }
31618 bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1618 break;
bc006682acb2 SF patch #910929: Optimize list comprehensions Raymond Hettinger <python@rcn.com> parents: 31606 diff changeset	1619
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1620 TARGET(SET_ADD)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1621 w = POP();
50211 2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	1622 v = stack_pointer[-oparg];
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1623 err = PySet_Add(v, w);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1624 Py_DECREF(w);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1625 if (err == 0) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1626 PREDICT(JUMP_ABSOLUTE);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1627 DISPATCH();
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1628 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1629 break;
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41226 diff changeset	1630
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1631 TARGET(INPLACE_POWER)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1632 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1633 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1634 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	1635 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1636 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1637 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1638 if (x != NULL) DISPATCH();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1639 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1640
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1641 TARGET(INPLACE_MULTIPLY)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1642 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1643 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1644 x = PyNumber_InPlaceMultiply(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1645 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1646 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1647 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1648 if (x != NULL) DISPATCH();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1649 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1650
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1651 TARGET(INPLACE_TRUE_DIVIDE)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1652 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1653 v = TOP();
21537 ca27d82ac89b SF bug #496549 -Qnew and in-place division "/=". Tim Peters <tim.peters@gmail.com> parents: 21477 diff changeset	1654 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	1655 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1656 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1657 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1658 if (x != NULL) DISPATCH();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1659 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1660
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1661 TARGET(INPLACE_FLOOR_DIVIDE)
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1662 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1663 v = TOP();
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1664 x = PyNumber_InPlaceFloorDivide(v, w);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1665 Py_DECREF(v);
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1666 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1667 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1668 if (x != NULL) DISPATCH();
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1669 break;
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1670
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1671 TARGET(INPLACE_MODULO)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1672 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1673 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1674 x = PyNumber_InPlaceRemainder(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1675 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1676 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1677 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1678 if (x != NULL) DISPATCH();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1679 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1680
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1681 TARGET(INPLACE_ADD)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1682 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1683 v = TOP();
44156 fb84bd9500a4 Remove special-casing of integer operations, to stop Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	1684 if (PyUnicode_CheckExact(v) &&
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1685 PyUnicode_CheckExact(w)) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1686 x = unicode_concatenate(v, w, f, next_instr);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1687 /* unicode_concatenate consumed the ref to v */
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1688 goto skip_decref_v;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1689 }
19434 c140bd7d3bdc When an inlined operation on two small ints causes overflow, don't Guido van Rossum <guido@python.org> parents: 19369 diff changeset	1690 else {
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1691 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	1692 }
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1693 Py_DECREF(v);
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	1694 skip_decref_v:
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1695 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1696 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1697 if (x != NULL) DISPATCH();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1698 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1699
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1700 TARGET(INPLACE_SUBTRACT)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1701 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1702 v = TOP();
44156 fb84bd9500a4 Remove special-casing of integer operations, to stop Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	1703 x = PyNumber_InPlaceSubtract(v, w);
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1704 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1705 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1706 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1707 if (x != NULL) DISPATCH();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1708 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1709
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1710 TARGET(INPLACE_LSHIFT)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1711 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1712 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1713 x = PyNumber_InPlaceLshift(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1714 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1715 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1716 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1717 if (x != NULL) DISPATCH();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1718 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1719
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1720 TARGET(INPLACE_RSHIFT)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1721 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1722 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1723 x = PyNumber_InPlaceRshift(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1724 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1725 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1726 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1727 if (x != NULL) DISPATCH();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1728 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1729
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1730 TARGET(INPLACE_AND)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1731 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1732 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1733 x = PyNumber_InPlaceAnd(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1734 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1735 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1736 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1737 if (x != NULL) DISPATCH();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1738 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1739
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1740 TARGET(INPLACE_XOR)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1741 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1742 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1743 x = PyNumber_InPlaceXor(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1744 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1745 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1746 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1747 if (x != NULL) DISPATCH();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1748 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1749
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1750 TARGET(INPLACE_OR)
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1751 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1752 v = TOP();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1753 x = PyNumber_InPlaceOr(v, w);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1754 Py_DECREF(v);
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1755 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1756 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1757 if (x != NULL) DISPATCH();
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1758 break;
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1759
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1760 TARGET(STORE_SUBSCR)
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1761 w = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1762 v = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1763 u = THIRD();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1764 STACKADJ(-3);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1765 /* v[w] = u */
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1766 err = PyObject_SetItem(v, w, u);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1767 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1768 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1769 Py_DECREF(w);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1770 if (err == 0) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1771 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1772
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1773 TARGET(DELETE_SUBSCR)
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1774 w = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1775 v = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1776 STACKADJ(-2);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1777 /* del v[w] */
5413 10267fdc7531 Used operators from abstract.h where possible (arithmetic operators, Guido van Rossum <guido@python.org> parents: 5405 diff changeset	1778 err = PyObject_DelItem(v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1779 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1780 Py_DECREF(w);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1781 if (err == 0) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1782 break;
14100 2de0cc174c3b PEP 214, Extended print Statement, has been accepted by the BDFL. Barry Warsaw <barry@python.org> parents: 14080 diff changeset	1783
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1784 TARGET(PRINT_EXPR)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1785 v = POP();
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1786 w = PySys_GetObject("displayhook");
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1787 if (w == NULL) {
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1788 PyErr_SetString(PyExc_RuntimeError,
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1789 "lost sys.displayhook");
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1790 err = -1;
15814 faaf9f10d849 Fixed bugs noted by Greg Stein Moshe Zadka <moshez@math.huji.ac.il> parents: 15811 diff changeset	1791 x = NULL;
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1792 }
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1793 if (err == 0) {
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 29669 diff changeset	1794 x = PyTuple_Pack(1, v);
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1795 if (x == NULL)
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1796 err = -1;
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1797 }
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1798 if (err == 0) {
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1799 w = PyEval_CallObject(w, x);
15814 faaf9f10d849 Fixed bugs noted by Greg Stein Moshe Zadka <moshez@math.huji.ac.il> parents: 15811 diff changeset	1800 Py_XDECREF(w);
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1801 if (w == NULL)
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1802 err = -1;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1803 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1804 Py_DECREF(v);
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1805 Py_XDECREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1806 break;
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15809 diff changeset	1807
14163 1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1808 #ifdef CASE_TOO_BIG
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1809 default: switch (opcode) {
1b9fd0cbd914 Support for three-token characters (*=, >>=, <<=) which was written by Thomas Wouters <thomas@python.org>* parents: 14147 diff changeset	1810 #endif
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1811 TARGET(RAISE_VARARGS)
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	1812 v = w = NULL;
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	1813 switch (oparg) {
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	1814 case 2:
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	1815 v = POP(); /* cause */
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	1816 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	1817 w = POP(); /* exc */
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	1818 case 0: /* Fallthrough */
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	1819 why = do_raise(w, v);
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	1820 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	1821 default:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1822 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	1823 "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	1824 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	1825 break;
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	1826 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1827 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1828
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1829 TARGET(STORE_LOCALS)
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1830 x = POP();
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1831 v = f->f_locals;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1832 Py_XDECREF(v);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1833 f->f_locals = x;
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1834 DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1835
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1836 TARGET(RETURN_VALUE)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1837 retval = POP();
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1838 why = WHY_RETURN;
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1839 goto fast_block_end;
1354 fccd415e2eb8 * bltinmodule.c: removed exec() built-in function. Guido van Rossum <guido@python.org> parents: 1319 diff changeset	1840
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1841 TARGET(YIELD_VALUE)
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	1842 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	1843 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	1844 why = WHY_YIELD;
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1845 /* Put aside the current exception state and restore
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1846 that of the calling frame. This only serves when
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1847 "yield" is used inside an except handler. */
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1848 SWAP_EXC_STATE();
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1849 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	1850
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1851 TARGET(POP_EXCEPT)
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1852 {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1853 PyTryBlock *b = PyFrame_BlockPop(f);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1854 if (b->b_type != EXCEPT_HANDLER) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1855 PyErr_SetString(PyExc_SystemError,
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1856 "popped block is not an except handler");
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1857 why = WHY_EXCEPTION;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1858 break;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1859 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1860 UNWIND_EXCEPT_HANDLER(b);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1861 }
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1862 DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1863
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1864 TARGET(POP_BLOCK)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1865 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1866 PyTryBlock *b = PyFrame_BlockPop(f);
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1867 UNWIND_BLOCK(b);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1868 }
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1869 DISPATCH();
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1870
45635 882eba145119 Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45017 diff changeset	1871 PREDICTED(END_FINALLY);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1872 TARGET(END_FINALLY)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1873 v = POP();
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43996 diff changeset	1874 if (PyLong_Check(v)) {
f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43996 diff changeset	1875 why = (enum why_code) PyLong_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	1876 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	1877 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	1878 why == WHY_CONTINUE)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1879 retval = POP();
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1880 if (why == WHY_SILENCED) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1881 /* An exception was silenced by 'with', we must
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1882 manually unwind the EXCEPT_HANDLER block which was
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1883 created when the exception was caught, otherwise
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1884 the stack will be in an inconsistent state. */
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1885 PyTryBlock *b = PyFrame_BlockPop(f);
54905 b55a78b39bd5 this is better written as an assertion Benjamin Peterson <benjamin@python.org> parents: 54904 diff changeset	1886 assert(b->b_type == EXCEPT_HANDLER);
b55a78b39bd5 this is better written as an assertion Benjamin Peterson <benjamin@python.org> parents: 54904 diff changeset	1887 UNWIND_EXCEPT_HANDLER(b);
b55a78b39bd5 this is better written as an assertion Benjamin Peterson <benjamin@python.org> parents: 54904 diff changeset	1888 why = WHY_NOT;
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	1889 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1890 }
40942 4b9d0dac79cc You can no longer catch non-BaseException objects; TypeError is raised if such Brett Cannon <bcannon@gmail.com> parents: 40937 diff changeset	1891 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	1892 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	1893 u = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1894 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	1895 why = WHY_RERAISE;
2872 d3b07ba3e12d fix bogus DECREF in finally clause Guido van Rossum <guido@python.org> parents: 2866 diff changeset	1896 break;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1897 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1898 else if (v != Py_None) {
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1899 PyErr_SetString(PyExc_SystemError,
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1900 "'finally' pops bad exception");
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1901 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1902 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1903 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1904 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1905
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1906 TARGET(LOAD_BUILD_CLASS)
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1907 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	1908 "__build_class__");
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1909 if (x == NULL) {
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1910 PyErr_SetString(PyExc_ImportError,
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1911 "__build_class__ not found");
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1912 break;
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1913 }
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1914 Py_INCREF(x);
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40946 diff changeset	1915 PUSH(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1916 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1917
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1918 TARGET(STORE_NAME)
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1919 w = GETITEM(names, oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1920 v = POP();
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1921 if ((x = f->f_locals) != NULL) {
32890 b8c2aa2be19a Completed the patch for Bug #215126. Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	1922 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	1923 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	1924 else
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	1925 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	1926 Py_DECREF(v);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1927 if (err == 0) DISPATCH();
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1928 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1929 }
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1930 PyErr_Format(PyExc_SystemError,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1931 "no locals found when storing %R", w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1932 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1933
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1934 TARGET(DELETE_NAME)
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1935 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	1936 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	1937 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	1938 format_exc_check_arg(PyExc_NameError,
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1939 NAME_ERROR_MSG,
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1940 w);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1941 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	1942 }
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	1943 PyErr_Format(PyExc_SystemError,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1944 "no locals when deleting %R", w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1945 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	1946
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	1947 PREDICTED_WITH_ARG(UNPACK_SEQUENCE);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1948 TARGET(UNPACK_SEQUENCE)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1949 v = POP();
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1950 if (PyTuple_CheckExact(v) &&
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1951 PyTuple_GET_SIZE(v) == oparg) {
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1952 PyObject **items = \
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1953 ((PyTupleObject *)v)->ob_item;
31630 b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1954 while (oparg--) {
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1955 w = items[oparg];
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1956 Py_INCREF(w);
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1957 PUSH(w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1958 }
31880 4c6fdeb8e2e0 Use continue instead of break whereever possible. Raymond Hettinger <python@rcn.com> parents: 31879 diff changeset	1959 Py_DECREF(v);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1960 DISPATCH();
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1961 } else if (PyList_CheckExact(v) &&
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1962 PyList_GET_SIZE(v) == oparg) {
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1963 PyObject **items = \
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1964 ((PyListObject *)v)->ob_item;
31630 b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1965 while (oparg--) {
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1966 w = items[oparg];
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1967 Py_INCREF(w);
b4e4dbd24fe7 Refactor and optimize code for UNPACK_SEQUENCE. Raymond Hettinger <python@rcn.com> parents: 31618 diff changeset	1968 PUSH(w);
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	1969 }
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1970 } else if (unpack_iterable(v, oparg, -1,
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	1971 stack_pointer + oparg)) {
54908 aa950f7962fd Merged revisions 73614-73615 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54905 diff changeset	1972 STACKADJ(oparg);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	1973 } else {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	1974 /* 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	1975 why = WHY_EXCEPTION;
20183 c6b6189a8397 SF bug [#466173] unpack TypeError unclear Tim Peters <tim.peters@gmail.com> parents: 20114 diff changeset	1976 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	1977 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	1978 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	1979
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1980 TARGET(UNPACK_EX)
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1981 {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1982 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	1983 v = POP();
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	1984
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1985 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	1986 stack_pointer + totalargs)) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1987 stack_pointer += totalargs;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1988 } else {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1989 why = WHY_EXCEPTION;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1990 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1991 Py_DECREF(v);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1992 break;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1993 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	1994
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	1995 TARGET(STORE_ATTR)
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	1996 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	1997 v = TOP();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1998 u = SECOND();
04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	1999 STACKADJ(-2);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2000 err = PyObject_SetAttr(v, w, u); /* v.w = u */
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2001 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2002 Py_DECREF(u);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2003 if (err == 0) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2004 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2005
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2006 TARGET(DELETE_ATTR)
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	2007 w = GETITEM(names, oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2008 v = POP();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2009 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	2010 /* del v.w */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2011 Py_DECREF(v);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2012 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2013
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2014 TARGET(STORE_GLOBAL)
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	2015 w = GETITEM(names, oparg);
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	2016 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2017 err = PyDict_SetItem(f->f_globals, w, v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2018 Py_DECREF(v);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2019 if (err == 0) DISPATCH();
464 90300ca21200 Added STORE_GLOBAL and DELETE_GLOBAL. Guido van Rossum <guido@python.org> parents: 409 diff changeset	2020 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2021
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2022 TARGET(DELETE_GLOBAL)
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	2023 w = GETITEM(names, oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2024 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	2025 format_exc_check_arg(
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2026 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	2027 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2028
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2029 TARGET(LOAD_NAME)
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	2030 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	2031 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	2032 PyErr_Format(PyExc_SystemError,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	2033 "no locals when loading %R", w);
50112 abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2034 why = WHY_EXCEPTION;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2035 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2036 }
32900 ac73f6662e11 Fix for the unfortunate fact that PyDict_GetItem and PyObject_GetItem Michael W. Hudson <mwh@python.net> parents: 32890 diff changeset	2037 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	2038 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	2039 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	2040 }
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	2041 else {
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	2042 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	2043 if (x == NULL && PyErr_Occurred()) {
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2044 if (!PyErr_ExceptionMatches(
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2045 PyExc_KeyError))
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	2046 break;
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	2047 PyErr_Clear();
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	2048 }
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 32421 diff changeset	2049 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2050 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2051 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	2052 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2053 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	2054 if (x == NULL) {
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	2055 format_exc_check_arg(
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2056 PyExc_NameError,
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2057 NAME_ERROR_MSG, w);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2058 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2059 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2060 }
32900 ac73f6662e11 Fix for the unfortunate fact that PyDict_GetItem and PyObject_GetItem Michael W. Hudson <mwh@python.net> parents: 32890 diff changeset	2061 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2062 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2063 PUSH(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2064 DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2065
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2066 TARGET(LOAD_GLOBAL)
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	2067 w = GETITEM(names, oparg);
42860 bf1a53cc6e65 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2068 if (PyUnicode_CheckExact(w)) {
24900 2cdf3d0dfabd Add a warning comment to the LOAD_GLOBAL inline code. Guido van Rossum <guido@python.org> parents: 24899 diff changeset	2069 /* 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	2070 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	2071 Do not try this at home. */
42860 bf1a53cc6e65 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2072 long hash = ((PyUnicodeObject *)w)->hash;
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2073 if (hash != -1) {
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2074 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	2075 PyDictEntry *e;
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2076 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	2077 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	2078 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	2079 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	2080 break;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2081 }
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2082 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	2083 if (x != NULL) {
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2084 Py_INCREF(x);
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2085 PUSH(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2086 DISPATCH();
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2087 }
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2088 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	2089 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	2090 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	2091 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	2092 break;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2093 }
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2094 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	2095 if (x != NULL) {
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2096 Py_INCREF(x);
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2097 PUSH(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2098 DISPATCH();
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2099 }
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2100 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	2101 }
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2102 }
8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2103 /* This is the un-inlined version of the code above */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2104 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	2105 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2106 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	2107 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	2108 load_global_error:
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	2109 format_exc_check_arg(
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2110 PyExc_NameError,
24899 8f8fe990e82c Another ugly inlining hack, expanding the two PyDict_GetItem() calls Guido van Rossum <guido@python.org> parents: 24870 diff changeset	2111 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	2112 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2113 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2114 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2115 Py_INCREF(x);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2116 PUSH(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2117 DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2118
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2119 TARGET(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	2120 x = GETLOCAL(oparg);
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2121 if (x != NULL) {
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2122 SETLOCAL(oparg, NULL);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2123 DISPATCH();
8318 ec87b62466d3 DELETE_FAST should issue an exception when the local variable is undefined. Guido van Rossum <guido@python.org> parents: 7982 diff changeset	2124 }
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2125 format_exc_check_arg(
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2126 PyExc_UnboundLocalError,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2127 UNBOUNDLOCAL_ERROR_MSG,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2128 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	2129 );
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2130 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2131
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2132 TARGET(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	2133 x = freevars[oparg];
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2134 Py_INCREF(x);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2135 PUSH(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2136 if (x != NULL) DISPATCH();
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2137 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2138
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2139 TARGET(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	2140 x = freevars[oparg];
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2141 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	2142 if (w != NULL) {
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2143 PUSH(w);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2144 DISPATCH();
31878 26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2145 }
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2146 err = -1;
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2147 /* 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	2148 if (PyErr_Occurred())
16453 2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	2149 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	2150 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	2151 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	2152 oparg);
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2153 format_exc_check_arg(
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2154 PyExc_UnboundLocalError,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2155 UNBOUNDLOCAL_ERROR_MSG,
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2156 v);
26ee1b3eb345 Small code improvements for readability, code size, and/or speed. Raymond Hettinger <python@rcn.com> parents: 31875 diff changeset	2157 } else {
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2158 v = PyTuple_GET_ITEM(co->co_freevars, oparg -
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2159 PyTuple_GET_SIZE(co->co_cellvars));
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2160 format_exc_check_arg(PyExc_NameError,
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2161 UNBOUNDFREE_ERROR_MSG, v);
16453 2e3dd62ceac5 SF patch 103596 by Nick Mathewson: rause UnboundLocalError for Jeremy Hylton <jeremy@alum.mit.edu> parents: 16398 diff changeset	2162 }
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2163 break;
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2164
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2165 TARGET(STORE_DEREF)
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2166 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	2167 x = freevars[oparg];
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 16017 diff changeset	2168 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	2169 Py_DECREF(w);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2170 DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2171
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2172 TARGET(BUILD_TUPLE)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2173 x = PyTuple_New(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2174 if (x != NULL) {
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	2175 for (; --oparg >= 0;) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2176 w = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2177 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	2178 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2179 PUSH(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2180 DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2181 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2182 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2183
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2184 TARGET(BUILD_LIST)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2185 x = PyList_New(oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2186 if (x != NULL) {
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	2187 for (; --oparg >= 0;) {
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2188 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	2189 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	2190 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2191 PUSH(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2192 DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2193 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2194 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2195
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2196 TARGET(BUILD_SET)
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2197 x = PySet_New(NULL);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2198 if (x != NULL) {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2199 for (; --oparg >= 0;) {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2200 w = POP();
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2201 if (err == 0)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2202 err = PySet_Add(x, w);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2203 Py_DECREF(w);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2204 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2205 if (err != 0) {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2206 Py_DECREF(x);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2207 break;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2208 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2209 PUSH(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2210 DISPATCH();
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2211 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2212 break;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2213
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2214 TARGET(BUILD_MAP)
44349 4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	2215 x = _PyDict_NewPresized((Py_ssize_t)oparg);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2216 PUSH(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2217 if (x != NULL) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2218 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2219
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2220 TARGET(STORE_MAP)
44349 4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	2221 w = TOP(); /* key */
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	2222 u = SECOND(); /* value */
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	2223 v = THIRD(); /* dict */
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	2224 STACKADJ(-2);
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	2225 assert (PyDict_CheckExact(v));
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	2226 err = PyDict_SetItem(v, w, u); /* v[w] = u */
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	2227 Py_DECREF(u);
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	2228 Py_DECREF(w);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2229 if (err == 0) DISPATCH();
44349 4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	2230 break;
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44310 diff changeset	2231
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2232 TARGET(MAP_ADD)
50211 2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	2233 w = TOP(); /* key */
2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	2234 u = SECOND(); /* value */
2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	2235 STACKADJ(-2);
2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	2236 v = stack_pointer[-oparg]; /* dict */
2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	2237 assert (PyDict_CheckExact(v));
2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	2238 err = PyDict_SetItem(v, w, u); /* v[w] = u */
2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	2239 Py_DECREF(u);
2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	2240 Py_DECREF(w);
2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	2241 if (err == 0) {
2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	2242 PREDICT(JUMP_ABSOLUTE);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2243 DISPATCH();
50211 2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	2244 }
2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	2245 break;
2ee4653927f7 Merged revisions 67818 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50112 diff changeset	2246
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2247 TARGET(LOAD_ATTR)
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	2248 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	2249 v = TOP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2250 x = PyObject_GetAttr(v, w);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2251 Py_DECREF(v);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2252 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2253 if (x != NULL) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2254 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2255
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2256 TARGET(COMPARE_OP)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2257 w = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2258 v = TOP();
44156 fb84bd9500a4 Remove special-casing of integer operations, to stop Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	2259 x = cmp_outcome(oparg, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2260 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2261 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2262 SET_TOP(x);
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2263 if (x == NULL) break;
51853 643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2264 PREDICT(POP_JUMP_IF_FALSE);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2265 PREDICT(POP_JUMP_IF_TRUE);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2266 DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2267
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2268 TARGET(IMPORT_NAME)
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	2269 w = GETITEM(names, oparg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2270 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	2271 if (x == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2272 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	2273 "__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	2274 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2275 }
44905 c0f048356c36 Merged revisions 60210-60233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2276 Py_INCREF(x);
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2277 v = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2278 u = TOP();
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43996 diff changeset	2279 if (PyLong_AsLong(u) != -1 \|\| PyErr_Occurred())
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2280 w = PyTuple_Pack(5,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2281 w,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2282 f->f_globals,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2283 f->f_locals == NULL ?
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2284 Py_None : f->f_locals,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2285 v,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2286 u);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2287 else
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2288 w = PyTuple_Pack(4,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2289 w,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2290 f->f_globals,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2291 f->f_locals == NULL ?
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2292 Py_None : f->f_locals,
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2293 v);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36702 diff changeset	2294 Py_DECREF(v);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2295 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	2296 if (w == NULL) {
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2297 u = POP();
44905 c0f048356c36 Merged revisions 60210-60233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2298 Py_DECREF(x);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2299 x = NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2300 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	2301 }
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	2302 READ_TIMESTAMP(intr0);
44905 c0f048356c36 Merged revisions 60210-60233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2303 v = x;
c0f048356c36 Merged revisions 60210-60233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2304 x = PyEval_CallObject(v, w);
c0f048356c36 Merged revisions 60210-60233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2305 Py_DECREF(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	2306 READ_TIMESTAMP(intr1);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2307 Py_DECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2308 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2309 if (x != NULL) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2310 break;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2311
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2312 TARGET(IMPORT_STAR)
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2313 v = POP();
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2314 PyFrame_FastToLocals(f);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2315 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	2316 PyErr_SetString(PyExc_SystemError,
16017 7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 15948 diff changeset	2317 "no locals found during 'import *'");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2318 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2319 }
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	2320 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	2321 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	2322 READ_TIMESTAMP(intr1);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2323 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	2324 Py_DECREF(v);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2325 if (err == 0) DISPATCH();
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2326 break;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1282 diff changeset	2327
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2328 TARGET(IMPORT_FROM)
24607 3e4d432872ea get rid of GETNAMEV macro - use GETITEM directly Skip Montanaro <skip@pobox.com> parents: 24545 diff changeset	2329 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	2330 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	2331 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	2332 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	2333 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	2334 PUSH(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2335 if (x != NULL) DISPATCH();
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2336 break;
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	2337
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2338 TARGET(JUMP_FORWARD)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2339 JUMPBY(oparg);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2340 FAST_DISPATCH();
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2341
51853 643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2342 PREDICTED_WITH_ARG(POP_JUMP_IF_FALSE);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2343 TARGET(POP_JUMP_IF_FALSE)
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2344 w = POP();
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2345 if (w == Py_True) {
51853 643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2346 Py_DECREF(w);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2347 FAST_DISPATCH();
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2348 }
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2349 if (w == Py_False) {
51853 643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2350 Py_DECREF(w);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2351 JUMPTO(oparg);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2352 FAST_DISPATCH();
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2353 }
fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2354 err = PyObject_IsTrue(w);
51853 643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2355 Py_DECREF(w);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2356 if (err > 0)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2357 err = 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2358 else if (err == 0)
51853 643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2359 JUMPTO(oparg);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2360 else
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2361 break;
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2362 DISPATCH();
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2363
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2364 PREDICTED_WITH_ARG(POP_JUMP_IF_TRUE);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2365 TARGET(POP_JUMP_IF_TRUE)
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2366 w = POP();
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2367 if (w == Py_False) {
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2368 Py_DECREF(w);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2369 FAST_DISPATCH();
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2370 }
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2371 if (w == Py_True) {
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2372 Py_DECREF(w);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2373 JUMPTO(oparg);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2374 FAST_DISPATCH();
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2375 }
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2376 err = PyObject_IsTrue(w);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2377 Py_DECREF(w);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2378 if (err > 0) {
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2379 err = 0;
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2380 JUMPTO(oparg);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2381 }
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2382 else if (err == 0)
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2383 ;
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2384 else
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2385 break;
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2386 DISPATCH();
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2387
51853 643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2388 TARGET(JUMP_IF_FALSE_OR_POP)
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2389 w = TOP();
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2390 if (w == Py_True) {
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2391 STACKADJ(-1);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2392 Py_DECREF(w);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2393 FAST_DISPATCH();
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2394 }
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2395 if (w == Py_False) {
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2396 JUMPTO(oparg);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2397 FAST_DISPATCH();
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2398 }
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2399 err = PyObject_IsTrue(w);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2400 if (err > 0) {
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2401 STACKADJ(-1);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2402 Py_DECREF(w);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2403 err = 0;
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2404 }
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2405 else if (err == 0)
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2406 JUMPTO(oparg);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2407 else
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2408 break;
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2409 DISPATCH();
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2410
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2411 TARGET(JUMP_IF_TRUE_OR_POP)
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2412 w = TOP();
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2413 if (w == Py_False) {
51853 643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2414 STACKADJ(-1);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2415 Py_DECREF(w);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2416 FAST_DISPATCH();
28302 8c082936daaf Introduced macros for a simple opcode prediction protocol. Raymond Hettinger <python@rcn.com> parents: 28296 diff changeset	2417 }
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2418 if (w == Py_True) {
51853 643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2419 JUMPTO(oparg);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2420 FAST_DISPATCH();
28077 fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2421 }
fcb39b0a6e30 Micro-optimizations. Raymond Hettinger <python@rcn.com> parents: 27978 diff changeset	2422 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	2423 if (err > 0) {
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2424 err = 0;
51853 643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2425 JUMPTO(oparg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2426 }
51853 643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2427 else if (err == 0) {
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2428 STACKADJ(-1);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2429 Py_DECREF(w);
643d8d4fc8eb http://bugs.python.org/issue4715 Jeffrey Yasskin <jyasskin@gmail.com> parents: 51031 diff changeset	2430 }
5002 ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2431 else
ae3b46a73765 Add "if (x != NULL) continue;" (or similar for err==0) before the Guido van Rossum <guido@python.org> parents: 4992 diff changeset	2432 break;
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2433 DISPATCH();
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2434
31649 243642bbd03f LIST_APPEND is predicably followed by JUMP_ABSOLUTE. Raymond Hettinger <python@rcn.com> parents: 31647 diff changeset	2435 PREDICTED_WITH_ARG(JUMP_ABSOLUTE);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2436 TARGET(JUMP_ABSOLUTE)
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2437 JUMPTO(oparg);
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2438 #if FAST_LOOPS
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2439 /* Enabling this path speeds-up all while and for-loops by bypassing
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2440 the per-loop checks for signals. By default, this should be turned-off
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2441 because it prevents detection of a control-break in tight loops like
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2442 "while 1: pass". Compile with this option turned-on when you need
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2443 the speed-up and do not need break checking inside tight loops (ones
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2444 that contain only instructions ending with FAST_DISPATCH).
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2445 */
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2446 FAST_DISPATCH();
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2447 #else
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2448 DISPATCH();
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2449 #endif
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2450
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2451 TARGET(GET_ITER)
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2452 /* 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	2453 v = TOP();
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2454 x = PyObject_GetIter(v);
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2455 Py_DECREF(v);
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2456 if (x != NULL) {
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2457 SET_TOP(x);
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	2458 PREDICT(FOR_ITER);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2459 DISPATCH();
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2460 }
27243 3afbd55fb18f Replaced POP() with STACKADJ(-1) on lines where the result wasn't used. Raymond Hettinger <python@rcn.com> parents: 27201 diff changeset	2461 STACKADJ(-1);
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2462 break;
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2463
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	2464 PREDICTED_WITH_ARG(FOR_ITER);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2465 TARGET(FOR_ITER)
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2466 /* before: [iter]; after: [iter, iter()] or [] */
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2467 v = TOP();
31646 83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2468 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	2469 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	2470 PUSH(x);
28304 b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	2471 PREDICT(STORE_FAST);
b14d6741f496 Eliminate data dependency in predict macro. Raymond Hettinger <python@rcn.com> parents: 28303 diff changeset	2472 PREDICT(UNPACK_SEQUENCE);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2473 DISPATCH();
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17494 diff changeset	2474 }
31646 83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2475 if (PyErr_Occurred()) {
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2476 if (!PyErr_ExceptionMatches(
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2477 PyExc_StopIteration))
31646 83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2478 break;
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2479 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	2480 }
31646 83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2481 /* iterator ended normally */
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2482 x = v = POP();
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2483 Py_DECREF(v);
83b0382e0d36 Speedup for-loops by inlining PyIter_Next(). Saves duplicate tests Raymond Hettinger <python@rcn.com> parents: 31630 diff changeset	2484 JUMPBY(oparg);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2485 DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2486
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2487 TARGET(BREAK_LOOP)
31647 d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2488 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	2489 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	2490
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2491 TARGET(CONTINUE_LOOP)
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43996 diff changeset	2492 retval = PyLong_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	2493 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	2494 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	2495 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2496 }
31647 d10c778af167 Move the code for BREAK and CONTINUE_LOOP to be near FOR_ITER. Raymond Hettinger <python@rcn.com> parents: 31646 diff changeset	2497 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	2498 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	2499
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2500 TARGET_WITH_IMPL(SETUP_LOOP, _setup_finally)
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2501 TARGET_WITH_IMPL(SETUP_EXCEPT, _setup_finally)
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2502 TARGET(SETUP_FINALLY)
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2503 _setup_finally:
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2504 /* NOTE: If you add any new block-setup opcodes that
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2505 are not try/except/finally handlers, you may need
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2506 to update the PyGen_NeedsFinalizing() function.
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	2507 */
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	2508
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2509 PyFrame_BlockSetup(f, opcode, INSTR_OFFSET() + oparg,
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2510 STACK_LEVEL());
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2511 DISPATCH();
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2512
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2513 TARGET(SETUP_WITH)
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2514 {
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2515 static PyObject exit, enter;
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2516 w = TOP();
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2517 x = special_lookup(w, "__exit__", &exit);
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2518 if (!x)
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2519 break;
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2520 SET_TOP(x);
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2521 u = special_lookup(w, "__enter__", &enter);
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2522 Py_DECREF(w);
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2523 if (!u) {
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2524 x = NULL;
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2525 break;
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2526 }
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2527 x = PyObject_CallFunctionObjArgs(u, NULL);
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2528 Py_DECREF(u);
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2529 if (!x)
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2530 break;
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2531 /* Setup the finally block before pushing the result
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2532 of __enter__ on the stack. */
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2533 PyFrame_BlockSetup(f, SETUP_FINALLY, INSTR_OFFSET() + oparg,
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2534 STACK_LEVEL());
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2535
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2536 PUSH(x);
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2537 DISPATCH();
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2538 }
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2539
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2540 TARGET(WITH_CLEANUP)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2541 {
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2542 /* At the top of the stack are 1-3 values indicating
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2543 how/why we entered the finally clause:
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2544 - TOP = None
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2545 - (TOP, SECOND) = (WHY_{RETURN,CONTINUE}), retval
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2546 - TOP = WHY_*; no retval below it
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2547 - (TOP, SECOND, THIRD) = exc_info()
54904 2602b56ad02d update comments Benjamin Peterson <benjamin@python.org> parents: 54903 diff changeset	2548 (FOURTH, FITH, SIXTH) = previous exception for EXCEPT_HANDLER
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2549 Below them is EXIT, the context.__exit__ bound method.
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2550 In the last case, we must call
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2551 EXIT(TOP, SECOND, THIRD)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2552 otherwise we must call
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2553 EXIT(None, None, None)
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2554
54904 2602b56ad02d update comments Benjamin Peterson <benjamin@python.org> parents: 54903 diff changeset	2555 In the first two cases, we remove EXIT from the
2602b56ad02d update comments Benjamin Peterson <benjamin@python.org> parents: 54903 diff changeset	2556 stack, leaving the rest in the same order. In the
2602b56ad02d update comments Benjamin Peterson <benjamin@python.org> parents: 54903 diff changeset	2557 third case, we shift the bottom 3 values of the
2602b56ad02d update comments Benjamin Peterson <benjamin@python.org> parents: 54903 diff changeset	2558 stack down, and replace the empty spot with NULL.
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 36712 diff changeset	2559
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 36712 diff changeset	2560 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	2561 and the function call returns a 'true' value, we
54904 2602b56ad02d update comments Benjamin Peterson <benjamin@python.org> parents: 54903 diff changeset	2562 push WHY_SILENCED onto the stack. END_FINALLY will
2602b56ad02d update comments Benjamin Peterson <benjamin@python.org> parents: 54903 diff changeset	2563 then not re-raise the exception. (But non-local
2602b56ad02d update comments Benjamin Peterson <benjamin@python.org> parents: 54903 diff changeset	2564 gotos should still be resumed.)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2565 */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2566
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2567 PyObject *exit_func;
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2568 u = TOP();
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2569 if (u == Py_None) {
56356 53f17cc7bff6 silence with (void) two warnings about computed and unused value of POP() Ezio Melotti <ezio.melotti@gmail.com> parents: 55373 diff changeset	2570 (void)POP();
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2571 exit_func = TOP();
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2572 SET_TOP(u);
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2573 v = w = Py_None;
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2574 }
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2575 else if (PyLong_Check(u)) {
56356 53f17cc7bff6 silence with (void) two warnings about computed and unused value of POP() Ezio Melotti <ezio.melotti@gmail.com> parents: 55373 diff changeset	2576 (void)POP();
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2577 switch(PyLong_AsLong(u)) {
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2578 case WHY_RETURN:
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2579 case WHY_CONTINUE:
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2580 /* Retval in TOP. */
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2581 exit_func = SECOND();
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2582 SET_SECOND(TOP());
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2583 SET_TOP(u);
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2584 break;
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2585 default:
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2586 exit_func = TOP();
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2587 SET_TOP(u);
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2588 break;
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2589 }
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2590 u = v = w = Py_None;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2591 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2592 else {
54903 544c5bad1607 correctly rearrange the stack in the exception case of WITH_CLEANUP Benjamin Peterson <benjamin@python.org> parents: 54889 diff changeset	2593 PyObject tp, exc, *tb;
544c5bad1607 correctly rearrange the stack in the exception case of WITH_CLEANUP Benjamin Peterson <benjamin@python.org> parents: 54889 diff changeset	2594 PyTryBlock *block;
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2595 v = SECOND();
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2596 w = THIRD();
54903 544c5bad1607 correctly rearrange the stack in the exception case of WITH_CLEANUP Benjamin Peterson <benjamin@python.org> parents: 54889 diff changeset	2597 tp = FOURTH();
54909 0c319e03d9a1 use stack altering macros here Benjamin Peterson <benjamin@python.org> parents: 54908 diff changeset	2598 exc = PEEK(5);
0c319e03d9a1 use stack altering macros here Benjamin Peterson <benjamin@python.org> parents: 54908 diff changeset	2599 tb = PEEK(6);
0c319e03d9a1 use stack altering macros here Benjamin Peterson <benjamin@python.org> parents: 54908 diff changeset	2600 exit_func = PEEK(7);
0c319e03d9a1 use stack altering macros here Benjamin Peterson <benjamin@python.org> parents: 54908 diff changeset	2601 SET_VALUE(7, tb);
0c319e03d9a1 use stack altering macros here Benjamin Peterson <benjamin@python.org> parents: 54908 diff changeset	2602 SET_VALUE(6, exc);
0c319e03d9a1 use stack altering macros here Benjamin Peterson <benjamin@python.org> parents: 54908 diff changeset	2603 SET_VALUE(5, tp);
54904 2602b56ad02d update comments Benjamin Peterson <benjamin@python.org> parents: 54903 diff changeset	2604 /* UNWIND_EXCEPT_BLOCK will pop this off. */
54909 0c319e03d9a1 use stack altering macros here Benjamin Peterson <benjamin@python.org> parents: 54908 diff changeset	2605 SET_FOURTH(NULL);
54904 2602b56ad02d update comments Benjamin Peterson <benjamin@python.org> parents: 54903 diff changeset	2606 /* We just shifted the stack down, so we have
2602b56ad02d update comments Benjamin Peterson <benjamin@python.org> parents: 54903 diff changeset	2607 to tell the except handler block that the
2602b56ad02d update comments Benjamin Peterson <benjamin@python.org> parents: 54903 diff changeset	2608 values are lower than it expects. */
54903 544c5bad1607 correctly rearrange the stack in the exception case of WITH_CLEANUP Benjamin Peterson <benjamin@python.org> parents: 54889 diff changeset	2609 block = &f->f_blockstack[f->f_iblock - 1];
544c5bad1607 correctly rearrange the stack in the exception case of WITH_CLEANUP Benjamin Peterson <benjamin@python.org> parents: 54889 diff changeset	2610 assert(block->b_type == EXCEPT_HANDLER);
544c5bad1607 correctly rearrange the stack in the exception case of WITH_CLEANUP Benjamin Peterson <benjamin@python.org> parents: 54889 diff changeset	2611 block->b_level--;
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2612 }
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2613 /* XXX Not the fastest way to call it... */
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2614 x = PyObject_CallFunctionObjArgs(exit_func, u, v, w,
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45635 diff changeset	2615 NULL);
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2616 Py_DECREF(exit_func);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2617 if (x == NULL)
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	2618 break; /* Go to error exit */
50104 48239f6209b0 Merged revisions 67688 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50045 diff changeset	2619
48239f6209b0 Merged revisions 67688 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50045 diff changeset	2620 if (u != Py_None)
48239f6209b0 Merged revisions 67688 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50045 diff changeset	2621 err = PyObject_IsTrue(x);
48239f6209b0 Merged revisions 67688 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50045 diff changeset	2622 else
48239f6209b0 Merged revisions 67688 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50045 diff changeset	2623 err = 0;
48239f6209b0 Merged revisions 67688 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50045 diff changeset	2624 Py_DECREF(x);
48239f6209b0 Merged revisions 67688 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50045 diff changeset	2625
48239f6209b0 Merged revisions 67688 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50045 diff changeset	2626 if (err < 0)
48239f6209b0 Merged revisions 67688 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50045 diff changeset	2627 break; /* Go to error exit */
48239f6209b0 Merged revisions 67688 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50045 diff changeset	2628 else if (err > 0) {
48239f6209b0 Merged revisions 67688 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50045 diff changeset	2629 err = 0;
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2630 /* There was an exception and a True return */
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	2631 PUSH(PyLong_FromLong((long) WHY_SILENCED));
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2632 }
45635 882eba145119 Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45017 diff changeset	2633 PREDICT(END_FINALLY);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2634 break;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2635 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	2636
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2637 TARGET(CALL_FUNCTION)
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2638 {
e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2639 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	2640 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	2641 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	2642 #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	2643 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	2644 #else
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2645 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	2646 #endif
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2647 stack_pointer = sp;
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	2648 PUSH(x);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	2649 if (x != NULL)
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2650 DISPATCH();
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	2651 break;
32359 e5bc947c44ca Performance tweak: allow stack_pointer and oparg to be register variables. Armin Rigo <arigo@tunes.org> parents: 32301 diff changeset	2652 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2653
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2654 TARGET_WITH_IMPL(CALL_FUNCTION_VAR, _call_function_var_kw)
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2655 TARGET_WITH_IMPL(CALL_FUNCTION_KW, _call_function_var_kw)
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2656 TARGET(CALL_FUNCTION_VAR_KW)
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2657 _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	2658 {
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2659 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	2660 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	2661 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	2662 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	2663 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	2664 PCALL(PCALL_ALL);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2665 if (flags & CALL_FLAG_VAR)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2666 n++;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2667 if (flags & CALL_FLAG_KW)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2668 n++;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2669 pfunc = stack_pointer - n - 1;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2670 func = *pfunc;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2671
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2672 if (PyMethod_Check(func)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2673 && PyMethod_GET_SELF(func) != NULL) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2674 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	2675 Py_INCREF(self);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2676 func = PyMethod_GET_FUNCTION(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2677 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	2678 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	2679 *pfunc = self;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2680 na++;
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2681 n++;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2682 } else
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2683 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	2684 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	2685 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	2686 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	2687 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	2688 stack_pointer = sp;
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2689 Py_DECREF(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2690
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2691 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	2692 w = POP();
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	2693 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	2694 }
603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2695 PUSH(x);
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2696 if (x != NULL)
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2697 DISPATCH();
12082 603db0d0aed1 slightly modified version of Greg Ewing's extended call syntax patch Jeremy Hylton <jeremy@alum.mit.edu> parents: 11839 diff changeset	2698 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	2699 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2700
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2701 TARGET_WITH_IMPL(MAKE_CLOSURE, _make_function)
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2702 TARGET(MAKE_FUNCTION)
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2703 _make_function:
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2704 {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2705 int posdefaults = oparg & 0xff;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2706 int kwdefaults = (oparg>>8) & 0xff;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2707 int num_annotations = (oparg >> 16) & 0x7fff;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2708
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2709 v = POP(); /* code object */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2710 x = PyFunction_New(v, f->f_globals);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2711 Py_DECREF(v);
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	2712
40943 c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2713 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	2714 v = POP();
50112 abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2715 if (PyFunction_SetClosure(x, v) != 0) {
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2716 /* Can't happen unless bytecode is corrupt. */
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2717 why = WHY_EXCEPTION;
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2718 }
40943 c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2719 Py_DECREF(v);
c79e6234fb19 Two more patches by Tony Lownds (SF# 1607548). Guido van Rossum <guido@python.org> parents: 40942 diff changeset	2720 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2721
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2722 if (x != NULL && num_annotations > 0) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2723 Py_ssize_t name_ix;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2724 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	2725 v = PyDict_New();
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2726 if (v == NULL) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2727 Py_DECREF(x);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2728 x = NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2729 break;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2730 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2731 name_ix = PyTuple_Size(u);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2732 assert(num_annotations == name_ix+1);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2733 while (name_ix > 0) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2734 --name_ix;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2735 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	2736 w = POP();
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2737 /* XXX(nnorwitz): check for errors */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2738 PyDict_SetItem(v, t, w);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2739 Py_DECREF(w);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2740 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2741
50112 abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2742 if (PyFunction_SetAnnotations(x, v) != 0) {
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2743 /* Can't happen unless
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2744 PyFunction_SetAnnotations changes. */
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2745 why = WHY_EXCEPTION;
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2746 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2747 Py_DECREF(v);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2748 Py_DECREF(u);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2749 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	2750
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2751 /* 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	2752 if (x != NULL && posdefaults > 0) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2753 v = PyTuple_New(posdefaults);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2754 if (v == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2755 Py_DECREF(x);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2756 x = NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2757 break;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2758 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2759 while (--posdefaults >= 0) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2760 w = POP();
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2761 PyTuple_SET_ITEM(v, posdefaults, w);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2762 }
50112 abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2763 if (PyFunction_SetDefaults(x, v) != 0) {
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2764 /* Can't happen unless
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2765 PyFunction_SetDefaults changes. */
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2766 why = WHY_EXCEPTION;
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2767 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2768 Py_DECREF(v);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2769 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2770 if (x != NULL && kwdefaults > 0) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2771 v = PyDict_New();
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2772 if (v == NULL) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2773 Py_DECREF(x);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2774 x = NULL;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2775 break;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2776 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2777 while (--kwdefaults >= 0) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2778 w = POP(); /* default value */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2779 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	2780 /* XXX(nnorwitz): check for errors */
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2781 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	2782 Py_DECREF(w);
93f582803733 Fix a refleak in the MAKE_FUNCTION opcode in ceval.c. Georg Brandl <georg@python.org> parents: 40894 diff changeset	2783 Py_DECREF(u);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2784 }
50112 abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2785 if (PyFunction_SetKwDefaults(x, v) != 0) {
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2786 /* Can't happen unless
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2787 PyFunction_SetKwDefaults changes. */
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2788 why = WHY_EXCEPTION;
abf815b80b5d Merged revisions 67666,67685 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 50104 diff changeset	2789 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2790 Py_DECREF(v);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2791 }
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2792 PUSH(x);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2793 break;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	2794 }
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2795
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2796 TARGET(BUILD_SLICE)
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2797 if (oparg == 3)
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2798 w = POP();
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2799 else
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2800 w = NULL;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2801 v = POP();
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2802 u = TOP();
5018 001a5042b181 Cleanup: Guido van Rossum <guido@python.org> parents: 5014 diff changeset	2803 x = PySlice_New(u, v, w);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2804 Py_DECREF(u);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2805 Py_DECREF(v);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2806 Py_XDECREF(w);
27186 04aa86d49d93 SF patch #664320: Replace push/pop clusters in ceval.c Raymond Hettinger <python@rcn.com> parents: 26141 diff changeset	2807 SET_TOP(x);
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2808 if (x != NULL) DISPATCH();
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2809 break;
22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2810
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2811 TARGET(EXTENDED_ARG)
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	2812 opcode = NEXTOP();
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	2813 oparg = oparg<<16 \| NEXTARG();
14147 21ec69a56228 Charles G. Waldman <cgw@fnal.gov>: Fred Drake <fdrake@acm.org> parents: 14100 diff changeset	2814 goto dispatch_opcode;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3694 diff changeset	2815
51031 d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2816 #ifdef USE_COMPUTED_GOTOS
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2817 _unknown_opcode:
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos' Antoine Pitrou <solipsis@pitrou.net> parents: 50840 diff changeset	2818 #endif
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2819 default:
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2820 fprintf(stderr,
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2821 "XXX lineno: %d, opcode: %d\n",
55372 79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54909 diff changeset	2822 PyFrame_GetLineNumber(f),
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	2823 opcode);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2824 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	2825 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2826 break;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2827
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2828 #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	2829 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2830 #endif
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	2831
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2832 } /* switch */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2833
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2834 on_error:
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2835
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	2836 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	2837
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2838 /* Quickly continue if no error occurred */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2839
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2840 if (why == WHY_NOT) {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2841 if (err == 0 && x != NULL) {
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2842 #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	2843 /* This check is expensive! */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2844 if (PyErr_Occurred())
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2845 fprintf(stderr,
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2846 "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	2847 else {
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2848 #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	2849 READ_TIMESTAMP(loop1);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2850 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	2851 #ifdef CHECKEXC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2852 }
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	2853 #endif
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2854 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2855 why = WHY_EXCEPTION;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2856 x = Py_None;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2857 err = 0;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2858 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2859
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2860 /* Double-check exception status */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2861
31900 0265bf9912ea Some (but not all) of the why code bitfield tests ran faster as Raymond Hettinger <python@rcn.com> parents: 31894 diff changeset	2862 if (why == WHY_EXCEPTION \|\| why == WHY_RERAISE) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2863 if (!PyErr_Occurred()) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	2864 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	2865 "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	2866 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2867 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2868 }
10363 4daab7a9f566 Always test for an error return (usually NULL or -1) without setting Guido van Rossum <guido@python.org> parents: 9679 diff changeset	2869 #ifdef CHECKEXC
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2870 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	2871 /* This check is expensive! */
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2872 if (PyErr_Occurred()) {
45017 4725c84b0422 Merged revisions 60350-60363 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44905 diff changeset	2873 char buf[128];
30861 c89fd7eaf875 Make undetected error on stack unwind a fatal error. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30801 diff changeset	2874 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	2875 "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	2876 Py_FatalError(buf);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	2877 }
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2878 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2879 #endif
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2880
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2881 /* 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	2882
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2883 if (why == WHY_EXCEPTION) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	2884 PyTraceBack_Here(f);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2885
20247 a4d328d50897 Rationalize the events passed to the profiler (no changes for the tracer). Fred Drake <fdrake@acm.org> parents: 20183 diff changeset	2886 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	2887 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	2888 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	2889 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2890
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2891 /* 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	2892
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2893 if (why == WHY_RERAISE)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2894 why = WHY_EXCEPTION;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2895
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2896 /* Unwind stacks if a (pseudo) exception occurred */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2897
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2898 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	2899 while (why != WHY_NOT && f->f_iblock > 0) {
55373 ebc9856a9bdb Merged revisions 73750 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 55372 diff changeset	2900 /* Peek at the current block. */
ebc9856a9bdb Merged revisions 73750 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 55372 diff changeset	2901 PyTryBlock *b = &f->f_blockstack[f->f_iblock - 1];
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2902
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2903 assert(why != WHY_YIELD);
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2904 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	2905 why = WHY_NOT;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43996 diff changeset	2906 JUMPTO(PyLong_AS_LONG(retval));
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2907 Py_DECREF(retval);
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2908 break;
80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2909 }
55373 ebc9856a9bdb Merged revisions 73750 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 55372 diff changeset	2910 /* Now we have to pop the block. */
ebc9856a9bdb Merged revisions 73750 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 55372 diff changeset	2911 f->f_iblock--;
16398 80c0b280a4f9 Allow 'continue' inside 'try' clause Jeremy Hylton <jeremy@alum.mit.edu> parents: 16394 diff changeset	2912
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2913 if (b->b_type == EXCEPT_HANDLER) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2914 UNWIND_EXCEPT_HANDLER(b);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2915 continue;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2916 }
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2917 UNWIND_BLOCK(b);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2918 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	2919 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2920 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2921 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2922 }
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2923 if (why == WHY_EXCEPTION && (b->b_type == SETUP_EXCEPT
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2924 \|\| b->b_type == SETUP_FINALLY)) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2925 PyObject exc, val, *tb;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2926 int handler = b->b_handler;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2927 /* Beware, this invalidates all b->b_* fields */
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2928 PyFrame_BlockSetup(f, EXCEPT_HANDLER, -1, STACK_LEVEL());
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2929 PUSH(tstate->exc_traceback);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2930 PUSH(tstate->exc_value);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2931 if (tstate->exc_type != NULL) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2932 PUSH(tstate->exc_type);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2933 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2934 else {
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2935 Py_INCREF(Py_None);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2936 PUSH(Py_None);
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2937 }
47594 212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2938 PyErr_Fetch(&exc, &val, &tb);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2939 /* Make the raw exception data
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2940 available to the handler,
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2941 so a program can emulate the
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2942 Python main loop. */
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2943 PyErr_NormalizeException(
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2944 &exc, &val, &tb);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2945 PyException_SetTraceback(val, tb);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2946 Py_INCREF(exc);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2947 tstate->exc_type = exc;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2948 Py_INCREF(val);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2949 tstate->exc_value = val;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2950 tstate->exc_traceback = tb;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2951 if (tb == NULL)
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2952 tb = Py_None;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2953 Py_INCREF(tb);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2954 PUSH(tb);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2955 PUSH(val);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2956 PUSH(exc);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2957 why = WHY_NOT;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2958 JUMPTO(handler);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2959 break;
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2960 }
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2961 if (b->b_type == SETUP_FINALLY) {
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2962 if (why & (WHY_RETURN \| WHY_CONTINUE))
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2963 PUSH(retval);
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	2964 PUSH(PyLong_FromLong((long)why));
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2965 why = WHY_NOT;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2966 JUMPTO(b->b_handler);
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2967 break;
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2968 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2969 } /* unwind stack */
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2970
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2971 /* 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	2972
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2973 if (why != WHY_NOT)
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2974 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	2975 READ_TIMESTAMP(loop1);
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2976
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	2977 } /* main loop */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2978
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2979 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	2980 /* 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	2981 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	2982 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	2983 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	2984 }
97709fd8fda0 Fix for SF bug #489671 (Neil Norwitz): memory leak in test_richcmp. Guido van Rossum <guido@python.org> parents: 21252 diff changeset	2985
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	2986 if (why != WHY_RETURN)
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	2987 retval = NULL;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	2988
31462 d5c047807c69 SF patch #864059: optimize eval_frame Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2989 fast_yield:
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	2990 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	2991 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	2992 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	2993 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	2994 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	2995 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	2996 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	2997 retval = NULL;
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	2998 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	2999 }
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	3000 }
700f08369092 Port from the Python 2.4 branch, patches for SF bug # 900092, Barry Warsaw <barry@python.org> parents: 35298 diff changeset	3001 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	3002 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	3003 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	3004 PyTrace_RETURN, NULL);
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3005 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3006 }
20247 a4d328d50897 Rationalize the events passed to the profiler (no changes for the tracer). Fred Drake <fdrake@acm.org> parents: 20183 diff changeset	3007 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	3008 if (why == WHY_EXCEPTION)
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3009 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	3010 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	3011 PyTrace_RETURN, NULL);
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3012 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	3013 tstate->c_profileobj, f,
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3014 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	3015 Py_XDECREF(retval);
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3016 retval = NULL;
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3017 why = WHY_EXCEPTION;
3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3018 }
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3019 }
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3020 }
5023 75c1ee882a4a Kill all local variables on function return. This closes a gigantic Guido van Rossum <guido@python.org> parents: 5021 diff changeset	3021
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	3022 /* pop frame */
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3023 exit_eval_frame:
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30782 diff changeset	3024 Py_LeaveRecursiveCall();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3025 tstate->frame = f->f_back;
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3026
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3027 return retval;
173 4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	3028 }
4656452436e1 Moved support functions after main function; added prototypes; Guido van Rossum <guido@python.org> parents: 159 diff changeset	3029
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36580 diff changeset	3030 /* 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	3031 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	3032 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	3033
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3034 PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3035 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	3036 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	3037 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	3038 {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3039 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	3040 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	3041 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	3042 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	3043 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	3044
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3045 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	3046 PyErr_SetString(PyExc_SystemError,
19198 3c1c9948ff65 Remove much dead code from ceval.c Jeremy Hylton <jeremy@alum.mit.edu> parents: 19158 diff changeset	3047 "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	3048 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	3049 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3050
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3051 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	3052 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	3053 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	3054 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	3055 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	3056
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3057 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	3058 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	3059
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3060 if (co->co_argcount > 0 \|\|
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3061 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	3062 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	3063 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	3064 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	3065 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	3066 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	3067 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	3068 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	3069 goto fail;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3070 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	3071 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	3072 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	3073 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	3074 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3075 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	3076 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	3077 PyErr_Format(PyExc_TypeError,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43418 diff changeset	3078 "%U() takes %s %d "
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3079 "%spositional argument%s (%d given)",
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	3080 co->co_name,
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	3081 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	3082 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	3083 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	3084 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	3085 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	3086 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	3087 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3088 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	3089 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3090 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	3091 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	3092 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	3093 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	3094 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3095 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	3096 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	3097 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	3098 goto fail;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3099 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	3100 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	3101 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	3102 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	3103 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	3104 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3105 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3106 for (i = 0; i < kwcount; i++) {
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3107 PyObject **co_varnames;
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	3108 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	3109 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	3110 int j;
42860 bf1a53cc6e65 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	3111 if (keyword == NULL \|\| !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	3112 PyErr_Format(PyExc_TypeError,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43418 diff changeset	3113 "%U() keywords must be strings",
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	3114 co->co_name);
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	3115 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	3116 }
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3117 /* Speed hack: do raw pointer compares. As names are
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3118 normally interned this should almost always hit. */
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3119 co_varnames = PySequence_Fast_ITEMS(co->co_varnames);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3120 for (j = 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3121 j < co->co_argcount + co->co_kwonlyargcount;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3122 j++) {
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3123 PyObject *nm = co_varnames[j];
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3124 if (nm == keyword)
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3125 goto kw_found;
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3126 }
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3127 /* Slow fallback, just in case */
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3128 for (j = 0;
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3129 j < co->co_argcount + co->co_kwonlyargcount;
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3130 j++) {
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3131 PyObject *nm = co_varnames[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	3132 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	3133 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	3134 if (cmp > 0)
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3135 goto kw_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	3136 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	3137 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	3138 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3139 /* 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	3140 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	3141 goto fail;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3142 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	3143 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	3144 PyErr_Format(PyExc_TypeError,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43418 diff changeset	3145 "%U() got an unexpected "
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	3146 "keyword argument '%S'",
089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	3147 co->co_name,
089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	3148 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	3149 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	3150 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3151 PyDict_SetItem(kwdict, keyword, value);
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3152 continue;
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	3153 }
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3154 kw_found:
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3155 if (GETLOCAL(j) != NULL) {
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3156 PyErr_Format(PyExc_TypeError,
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3157 "%U() got multiple "
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3158 "values for keyword "
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3159 "argument '%S'",
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3160 co->co_name,
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3161 keyword);
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3162 goto fail;
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	3163 }
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3164 Py_INCREF(value);
d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3165 SETLOCAL(j, value);
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	3166 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3167 if (co->co_kwonlyargcount > 0) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3168 for (i = co->co_argcount;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3169 i < co->co_argcount + co->co_kwonlyargcount;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3170 i++) {
40381 259d26900861 Make it compile with older compilers. Guido van Rossum <guido@python.org> parents: 40215 diff changeset	3171 PyObject name, def;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3172 if (GETLOCAL(i) != NULL)
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3173 continue;
40381 259d26900861 Make it compile with older compilers. Guido van Rossum <guido@python.org> parents: 40215 diff changeset	3174 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	3175 def = NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3176 if (kwdefs != NULL)
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3177 def = PyDict_GetItem(kwdefs, name);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3178 if (def != NULL) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3179 Py_INCREF(def);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3180 SETLOCAL(i, def);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3181 continue;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3182 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3183 PyErr_Format(PyExc_TypeError,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43418 diff changeset	3184 "%U() needs keyword-only argument %S",
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	3185 co->co_name, name);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3186 goto fail;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3187 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3188 }
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	3189 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	3190 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	3191 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	3192 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	3193 PyErr_Format(PyExc_TypeError,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43418 diff changeset	3194 "%U() takes %s %d "
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3195 "%spositional argument%s "
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3196 "(%d given)",
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	3197 co->co_name,
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	3198 ((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	3199 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	3200 : "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	3201 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	3202 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	3203 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	3204 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3205 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3206 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	3207 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	3208 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	3209 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	3210 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	3211 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	3212 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	3213 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	3214 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	3215 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3216 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3217 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3218 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3219 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	3220 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	3221 PyErr_Format(PyExc_TypeError,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43418 diff changeset	3222 "%U() takes no arguments (%d given)",
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	3223 co->co_name,
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	3224 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	3225 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	3226 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3227 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3228 /* 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	3229 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	3230 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	3231 int i, j, nargs, found;
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	3232 Py_UNICODE cellname, argname;
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	3233 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	3234
43996 b86e6bf7438f fix #1409: cell variables were not initialized, Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43840 diff changeset	3235 nargs = 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	3236 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	3237 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	3238 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	3239 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	3240
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	3241 /* Initialize each cell var, taking into account
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	3242 cell vars that are initialized from arguments.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	3243
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	3244 Should arrange for the compiler to put cellvars
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	3245 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	3246 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	3247 */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3248 for (i = 0; i < PyTuple_GET_SIZE(co->co_cellvars); ++i) {
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	3249 cellname = PyUnicode_AS_UNICODE(
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	3250 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	3251 found = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35609 diff changeset	3252 for (j = 0; j < nargs; j++) {
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	3253 argname = PyUnicode_AS_UNICODE(
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	3254 PyTuple_GET_ITEM(co->co_varnames, j));
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	3255 if (Py_UNICODE_strcmp(cellname, argname) == 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	3256 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	3257 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	3258 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	3259 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	3260 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	3261 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	3262 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3263 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3264 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	3265 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	3266 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	3267 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	3268 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	3269 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3270 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3271 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3272 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	3273 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	3274 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	3275 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	3276 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	3277 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	3278 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3279 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3280
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3281 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	3282 /* 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	3283 * 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	3284 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	3285 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	3286
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3287 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	3288
18194 990b73fa074c Try to avoid creating reference cycles involving generators. Only keep a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18172 diff changeset	3289 /* 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	3290 * 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	3291 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	3292 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3293
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3294 retval = PyEval_EvalFrameEx(f,0);
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3295
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3296 fail: /* Jump here from prelude on failure */
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	3297
21058 9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	3298 /* 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	3299 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	3300 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	3301 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	3302 */
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	3303 assert(tstate != NULL);
9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	3304 ++tstate->recursion_depth;
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3305 Py_DECREF(f);
21058 9df82c13c675 SF bug #483469: crash on unbounded recursion in __del__. Tim Peters <tim.peters@gmail.com> parents: 21027 diff changeset	3306 --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	3307 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	3308 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3309
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 18136 diff changeset	3310
54889 3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	3311 static PyObject *
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	3312 special_lookup(PyObject o, char meth, PyObject **cache)
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	3313 {
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	3314 PyObject *res;
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	3315 res = _PyObject_LookupSpecial(o, meth, cache);
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	3316 if (res == NULL && !PyErr_Occurred()) {
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	3317 PyErr_SetObject(PyExc_AttributeError, *cache);
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	3318 return NULL;
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	3319 }
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	3320 return res;
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	3321 }
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	3322
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54459 diff changeset	3323
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	3324 /* 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	3325 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	3326 static enum why_code
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3327 do_raise(PyObject exc, PyObject cause)
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	3328 {
47722 7ba7901dad7f Implicit exception chaining via __context__ (PEP 3134). Guido van Rossum <guido@python.org> parents: 47594 diff changeset	3329 PyObject type = NULL, value = NULL;
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3330
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3331 if (exc == NULL) {
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3332 /* Reraise */
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	3333 PyThreadState *tstate = PyThreadState_GET();
47722 7ba7901dad7f Implicit exception chaining via __context__ (PEP 3134). Guido van Rossum <guido@python.org> parents: 47594 diff changeset	3334 PyObject *tb;
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3335 type = tstate->exc_type;
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3336 value = tstate->exc_value;
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3337 tb = tstate->exc_traceback;
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3338 if (type == Py_None) {
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3339 PyErr_SetString(PyExc_RuntimeError,
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3340 "No active exception to reraise");
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3341 return WHY_EXCEPTION;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3342 }
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3343 Py_XINCREF(type);
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3344 Py_XINCREF(value);
ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3345 Py_XINCREF(tb);
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3346 PyErr_Restore(type, value, tb);
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3347 return WHY_RERAISE;
7946 ad114620f8c2 Make first raise argument optional Guido van Rossum <guido@python.org> parents: 7014 diff changeset	3348 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3349
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	3350 /* We support the following forms of raise:
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3351 raise
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3352 raise <instance>
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3353 raise <type> */
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3354
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3355 if (PyExceptionClass_Check(exc)) {
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3356 type = exc;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3357 value = PyObject_CallObject(exc, NULL);
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3358 if (value == NULL)
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3359 goto raise_error;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3360 }
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3361 else if (PyExceptionInstance_Check(exc)) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3362 value = exc;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3363 type = PyExceptionInstance_Class(exc);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3364 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	3365 }
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	3366 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	3367 /* 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	3368 anyway, just not what you specified :-) */
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3369 Py_DECREF(exc);
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36926 diff changeset	3370 PyErr_SetString(PyExc_TypeError,
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3371 "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	3372 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	3373 }
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3374
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3375 if (cause) {
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3376 PyObject *fixed_cause;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3377 if (PyExceptionClass_Check(cause)) {
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3378 fixed_cause = PyObject_CallObject(cause, NULL);
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3379 if (fixed_cause == NULL)
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3380 goto raise_error;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3381 Py_DECREF(cause);
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3382 }
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3383 else if (PyExceptionInstance_Check(cause)) {
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3384 fixed_cause = cause;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3385 }
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3386 else {
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3387 PyErr_SetString(PyExc_TypeError,
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3388 "exception causes must derive from "
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3389 "BaseException");
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3390 goto raise_error;
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3391 }
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3392 PyException_SetCause(value, fixed_cause);
a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	3393 }
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3394
47722 7ba7901dad7f Implicit exception chaining via __context__ (PEP 3134). Guido van Rossum <guido@python.org> parents: 47594 diff changeset	3395 PyErr_SetObject(type, value);
7ba7901dad7f Implicit exception chaining via __context__ (PEP 3134). Guido van Rossum <guido@python.org> parents: 47594 diff changeset	3396 /* PyErr_SetObject incref's its arguments */
7ba7901dad7f Implicit exception chaining via __context__ (PEP 3134). Guido van Rossum <guido@python.org> parents: 47594 diff changeset	3397 Py_XDECREF(value);
7ba7901dad7f Implicit exception chaining via __context__ (PEP 3134). Guido van Rossum <guido@python.org> parents: 47594 diff changeset	3398 Py_XDECREF(type);
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3399 return WHY_EXCEPTION;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3400
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 43100 diff changeset	3401 raise_error:
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3402 Py_XDECREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3403 Py_XDECREF(type);
43188 386c22d93ab6 Fix refleaks exposed by test_raise. Collin Winter <collinw@gmail.com> parents: 43102 diff changeset	3404 Py_XDECREF(cause);
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	3405 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	3406 }
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	3407
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3408 /* 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	3409 sp). Return 1 for success, 0 if error.
48574 d3d586019aff Merged revisions 65240-65242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48516 diff changeset	3410
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3411 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	3412 with a variable target.
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3413 */
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3414
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3415 static int
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3416 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	3417 {
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3418 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	3419 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	3420 PyObject it; / iter(v) */
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3421 PyObject *w;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3422 PyObject l = NULL; / variable list */
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3423
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3424 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	3425
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3426 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	3427 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	3428 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	3429
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3430 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	3431 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	3432 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	3433 /* 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	3434 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	3435 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	3436 "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	3437 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	3438 }
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3439 goto Error;
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3440 }
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3441 *--sp = w;
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3442 }
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3443
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3444 if (argcntafter == -1) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3445 /* 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	3446 w = PyIter_Next(it);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3447 if (w == NULL) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3448 if (PyErr_Occurred())
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3449 goto Error;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3450 Py_DECREF(it);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3451 return 1;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3452 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3453 Py_DECREF(w);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3454 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	3455 goto Error;
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3456 }
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3457
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3458 l = PySequence_List(it);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3459 if (l == NULL)
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3460 goto Error;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3461 *--sp = l;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3462 i++;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3463
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3464 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	3465 if (ll < argcntafter) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3466 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	3467 argcnt + ll);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3468 goto Error;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3469 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3470
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3471 /* 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	3472 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	3473 *--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	3474 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3475 /* Resize the list. */
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	3476 Py_SIZE(l) = ll - argcntafter;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3477 Py_DECREF(it);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3478 return 1;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41558 diff changeset	3479
18195 36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into Tim Peters <tim.peters@gmail.com> parents: 18194 diff changeset	3480 Error:
6160 79592761b331 unpack_sequence(): In finally clause, watch out for Py_DECREF Barry Warsaw <barry@python.org> parents: 6157 diff changeset	3481 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	3482 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	3483 Py_XDECREF(it);
6157 647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3484 return 0;
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3485 }
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3486
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and Barry Warsaw <barry@python.org> parents: 6147 diff changeset	3487
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3488 #ifdef LLTRACE
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3489 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3490 prtrace(PyObject v, char str)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3491 {
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3492 printf("%s ", str);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3493 if (PyObject_Print(v, stdout, 0) != 0)
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3494 PyErr_Clear(); /* Don't know what else to do */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3495 printf("\n");
12579 978253542076 Add useless 'return 1' to prtrace() to shut up VC++. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	3496 return 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3497 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3498 #endif
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3499
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3500 static void
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3501 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	3502 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3503 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	3504 int err;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3505 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	3506 if (value == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3507 value = Py_None;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3508 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	3509 }
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 29669 diff changeset	3510 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	3511 if (arg == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3512 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	3513 return;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2006 diff changeset	3514 }
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3515 err = call_trace(func, self, f, PyTrace_EXCEPTION, arg);
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3516 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	3517 if (err == 0)
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3518 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	3519 else {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3520 Py_XDECREF(type);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3521 Py_XDECREF(value);
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3522 Py_XDECREF(traceback);
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3523 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3524 }
8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3525
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	3526 static int
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3527 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	3528 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	3529 {
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3530 PyObject type, value, *traceback;
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3531 int err;
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3532 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	3533 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	3534 if (err == 0)
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	3535 {
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3536 PyErr_Restore(type, value, traceback);
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	3537 return 0;
73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	3538 }
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3539 else {
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3540 Py_XDECREF(type);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3541 Py_XDECREF(value);
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3542 Py_XDECREF(traceback);
43840 73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement). Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	3543 return -1;
20257 e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3544 }
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3545 }
e3f63a95455f Fix bug in profiler modifications detected only in debug builds. Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	3546
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3547 static int
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3548 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	3549 int what, PyObject *arg)
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3550 {
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3551 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	3552 int result;
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3553 if (tstate->tracing)
708 8bcb50f436fa New trace implementation; and profile (in a similat vein). Guido van Rossum <guido@python.org> parents: 688 diff changeset	3554 return 0;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3555 tstate->tracing++;
18374 3b295ce2705f This change adjusts the profiling/tracing support so that the common Fred Drake <fdrake@acm.org> parents: 18326 diff changeset	3556 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	3557 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	3558 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	3559 \|\| (tstate->c_profilefunc != NULL));
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3560 tstate->tracing--;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3561 return result;
567 8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3562 }
8c179d023583 User trace feature. Guido van Rossum <guido@python.org> parents: 565 diff changeset	3563
28556 78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3564 PyObject *
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3565 _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	3566 {
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3567 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	3568 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	3569 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	3570 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	3571 PyObject *result;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3572
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3573 tstate->tracing = 0;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3574 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	3575 \|\| (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	3576 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	3577 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	3578 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	3579 return result;
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3580 }
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28304 diff changeset	3581
55372 79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54909 diff changeset	3582 /* See Objects/lnotab_notes.txt for a description of how tracing works. */
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3583 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	3584 maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
31768 9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	3585 PyFrameObject frame, int instr_lb, int *instr_ub,
9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	3586 int *instr_prev)
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3587 {
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3588 int result = 0;
55372 79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54909 diff changeset	3589 int line = frame->f_lineno;
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3590
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	3591 /* If the last instruction executed isn't in the current
55372 79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54909 diff changeset	3592 instruction window, reset the window.
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	3593 */
55372 79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54909 diff changeset	3594 if (frame->f_lasti < instr_lb \|\| frame->f_lasti >= instr_ub) {
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3595 PyAddrPair bounds;
55372 79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54909 diff changeset	3596 line = _PyCode_CheckLineNumber(frame->f_code, frame->f_lasti,
79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54909 diff changeset	3597 &bounds);
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3598 *instr_lb = bounds.ap_lower;
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3599 *instr_ub = bounds.ap_upper;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3600 }
55372 79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54909 diff changeset	3601 /* If the last instruction falls at the start of a line or if
79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54909 diff changeset	3602 it represents a jump backwards, update the frame's line
79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54909 diff changeset	3603 number and call the trace function. */
79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54909 diff changeset	3604 if (frame->f_lasti == instr_lb \|\| frame->f_lasti < instr_prev) {
79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 54909 diff changeset	3605 frame->f_lineno = line;
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	3606 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	3607 }
9817dee5d9df Fix SF bug #765624. Armin Rigo <arigo@tunes.org> parents: 31714 diff changeset	3608 *instr_prev = frame->f_lasti;
26110 964d6b79c22e This is Richie Hindle's patch: Michael W. Hudson <mwh@python.net> parents: 26109 diff changeset	3609 return result;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3610 }
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 24718 diff changeset	3611
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3612 void
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3613 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	3614 {
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	3615 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	3616 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	3617 Py_XINCREF(arg);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3618 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	3619 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	3620 /* 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	3621 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	3622 Py_XDECREF(temp);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3623 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	3624 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	3625 /* 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	3626 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	3627 }
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3628
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3629 void
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3630 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	3631 {
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	3632 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	3633 PyObject *temp = tstate->c_traceobj;
50045 ba8fe3a40a5b Merged revisions 67494 via svnmerge from Jeffrey Yasskin <jyasskin@gmail.com> parents: 48986 diff changeset	3634 _Py_TracingPossible += (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	3635 Py_XINCREF(arg);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3636 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	3637 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	3638 /* 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	3639 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	3640 Py_XDECREF(temp);
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18293 diff changeset	3641 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	3642 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	3643 /* 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	3644 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	3645 \|\| (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	3646 }
4cb34314bd97 Instead of initializing & interning the strings passed to the profile Fred Drake <fdrake@acm.org> parents: 18128 diff changeset	3647
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3648 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3649 PyEval_GetBuiltins(void)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3650 {
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3651 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	3652 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	3653 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	3654 else
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3655 return current_frame->f_builtins;
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3656 }
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3657
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3658 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3659 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	3660 {
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3661 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	3662 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	3663 return NULL;
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3664 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	3665 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	3666 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	3667
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3668 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3669 PyEval_GetGlobals(void)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3670 {
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3671 PyFrameObject *current_frame = PyEval_GetFrame();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3672 if (current_frame == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3673 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3674 else
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3675 return current_frame->f_globals;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3676 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3677
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3678 PyFrameObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3679 PyEval_GetFrame(void)
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3680 {
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31796 diff changeset	3681 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	3682 return _PyThreadState_GetFrame(tstate);
1846 5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3683 }
5243fb187d36 call_object: print message before abort() Guido van Rossum <guido@python.org> parents: 1425 diff changeset	3684
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2088 diff changeset	3685 int
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3686 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	3687 {
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 27781 diff changeset	3688 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	3689 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	3690
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3691 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	3692 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	3693 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	3694 if (compilerflags) {
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3695 result = 1;
19350 5b6a6d7d44ae ceval, PyEval_MergeCompilerFlags: wasn't merging in the Tim Peters <tim.peters@gmail.com> parents: 19301 diff changeset	3696 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	3697 }
22468 eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22398 diff changeset	3698 #if 0 /* future keyword */
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3699 if (codeflags & CO_GENERATOR_ALLOWED) {
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3700 result = 1;
3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	3701 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	3702 }
22468 eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22398 diff changeset	3703 #endif
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3704 }
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18513 diff changeset	3705 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	3706 }
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	3707
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	3708
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3709 /* External interface to call any callable object.
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3710 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	3711
6206 77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3712 #undef PyEval_CallObject
77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3713 /* for backward compatibility: export this interface */
77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3714
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3715 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3716 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	3717 {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3718 return PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3719 }
6206 77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3720 #define PyEval_CallObject(func,arg) \
77f5b6cbea66 Inline PyObject_CallObject (Marc-Andre Lemburg). Guido van Rossum <guido@python.org> parents: 6185 diff changeset	3721 PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL)
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3722
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3723 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	3724 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	3725 {
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3726 PyObject *result;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3727
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36803 diff changeset	3728 if (arg == NULL) {
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3729 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	3730 if (arg == NULL)
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36803 diff changeset	3731 return NULL;
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36803 diff changeset	3732 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3733 else if (!PyTuple_Check(arg)) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3734 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3735 "argument list must be a tuple");
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3736 return NULL;
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3737 }
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3738 else
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3739 Py_INCREF(arg);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2813 diff changeset	3740
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	3741 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	3742 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	3743 "keyword list must be a dictionary");
12440 d47460b1a679 Charles Waldman writes: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	3744 Py_DECREF(arg);
2894 4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	3745 return NULL;
4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	3746 }
4095782c940e empty kw dict is ok for builtins Guido van Rossum <guido@python.org> parents: 2872 diff changeset	3747
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3748 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	3749 Py_DECREF(arg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3750 return result;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3751 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3752
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35745 diff changeset	3753 const char *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3754 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	3755 {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3756 if (PyMethod_Check(func))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3757 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	3758 else if (PyFunction_Check(func))
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48574 diff changeset	3759 return _PyUnicode_AsString(((PyFunctionObject*)func)->func_name);
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3760 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	3761 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	3762 else
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3763 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	3764 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3765
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35745 diff changeset	3766 const char *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3767 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	3768 {
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3769 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	3770 return "()";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3771 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	3772 return "()";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3773 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	3774 return "()";
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3775 else
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3776 return " object";
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3777 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	3778
26141 6ce9228a3da2 Make private functions static so we don't pollute the namespace Neal Norwitz <nnorwitz@gmail.com> parents: 26110 diff changeset	3779 static void
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3780 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	3781 {
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3782 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	3783 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	3784 "%.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	3785 ((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	3786 nargs);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3787 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	3788 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	3789 "%.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	3790 ((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	3791 nargs);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3792 }
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3793
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	3794 #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	3795 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	3796 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	3797 tstate->c_profileobj, \
77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3798 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	3799 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	3800 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	3801 } \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3802 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	3803 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	3804 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	3805 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	3806 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	3807 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	3808 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	3809 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	3810 /* 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	3811 } 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	3812 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	3813 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	3814 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	3815 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	3816 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	3817 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	3818 } \
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func Armin Rigo <arigo@tunes.org> parents: 35345 diff changeset	3819 } \
31796 1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3820 } \
32409 77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3821 } \
77913be294b9 Massive performance improvement for C extension and builtin tracing code Nicholas Bastin <nick.bastin@gmail.com> parents: 32398 diff changeset	3822 } 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	3823 x = call; \
31796 1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3824 }
1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 31768 diff changeset	3825
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3826 static PyObject *
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3827 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	3828 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3829 , 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	3830 #endif
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 32247 diff changeset	3831 )
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3832 {
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3833 int na = oparg & 0xff;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3834 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	3835 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	3836 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	3837 PyObject func = pfunc;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3838 PyObject x, w;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3839
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3840 /* 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	3841 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	3842 */
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3843 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	3844 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	3845 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	3846
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3847 PCALL(PCALL_CFUNCTION);
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3848 if (flags & (METH_NOARGS \| METH_O)) {
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3849 PyCFunction meth = PyCFunction_GET_FUNCTION(func);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3850 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	3851 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	3852 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	3853 }
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3854 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	3855 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	3856 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	3857 Py_DECREF(arg);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3858 }
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3859 else {
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3860 err_args(func, flags, na);
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3861 x = NULL;
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3862 }
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3863 }
df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3864 else {
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3865 PyObject *callargs;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3866 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	3867 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	3868 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	3869 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	3870 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	3871 }
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3872 } else {
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3873 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	3874 /* 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	3875 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	3876 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	3877 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	3878 Py_INCREF(self);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3879 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	3880 Py_INCREF(func);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3881 Py_DECREF(*pfunc);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3882 *pfunc = self;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3883 na++;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3884 n++;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3885 } else
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3886 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	3887 READ_TIMESTAMP(*pintr0);
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3888 if (PyFunction_Check(func))
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3889 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	3890 else
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3891 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	3892 READ_TIMESTAMP(*pintr1);
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3893 Py_DECREF(func);
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3894 }
31872 9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most Tim Peters <tim.peters@gmail.com> parents: 31797 diff changeset	3895
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	3896 /* 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	3897 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	3898 (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	3899 */
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3900 while ((*pp_stack) > pfunc) {
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3901 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	3902 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	3903 PCALL(PCALL_POP);
24868 2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3904 }
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3905 return x;
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3906 }
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24866 diff changeset	3907
24870 df2326a4894d Inline fast_cfunction() in new call_function(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24868 diff changeset	3908 /* 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	3909 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	3910 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	3911 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	3912 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	3913 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	3914 done before evaluating the frame.
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3915 */
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3916
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3917 static PyObject *
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	3918 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	3919 {
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3920 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	3921 PyObject *globals = PyFunction_GET_GLOBALS(func);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3922 PyObject *argdefs = PyFunction_GET_DEFAULTS(func);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3923 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	3924 PyObject **d = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3925 int nd = 0;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3926
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3927 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	3928 PCALL(PCALL_FAST_FUNCTION);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3929 if (argdefs == NULL && co->co_argcount == n &&
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3930 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	3931 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	3932 PyFrameObject *f;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3933 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	3934 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	3935 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	3936 int i;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3937
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3938 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	3939 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	3940 /* 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	3941 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	3942 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	3943 */
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	3944 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	3945 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	3946 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	3947 return NULL;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3948
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3949 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	3950 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	3951
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3952 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	3953 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	3954 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	3955 }
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 35126 diff changeset	3956 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	3957 ++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	3958 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	3959 --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	3960 return retval;
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3961 }
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3962 if (argdefs != NULL) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3963 d = &PyTuple_GET_ITEM(argdefs, 0);
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	3964 nd = Py_SIZE(argdefs);
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3965 }
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	3966 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	3967 (PyObject )NULL, (pp_stack)-n, na,
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39782 diff changeset	3968 (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	3969 PyFunction_GET_CLOSURE(func));
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3970 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3971
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3972 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	3973 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	3974 PyObject *func)
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3975 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3976 PyObject *kwdict = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3977 if (orig_kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3978 kwdict = PyDict_New();
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3979 else {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3980 kwdict = PyDict_Copy(orig_kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3981 Py_DECREF(orig_kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3982 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3983 if (kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3984 return NULL;
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	3985 while (--nk >= 0) {
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3986 int err;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3987 PyObject value = EXT_POP(pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3988 PyObject key = EXT_POP(pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3989 if (PyDict_GetItem(kwdict, key) != NULL) {
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3990 PyErr_Format(PyExc_TypeError,
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3991 "%.200s%s got multiple values "
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	3992 "for keyword argument '%.200s'",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3993 PyEval_GetFuncName(func),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	3994 PyEval_GetFuncDesc(func),
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48574 diff changeset	3995 _PyUnicode_AsString(key));
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3996 Py_DECREF(key);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3997 Py_DECREF(value);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3998 Py_DECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	3999 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4000 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4001 err = PyDict_SetItem(kwdict, key, value);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4002 Py_DECREF(key);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4003 Py_DECREF(value);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4004 if (err) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4005 Py_DECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4006 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4007 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4008 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4009 return kwdict;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4010 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4011
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4012 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4013 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	4014 PyObject ***pp_stack)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4015 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4016 PyObject callargs, w;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4017
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4018 callargs = PyTuple_New(nstack + nstar);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4019 if (callargs == NULL) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4020 return NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4021 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4022 if (nstar) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4023 int i;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4024 for (i = 0; i < nstar; i++) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4025 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	4026 Py_INCREF(a);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4027 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	4028 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4029 }
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	4030 while (--nstack >= 0) {
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4031 w = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4032 PyTuple_SET_ITEM(callargs, nstack, w);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4033 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4034 return callargs;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4035 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4036
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4037 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4038 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	4039 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4040 PyObject *args = PyTuple_New(na);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4041 PyObject *w;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4042
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4043 if (args == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4044 return NULL;
31894 310dd98ea064 Revert 2.393, elimination of pre-decrementing, which Raymond Hettinger <python@rcn.com> parents: 31880 diff changeset	4045 while (--na >= 0) {
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4046 w = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4047 PyTuple_SET_ITEM(args, na, w);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4048 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4049 return args;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4050 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4051
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4052 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4053 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	4054 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4055 PyObject *callargs = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4056 PyObject *kwdict = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4057 PyObject *result = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4058
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4059 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	4060 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	4061 if (kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4062 goto call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4063 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4064 callargs = load_args(pp_stack, na);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4065 if (callargs == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4066 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	4067 #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	4068 /* 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	4069 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	4070 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	4071 */
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	4072 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	4073 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	4074 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	4075 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	4076 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	4077 PCALL(PCALL_TYPE);
54459 4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4078 else if (PyCFunction_Check(func))
4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4079 PCALL(PCALL_CFUNCTION);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	4080 else
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	4081 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	4082 #endif
54459 4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4083 if (PyCFunction_Check(func)) {
4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4084 PyThreadState *tstate = PyThreadState_GET();
4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4085 C_TRACE(result, PyCFunction_Call(func, callargs, kwdict));
4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4086 }
4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4087 else
4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4088 result = PyObject_Call(func, callargs, kwdict);
43411 a5d37cdcd316 Whitespace cleanup. Thomas Wouters <thomas@python.org> parents: 43410 diff changeset	4089 call_fail:
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4090 Py_XDECREF(callargs);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4091 Py_XDECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4092 return result;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4093 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4094
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4095 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4096 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	4097 {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4098 int nstar = 0;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4099 PyObject *callargs = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4100 PyObject *stararg = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4101 PyObject *kwdict = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4102 PyObject *result = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4103
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4104 if (flags & CALL_FLAG_KW) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4105 kwdict = EXT_POP(*pp_stack);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4106 if (!PyDict_Check(kwdict)) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4107 PyObject *d;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4108 d = PyDict_New();
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4109 if (d == NULL)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4110 goto ext_call_fail;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4111 if (PyDict_Update(d, kwdict) != 0) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4112 Py_DECREF(d);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4113 /* PyDict_Update raises attribute
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4114 * error (percolated from an attempt
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4115 * to get 'keys' attribute) instead of
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4116 * a type error if its second argument
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4117 * is not a mapping.
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4118 */
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4119 if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4120 PyErr_Format(PyExc_TypeError,
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4121 "%.200s%.200s argument after ** "
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4122 "must be a mapping, not %.200s",
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4123 PyEval_GetFuncName(func),
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4124 PyEval_GetFuncDesc(func),
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4125 kwdict->ob_type->tp_name);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4126 }
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4127 goto ext_call_fail;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4128 }
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4129 Py_DECREF(kwdict);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4130 kwdict = d;
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4131 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4132 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4133 if (flags & CALL_FLAG_VAR) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4134 stararg = EXT_POP(*pp_stack);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4135 if (!PyTuple_Check(stararg)) {
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4136 PyObject *t = NULL;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4137 t = PySequence_Tuple(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4138 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	4139 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	4140 PyErr_Format(PyExc_TypeError,
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4141 "%.200s%.200s argument after * "
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4142 "must be a sequence, not %200s",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18611 diff changeset	4143 PyEval_GetFuncName(func),
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4144 PyEval_GetFuncDesc(func),
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	4145 stararg->ob_type->tp_name);
17406 c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17125 diff changeset	4146 }
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4147 goto ext_call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4148 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4149 Py_DECREF(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4150 stararg = t;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4151 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4152 nstar = PyTuple_GET_SIZE(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4153 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4154 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	4155 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	4156 if (kwdict == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4157 goto ext_call_fail;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4158 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4159 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	4160 if (callargs == NULL)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4161 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	4162 #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	4163 /* 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	4164 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	4165 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	4166 */
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	4167 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	4168 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	4169 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	4170 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	4171 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	4172 PCALL(PCALL_TYPE);
54459 4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4173 else if (PyCFunction_Check(func))
4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4174 PCALL(PCALL_CFUNCTION);
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	4175 else
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27295 diff changeset	4176 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	4177 #endif
54459 4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4178 if (PyCFunction_Check(func)) {
4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4179 PyThreadState *tstate = PyThreadState_GET();
4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4180 C_TRACE(result, PyCFunction_Call(func, callargs, kwdict));
4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4181 }
4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4182 else
4e96d7daf79f Merged revisions 73064 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51872 diff changeset	4183 result = PyObject_Call(func, callargs, kwdict);
43410 b06b191b7cfa Merged revisions 58203-58210 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	4184 ext_call_fail:
15711 2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4185 Py_XDECREF(callargs);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4186 Py_XDECREF(kwdict);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4187 Py_XDECREF(stararg);
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4188 return result;
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4189 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 15364 diff changeset	4190
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	4191 /* 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	4192 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	4193 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	4194 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	4195 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	4196 */
21441 05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks Tim Peters <tim.peters@gmail.com> parents: 21440 diff changeset	4197 /* 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	4198 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	4199 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	4200 */
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	4201 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36475 diff changeset	4202 _PyEval_SliceIndex(PyObject v, Py_ssize_t pi)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4203 {
21441 05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks Tim Peters <tim.peters@gmail.com> parents: 21440 diff changeset	4204 if (v != NULL) {
36558 d3685f9b7b71 Remove size constraints in SLICE opcodes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	4205 Py_ssize_t x;
44158 81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44156 diff changeset	4206 if (PyIndex_Check(v)) {
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	4207 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	4208 if (x == -1 && PyErr_Occurred())
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	4209 return 0;
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	4210 }
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	4211 else {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	4212 PyErr_SetString(PyExc_TypeError,
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	4213 "slice indices must be integers or "
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	4214 "None or have an __index__ method");
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	4215 return 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4216 }
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5368 diff changeset	4217 *pi = x;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4218 }
12614 8d7ad3818ea6 Trent Mick: Guido van Rossum <guido@python.org> parents: 12579 diff changeset	4219 return 1;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4220 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4221
42132 863ed7cd45dc Merged revisions 56020-56124 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	4222 #define CANNOT_CATCH_MSG "catching classes that do not inherit from "\
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	4223 "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	4224
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	4225 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	4226 cmp_outcome(int op, register PyObject v, register PyObject w)
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4227 {
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	4228 int res = 0;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4229 switch (op) {
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	4230 case PyCmp_IS:
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	4231 res = (v == w);
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	4232 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	4233 case PyCmp_IS_NOT:
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	4234 res = (v != w);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	4235 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	4236 case PyCmp_IN:
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	4237 res = PySequence_Contains(w, v);
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	4238 if (res < 0)
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	4239 return NULL;
b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	4240 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	4241 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	4242 res = PySequence_Contains(w, v);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	4243 if (res < 0)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 72 diff changeset	4244 return NULL;
27295 b8387730dd8f SF patch #670367: Micro-optimizations for ceval.c Raymond Hettinger <python@rcn.com> parents: 27243 diff changeset	4245 res = !res;
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4246 break;
21609 3ba0f1b20320 Patch #494783: Rename cmp_op enumerators. Martin v. Löwis <martin@v.loewis.de> parents: 21537 diff changeset	4247 case PyCmp_EXC_MATCH:
40742 f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	4248 if (PyTuple_Check(w)) {
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	4249 Py_ssize_t i, length;
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	4250 length = PyTuple_Size(w);
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	4251 for (i = 0; i < length; i += 1) {
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	4252 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	4253 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	4254 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	4255 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	4256 return NULL;
40742 f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	4257 }
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	4258 }
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	4259 }
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	4260 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	4261 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	4262 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	4263 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	4264 return NULL;
40742 f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	4265 }
f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40729 diff changeset	4266 }
6147 b76a44163e0f cmp_exception gets promoted (essentially) to the C API function Barry Warsaw <barry@python.org> parents: 6139 diff changeset	4267 res = PyErr_GivenExceptionMatches(v, w);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4268 break;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4269 default:
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	4270 return PyObject_RichCompare(v, w, op);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4271 }
5368 f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	4272 v = res ? Py_True : Py_False;
f2132d1f66a6 Quickly renamed. Guido van Rossum <guido@python.org> parents: 5177 diff changeset	4273 Py_INCREF(v);
69 cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4274 return v;
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4275 }
cccd534f2280 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4276
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4277 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	4278 import_from(PyObject v, PyObject name)
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4279 {
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4280 PyObject *x;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4281
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4282 x = PyObject_GetAttr(v, name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4283 if (x == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41824 diff changeset	4284 PyErr_Format(PyExc_ImportError, "cannot import name %S", name);
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4285 }
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4286 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	4287 }
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	4288
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4289 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	4290 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	4291 {
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4292 PyObject *all = PyObject_GetAttrString(v, "__all__");
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4293 PyObject dict, name, *value;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4294 int skip_leading_underscores = 0;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4295 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	4296
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4297 if (all == NULL) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4298 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4299 return -1; /* Unexpected error */
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4300 PyErr_Clear();
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4301 dict = PyObject_GetAttrString(v, "__dict__");
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4302 if (dict == NULL) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4303 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4304 return -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4305 PyErr_SetString(PyExc_ImportError,
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4306 "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	4307 return -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4308 }
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4309 all = PyMapping_Keys(dict);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4310 Py_DECREF(dict);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4311 if (all == NULL)
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4312 return -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4313 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	4314 }
14038 18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import Thomas Wouters <thomas@python.org> parents: 13930 diff changeset	4315
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4316 for (pos = 0, err = 0; ; pos++) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4317 name = PySequence_GetItem(all, pos);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4318 if (name == NULL) {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4319 if (!PyErr_ExceptionMatches(PyExc_IndexError))
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4320 err = -1;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4321 else
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4322 PyErr_Clear();
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4323 break;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4324 }
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4325 if (skip_leading_underscores &&
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	4326 PyUnicode_Check(name) &&
cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	4327 PyUnicode_AS_UNICODE(name)[0] == '_')
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4328 {
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4329 Py_DECREF(name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4330 continue;
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4331 }
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4332 value = PyObject_GetAttr(v, name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4333 if (value == NULL)
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4334 err = -1;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	4335 else if (PyDict_CheckExact(locals))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	4336 err = PyDict_SetItem(locals, name, value);
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4337 else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40381 diff changeset	4338 err = PyObject_SetItem(locals, name, value);
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4339 Py_DECREF(name);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4340 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	4341 if (err != 0)
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4342 break;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4343 }
15830 e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4344 Py_DECREF(all);
e00f718e4d8a Two changes to from...import: Guido van Rossum <guido@python.org> parents: 15814 diff changeset	4345 return err;
72 5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4346 }
5e8a0b40a4bd Free parse tree after compiling. Guido van Rossum <guido@python.org> parents: 69 diff changeset	4347
15948 3bc2440427d3 Rich comparisons fall-out: Guido van Rossum <guido@python.org> parents: 15899 diff changeset	4348 static void
42860 bf1a53cc6e65 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	4349 format_exc_check_arg(PyObject exc, const char format_str, PyObject *obj)
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4350 {
42860 bf1a53cc6e65 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	4351 const char *obj_str;
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4352
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4353 if (!obj)
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4354 return;
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4355
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48574 diff changeset	4356 obj_str = _PyUnicode_AsString(obj);
14268 cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4357 if (!obj_str)
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4358 return;
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4359
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4360 PyErr_Format(exc, format_str, obj_str);
cd8b815cb196 Better error message with UnboundLocalError Paul Prescod <prescod@prescod.net> parents: 14238 diff changeset	4361 }
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4362
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4363 static PyObject *
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	4364 unicode_concatenate(PyObject v, PyObject w,
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4365 PyFrameObject f, unsigned char next_instr)
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4366 {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4367 /* This function implements 'variable += expr' when both arguments
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	4368 are (Unicode) strings. */
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	4369 Py_ssize_t v_len = PyUnicode_GET_SIZE(v);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	4370 Py_ssize_t w_len = PyUnicode_GET_SIZE(w);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4371 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	4372 if (new_len < 0) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4373 PyErr_SetString(PyExc_OverflowError,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4374 "strings are too large to concat");
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4375 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4376 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4377
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4378 if (v->ob_refcnt == 2) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4379 /* 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	4380 * stored in 'variable' when the += is performed: one on the
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	4381 * value stack (in 'v') and one still stored in the
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	4382 * 'variable'. We try to delete the variable now to reduce
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	4383 * the refcnt to 1.
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4384 */
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4385 switch (*next_instr) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4386 case STORE_FAST:
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4387 {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4388 int oparg = PEEKARG();
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4389 PyObject **fastlocals = f->f_localsplus;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4390 if (GETLOCAL(oparg) == v)
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4391 SETLOCAL(oparg, NULL);
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4392 break;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4393 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4394 case STORE_DEREF:
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4395 {
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	4396 PyObject **freevars = (f->f_localsplus +
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	4397 f->f_code->co_nlocals);
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4398 PyObject *c = freevars[PEEKARG()];
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4399 if (PyCell_GET(c) == v)
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4400 PyCell_Set(c, NULL);
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4401 break;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4402 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4403 case STORE_NAME:
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4404 {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4405 PyObject *names = f->f_code->co_names;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4406 PyObject *name = GETITEM(names, PEEKARG());
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4407 PyObject *locals = f->f_locals;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4408 if (PyDict_CheckExact(locals) &&
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4409 PyDict_GetItem(locals, name) == v) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4410 if (PyDict_DelItem(locals, name) != 0) {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4411 PyErr_Clear();
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4412 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4413 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4414 break;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4415 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4416 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4417 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4418
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	4419 if (v->ob_refcnt == 1 && !PyUnicode_CHECK_INTERNED(v)) {
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4420 /* 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	4421 * in-place.
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4422 */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	4423 if (PyUnicode_Resize(&v, new_len) != 0) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	4424 /* XXX if PyUnicode_Resize() fails, 'v' has been
43418 0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	4425 * deallocated so it cannot be put back into
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	4426 * 'variable'. The MemoryError is raised when there
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	4427 * is no value in 'variable', which might (very
0c8fec76111c Merged revisions 58211-58220 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43411 diff changeset	4428 * remotely) be a cause of incompatibilities.
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4429 */
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4430 return NULL;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4431 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4432 /* copy 'w' into the newly allocated area of 'v' */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	4433 memcpy(PyUnicode_AS_UNICODE(v) + v_len,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	4434 PyUnicode_AS_UNICODE(w), w_len*sizeof(Py_UNICODE));
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4435 return v;
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4436 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4437 else {
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4438 /* When in-place resizing is not an option. */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	4439 w = PyUnicode_Concat(v, w);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	4440 Py_DECREF(v);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	4441 return w;
32974 fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4442 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4443 }
fb6ffd290cfb SF patch #980695: efficient string concatenation Raymond Hettinger <python@rcn.com> parents: 32900 diff changeset	4444
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4445 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4446
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	4447 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	4448 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	4449 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4450 int i;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4451 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	4452 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	4453 for (i = 0; i < 256; i++) {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43996 diff changeset	4454 PyObject *x = PyLong_FromLong(a[i]);
5049 946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4455 if (x == NULL) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4456 Py_DECREF(l);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4457 return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4458 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4459 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	4460 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4461 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	4462 a[i] = 0;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4463 return l;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4464 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4465
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4466 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	4467 _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	4468 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4469 #ifndef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4470 return getarray(dxp);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4471 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4472 int i;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4473 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	4474 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	4475 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	4476 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	4477 if (x == NULL) {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4478 Py_DECREF(l);
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4479 return NULL;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4480 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4481 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	4482 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4483 return l;
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4484 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4485 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4486
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling -- Guido van Rossum <guido@python.org> parents: 5048 diff changeset	4487 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/ceval.c @ 58664:993f703a61ba