Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/coreclr/jit/lsra.h
Original file line number Diff line number Diff line change
Expand Up @@ -1725,13 +1725,15 @@ class LinearScan : public LinearScanInterface
#endif
PhasedVar<SingleTypeRegSet>* availableRegs[TYP_COUNT];

#if defined(TARGET_XARCH)
#define allAvailableRegs regMaskTP(availableIntRegs | availableFloatRegs | availableMaskRegs)
#elif defined(TARGET_ARM64)
#if defined(TARGET_XARCH) || defined(TARGET_ARM64)
#ifdef HAS_MORE_THAN_64_REGISTERS
#define allAvailableRegs regMaskTP(availableIntRegs | availableFloatRegs, availableMaskRegs)
#else
#define allAvailableRegs regMaskTP(availableIntRegs | availableFloatRegs | availableMaskRegs)
#endif // HAS_MORE_THAN_64_REGISTERS
#else
#define allAvailableRegs regMaskTP(availableIntRegs | availableFloatRegs)
#endif
#endif // defined(TARGET_XARCH) || defined(TARGET_ARM64)

// Register mask of argument registers currently occupied because we saw a
// PUTARG_REG node. Tracked between the PUTARG_REG and its corresponding
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/target.h
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ typedef uint64_t regMaskSmall;
#endif

#ifdef TARGET_ARM64
#define HAS_MORE_THAN_64_REGISTERS 1
// #define HAS_MORE_THAN_64_REGISTERS 1
#endif // TARGET_ARM64

#ifdef HAS_MORE_THAN_64_REGISTERS
Expand Down