mirror of
https://github.com/python/cpython.git
synced 2025-09-17 14:16:02 +00:00
64949cb753
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.
146 lines
4 KiB
C
146 lines
4 KiB
C
#ifndef Py_OPCODE_H
|
|
#define Py_OPCODE_H
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
|
|
/* Instruction opcodes for compiled code */
|
|
|
|
#define STOP_CODE 0
|
|
#define POP_TOP 1
|
|
#define ROT_TWO 2
|
|
#define ROT_THREE 3
|
|
#define DUP_TOP 4
|
|
#define ROT_FOUR 5
|
|
|
|
#define UNARY_POSITIVE 10
|
|
#define UNARY_NEGATIVE 11
|
|
#define UNARY_NOT 12
|
|
#define UNARY_CONVERT 13
|
|
|
|
#define UNARY_INVERT 15
|
|
|
|
#define BINARY_POWER 19
|
|
|
|
#define BINARY_MULTIPLY 20
|
|
#define BINARY_DIVIDE 21
|
|
#define BINARY_MODULO 22
|
|
#define BINARY_ADD 23
|
|
#define BINARY_SUBTRACT 24
|
|
#define BINARY_SUBSCR 25
|
|
|
|
#define SLICE 30
|
|
/* Also uses 31-33 */
|
|
|
|
#define STORE_SLICE 40
|
|
/* Also uses 41-43 */
|
|
|
|
#define DELETE_SLICE 50
|
|
/* Also uses 51-53 */
|
|
|
|
#define INPLACE_ADD 55
|
|
#define INPLACE_SUBTRACT 56
|
|
#define INPLACE_MULTIPLY 57
|
|
#define INPLACE_DIVIDE 58
|
|
#define INPLACE_MODULO 59
|
|
#define STORE_SUBSCR 60
|
|
#define DELETE_SUBSCR 61
|
|
|
|
#define BINARY_LSHIFT 62
|
|
#define BINARY_RSHIFT 63
|
|
#define BINARY_AND 64
|
|
#define BINARY_XOR 65
|
|
#define BINARY_OR 66
|
|
#define INPLACE_POWER 67
|
|
|
|
#define PRINT_EXPR 70
|
|
#define PRINT_ITEM 71
|
|
#define PRINT_NEWLINE 72
|
|
#define PRINT_ITEM_TO 73
|
|
#define PRINT_NEWLINE_TO 74
|
|
#define INPLACE_LSHIFT 75
|
|
#define INPLACE_RSHIFT 76
|
|
#define INPLACE_AND 77
|
|
#define INPLACE_XOR 78
|
|
#define INPLACE_OR 79
|
|
#define BREAK_LOOP 80
|
|
|
|
#define LOAD_LOCALS 82
|
|
#define RETURN_VALUE 83
|
|
#define IMPORT_STAR 84
|
|
#define EXEC_STMT 85
|
|
|
|
#define POP_BLOCK 87
|
|
#define END_FINALLY 88
|
|
#define BUILD_CLASS 89
|
|
|
|
#define HAVE_ARGUMENT 90 /* Opcodes from here have an argument: */
|
|
|
|
#define STORE_NAME 90 /* Index in name list */
|
|
#define DELETE_NAME 91 /* "" */
|
|
#define UNPACK_SEQUENCE 92 /* Number of sequence items */
|
|
|
|
#define STORE_ATTR 95 /* Index in name list */
|
|
#define DELETE_ATTR 96 /* "" */
|
|
#define STORE_GLOBAL 97 /* "" */
|
|
#define DELETE_GLOBAL 98 /* "" */
|
|
#define DUP_TOPX 99 /* number of items to duplicate */
|
|
#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 */
|
|
#define FOR_LOOP 114 /* Number of bytes to skip */
|
|
|
|
#define LOAD_GLOBAL 116 /* Index in name list */
|
|
|
|
#define SETUP_LOOP 120 /* Target address (absolute) */
|
|
#define SETUP_EXCEPT 121 /* "" */
|
|
#define SETUP_FINALLY 122 /* "" */
|
|
|
|
#define LOAD_FAST 124 /* Local variable number */
|
|
#define STORE_FAST 125 /* Local variable number */
|
|
#define DELETE_FAST 126 /* Local variable number */
|
|
|
|
#define SET_LINENO 127 /* Current line number */
|
|
|
|
#define RAISE_VARARGS 130 /* Number of raise arguments (1, 2 or 3) */
|
|
/* CALL_FUNCTION_XXX opcodes defined below depend on this definition */
|
|
#define CALL_FUNCTION 131 /* #args + (#kwargs<<8) */
|
|
#define MAKE_FUNCTION 132 /* #defaults */
|
|
#define BUILD_SLICE 133 /* Number of items */
|
|
|
|
#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 */
|
|
|
|
/* The next 3 opcodes must be contiguous and satisfy
|
|
(CALL_FUNCTION_VAR - CALL_FUNCTION) & 3 == 1 */
|
|
#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) */
|
|
|
|
/* Support for opargs more than 16 bits long */
|
|
#define EXTENDED_ARG 143
|
|
|
|
/* Comparison operator codes (argument to COMPARE_OP) */
|
|
enum cmp_op {LT=Py_LT, LE=Py_LE, EQ=Py_EQ, NE=Py_NE, GT=Py_GT, GE=Py_GE,
|
|
IN, NOT_IN, IS, IS_NOT, EXC_MATCH, BAD};
|
|
|
|
#define HAS_ARG(op) ((op) >= HAVE_ARGUMENT)
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* !Py_OPCODE_H */
|