mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

GH-98831: Add macro and op and their implementation to DSL (#99495)

Browse source 
Newly supported interpreter definition syntax:
- `op(NAME, (input_stack_effects -- output_stack_effects)) { ... }`
- `macro(NAME) = OP1 + OP2;`

Also some other random improvements:
- Convert `WITH_EXCEPT_START` to use stack effects
- Fix lexer to balk at unrecognized characters, e.g. `@`
- Fix moved output names; support object pointers in cache
- Introduce `error()` method to print errors
- Introduce read_uint16(p) as equivalent to `*p`

Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
This commit is contained in:
Guido van Rossum 2022-11-22 16:04:57 -08:00 • committed by GitHub
parent f1a4a6a587
commit 8f18ac04d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 325 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Python/bytecodes.c
View file

@ -70,6 +70,8 @@ do { \
#define DISPATCH_SAME_OPARG() ((void)0)
#define inst(name, ...) case name:
#define op(name, ...) /* NAME is ignored */
#define macro(name) static int MACRO_##name
#define super(name) static int SUPER_##name
#define family(name, ...) static int family_##name
@ -80,6 +82,7 @@ do { \
static PyObject *value, *value1, *value2, *left, *right, *res, *sum, *prod, *sub;
static PyObject *container, *start, *stop, *v, *lhs, *rhs;
static PyObject *list, *tuple, *dict;
static PyObject *exit_func, *lasti, *val;
static PyObject *
dummy_func(
@ -156,10 +159,7 @@ dummy_func(
res = NULL;
}
inst(END_FOR, (value1, value2 --)) {
Py_DECREF(value1);
Py_DECREF(value2);
}
macro(END_FOR) = POP_TOP + POP_TOP;
inst(UNARY_POSITIVE, (value -- res)) {
res = PyNumber_Positive(value);
@ -2725,33 +2725,27 @@ dummy_func(
PUSH(res);
}
// stack effect: ( -- __0)
inst(WITH_EXCEPT_START) {
inst(WITH_EXCEPT_START, (exit_func, lasti, unused, val -- exit_func, lasti, unused, val, res)) {
/* At the top of the stack are 4 values:
- TOP = exc_info()
- SECOND = previous exception
- THIRD: lasti of exception in exc_info()
- FOURTH: the context.__exit__ bound method
- val: TOP = exc_info()
- unused: SECOND = previous exception
- lasti: THIRD = lasti of exception in exc_info()
- exit_func: FOURTH = the context.__exit__ bound method
We call FOURTH(type(TOP), TOP, GetTraceback(TOP)).
Then we push the __exit__ return value.
*/
PyObject *exit_func;
PyObject *exc, *val, *tb, *res;
PyObject *exc, *tb;
val = TOP();
assert(val && PyExceptionInstance_Check(val));
exc = PyExceptionInstance_Class(val);
tb = PyException_GetTraceback(val);
Py_XDECREF(tb);
assert(PyLong_Check(PEEK(3)));
exit_func = PEEK(4);
assert(PyLong_Check(lasti));
(void)lasti; // Shut up compiler warning if asserts are off
PyObject *stack[4] = {NULL, exc, val, tb};
res = PyObject_Vectorcall(exit_func, stack + 1,
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL)
goto error;
PUSH(res);
ERROR_IF(res == NULL, error);
}
// stack effect: ( -- __0)

103
Python/generated_cases.c.h generated
View file

@ -78,15 +78,6 @@
DISPATCH();
}
TARGET(END_FOR) {
PyObject *value2 = PEEK(1);
PyObject *value1 = PEEK(2);
Py_DECREF(value1);
Py_DECREF(value2);
STACK_SHRINK(2);
DISPATCH();
}
TARGET(UNARY_POSITIVE) {
PyObject *value = PEEK(1);
PyObject *res;
@ -446,7 +437,7 @@
TARGET(BINARY_SUBSCR_GETITEM) {
uint32_t type_version = read_u32(next_instr + 1);
uint16_t func_version = *(next_instr + 3);
uint16_t func_version = read_u16(next_instr + 3);
PyObject *sub = PEEK(1);
PyObject *container = PEEK(2);
PyTypeObject *tp = Py_TYPE(container);
@ -2754,31 +2745,32 @@
}
TARGET(WITH_EXCEPT_START) {
PyObject *val = PEEK(1);
PyObject *lasti = PEEK(3);
PyObject *exit_func = PEEK(4);
PyObject *res;
/* At the top of the stack are 4 values:
- TOP = exc_info()
- SECOND = previous exception
- THIRD: lasti of exception in exc_info()
- FOURTH: the context.__exit__ bound method
- val: TOP = exc_info()
- unused: SECOND = previous exception
- lasti: THIRD = lasti of exception in exc_info()
- exit_func: FOURTH = the context.__exit__ bound method
We call FOURTH(type(TOP), TOP, GetTraceback(TOP)).
Then we push the __exit__ return value.
*/
PyObject *exit_func;
PyObject *exc, *val, *tb, *res;
PyObject *exc, *tb;
val = TOP();
assert(val && PyExceptionInstance_Check(val));
exc = PyExceptionInstance_Class(val);
tb = PyException_GetTraceback(val);
Py_XDECREF(tb);
assert(PyLong_Check(PEEK(3)));
exit_func = PEEK(4);
assert(PyLong_Check(lasti));
(void)lasti; // Shut up compiler warning if asserts are off
PyObject *stack[4] = {NULL, exc, val, tb};
res = PyObject_Vectorcall(exit_func, stack + 1,
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL)
goto error;
PUSH(res);
if (res == NULL) goto error;
STACK_GROW(1);
POKE(1, res);
DISPATCH();
}
@ -3711,13 +3703,14 @@
}
TARGET(LOAD_FAST__LOAD_FAST) {
PyObject *_tmp_1;
PyObject *_tmp_2;
{
PyObject *value;
value = GETLOCAL(oparg);
assert(value != NULL);
Py_INCREF(value);
STACK_GROW(1);
POKE(1, value);
_tmp_1 = value;
}
NEXTOPARG();
next_instr++;
@ -3726,20 +3719,23 @@
value = GETLOCAL(oparg);
assert(value != NULL);
Py_INCREF(value);
STACK_GROW(1);
POKE(1, value);
_tmp_2 = value;
}
STACK_GROW(2);
POKE(1, _tmp_2);
POKE(2, _tmp_1);
DISPATCH();
}
TARGET(LOAD_FAST__LOAD_CONST) {
PyObject *_tmp_1;
PyObject *_tmp_2;
{
PyObject *value;
value = GETLOCAL(oparg);
assert(value != NULL);
Py_INCREF(value);
STACK_GROW(1);
POKE(1, value);
_tmp_1 = value;
}
NEXTOPARG();
next_instr++;
@ -3747,17 +3743,19 @@
PyObject *value;
value = GETITEM(consts, oparg);
Py_INCREF(value);
STACK_GROW(1);
POKE(1, value);
_tmp_2 = value;
}
STACK_GROW(2);
POKE(1, _tmp_2);
POKE(2, _tmp_1);
DISPATCH();
}
TARGET(STORE_FAST__LOAD_FAST) {
PyObject *_tmp_1 = PEEK(1);
{
PyObject *value = PEEK(1);
PyObject *value = _tmp_1;
SETLOCAL(oparg, value);
STACK_SHRINK(1);
}
NEXTOPARG();
next_instr++;
@ -3766,35 +3764,37 @@
value = GETLOCAL(oparg);
assert(value != NULL);
Py_INCREF(value);
STACK_GROW(1);
POKE(1, value);
_tmp_1 = value;
}
POKE(1, _tmp_1);
DISPATCH();
}
TARGET(STORE_FAST__STORE_FAST) {
PyObject *_tmp_1 = PEEK(2);
PyObject *_tmp_2 = PEEK(1);
{
PyObject *value = PEEK(1);
PyObject *value = _tmp_2;
SETLOCAL(oparg, value);
STACK_SHRINK(1);
}
NEXTOPARG();
next_instr++;
{
PyObject *value = PEEK(1);
PyObject *value = _tmp_1;
SETLOCAL(oparg, value);
STACK_SHRINK(1);
}
STACK_SHRINK(2);
DISPATCH();
}
TARGET(LOAD_CONST__LOAD_FAST) {
PyObject *_tmp_1;
PyObject *_tmp_2;
{
PyObject *value;
value = GETITEM(consts, oparg);
Py_INCREF(value);
STACK_GROW(1);
POKE(1, value);
_tmp_1 = value;
}
NEXTOPARG();
next_instr++;
@ -3803,8 +3803,25 @@
value = GETLOCAL(oparg);
assert(value != NULL);
Py_INCREF(value);
STACK_GROW(1);
POKE(1, value);
_tmp_2 = value;
}
STACK_GROW(2);
POKE(1, _tmp_2);
POKE(2, _tmp_1);
DISPATCH();
}
TARGET(END_FOR) {
PyObject *_tmp_1 = PEEK(2);
PyObject *_tmp_2 = PEEK(1);
{
PyObject *value = _tmp_2;
Py_DECREF(value);
}
{
PyObject *value = _tmp_1;
Py_DECREF(value);
}
STACK_SHRINK(2);
DISPATCH();
}