path: pathlib.Path
_: dataclasses.KW_ONLY
- # prefix used to mangle symbols on some platforms:
- prefix: str = ""
+ # Prefixes used to mangle local labels and symbols:
+ label_prefix: str
+ symbol_prefix: str
# The first block in the linked list:
_root: _Block = dataclasses.field(init=False, default_factory=_Block)
_labels: dict[str, _Block] = dataclasses.field(init=False, default_factory=dict)
# No groups:
_re_noninstructions: typing.ClassVar[re.Pattern[str]] = re.compile(
- r"\s*(?:\.|#|//|$)"
+ r"\s*(?:\.|#|//|;|$)"
)
# One group (label):
_re_label: typing.ClassVar[re.Pattern[str]] = re.compile(
r'\s*(?P<label>[\w."$?@]+):'
)
# Override everything that follows in subclasses:
- _alignment: typing.ClassVar[int] = 1
_branches: typing.ClassVar[dict[str, str | None]] = {}
# Two groups (instruction and target):
_re_branch: typing.ClassVar[re.Pattern[str]] = _RE_NEVER_MATCH
block.fallthrough = False
def _preprocess(self, text: str) -> str:
- # Override this method to do preprocessing of the textual assembly:
- return text
+ # Override this method to do preprocessing of the textual assembly.
+ # In all cases, replace references to the _JIT_CONTINUE symbol with
+ # references to a local _JIT_CONTINUE label (which we will add later):
+ continue_symbol = rf"\b{re.escape(self.symbol_prefix)}_JIT_CONTINUE\b"
+ continue_label = f"{self.label_prefix}_JIT_CONTINUE"
+ return re.sub(continue_symbol, continue_label, text)
@classmethod
def _invert_branch(cls, line: str, target: str) -> str | None:
# jmp FOO
# After:
# jmp FOO
- # .balign 8
# _JIT_CONTINUE:
# This lets the assembler encode _JIT_CONTINUE jumps at build time!
- align = _Block()
- align.noninstructions.append(f"\t.balign\t{self._alignment}")
- continuation = self._lookup_label(f"{self.prefix}_JIT_CONTINUE")
+ continuation = self._lookup_label(f"{self.label_prefix}_JIT_CONTINUE")
assert continuation.label
continuation.noninstructions.append(f"{continuation.label}:")
- end.link, align.link, continuation.link = align, continuation, end.link
+ end.link, continuation.link = continuation, end.link
def _mark_hot_blocks(self) -> None:
# Start with the last block, and perform a DFS to find all blocks that
class OptimizerAArch64(Optimizer): # pylint: disable = too-few-public-methods
"""aarch64-apple-darwin/aarch64-pc-windows-msvc/aarch64-unknown-linux-gnu"""
- # TODO: @diegorusso
- _alignment = 8
# https://developer.arm.com/documentation/ddi0602/2025-03/Base-Instructions/B--Branch-
_re_jump = re.compile(r"\s*b\s+(?P<target>[\w.]+)")
_re_jump = re.compile(r"\s*jmp\s+(?P<target>[\w.]+)")
# https://www.felixcloutier.com/x86/ret
_re_return = re.compile(r"\s*ret\b")
-
-
-class OptimizerX8664Windows(OptimizerX86): # pylint: disable = too-few-public-methods
- """x86_64-pc-windows-msvc"""
-
- def _preprocess(self, text: str) -> str:
- text = super()._preprocess(text)
- # Before:
- # rex64 jmpq *__imp__JIT_CONTINUE(%rip)
- # After:
- # jmp _JIT_CONTINUE
- far_indirect_jump = (
- rf"rex64\s+jmpq\s+\*__imp_(?P<target>{self.prefix}_JIT_\w+)\(%rip\)"
- )
- return re.sub(far_indirect_jump, r"jmp\t\g<target>", text)
_: dataclasses.KW_ONLY
args: typing.Sequence[str] = ()
optimizer: type[_optimizers.Optimizer] = _optimizers.Optimizer
- prefix: str = ""
+ label_prefix: typing.ClassVar[str]
+ symbol_prefix: typing.ClassVar[str]
stable: bool = False
debug: bool = False
verbose: bool = False
*shlex.split(self.cflags),
]
await _llvm.run("clang", args_s, echo=self.verbose)
- self.optimizer(s, prefix=self.prefix).run()
+ self.optimizer(
+ s, label_prefix=self.label_prefix, symbol_prefix=self.symbol_prefix
+ ).run()
args_o = [f"--target={self.triple}", "-c", "-o", f"{o}", f"{s}"]
await _llvm.run("clang", args_o, echo=self.verbose)
return await self._parse(o)
symbol = wrapped_symbol["Symbol"]
offset = base + symbol["Value"]
name = symbol["Name"]
- name = name.removeprefix(self.prefix)
+ name = name.removeprefix(self.symbol_prefix)
if name not in group.symbols:
group.symbols[name] = value, offset
for wrapped_relocation in section["Relocations"]:
def _unwrap_dllimport(self, name: str) -> tuple[_stencils.HoleValue, str | None]:
if name.startswith("__imp_"):
name = name.removeprefix("__imp_")
- name = name.removeprefix(self.prefix)
+ name = name.removeprefix(self.symbol_prefix)
return _stencils.HoleValue.GOT, name
- name = name.removeprefix(self.prefix)
+ name = name.removeprefix(self.symbol_prefix)
return _stencils.symbol_to_value(name)
def _handle_relocation(
return _stencils.Hole(offset, kind, value, symbol, addend)
+class _COFF32(_COFF):
+ # These mangle like Mach-O and other "older" formats:
+ label_prefix = "L"
+ symbol_prefix = "_"
+
+
+class _COFF64(_COFF):
+ # These mangle like ELF and other "newer" formats:
+ label_prefix = ".L"
+ symbol_prefix = ""
+
+
class _ELF(
_Target[_schema.ELFSection, _schema.ELFRelocation]
): # pylint: disable = too-few-public-methods
+ label_prefix = ".L"
+ symbol_prefix = ""
+
def _handle_section(
self, section: _schema.ELFSection, group: _stencils.StencilGroup
) -> None:
symbol = wrapped_symbol["Symbol"]
offset = len(stencil.body) + symbol["Value"]
name = symbol["Name"]["Name"]
- name = name.removeprefix(self.prefix)
+ name = name.removeprefix(self.symbol_prefix)
group.symbols[name] = value, offset
stencil.body.extend(section["SectionData"]["Bytes"])
assert not section["Relocations"]
},
}:
offset += base
- s = s.removeprefix(self.prefix)
+ s = s.removeprefix(self.symbol_prefix)
value, symbol = _stencils.HoleValue.GOT, s
case {
"Addend": addend,
"Type": {"Name": kind},
}:
offset += base
- s = s.removeprefix(self.prefix)
+ s = s.removeprefix(self.symbol_prefix)
value, symbol = _stencils.symbol_to_value(s)
case _:
raise NotImplementedError(relocation)
class _MachO(
_Target[_schema.MachOSection, _schema.MachORelocation]
): # pylint: disable = too-few-public-methods
+ label_prefix = "L"
+ symbol_prefix = "_"
+
def _handle_section(
self, section: _schema.MachOSection, group: _stencils.StencilGroup
) -> None:
assert "SectionData" in section
flags = {flag["Name"] for flag in section["Attributes"]["Flags"]}
name = section["Name"]["Value"]
- name = name.removeprefix(self.prefix)
+ name = name.removeprefix(self.symbol_prefix)
if "Debug" in flags:
return
- if "SomeInstructions" in flags:
+ if "PureInstructions" in flags:
value = _stencils.HoleValue.CODE
stencil = group.code
start_address = 0
symbol = wrapped_symbol["Symbol"]
offset = symbol["Value"] - start_address
name = symbol["Name"]["Name"]
- name = name.removeprefix(self.prefix)
+ name = name.removeprefix(self.symbol_prefix)
group.symbols[name] = value, offset
assert "Relocations" in section
for wrapped_relocation in section["Relocations"]:
},
}:
offset += base
- s = s.removeprefix(self.prefix)
+ s = s.removeprefix(self.symbol_prefix)
value, symbol = _stencils.HoleValue.GOT, s
addend = 0
case {
"Type": {"Name": "X86_64_RELOC_GOT" | "X86_64_RELOC_GOT_LOAD" as kind},
}:
offset += base
- s = s.removeprefix(self.prefix)
+ s = s.removeprefix(self.symbol_prefix)
value, symbol = _stencils.HoleValue.GOT, s
addend = (
int.from_bytes(raw[offset : offset + 4], "little", signed=True) - 4
"Type": {"Name": "X86_64_RELOC_BRANCH" | "X86_64_RELOC_SIGNED" as kind},
}:
offset += base
- s = s.removeprefix(self.prefix)
+ s = s.removeprefix(self.symbol_prefix)
value, symbol = _stencils.symbol_to_value(s)
addend = (
int.from_bytes(raw[offset : offset + 4], "little", signed=True) - 4
"Type": {"Name": kind},
}:
offset += base
- s = s.removeprefix(self.prefix)
+ s = s.removeprefix(self.symbol_prefix)
value, symbol = _stencils.symbol_to_value(s)
addend = 0
case _:
return _stencils.Hole(offset, kind, value, symbol, addend)
-def get_target(host: str) -> _COFF | _ELF | _MachO:
+def get_target(host: str) -> _COFF32 | _COFF64 | _ELF | _MachO:
"""Build a _Target for the given host "triple" and options."""
optimizer: type[_optimizers.Optimizer]
- target: _COFF | _ELF | _MachO
+ target: _COFF32 | _COFF64 | _ELF | _MachO
if re.fullmatch(r"aarch64-apple-darwin.*", host):
condition = "defined(__aarch64__) && defined(__APPLE__)"
optimizer = _optimizers.OptimizerAArch64
- target = _MachO(host, condition, optimizer=optimizer, prefix="_")
+ target = _MachO(host, condition, optimizer=optimizer)
elif re.fullmatch(r"aarch64-pc-windows-msvc", host):
args = ["-fms-runtime-lib=dll", "-fplt"]
condition = "defined(_M_ARM64)"
optimizer = _optimizers.OptimizerAArch64
- target = _COFF(host, condition, args=args, optimizer=optimizer)
+ target = _COFF64(host, condition, args=args, optimizer=optimizer)
elif re.fullmatch(r"aarch64-.*-linux-gnu", host):
# -mno-outline-atomics: Keep intrinsics from being emitted.
args = ["-fpic", "-mno-outline-atomics"]
args = ["-DPy_NO_ENABLE_SHARED", "-Wno-ignored-attributes"]
optimizer = _optimizers.OptimizerX86
condition = "defined(_M_IX86)"
- target = _COFF(host, condition, args=args, optimizer=optimizer, prefix="_")
+ target = _COFF32(host, condition, args=args, optimizer=optimizer)
elif re.fullmatch(r"x86_64-apple-darwin.*", host):
condition = "defined(__x86_64__) && defined(__APPLE__)"
optimizer = _optimizers.OptimizerX86
- target = _MachO(host, condition, optimizer=optimizer, prefix="_")
+ target = _MachO(host, condition, optimizer=optimizer)
elif re.fullmatch(r"x86_64-pc-windows-msvc", host):
args = ["-fms-runtime-lib=dll"]
condition = "defined(_M_X64)"
- optimizer = _optimizers.OptimizerX8664Windows
- target = _COFF(host, condition, args=args, optimizer=optimizer)
+ optimizer = _optimizers.OptimizerX86
+ target = _COFF64(host, condition, args=args, optimizer=optimizer)
elif re.fullmatch(r"x86_64-.*-linux-gnu", host):
args = ["-fno-pic", "-mcmodel=medium", "-mlarge-data-threshold=0"]
condition = "defined(__x86_64__) && defined(__linux__)"
projects / thirdparty / Python / cpython.git / commitdiff
