diff options
author | Jeff Cohen <jeffc@jolt-lang.org> | 2005-07-27 06:12:32 +0000 |
---|---|---|
committer | Jeff Cohen <jeffc@jolt-lang.org> | 2005-07-27 06:12:32 +0000 |
commit | 00b16889ab461b7ecef1c91ade101186b7f1fce2 (patch) | |
tree | 263acb2b05b59235d77bee1d38fa842f2044ec0e | |
parent | 54eed36da595f09c46a46b2b0b15757ea486b4c1 (diff) |
Eliminate all remaining tabs and trailing spaces.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22523 91177308-0d34-0410-b5e6-96231b3b80d8
69 files changed, 1273 insertions, 1273 deletions
diff --git a/examples/ParallelJIT/ParallelJIT.cpp b/examples/ParallelJIT/ParallelJIT.cpp index d27683e907..5c605c002e 100644 --- a/examples/ParallelJIT/ParallelJIT.cpp +++ b/examples/ParallelJIT/ParallelJIT.cpp @@ -9,7 +9,7 @@ // // Parallel JIT // -// This test program creates two LLVM functions then calls them from three +// This test program creates two LLVM functions then calls them from three // separate threads. It requires the pthreads library. // The three threads are created and then block waiting on a condition variable. // Once all threads are blocked on the conditional variable, the main thread @@ -28,32 +28,32 @@ #include <iostream> using namespace llvm; -static Function* createAdd1( Module* M ) +static Function* createAdd1(Module* M) { // Create the add1 function entry and insert this entry into module M. The // function will have a return type of "int" and take an argument of "int". // The '0' terminates the list of argument types. Function *Add1F = M->getOrInsertFunction("add1", Type::IntTy, Type::IntTy, 0); - + // Add a basic block to the function. As before, it automatically inserts // because of the last argument. BasicBlock *BB = new BasicBlock("EntryBlock", Add1F); - + // Get pointers to the constant `1'. Value *One = ConstantSInt::get(Type::IntTy, 1); - + // Get pointers to the integer argument of the add1 function... assert(Add1F->arg_begin() != Add1F->arg_end()); // Make sure there's an arg Argument *ArgX = Add1F->arg_begin(); // Get the arg ArgX->setName("AnArg"); // Give it a nice symbolic name for fun. - + // Create the add instruction, inserting it into the end of BB. Instruction *Add = BinaryOperator::createAdd(One, ArgX, "addresult", BB); - + // Create the return instruction and add it to the basic block new ReturnInst(Add, BB); - - // Now, function add1 is ready. + + // Now, function add1 is ready. return Add1F; } @@ -62,45 +62,45 @@ static Function *CreateFibFunction(Module *M) // Create the fib function and insert it into module M. This function is said // to return an int and take an int parameter. Function *FibF = M->getOrInsertFunction("fib", Type::IntTy, Type::IntTy, 0); - + // Add a basic block to the function. BasicBlock *BB = new BasicBlock("EntryBlock", FibF); - + // Get pointers to the constants. Value *One = ConstantSInt::get(Type::IntTy, 1); Value *Two = ConstantSInt::get(Type::IntTy, 2); - + // Get pointer to the integer argument of the add1 function... Argument *ArgX = FibF->arg_begin(); // Get the arg. ArgX->setName("AnArg"); // Give it a nice symbolic name for fun. - + // Create the true_block. BasicBlock *RetBB = new BasicBlock("return", FibF); // Create an exit block. BasicBlock* RecurseBB = new BasicBlock("recurse", FibF); - + // Create the "if (arg < 2) goto exitbb" Value *CondInst = BinaryOperator::createSetLE(ArgX, Two, "cond", BB); new BranchInst(RetBB, RecurseBB, CondInst, BB); - + // Create: ret int 1 new ReturnInst(One, RetBB); - + // create fib(x-1) Value *Sub = BinaryOperator::createSub(ArgX, One, "arg", RecurseBB); Value *CallFibX1 = new CallInst(FibF, Sub, "fibx1", RecurseBB); - + // create fib(x-2) Sub = BinaryOperator::createSub(ArgX, Two, "arg", RecurseBB); Value *CallFibX2 = new CallInst(FibF, Sub, "fibx2", RecurseBB); - + // fib(x-1)+fib(x-2) - Value *Sum = + Value *Sum = BinaryOperator::createAdd(CallFibX1, CallFibX2, "addresult", RecurseBB); - + // Create the return instruction and add it to the basic block new ReturnInst(Sum, RecurseBB); - + return FibF; } @@ -120,23 +120,23 @@ public: { n = 0; waitFor = 0; - + int result = pthread_cond_init( &condition, NULL ); assert( result == 0 ); - + result = pthread_mutex_init( &mutex, NULL ); assert( result == 0 ); } - + ~WaitForThreads() { int result = pthread_cond_destroy( &condition ); assert( result == 0 ); - + result = pthread_mutex_destroy( &mutex ); assert( result == 0 ); } - + // All threads will stop here until another thread calls releaseThreads void block() { @@ -144,26 +144,26 @@ public: assert( result == 0 ); n ++; //~ std::cout << "block() n " << n << " waitFor " << waitFor << std::endl; - + assert( waitFor == 0 || n <= waitFor ); - if ( waitFor > 0 && n == waitFor ) + if ( waitFor > 0 && n == waitFor ) { // There are enough threads blocked that we can release all of them std::cout << "Unblocking threads from block()" << std::endl; unblockThreads(); - } - else + } + else { // We just need to wait until someone unblocks us result = pthread_cond_wait( &condition, &mutex ); assert( result == 0 ); } - + // unlock the mutex before returning result = pthread_mutex_unlock( &mutex ); assert( result == 0 ); } - + // If there are num or more threads blocked, it will signal them all // Otherwise, this thread blocks until there are enough OTHER threads // blocked @@ -171,22 +171,22 @@ public: { int result = pthread_mutex_lock( &mutex ); assert( result == 0 ); - + if ( n >= num ) { std::cout << "Unblocking threads from releaseThreads()" << std::endl; unblockThreads(); - } - else + } + else { waitFor = num; pthread_cond_wait( &condition, &mutex ); } - + // unlock the mutex before returning result = pthread_mutex_unlock( &mutex ); assert( result == 0 ); } - + private: void unblockThreads() { @@ -194,7 +194,7 @@ private: // enter while threads are exiting, they will block instead // of triggering a new release of threads n = 0; - + // Reset waitFor to zero: this way, if waitFor threads enter // while threads are exiting, they will block instead of // triggering a new release of threads @@ -203,7 +203,7 @@ private: int result = pthread_cond_broadcast( &condition ); assert( result == 0 ); } - + size_t n; size_t waitFor; pthread_cond_t condition; @@ -215,60 +215,60 @@ static WaitForThreads synchronize; void* callFunc( void* param ) { struct threadParams* p = (struct threadParams*) param; - + // Call the `foo' function with no arguments: std::vector<GenericValue> Args(1); Args[0].IntVal = p->value; - + synchronize.block(); // wait until other threads are at this point GenericValue gv = p->EE->runFunction(p->F, Args); - + return (void*) intptr_t(gv.IntVal); } -int main() +int main() { // Create some module to put our function into it. Module *M = new Module("test"); - + Function* add1F = createAdd1( M ); Function* fibF = CreateFibFunction( M ); - + // Now we create the JIT. ExistingModuleProvider* MP = new ExistingModuleProvider(M); ExecutionEngine* EE = ExecutionEngine::create(MP, false); - + //~ std::cout << "We just constructed this LLVM module:\n\n" << *M; //~ std::cout << "\n\nRunning foo: " << std::flush; - + // Create one thread for add1 and two threads for fib struct threadParams add1 = { EE, add1F, 1000 }; struct threadParams fib1 = { EE, fibF, 39 }; struct threadParams fib2 = { EE, fibF, 42 }; - + pthread_t add1Thread; int result = pthread_create( &add1Thread, NULL, callFunc, &add1 ); if ( result != 0 ) { std::cerr << "Could not create thread" << std::endl; return 1; } - + pthread_t fibThread1; result = pthread_create( &fibThread1, NULL, callFunc, &fib1 ); if ( result != 0 ) { std::cerr << "Could not create thread" << std::endl; return 1; } - + pthread_t fibThread2; result = pthread_create( &fibThread2, NULL, callFunc, &fib2 ); if ( result != 0 ) { std::cerr << "Could not create thread" << std::endl; return 1; } - + synchronize.releaseThreads(3); // wait until other threads are at this point - + void* returnValue; result = pthread_join( add1Thread, &returnValue ); if ( result != 0 ) { @@ -276,20 +276,20 @@ int main() return 1; } std::cout << "Add1 returned " << intptr_t(returnValue) << std::endl; - + result = pthread_join( fibThread1, &returnValue ); if ( result != 0 ) { std::cerr << "Could not join thread" << std::endl; return 1; } std::cout << "Fib1 returned " << intptr_t(returnValue) << std::endl; - + result = pthread_join( fibThread2, &returnValue ); if ( result != 0 ) { std::cerr << "Could not join thread" << std::endl; return 1; } std::cout << "Fib2 returned " << intptr_t(returnValue) << std::endl; - + return 0; } diff --git a/lib/Analysis/DataStructure/BottomUpClosure.cpp b/lib/Analysis/DataStructure/BottomUpClosure.cpp index 21ca2dc037..2aaf19e595 100644 --- a/lib/Analysis/DataStructure/BottomUpClosure.cpp +++ b/lib/Analysis/DataStructure/BottomUpClosure.cpp @@ -418,7 +418,7 @@ DSGraph &BUDataStructures::CreateGraphForExternalFunction(const Function &Fn) { DSG->getReturnNodes().insert(std::make_pair(F, DSNodeHandle())); if (F->getName() == "free") { // Taking the address of free. - + // Free should take a single pointer argument, mark it as heap memory. DSNode *N = new DSNode(0, DSG); N->setHeapNodeMarker(); diff --git a/lib/Bytecode/Reader/Reader.cpp b/lib/Bytecode/Reader/Reader.cpp index d730ca256a..f56c59ad18 100644 --- a/lib/Bytecode/Reader/Reader.cpp +++ b/lib/Bytecode/Reader/Reader.cpp @@ -682,9 +682,9 @@ void BytecodeReader::ParseInstruction(std::vector<unsigned> &Oprnds, const Type* ArgTy = getValue(iType, Oprnds[0])->getType(); Function* NF = TheModule->getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, 0); - //b = vaarg a, t -> + //b = vaarg a, t -> //foo = alloca 1 of t - //bar = vacopy a + //bar = vacopy a //store bar -> foo //b = vaarg foo, t AllocaInst* foo = new AllocaInst(ArgTy, 0, "vaarg.fix"); diff --git a/lib/Bytecode/Reader/ReaderWrappers.cpp b/lib/Bytecode/Reader/ReaderWrappers.cpp index a198447d72..4db954a307 100644 --- a/lib/Bytecode/Reader/ReaderWrappers.cpp +++ b/lib/Bytecode/Reader/ReaderWrappers.cpp @@ -170,17 +170,17 @@ static ModuleProvider* CheckVarargs(ModuleProvider* MP) { if(Function* F = M->getNamedFunction("llvm.va_start")) { assert(F->arg_size() == 0 && "Obsolete va_start takes 0 argument!"); - + //foo = va_start() // -> //bar = alloca typeof(foo) //va_start(bar) //foo = load bar - + const Type* RetTy = Type::getPrimitiveType(Type::VoidTyID); const Type* ArgTy = F->getFunctionType()->getReturnType(); const Type* ArgTyPtr = PointerType::get(ArgTy); - Function* NF = M->getOrInsertFunction("llvm.va_start", + Function* NF = M->getOrInsertFunction("llvm.va_start", RetTy, ArgTyPtr, 0); for(Value::use_iterator I = F->use_begin(), E = F->use_end(); I != E;) @@ -193,7 +193,7 @@ static ModuleProvider* CheckVarargs(ModuleProvider* MP) { } F->setName(""); } - + if(Function* F = M->getNamedFunction("llvm.va_end")) { assert(F->arg_size() == 1 && "Obsolete va_end takes 1 argument!"); //vaend foo @@ -203,9 +203,9 @@ static ModuleProvider* CheckVarargs(ModuleProvider* MP) { const Type* RetTy = Type::getPrimitiveType(Type::VoidTyID); const Type* ArgTy = F->getFunctionType()->getParamType(0); const Type* ArgTyPtr = PointerType::get(ArgTy); - Function* NF = M->getOrInsertFunction("llvm.va_end", + Function* NF = M->getOrInsertFunction("llvm.va_end", RetTy, ArgTyPtr, 0); - + for(Value::use_iterator I = F->use_begin(), E = F->use_end(); I != E;) if (CallInst* CI = dyn_cast<CallInst>(*I++)) { AllocaInst* bar = new AllocaInst(ArgTy, 0, "vaend.fix.1", CI); @@ -215,7 +215,7 @@ static ModuleProvider* CheckVarargs(ModuleProvider* MP) { } F->setName(""); } - + if(Function* F = M->getNamedFunction("llvm.va_copy")) { assert(F->arg_size() == 1 && "Obsolete va_copy takes 1 argument!"); //foo = vacopy(bar) @@ -225,13 +225,13 @@ static ModuleProvider* CheckVarargs(ModuleProvider* MP) { //store bar -> b //vacopy(a, b) //foo = load a - + const Type* RetTy = Type::getPrimitiveType(Type::VoidTyID); const Type* ArgTy = F->getFunctionType()->getReturnType(); const Type* ArgTyPtr = PointerType::get(ArgTy); - Function* NF = M->getOrInsertFunction("llvm.va_copy", + Function* NF = M->getOrInsertFunction("llvm.va_copy", RetTy, ArgTyPtr, ArgTyPtr, 0); - + for(Value::use_iterator I = F->use_begin(), E = F->use_end(); I != E;) if (CallInst* CI = dyn_cast<CallInst>(*I++)) { AllocaInst* a = new AllocaInst(ArgTy, 0, "vacopy.fix.1", CI); diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp index 90cfa96462..95bbd2e575 100644 --- a/lib/Bytecode/Writer/Writer.cpp +++ b/lib/Bytecode/Writer/Writer.cpp @@ -628,7 +628,7 @@ void BytecodeWriter::outputInstruction(const Instruction &I) { Opcode = 57; // FastCC invoke. else if (II->getCallingConv() != CallingConv::C) Opcode = 56; // Invoke escape sequence. - + } else if (isa<LoadInst>(I) && cast<LoadInst>(I).isVolatile()) { Opcode = 62; } else if (isa<StoreInst>(I) && cast<StoreInst>(I).isVolatile()) { diff --git a/lib/CodeGen/ELFWriter.cpp b/lib/CodeGen/ELFWriter.cpp index d53afde6a4..7963b658d6 100644 --- a/lib/CodeGen/ELFWriter.cpp +++ b/lib/CodeGen/ELFWriter.cpp @@ -108,15 +108,15 @@ void ELFCodeEmitter::startFunction(MachineFunction &F) { ELFWriter::ELFSection::SHF_EXECINSTR | ELFWriter::ELFSection::SHF_ALLOC); OutBuffer = &ES->SectionData; - + // Upgrade the section alignment if required. if (ES->Align < Align) ES->Align = Align; - + // Add padding zeros to the end of the buffer to make sure that the // function will start on the correct byte alignment within the section. size_t SectionOff = OutBuffer->size(); ELFWriter::align(*OutBuffer, Align); - + FnStart = OutBuffer->size(); } @@ -125,7 +125,7 @@ void ELFCodeEmitter::startFunction(MachineFunction &F) { void ELFCodeEmitter::finishFunction(MachineFunction &F) { // We now know the size of the function, add a symbol to represent it. ELFWriter::ELFSym FnSym(F.getFunction()); - + // Figure out the binding (linkage) of the symbol. switch (F.getFunction()->getLinkage()) { default: @@ -149,7 +149,7 @@ void ELFCodeEmitter::finishFunction(MachineFunction &F) { FnSym.SectionIdx = ES->SectionIdx; FnSym.Value = FnStart; // Value = Offset from start of Section. FnSym.Size = OutBuffer->size()-FnStart; - + // Finally, add it to the symtab. EW.SymbolTable.push_back(FnSym); } @@ -162,7 +162,7 @@ ELFWriter::ELFWriter(std::ostream &o, TargetMachine &tm) : O(o), TM(tm) { e_machine = 0; // e_machine defaults to 'No Machine' e_flags = 0; // e_flags defaults to 0, no flags.< |