Skip to content

Commit

Permalink
Fix some incorrect opcode tables from Python 1.0-1.4
Browse files Browse the repository at this point in the history 
The dis.py from these versions was often out-of-date from the C source.
  • Loading branch information
@zrax
zrax committed Nov 16, 2023
1 parent 4ecdd1f commit 3ffbb0a
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 26 deletions.
30 changes: 15 additions & 15 deletions PythonBytecode.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ UNARY_POSITIVE [X] [X] [X] [X] [X] [X] [X]
UNARY_NEGATIVE [X] [X] [X] [X] [X] [X] [X]
UNARY_NOT [X] [X] [X] [X] [X] [X] [X]
UNARY_CONVERT [X] [X] [X] [X] [X] [X] [X]
UNARY_CALL [X] [X] [X] [X] [X] [ ] [ ]
UNARY_CALL [X] [X] [X] [ ] [ ] [ ] [ ]
UNARY_INVERT [X] [X] [X] [X] [X] [X] [X]
<16> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
<17> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
Expand All @@ -42,7 +42,7 @@ BINARY_MODULO [X] [X] [X] [X] [X] [X] [X]
BINARY_ADD [X] [X] [X] [X] [X] [X] [X]
BINARY_SUBTRACT [X] [X] [X] [X] [X] [X] [X]
BINARY_SUBSCR [X] [X] [X] [X] [X] [X] [X]
BINARY_CALL [X] [X] [X] [X] [X] [ ] [ ]
BINARY_CALL [X] [X] [X] [ ] [ ] [ ] [ ]
<27> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
<28> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
<29> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
Expand Down Expand Up @@ -78,11 +78,11 @@ DELETE_SLICE+3 [X] [X] [X] [X] [X] [X] [X]
<59> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
STORE_SUBSCR [X] [X] [X] [X] [X] [X] [X]
DELETE_SUBSCR [X] [X] [X] [X] [X] [X] [X]
BINARY_LSHIFT [ ] [ ] [ ] [ ] [ ] [X] [X]
BINARY_RSHIFT [ ] [ ] [ ] [ ] [ ] [X] [X]
BINARY_AND [ ] [ ] [ ] [ ] [ ] [X] [X]
BINARY_XOR [ ] [ ] [ ] [ ] [ ] [X] [X]
BINARY_OR [ ] [ ] [ ] [ ] [ ] [X] [X]
BINARY_LSHIFT [X] [X] [X] [X] [X] [X] [X]
BINARY_RSHIFT [X] [X] [X] [X] [X] [X] [X]
BINARY_AND [X] [X] [X] [X] [X] [X] [X]
BINARY_XOR [X] [X] [X] [X] [X] [X] [X]
BINARY_OR [X] [X] [X] [X] [X] [X] [X]
<67> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
<68> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
<69> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
Expand All @@ -97,12 +97,12 @@ PRINT_NEWLINE [X] [X] [X] [X] [X] [X] [X]
<78> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
<79> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
BREAK_LOOP [X] [X] [X] [X] [X] [X] [X]
RAISE_EXCEPTION [X] [X] [X] [X] [X] [ ] [ ]
RAISE_EXCEPTION [X] [X] [X] [ ] [ ] [ ] [ ]
LOAD_LOCALS [X] [X] [X] [X] [X] [X] [X]
RETURN_VALUE [X] [X] [X] [X] [X] [X] [X]
LOAD_GLOBALS [ ] [X] [X] [X] [ ] [ ] [ ]
EXEC_STMT [ ] [X] [X] [X] [X] [X] [X]
BUILD_FUNCTION [X] [X] [X] [X] [X] [ ] [ ]
LOAD_GLOBALS [X] [X] [X] [ ] [ ] [ ] [ ]
EXEC_STMT [X] [X] [X] [X] [X] [X] [X]
BUILD_FUNCTION [X] [X] [X] [ ] [ ] [ ] [ ]
POP_BLOCK [X] [X] [X] [X] [X] [X] [X]
END_FINALLY [X] [X] [X] [X] [X] [X] [X]
BUILD_CLASS [X] [X] [X] [X] [X] [X] [X]
Expand Down Expand Up @@ -139,16 +139,16 @@ SET_FUNC_ARGS [ ] [X] [X] [X] [X] [ ] [ ]
SETUP_LOOP [X] [X] [X] [X] [X] [X] [X]
SETUP_EXCEPT [X] [X] [X] [X] [X] [X] [X]
SETUP_FINALLY [X] [X] [X] [X] [X] [X] [X]
RESERVE_FAST [X] [X] [X] [X] [X] [ ] [ ]
RESERVE_FAST [X] [X] [X] [ ] [ ] [ ] [ ]
LOAD_FAST [X] [X] [X] [X] [X] [X] [X]
STORE_FAST [X] [X] [X] [X] [X] [X] [X]
DELETE_FAST [X] [X] [X] [X] [X] [X] [X]
SET_LINENO [X] [X] [X] [X] [X] [X] [X]
<128> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
<129> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
RAISE_VARARGS [ ] [ ] [ ] [ ] [X] [X] [X]
CALL_FUNCTION [ ] [ ] [ ] [ ] [X] [X] [X]
MAKE_FUNCTION [ ] [ ] [ ] [ ] [X] [X] [X]
RAISE_VARARGS [ ] [ ] [ ] [X] [X] [X] [X]
CALL_FUNCTION [ ] [ ] [ ] [X] [X] [X] [X]
MAKE_FUNCTION [ ] [ ] [ ] [X] [X] [X] [X]
BUILD_SLICE [ ] [ ] [ ] [ ] [X] [X] [X]
<134> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
<135> [ ] [ ] [ ] [ ] [ ] [ ] [ ]
Expand Down
7 changes: 7 additions & 0 deletions bytes/python_10.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,20 @@
53 DELETE_SLICE_3
60 STORE_SUBSCR
61 DELETE_SUBSCR
62 BINARY_LSHIFT
63 BINARY_RSHIFT
64 BINARY_AND
65 BINARY_XOR
66 BINARY_OR
70 PRINT_EXPR
71 PRINT_ITEM
72 PRINT_NEWLINE
80 BREAK_LOOP
81 RAISE_EXCEPTION
82 LOAD_LOCALS
83 RETURN_VALUE
84 LOAD_GLOBALS
85 EXEC_STMT
86 BUILD_FUNCTION
87 POP_BLOCK
88 END_FINALLY
Expand Down
5 changes: 5 additions & 0 deletions bytes/python_11.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
53 DELETE_SLICE_3
60 STORE_SUBSCR
61 DELETE_SUBSCR
62 BINARY_LSHIFT
63 BINARY_RSHIFT
64 BINARY_AND
65 BINARY_XOR
66 BINARY_OR
70 PRINT_EXPR
71 PRINT_ITEM
72 PRINT_NEWLINE
Expand Down
14 changes: 8 additions & 6 deletions bytes/python_13.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
11 UNARY_NEGATIVE
12 UNARY_NOT
13 UNARY_CONVERT
14 UNARY_CALL
15 UNARY_INVERT
20 BINARY_MULTIPLY
21 BINARY_DIVIDE
22 BINARY_MODULO
23 BINARY_ADD
24 BINARY_SUBTRACT
25 BINARY_SUBSCR
26 BINARY_CALL
30 SLICE_0
31 SLICE_1
32 SLICE_2
Expand All @@ -30,16 +28,18 @@
53 DELETE_SLICE_3
60 STORE_SUBSCR
61 DELETE_SUBSCR
62 BINARY_LSHIFT
63 BINARY_RSHIFT
64 BINARY_AND
65 BINARY_XOR
66 BINARY_OR
70 PRINT_EXPR
71 PRINT_ITEM
72 PRINT_NEWLINE
80 BREAK_LOOP
81 RAISE_EXCEPTION
82 LOAD_LOCALS
83 RETURN_VALUE
84 LOAD_GLOBALS
85 EXEC_STMT
86 BUILD_FUNCTION
87 POP_BLOCK
88 END_FINALLY
89 BUILD_CLASS
Expand Down Expand Up @@ -74,8 +74,10 @@
120 SETUP_LOOP_A
121 SETUP_EXCEPT_A
122 SETUP_FINALLY_A
123 RESERVE_FAST_A
124 LOAD_FAST_A
125 STORE_FAST_A
126 DELETE_FAST_A
127 SET_LINENO_A
130 RAISE_VARARGS_A
131 CALL_FUNCTION_A
132 MAKE_FUNCTION_A
10 changes: 5 additions & 5 deletions bytes/python_14.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
11 UNARY_NEGATIVE
12 UNARY_NOT
13 UNARY_CONVERT
14 UNARY_CALL
15 UNARY_INVERT
19 BINARY_POWER
20 BINARY_MULTIPLY
Expand All @@ -16,7 +15,6 @@
23 BINARY_ADD
24 BINARY_SUBTRACT
25 BINARY_SUBSCR
26 BINARY_CALL
30 SLICE_0
31 SLICE_1
32 SLICE_2
Expand All @@ -31,15 +29,18 @@
53 DELETE_SLICE_3
60 STORE_SUBSCR
61 DELETE_SUBSCR
62 BINARY_LSHIFT
63 BINARY_RSHIFT
64 BINARY_AND
65 BINARY_XOR
66 BINARY_OR
70 PRINT_EXPR
71 PRINT_ITEM
72 PRINT_NEWLINE
80 BREAK_LOOP
81 RAISE_EXCEPTION
82 LOAD_LOCALS
83 RETURN_VALUE
85 EXEC_STMT
86 BUILD_FUNCTION
87 POP_BLOCK
88 END_FINALLY
89 BUILD_CLASS
Expand Down Expand Up @@ -74,7 +75,6 @@
120 SETUP_LOOP_A
121 SETUP_EXCEPT_A
122 SETUP_FINALLY_A
123 RESERVE_FAST_A
124 LOAD_FAST_A
125 STORE_FAST_A
126 DELETE_FAST_A
Expand Down

0 comments on commit 3ffbb0a

Please sign in to comment.