diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2019-08-21 18:13:02 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2019-08-21 18:13:02 +0000 |
commit | 54db30ce18663e6c2991958f3b5d18362e8e93c4 (patch) | |
tree | 4aa6442802570767398cc83ba484e97b1309bdc2 /contrib/llvm/lib/Target/Lanai/LanaiRegisterInfo.cpp | |
parent | 35284c22e9c8348159b7ce032ea45f2cdeb65298 (diff) | |
parent | e6d1592492a3a379186bfb02bd0f4eda0669c0d5 (diff) | |
download | src-54db30ce18663e6c2991958f3b5d18362e8e93c4.tar.gz src-54db30ce18663e6c2991958f3b5d18362e8e93c4.zip |
Merge llvm trunk r366426, resolve conflicts, and update FREEBSD-Xlist.
Notes
Notes:
svn path=/projects/clang900-import/; revision=351344
Diffstat (limited to 'contrib/llvm/lib/Target/Lanai/LanaiRegisterInfo.cpp')
-rw-r--r-- | contrib/llvm/lib/Target/Lanai/LanaiRegisterInfo.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/contrib/llvm/lib/Target/Lanai/LanaiRegisterInfo.cpp b/contrib/llvm/lib/Target/Lanai/LanaiRegisterInfo.cpp index 56a5e0ea2def..d3056a1eba8e 100644 --- a/contrib/llvm/lib/Target/Lanai/LanaiRegisterInfo.cpp +++ b/contrib/llvm/lib/Target/Lanai/LanaiRegisterInfo.cpp @@ -1,9 +1,8 @@ //===-- LanaiRegisterInfo.cpp - Lanai Register Information ------*- C++ -*-===// // -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// // @@ -12,8 +11,10 @@ //===----------------------------------------------------------------------===// #include "LanaiRegisterInfo.h" -#include "Lanai.h" -#include "LanaiSubtarget.h" +#include "LanaiAluCode.h" +#include "LanaiCondCode.h" +#include "LanaiFrameLowering.h" +#include "LanaiInstrInfo.h" #include "llvm/ADT/BitVector.h" #include "llvm/ADT/STLExtras.h" #include "llvm/CodeGen/MachineFrameInfo.h" @@ -257,12 +258,12 @@ bool LanaiRegisterInfo::hasBasePointer(const MachineFunction &MF) const { unsigned LanaiRegisterInfo::getRARegister() const { return Lanai::RCA; } -unsigned +Register LanaiRegisterInfo::getFrameRegister(const MachineFunction & /*MF*/) const { return Lanai::FP; } -unsigned LanaiRegisterInfo::getBaseRegister() const { return Lanai::R14; } +Register LanaiRegisterInfo::getBaseRegister() const { return Lanai::R14; } const uint32_t * LanaiRegisterInfo::getCallPreservedMask(const MachineFunction & /*MF*/, |