Skip to content

Commit 000ef44

Browse files
kddnewtonmeta-codesync[bot]
authored andcommitted
Rename STACK_REGISTERS -> DISALLOWED_REGISTERS
Summary: On x86-64 these are the same concepts (the set of disallowed registers is the same set of registers as those that are used for the stack). However on aarch64, we want XZR to also be on the list of disallowed registers, which is not explicitly a stack register, but rather something that has special meaning. Reviewed By: alexmalyshev Differential Revision: D87260451 fbshipit-source-id: 78602c1da4f4719d06e5d5d0f14258092bafb90c
1 parent 4e24c68 commit 000ef44

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

cinderx/Jit/codegen/arch/unknown.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ constexpr PhyRegisterSet ALL_VECD_REGISTERS =
227227
constexpr PhyRegisterSet ALL_REGISTERS = ALL_GP_REGISTERS | ALL_VECD_REGISTERS;
228228
#undef ADD_REG
229229

230-
constexpr PhyRegisterSet STACK_REGISTERS = PhyRegisterSet();
231-
constexpr PhyRegisterSet INIT_REGISTERS = ALL_REGISTERS - STACK_REGISTERS;
230+
constexpr PhyRegisterSet DISALLOWED_REGISTERS = PhyRegisterSet();
231+
constexpr PhyRegisterSet INIT_REGISTERS = ALL_REGISTERS - DISALLOWED_REGISTERS;
232232
constexpr PhyRegisterSet CALLEE_SAVE_REGS = PhyRegisterSet();
233233
constexpr PhyRegisterSet CALLER_SAVE_REGS = INIT_REGISTERS - CALLEE_SAVE_REGS;
234234

cinderx/Jit/codegen/arch/x86_64.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,9 @@ constexpr PhyRegisterSet ALL_VECD_REGISTERS =
296296
constexpr PhyRegisterSet ALL_REGISTERS = ALL_GP_REGISTERS | ALL_VECD_REGISTERS;
297297
#undef ADD_REG
298298

299-
constexpr PhyRegisterSet STACK_REGISTERS = PhyRegisterSet(RSP) | RBP;
299+
constexpr PhyRegisterSet DISALLOWED_REGISTERS = PhyRegisterSet(RSP) | RBP;
300300

301-
constexpr PhyRegisterSet INIT_REGISTERS = ALL_REGISTERS - STACK_REGISTERS;
301+
constexpr PhyRegisterSet INIT_REGISTERS = ALL_REGISTERS - DISALLOWED_REGISTERS;
302302

303303
constexpr PhyRegisterSet CALLER_SAVE_REGS = PhyRegisterSet(RAX) | RCX | RDX |
304304
RSI | RDI | R8 | R9 | R10 | R11 | ALL_VECD_REGISTERS;

cinderx/Jit/lir/regalloc.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ struct LiveRangeCompare {
3535
};
3636

3737
void markDisallowedRegisters(std::vector<LIRLocation>& locs) {
38-
auto stack_registers = STACK_REGISTERS;
39-
while (!stack_registers.Empty()) {
40-
auto reg = stack_registers.GetFirst();
41-
stack_registers.RemoveFirst();
38+
auto disallowed_registers = DISALLOWED_REGISTERS;
39+
while (!disallowed_registers.Empty()) {
40+
auto reg = disallowed_registers.GetFirst();
41+
disallowed_registers.RemoveFirst();
4242

4343
locs[reg.loc] = START_LOCATION;
4444
}

0 commit comments

Comments
 (0)