From 502374a58fcd1c28065170a8c4a210be002ff190 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 24 Oct 2002 22:34:41 +0000 Subject: [PATCH] * Remove unneccesary #includes * Fix typeo in the (unused) MachineInstrInfo::isArith method git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4275 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Target/MachineInstrInfo.h | 8 +++----- include/llvm/Target/TargetInstrInfo.h | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/include/llvm/Target/MachineInstrInfo.h b/include/llvm/Target/MachineInstrInfo.h index d0029299a42..6bfe7e5d67f 100644 --- a/include/llvm/Target/MachineInstrInfo.h +++ b/include/llvm/Target/MachineInstrInfo.h @@ -11,8 +11,6 @@ #include "Support/DataTypes.h" #include "llvm/Constant.h" #include "llvm/DerivedTypes.h" -#include -#include class MachineInstrDescriptor; class TmpInstruction; @@ -55,7 +53,7 @@ extern const MachineInstrDescriptor *TargetInstrDescriptors; //--------------------------------------------------------------------------- -const unsigned int M_NOP_FLAG = 1; +const unsigned int M_NOP_FLAG = 1 << 0; const unsigned int M_BRANCH_FLAG = 1 << 1; const unsigned int M_CALL_FLAG = 1 << 2; const unsigned int M_RET_FLAG = 1 << 3; @@ -150,7 +148,7 @@ public: || getDescriptor(opCode).iclass & M_RET_FLAG; } bool isArith(MachineOpCode opCode) const { - return getDescriptor(opCode).iclass & M_RET_FLAG; + return getDescriptor(opCode).iclass & M_ARITH_FLAG; } bool isCCInstr(MachineOpCode opCode) const { return getDescriptor(opCode).iclass & M_CC_FLAG; @@ -164,7 +162,7 @@ public: bool isFloatInstr(MachineOpCode opCode) const { return getDescriptor(opCode).iclass & M_FLOAT_FLAG; } - bool isConditional(MachineOpCode opCode) const { + bool isConditional(MachineOpCode opCode) const { return getDescriptor(opCode).iclass & M_CONDL_FLAG; } bool isLoad(MachineOpCode opCode) const { diff --git a/include/llvm/Target/TargetInstrInfo.h b/include/llvm/Target/TargetInstrInfo.h index d0029299a42..6bfe7e5d67f 100644 --- a/include/llvm/Target/TargetInstrInfo.h +++ b/include/llvm/Target/TargetInstrInfo.h @@ -11,8 +11,6 @@ #include "Support/DataTypes.h" #include "llvm/Constant.h" #include "llvm/DerivedTypes.h" -#include -#include class MachineInstrDescriptor; class TmpInstruction; @@ -55,7 +53,7 @@ extern const MachineInstrDescriptor *TargetInstrDescriptors; //--------------------------------------------------------------------------- -const unsigned int M_NOP_FLAG = 1; +const unsigned int M_NOP_FLAG = 1 << 0; const unsigned int M_BRANCH_FLAG = 1 << 1; const unsigned int M_CALL_FLAG = 1 << 2; const unsigned int M_RET_FLAG = 1 << 3; @@ -150,7 +148,7 @@ public: || getDescriptor(opCode).iclass & M_RET_FLAG; } bool isArith(MachineOpCode opCode) const { - return getDescriptor(opCode).iclass & M_RET_FLAG; + return getDescriptor(opCode).iclass & M_ARITH_FLAG; } bool isCCInstr(MachineOpCode opCode) const { return getDescriptor(opCode).iclass & M_CC_FLAG; @@ -164,7 +162,7 @@ public: bool isFloatInstr(MachineOpCode opCode) const { return getDescriptor(opCode).iclass & M_FLOAT_FLAG; } - bool isConditional(MachineOpCode opCode) const { + bool isConditional(MachineOpCode opCode) const { return getDescriptor(opCode).iclass & M_CONDL_FLAG; } bool isLoad(MachineOpCode opCode) const { -- 2.34.1