mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-109214: Rename SAVE_IP to _SET_IP, and similar (#109285)

Browse source 
* Rename SAVE_IP to _SET_IP
* Rename EXIT_TRACE to _EXIT_TRACE
* Rename SAVE_CURRENT_IP to _SAVE_CURRENT_IP
* Rename INSERT to _INSERT (This is for Ken Jin's abstract interpreter)
* Rename IS_NONE to _IS_NONE
* Rename JUMP_TO_TOP to _JUMP_TO_TOP
This commit is contained in:
Guido van Rossum 2023-09-11 15:39:19 -07:00 • committed by GitHub
parent 1ee50e2a78
commit fbaf77eb9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 117 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Tools/cases_generator/analysis.py
View file

@ -365,8 +365,8 @@ class Analyzer:
case Instruction() as instr:
part, offset = self.analyze_instruction(instr, offset)
parts.append(part)
if instr.name != "SAVE_IP":
# SAVE_IP in a macro is a no-op in Tier 1
if instr.name != "_SET_IP":
# _SET_IP in a macro is a no-op in Tier 1
flags.add(instr.instr_flags)
case _:
assert_never(component)

10
Tools/cases_generator/generate_cases.py
View file

@ -68,7 +68,7 @@ OPARG_SIZES = {
"OPARG_CACHE_4": 4,
"OPARG_TOP": 5,
"OPARG_BOTTOM": 6,
"OPARG_SAVE_IP": 7,
"OPARG_SET_IP": 7,
}
INSTR_FMT_PREFIX = "INSTR_FMT_"
@ -658,8 +658,8 @@ class Generator(Analyzer):
seen.add(name)
# These two are first by convention
add("EXIT_TRACE")
add("SAVE_IP")
add("_EXIT_TRACE")
add("_SET_IP")
for instr in self.instrs.values():
if instr.kind == "op":
@ -687,8 +687,8 @@ class Generator(Analyzer):
)
return
if not part.active_caches:
if part.instr.name == "SAVE_IP":
size, offset = OPARG_SIZES["OPARG_SAVE_IP"], cache_offset
if part.instr.name == "_SET_IP":
size, offset = OPARG_SIZES["OPARG_SET_IP"], cache_offset
else:
size, offset = OPARG_SIZES["OPARG_FULL"], 0
else:

2
Tools/cases_generator/instructions.py
View file

@ -124,7 +124,7 @@ class Instruction:
if "FRAME" in self.name:
dprint = print
if self.name == "EXIT_TRACE":
if self.name == "_EXIT_TRACE":
return True # This has 'return frame' but it's okay
if self.always_exits:
dprint(f"Skipping {self.name} because it always exits: {self.always_exits}")

4
Tools/cases_generator/stacking.py
View file

@ -362,7 +362,7 @@ def write_macro_instr(
parts = [
part
for part in mac.parts
if isinstance(part, Component) and part.instr.name != "SAVE_IP"
if isinstance(part, Component) and part.instr.name != "_SET_IP"
]
out.emit("")
with out.block(f"TARGET({mac.name})"):
@ -444,7 +444,7 @@ def write_components(
), f"Expected {mgr.instr.name!r} to be the last uop"
assert_no_pokes(managers)
if mgr.instr.name == "SAVE_CURRENT_IP":
if mgr.instr.name == "_SAVE_CURRENT_IP":
next_instr_is_set = True
if cache_offset:
out.emit(f"next_instr += {cache_offset};")