| 
									
										
										
										
											1993-07-28 09:05:47 +00:00
										 |  |  | #ifndef Py_OPCODE_H
 | 
					
						
							|  |  |  | #define Py_OPCODE_H
 | 
					
						
							|  |  |  | #ifdef __cplusplus
 | 
					
						
							|  |  |  | extern "C" { | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-02-19 12:39:46 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | /* Instruction opcodes for compiled code */ | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1990-12-20 15:06:42 +00:00
										 |  |  | #define STOP_CODE	0
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | #define POP_TOP		1
 | 
					
						
							|  |  |  | #define ROT_TWO		2
 | 
					
						
							|  |  |  | #define ROT_THREE	3
 | 
					
						
							| 
									
										
										
										
											1990-12-20 15:06:42 +00:00
										 |  |  | #define DUP_TOP		4
 | 
					
						
							| 
									
										
										
										
											2000-08-24 20:09:45 +00:00
										 |  |  | #define ROT_FOUR	5
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | #define UNARY_POSITIVE	10
 | 
					
						
							|  |  |  | #define UNARY_NEGATIVE	11
 | 
					
						
							|  |  |  | #define UNARY_NOT	12
 | 
					
						
							|  |  |  | #define UNARY_CONVERT	13
 | 
					
						
							| 
									
										
										
										
											1995-07-18 14:21:06 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-10-24 14:59:31 +00:00
										 |  |  | #define UNARY_INVERT	15
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1996-01-12 00:51:44 +00:00
										 |  |  | #define BINARY_POWER	19
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | #define BINARY_MULTIPLY	20
 | 
					
						
							|  |  |  | #define BINARY_DIVIDE	21
 | 
					
						
							|  |  |  | #define BINARY_MODULO	22
 | 
					
						
							|  |  |  | #define BINARY_ADD	23
 | 
					
						
							|  |  |  | #define BINARY_SUBTRACT	24
 | 
					
						
							|  |  |  | #define BINARY_SUBSCR	25
 | 
					
						
							| 
									
										
										
										
											2001-08-08 05:00:18 +00:00
										 |  |  | #define BINARY_FLOOR_DIVIDE 26
 | 
					
						
							|  |  |  | #define BINARY_TRUE_DIVIDE 27
 | 
					
						
							|  |  |  | #define INPLACE_FLOOR_DIVIDE 28
 | 
					
						
							|  |  |  | #define INPLACE_TRUE_DIVIDE 29
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | #define SLICE		30
 | 
					
						
							|  |  |  | /* Also uses 31-33 */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define STORE_SLICE	40
 | 
					
						
							|  |  |  | /* Also uses 41-43 */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define DELETE_SLICE	50
 | 
					
						
							|  |  |  | /* Also uses 51-53 */ | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-08-24 20:09:45 +00:00
										 |  |  | #define INPLACE_ADD	55
 | 
					
						
							|  |  |  | #define INPLACE_SUBTRACT	56
 | 
					
						
							|  |  |  | #define INPLACE_MULTIPLY	57
 | 
					
						
							|  |  |  | #define INPLACE_DIVIDE	58
 | 
					
						
							|  |  |  | #define INPLACE_MODULO	59
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | #define STORE_SUBSCR	60
 | 
					
						
							|  |  |  | #define DELETE_SUBSCR	61
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-10-24 14:59:31 +00:00
										 |  |  | #define BINARY_LSHIFT	62
 | 
					
						
							|  |  |  | #define BINARY_RSHIFT	63
 | 
					
						
							|  |  |  | #define BINARY_AND	64
 | 
					
						
							|  |  |  | #define BINARY_XOR	65
 | 
					
						
							|  |  |  | #define BINARY_OR	66
 | 
					
						
							| 
									
										
										
										
											2000-08-24 20:09:45 +00:00
										 |  |  | #define INPLACE_POWER	67
 | 
					
						
							| 
									
										
										
										
											2001-04-20 19:13:02 +00:00
										 |  |  | #define GET_ITER	68
 | 
					
						
							| 
									
										
										
										
											1991-10-24 14:59:31 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | #define PRINT_EXPR	70
 | 
					
						
							|  |  |  | #define PRINT_ITEM	71
 | 
					
						
							|  |  |  | #define PRINT_NEWLINE	72
 | 
					
						
							| 
									
										
										
										
											2000-08-21 15:36:27 +00:00
										 |  |  | #define PRINT_ITEM_TO   73
 | 
					
						
							|  |  |  | #define PRINT_NEWLINE_TO 74
 | 
					
						
							| 
									
										
										
										
											2000-08-24 20:09:45 +00:00
										 |  |  | #define INPLACE_LSHIFT	75
 | 
					
						
							|  |  |  | #define INPLACE_RSHIFT	76
 | 
					
						
							|  |  |  | #define INPLACE_AND	77
 | 
					
						
							|  |  |  | #define INPLACE_XOR	78
 | 
					
						
							|  |  |  | #define INPLACE_OR	79
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | #define BREAK_LOOP	80
 | 
					
						
							| 
									
										
										
										
											1995-07-18 14:21:06 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:38:15 +00:00
										 |  |  | #define LOAD_LOCALS	82
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | #define RETURN_VALUE	83
 | 
					
						
							| 
									
										
										
										
											2000-08-17 22:55:00 +00:00
										 |  |  | #define IMPORT_STAR	84
 | 
					
						
							| 
									
										
										
										
											1993-10-18 17:06:59 +00:00
										 |  |  | #define EXEC_STMT	85
 | 
					
						
							| 
									
										
										
										
											2001-06-18 22:08:13 +00:00
										 |  |  | #define YIELD_VALUE	86
 | 
					
						
							| 
									
										
										
										
											1993-03-30 13:18:41 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | #define POP_BLOCK	87
 | 
					
						
							|  |  |  | #define END_FINALLY	88
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:38:15 +00:00
										 |  |  | #define BUILD_CLASS	89
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | #define HAVE_ARGUMENT	90	/* Opcodes from here have an argument: */
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define STORE_NAME	90	/* Index in name list */
 | 
					
						
							|  |  |  | #define DELETE_NAME	91	/* "" */
 | 
					
						
							| 
									
										
										
										
											2000-08-11 22:15:52 +00:00
										 |  |  | #define UNPACK_SEQUENCE	92	/* Number of sequence items */
 | 
					
						
							| 
									
										
										
										
											2001-04-20 19:13:02 +00:00
										 |  |  | #define FOR_ITER	93
 | 
					
						
							| 
									
										
										
										
											2000-08-11 22:15:52 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | #define STORE_ATTR	95	/* Index in name list */
 | 
					
						
							|  |  |  | #define DELETE_ATTR	96	/* "" */
 | 
					
						
							| 
									
										
										
										
											1991-12-10 13:59:17 +00:00
										 |  |  | #define STORE_GLOBAL	97	/* "" */
 | 
					
						
							|  |  |  | #define DELETE_GLOBAL	98	/* "" */
 | 
					
						
							| 
									
										
										
										
											2000-08-24 20:09:45 +00:00
										 |  |  | #define DUP_TOPX	99	/* number of items to duplicate */
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | #define LOAD_CONST	100	/* Index in const list */
 | 
					
						
							|  |  |  | #define LOAD_NAME	101	/* Index in name list */
 | 
					
						
							|  |  |  | #define BUILD_TUPLE	102	/* Number of tuple items */
 | 
					
						
							|  |  |  | #define BUILD_LIST	103	/* Number of list items */
 | 
					
						
							|  |  |  | #define BUILD_MAP	104	/* Always zero for now */
 | 
					
						
							|  |  |  | #define LOAD_ATTR	105	/* Index in name list */
 | 
					
						
							|  |  |  | #define COMPARE_OP	106	/* Comparison operator */
 | 
					
						
							|  |  |  | #define IMPORT_NAME	107	/* Index in name list */
 | 
					
						
							|  |  |  | #define IMPORT_FROM	108	/* Index in name list */
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define JUMP_FORWARD	110	/* Number of bytes to skip */
 | 
					
						
							|  |  |  | #define JUMP_IF_FALSE	111	/* "" */
 | 
					
						
							|  |  |  | #define JUMP_IF_TRUE	112	/* "" */
 | 
					
						
							|  |  |  | #define JUMP_ABSOLUTE	113	/* Target byte offset from beginning of code */
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-04-04 10:45:01 +00:00
										 |  |  | #define LOAD_GLOBAL	116	/* Index in name list */
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-02-01 22:48:12 +00:00
										 |  |  | #define CONTINUE_LOOP	119	/* Start of loop (absolute) */
 | 
					
						
							| 
									
										
										
										
											1990-11-18 17:27:39 +00:00
										 |  |  | #define SETUP_LOOP	120	/* Target address (absolute) */
 | 
					
						
							|  |  |  | #define SETUP_EXCEPT	121	/* "" */
 | 
					
						
							|  |  |  | #define SETUP_FINALLY	122	/* "" */
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1993-03-30 13:18:41 +00:00
										 |  |  | #define LOAD_FAST	124	/* Local variable number */
 | 
					
						
							|  |  |  | #define STORE_FAST	125	/* Local variable number */
 | 
					
						
							|  |  |  | #define DELETE_FAST	126	/* Local variable number */
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1995-07-07 22:32:10 +00:00
										 |  |  | #define RAISE_VARARGS	130	/* Number of raise arguments (1, 2 or 3) */
 | 
					
						
							| 
									
										
										
										
											2000-03-28 23:49:17 +00:00
										 |  |  | /* CALL_FUNCTION_XXX opcodes defined below depend on this definition */ | 
					
						
							| 
									
										
										
										
											1995-07-07 22:32:10 +00:00
										 |  |  | #define CALL_FUNCTION	131	/* #args + (#kwargs<<8) */
 | 
					
						
							| 
									
										
										
										
											1995-07-18 14:21:06 +00:00
										 |  |  | #define MAKE_FUNCTION	132	/* #defaults */
 | 
					
						
							| 
									
										
										
										
											1996-07-30 16:41:26 +00:00
										 |  |  | #define BUILD_SLICE 	133	/* Number of items */
 | 
					
						
							| 
									
										
										
										
											1995-07-07 22:32:10 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												PEP 227 implementation
The majority of the changes are in the compiler.  The mainloop changes
primarily to implement the new opcodes and to pass a function's
closure to eval_code2().  Frames and functions got new slots to hold
the closure.
Include/compile.h
    Add co_freevars and co_cellvars slots to code objects.
    Update PyCode_New() to take freevars and cellvars as arguments
Include/funcobject.h
    Add func_closure slot to function objects.
    Add GetClosure()/SetClosure() functions (and corresponding
    macros) for getting at the closure.
Include/frameobject.h
    PyFrame_New() now takes a closure.
Include/opcode.h
    Add four new opcodes: MAKE_CLOSURE, LOAD_CLOSURE, LOAD_DEREF,
    STORE_DEREF.
    Remove comment about old requirement for opcodes to fit in 7
    bits.
compile.c
    Implement changes to code objects for co_freevars and co_cellvars.
    Modify symbol table to use st_cur_name (string object for the name
    of the current scope) and st_cur_children (list of nested blocks).
    Also define st_nested, which might more properly be called
    st_cur_nested.  Add several DEF_XXX flags to track def-use
    information for free variables.
    New or modified functions of note:
    com_make_closure(struct compiling *, PyCodeObject *)
        Emit LOAD_CLOSURE opcodes as needed to pass cells for free
        variables into nested scope.
    com_addop_varname(struct compiling *, int, char *)
        Emits opcodes for LOAD_DEREF and STORE_DEREF.
    get_ref_type(struct compiling *, char *name)
        Return NAME_CLOSURE if ref type is FREE or CELL
    symtable_load_symbols(struct compiling *)
        Decides what variables are cell or free based on def-use info.
        Can now raise SyntaxError if nested scopes are mixed with
        exec or from blah import *.
    make_scope_info(PyObject *, PyObject *, int, int)
        Helper functions for symtable scope stack.
    symtable_update_free_vars(struct symtable *)
        After a code block has been analyzed, it must check each of
        its children for free variables that are not defined in the
        block.  If a variable is free in a child and not defined in
        the parent, then it is defined by block the enclosing the
        current one or it is a global.  This does the right logic.
    symtable_add_use() is now a macro for symtable_add_def()
    symtable_assign(struct symtable *, node *)
        Use goto instead of for (;;)
    Fixed bug in symtable where name of keyword argument in function
    call was treated as assignment in the scope of the call site. Ex:
        def f():
            g(a=2) # a was considered a local of f
ceval.c
    eval_code2() now take one more argument, a closure.
    Implement LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE>
    Also: When name error occurs for global variable, report that the
    name was global in the error mesage.
Objects/frameobject.c
    Initialize f_closure to be a tuple containing space for cellvars
    and freevars.  f_closure is NULL if neither are present.
Objects/funcobject.c
    Add support for func_closure.
Python/import.c
    Change the magic number.
Python/marshal.c
    Track changes to code objects.
											
										 
											2001-01-25 20:06:59 +00:00
										 |  |  | #define MAKE_CLOSURE    134     /* #free vars */
 | 
					
						
							|  |  |  | #define LOAD_CLOSURE    135     /* Load free variable from closure */
 | 
					
						
							|  |  |  | #define LOAD_DEREF      136     /* Load and dereference from closure cell */ 
 | 
					
						
							|  |  |  | #define STORE_DEREF     137     /* Store into cell */ 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-03-28 23:49:17 +00:00
										 |  |  | /* The next 3 opcodes must be contiguous and satisfy
 | 
					
						
							| 
									
										
										
										
											2000-03-29 00:10:03 +00:00
										 |  |  |    (CALL_FUNCTION_VAR - CALL_FUNCTION) & 3 == 1  */ | 
					
						
							| 
									
										
										
										
											2000-03-28 23:49:17 +00:00
										 |  |  | #define CALL_FUNCTION_VAR          140	/* #args + (#kwargs<<8) */
 | 
					
						
							|  |  |  | #define CALL_FUNCTION_KW           141	/* #args + (#kwargs<<8) */
 | 
					
						
							|  |  |  | #define CALL_FUNCTION_VAR_KW       142	/* #args + (#kwargs<<8) */
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-08-24 00:32:09 +00:00
										 |  |  | /* Support for opargs more than 16 bits long */ | 
					
						
							|  |  |  | #define EXTENDED_ARG  143
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2002-01-01 19:59:11 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | enum cmp_op {PyCmp_LT=Py_LT, PyCmp_LE=Py_LE, PyCmp_EQ=Py_EQ, PyCmp_NE=Py_NE, PyCmp_GT=Py_GT, PyCmp_GE=Py_GE, | 
					
						
							|  |  |  | 	     PyCmp_IN, PyCmp_NOT_IN, PyCmp_IS, PyCmp_IS_NOT, PyCmp_EXC_MATCH, PyCmp_BAD}; | 
					
						
							| 
									
										
										
										
											1990-12-20 15:06:42 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | #define HAS_ARG(op) ((op) >= HAVE_ARGUMENT)
 | 
					
						
							| 
									
										
										
										
											1993-07-28 09:05:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | #ifdef __cplusplus
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | #endif /* !Py_OPCODE_H */
 |