RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-04-12 04:26:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add includes and use std:: for standard library calls to make code

Browse Source 
compile on windows. This patch was contributed by Paolo Invernizzi.

llvm-svn: 16539
This commit is contained in:
Alkis Evlogimenos 2004-09-28 14:42:44 +00:00
parent cfba8b1306
commit 4f5920aaef
6 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/ADT/PostOrderIterator.h
View File

@ -39,14 +39,14 @@ class po_iterator : public forward_iterator<typename GT::NodeType, ptrdiff_t> {
NodeType *BB = *VisitStack.top().second++; NodeType *BB = *VisitStack.top().second++;
if (!Visited.count(BB)) { // If the block is not visited... if (!Visited.count(BB)) { // If the block is not visited...
Visited.insert(BB); Visited.insert(BB);
VisitStack.push(make_pair(BB, GT::child_begin(BB))); VisitStack.push(std::make_pair(BB, GT::child_begin(BB)));
} }
} }
} }
inline po_iterator(NodeType *BB) { inline po_iterator(NodeType *BB) {
Visited.insert(BB); Visited.insert(BB);
VisitStack.push(make_pair(BB, GT::child_begin(BB))); VisitStack.push(std::make_pair(BB, GT::child_begin(BB)));
traverseChild(); traverseChild();
} }
inline po_iterator() { /* End is when stack is empty */ } inline po_iterator() { /* End is when stack is empty */ }

1
lib/CodeGen/InstrSched/SchedGraphCommon.cpp
View File

@ -14,6 +14,7 @@
#include "llvm/CodeGen/SchedGraphCommon.h" #include "llvm/CodeGen/SchedGraphCommon.h"
#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/STLExtras.h"
#include <algorithm>
#include <iostream> #include <iostream>
namespace llvm { namespace llvm {

3
lib/CodeGen/ModuloScheduling/MSchedGraph.cpp
View File

@ -18,6 +18,7 @@
#include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetInstrInfo.h"
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
#include <cstdlib> #include <cstdlib>
#include <algorithm>
using namespace llvm; using namespace llvm;
MSchedGraphNode::MSchedGraphNode(const MachineInstr* inst, MSchedGraphNode::MSchedGraphNode(const MachineInstr* inst,
@ -67,7 +68,7 @@ bool MSchedGraphNode::isSuccessor(MSchedGraphNode *succ) {
bool MSchedGraphNode::isPredecessor(MSchedGraphNode *pred) { bool MSchedGraphNode::isPredecessor(MSchedGraphNode *pred) {
if(find( Predecessors.begin(), Predecessors.end(), pred) != Predecessors.end()) if(std::find( Predecessors.begin(), Predecessors.end(), pred) != Predecessors.end())
return true; return true;
else else
return false; return false;

43
lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
View File

@ -25,6 +25,7 @@
#include "llvm/Support/GraphWriter.h" #include "llvm/Support/GraphWriter.h"
#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringExtras.h"
#include <cmath> #include <cmath>
#include <algorithm>
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <utility> #include <utility>
@ -580,7 +581,7 @@ void ModuloSchedulingPass::addReccurrence(std::vector<MSchedGraphNode*> &recurre
if(R->second.size() == recurrence.size()) { if(R->second.size() == recurrence.size()) {
for(std::vector<MSchedGraphNode*>::const_iterator node = R->second.begin(), end = R->second.end(); node != end; ++node) { for(std::vector<MSchedGraphNode*>::const_iterator node = R->second.begin(), end = R->second.end(); node != end; ++node) {
if(find(recurrence.begin(), recurrence.end(), *node) == recurrence.end()) { if(std::find(recurrence.begin(), recurrence.end(), *node) == recurrence.end()) {
all_same = all_same && false; all_same = all_same && false;
break; break;
} }
@ -623,7 +624,7 @@ void ModuloSchedulingPass::findAllReccurrences(MSchedGraphNode *node,
std::vector<MSchedGraphNode*> &visitedNodes, std::vector<MSchedGraphNode*> &visitedNodes,
int II) { int II) {
if(find(visitedNodes.begin(), visitedNodes.end(), node) != visitedNodes.end()) { if(std::find(visitedNodes.begin(), visitedNodes.end(), node) != visitedNodes.end()) {
std::vector<MSchedGraphNode*> recurrence; std::vector<MSchedGraphNode*> recurrence;
bool first = true; bool first = true;
int delay = 0; int delay = 0;
@ -714,7 +715,7 @@ void ModuloSchedulingPass::computePartialOrder() {
for(std::vector<MSchedGraphNode*>::const_iterator N = I->second.begin(), NE = I->second.end(); N != NE; ++N) { for(std::vector<MSchedGraphNode*>::const_iterator N = I->second.begin(), NE = I->second.end(); N != NE; ++N) {
bool found = false; bool found = false;
for(std::vector<std::vector<MSchedGraphNode*> >::iterator PO = partialOrder.begin(), PE = partialOrder.end(); PO != PE; ++PO) { for(std::vector<std::vector<MSchedGraphNode*> >::iterator PO = partialOrder.begin(), PE = partialOrder.end(); PO != PE; ++PO) {
if(find(PO->begin(), PO->end(), *N) != PO->end()) if(std::find(PO->begin(), PO->end(), *N) != PO->end())
found = true; found = true;
} }
if(!found) { if(!found) {
@ -728,16 +729,16 @@ void ModuloSchedulingPass::computePartialOrder() {
//Check if we are supposed to ignore this edge or not //Check if we are supposed to ignore this edge or not
if(!ignoreEdge(*P, *N)) if(!ignoreEdge(*P, *N))
//Check if already in this recurrence //Check if already in this recurrence
if(find(I->second.begin(), I->second.end(), *P) == I->second.end()) { if(std::find(I->second.begin(), I->second.end(), *P) == I->second.end()) {
//Also need to check if in partial order //Also need to check if in partial order
bool predFound = false; bool predFound = false;
for(std::vector<std::vector<MSchedGraphNode*> >::iterator PO = partialOrder.begin(), PEND = partialOrder.end(); PO != PEND; ++PO) { for(std::vector<std::vector<MSchedGraphNode*> >::iterator PO = partialOrder.begin(), PEND = partialOrder.end(); PO != PEND; ++PO) {
if(find(PO->begin(), PO->end(), *P) != PO->end()) if(std::find(PO->begin(), PO->end(), *P) != PO->end())
predFound = true; predFound = true;
} }
if(!predFound) if(!predFound)
if(find(new_recurrence.begin(), new_recurrence.end(), *P) == new_recurrence.end()) if(std::find(new_recurrence.begin(), new_recurrence.end(), *P) == new_recurrence.end())
new_recurrence.push_back(*P); new_recurrence.push_back(*P);
} }
@ -756,7 +757,7 @@ void ModuloSchedulingPass::computePartialOrder() {
bool found = false; bool found = false;
//Check if its already in our partial order, if not add it to the final vector //Check if its already in our partial order, if not add it to the final vector
for(std::vector<std::vector<MSchedGraphNode*> >::iterator PO = partialOrder.begin(), PE = partialOrder.end(); PO != PE; ++PO) { for(std::vector<std::vector<MSchedGraphNode*> >::iterator PO = partialOrder.begin(), PE = partialOrder.end(); PO != PE; ++PO) {
if(find(PO->begin(), PO->end(), I->first) != PO->end()) if(std::find(PO->begin(), PO->end(), I->first) != PO->end())
found = true; found = true;
} }
if(!found) if(!found)
@ -772,7 +773,7 @@ void ModuloSchedulingPass::computePartialOrder() {
void ModuloSchedulingPass::predIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &IntersectResult) { void ModuloSchedulingPass::predIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &IntersectResult) {
//Sort CurrentSet so we can use lowerbound //Sort CurrentSet so we can use lowerbound
sort(CurrentSet.begin(), CurrentSet.end()); std::sort(CurrentSet.begin(), CurrentSet.end());
for(unsigned j=0; j < FinalNodeOrder.size(); ++j) { for(unsigned j=0; j < FinalNodeOrder.size(); ++j) {
for(MSchedGraphNode::pred_iterator P = FinalNodeOrder[j]->pred_begin(), for(MSchedGraphNode::pred_iterator P = FinalNodeOrder[j]->pred_begin(),
@ -782,9 +783,9 @@ void ModuloSchedulingPass::predIntersect(std::vector<MSchedGraphNode*> &CurrentS
if(ignoreEdge(*P,FinalNodeOrder[j])) if(ignoreEdge(*P,FinalNodeOrder[j]))
continue; continue;
if(find(CurrentSet.begin(), if(std::find(CurrentSet.begin(),
CurrentSet.end(), *P) != CurrentSet.end()) CurrentSet.end(), *P) != CurrentSet.end())
if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end())
IntersectResult.push_back(*P); IntersectResult.push_back(*P);
} }
} }
@ -793,7 +794,7 @@ void ModuloSchedulingPass::predIntersect(std::vector<MSchedGraphNode*> &CurrentS
void ModuloSchedulingPass::succIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &IntersectResult) { void ModuloSchedulingPass::succIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &IntersectResult) {
//Sort CurrentSet so we can use lowerbound //Sort CurrentSet so we can use lowerbound
sort(CurrentSet.begin(), CurrentSet.end()); std::sort(CurrentSet.begin(), CurrentSet.end());
for(unsigned j=0; j < FinalNodeOrder.size(); ++j) { for(unsigned j=0; j < FinalNodeOrder.size(); ++j) {
for(MSchedGraphNode::succ_iterator P = FinalNodeOrder[j]->succ_begin(), for(MSchedGraphNode::succ_iterator P = FinalNodeOrder[j]->succ_begin(),
@ -803,9 +804,9 @@ void ModuloSchedulingPass::succIntersect(std::vector<MSchedGraphNode*> &CurrentS
if(ignoreEdge(FinalNodeOrder[j],*P)) if(ignoreEdge(FinalNodeOrder[j],*P))
continue; continue;
if(find(CurrentSet.begin(), if(std::find(CurrentSet.begin(),
CurrentSet.end(), *P) != CurrentSet.end()) CurrentSet.end(), *P) != CurrentSet.end())
if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end())
IntersectResult.push_back(*P); IntersectResult.push_back(*P);
} }
} }
@ -914,13 +915,13 @@ void ModuloSchedulingPass::orderNodes() {
} }
//Append our node with greatest height to the NodeOrder //Append our node with greatest height to the NodeOrder
if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestHeightNode) == FinalNodeOrder.end()) { if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestHeightNode) == FinalNodeOrder.end()) {
DEBUG(std::cerr << "Adding node to Final Order: " << *highestHeightNode << "\n"); DEBUG(std::cerr << "Adding node to Final Order: " << *highestHeightNode << "\n");
FinalNodeOrder.push_back(highestHeightNode); FinalNodeOrder.push_back(highestHeightNode);
} }
//Remove V from IntersectOrder //Remove V from IntersectOrder
IntersectCurrent.erase(find(IntersectCurrent.begin(), IntersectCurrent.erase(std::find(IntersectCurrent.begin(),
IntersectCurrent.end(), highestHeightNode)); IntersectCurrent.end(), highestHeightNode));
@ -929,11 +930,11 @@ void ModuloSchedulingPass::orderNodes() {
E = highestHeightNode->succ_end(); P != E; ++P) { E = highestHeightNode->succ_end(); P != E; ++P) {
//if(lower_bound(CurrentSet->begin(), //if(lower_bound(CurrentSet->begin(),
// CurrentSet->end(), *P) != CurrentSet->end()) { // CurrentSet->end(), *P) != CurrentSet->end()) {
if(find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { if(std::find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) {
if(ignoreEdge(highestHeightNode, *P)) if(ignoreEdge(highestHeightNode, *P))
continue; continue;
//If not already in Intersect, add //If not already in Intersect, add
if(find(IntersectCurrent.begin(), IntersectCurrent.end(), *P) == IntersectCurrent.end()) if(std::find(IntersectCurrent.begin(), IntersectCurrent.end(), *P) == IntersectCurrent.end())
IntersectCurrent.push_back(*P); IntersectCurrent.push_back(*P);
} }
} }
@ -984,12 +985,12 @@ void ModuloSchedulingPass::orderNodes() {
//Append highest depth node to the NodeOrder //Append highest depth node to the NodeOrder
if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestDepthNode) == FinalNodeOrder.end()) { if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestDepthNode) == FinalNodeOrder.end()) {
DEBUG(std::cerr << "Adding node to Final Order: " << *highestDepthNode << "\n"); DEBUG(std::cerr << "Adding node to Final Order: " << *highestDepthNode << "\n");
FinalNodeOrder.push_back(highestDepthNode); FinalNodeOrder.push_back(highestDepthNode);
} }
//Remove heightestDepthNode from IntersectOrder //Remove heightestDepthNode from IntersectOrder
IntersectCurrent.erase(find(IntersectCurrent.begin(), IntersectCurrent.erase(std::find(IntersectCurrent.begin(),
IntersectCurrent.end(),highestDepthNode)); IntersectCurrent.end(),highestDepthNode));
@ -998,13 +999,13 @@ void ModuloSchedulingPass::orderNodes() {
E = highestDepthNode->pred_end(); P != E; ++P) { E = highestDepthNode->pred_end(); P != E; ++P) {
//if(lower_bound(CurrentSet->begin(), //if(lower_bound(CurrentSet->begin(),
// CurrentSet->end(), *P) != CurrentSet->end()) { // CurrentSet->end(), *P) != CurrentSet->end()) {
if(find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { if(std::find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) {
if(ignoreEdge(*P, highestDepthNode)) if(ignoreEdge(*P, highestDepthNode))
continue; continue;
//If not already in Intersect, add //If not already in Intersect, add
if(find(IntersectCurrent.begin(), if(std::find(IntersectCurrent.begin(),
IntersectCurrent.end(), *P) == IntersectCurrent.end()) IntersectCurrent.end(), *P) == IntersectCurrent.end())
IntersectCurrent.push_back(*P); IntersectCurrent.push_back(*P);
} }

3
lib/Support/DynamicLinker.cpp
View File

@ -21,8 +21,9 @@
#include "llvm/Support/DynamicLinker.h" #include "llvm/Support/DynamicLinker.h"
#include "llvm/Config/dlfcn.h" #include "llvm/Config/dlfcn.h"
#include "llvm/Config/windows.h" #include "llvm/Config/windows.h"
#include <cassert>
#include <vector> #include <vector>
#include <cassert>
#include <cstdio>
using namespace llvm; using namespace llvm;
#if defined(HAVE_WINDOWS_H) #if defined(HAVE_WINDOWS_H)

4
lib/Transforms/ExprTypeConvert.cpp
View File

@ -828,7 +828,7 @@ static bool OperandConvertibleToType(User *U, Value *V, const Type *Ty,
} }
case Instruction::Call: { case Instruction::Call: {
User::op_iterator OI = find(I->op_begin(), I->op_end(), V); User::op_iterator OI = std::find(I->op_begin(), I->op_end(), V);
assert (OI != I->op_end() && "Not using value!"); assert (OI != I->op_end() && "Not using value!");
unsigned OpNum = OI - I->op_begin(); unsigned OpNum = OI - I->op_begin();
@ -1206,7 +1206,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
} else { // Changing an argument, must be in vararg area } else { // Changing an argument, must be in vararg area
std::vector<Value*>::iterator OI = std::vector<Value*>::iterator OI =
find(Params.begin(), Params.end(), OldVal); std::find(Params.begin(), Params.end(), OldVal);
assert (OI != Params.end() && "Not using value!"); assert (OI != Params.end() && "Not using value!");
*OI = NewVal; *OI = NewVal;