diff --git a/llvm/lib/Target/VE/VEISelLowering.h b/llvm/lib/Target/VE/VEISelLowering.h --- a/llvm/lib/Target/VE/VEISelLowering.h +++ b/llvm/lib/Target/VE/VEISelLowering.h @@ -24,22 +24,19 @@ enum NodeType : unsigned { FIRST_NUMBER = ISD::BUILTIN_OP_END, - Hi, - Lo, // Hi/Lo operations, typically on a global address. - - GETFUNPLT, // load function address through %plt insturction - GETTLSADDR, // load address for TLS access - GETSTACKTOP, // retrieve address of stack top (first address of - // locals and temporaries) - - MEMBARRIER, // Compiler barrier only; generate a no-op. - TS1AM, // A TS1AM instruction used for 1/2 bytes swap. - - VEC_BROADCAST, // 0: scalar value, 1: VL - CALL, // A call instruction. - RET_FLAG, // Return with a flag operand. + GETFUNPLT, // Load function address through %plt insturction. + GETTLSADDR, // Load address for TLS access. + GETSTACKTOP, // Retrieve address of stack top (first address of + // locals and temporaries). GLOBAL_BASE_REG, // Global base reg for PIC. + Hi, // Hi/Lo operations, typically on a global address. + Lo, // Hi/Lo operations, typically on a global address. + MEMBARRIER, // Compiler barrier only; generate a no-op. + RET_FLAG, // Return with a flag operand. + TS1AM, // A TS1AM instruction used for 1/2 bytes swap. + VEC_BROADCAST, // A vector broadcast instruction. + // 0: scalar value, 1: VL // VVP_* nodes. #define ADD_VVP_OP(VVP_NAME, ...) VVP_NAME, diff --git a/llvm/lib/Target/VE/VEISelLowering.cpp b/llvm/lib/Target/VE/VEISelLowering.cpp --- a/llvm/lib/Target/VE/VEISelLowering.cpp +++ b/llvm/lib/Target/VE/VEISelLowering.cpp @@ -865,17 +865,17 @@ switch ((VEISD::NodeType)Opcode) { case VEISD::FIRST_NUMBER: break; - TARGET_NODE_CASE(Lo) - TARGET_NODE_CASE(Hi) + TARGET_NODE_CASE(CALL) TARGET_NODE_CASE(GETFUNPLT) TARGET_NODE_CASE(GETSTACKTOP) TARGET_NODE_CASE(GETTLSADDR) + TARGET_NODE_CASE(GLOBAL_BASE_REG) + TARGET_NODE_CASE(Hi) + TARGET_NODE_CASE(Lo) TARGET_NODE_CASE(MEMBARRIER) - TARGET_NODE_CASE(CALL) + TARGET_NODE_CASE(RET_FLAG) TARGET_NODE_CASE(TS1AM) TARGET_NODE_CASE(VEC_BROADCAST) - TARGET_NODE_CASE(RET_FLAG) - TARGET_NODE_CASE(GLOBAL_BASE_REG) // Register the VVP_* SDNodes. #define ADD_VVP_OP(VVP_NAME, ...) TARGET_NODE_CASE(VVP_NAME)