[llvm-commits] CVS: llvm/lib/Reoptimizer/Inst/lib/Phase1/Intraphase.h PrimInfo.cpp

[Joel Stanley]

Changes in directory llvm/lib/Reoptimizer/Inst/lib/Phase1:

Intraphase.h added (r1.1)
PrimInfo.cpp updated: 1.12 -> 1.13

---
Log message:

Now using heap-allocated temps to transfer values between start- and
end-interval sites. This only affects phases 4 and 5.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/Inst/lib/Phase1/Intraphase.h
diff -c /dev/null llvm/lib/Reoptimizer/Inst/lib/Phase1/Intraphase.h:1.1
*** /dev/null	Tue May 13 12:30:01 2003
--- llvm/lib/Reoptimizer/Inst/lib/Phase1/Intraphase.h	Tue May 13 12:29:50 2003
***************
*** 0 ****
--- 1,23 ----
+ ////////////////
+ // programmer: Joel Stanley
+ //       date: Sun May 11 00:02:14 CDT 2003
+ //     fileid: Intraphase.h
+ //    purpose: Provides declarations of types that must be shared between Phase1 and the
+ //    other (runtime) phases.
+ 
+ #ifndef _INCLUDED_INTRAPHASE_H
+ #define _INCLUDED_INTRAPHASE_H
+ 
+ namespace pp
+ {
+ 
+ enum GBTEntryType {
+     GBT_COUNTER,
+     GBT_INTERVAL_START,
+     GBT_INTERVAL_END,
+     GBT_POINT
+ };
+  
+ }; // end namespace pp
+ 
+ #endif // _INCLUDED_INTRAPHASE_H


Index: llvm/lib/Reoptimizer/Inst/lib/Phase1/PrimInfo.cpp
diff -u llvm/lib/Reoptimizer/Inst/lib/Phase1/PrimInfo.cpp:1.12 llvm/lib/Reoptimizer/Inst/lib/Phase1/PrimInfo.cpp:1.13
--- llvm/lib/Reoptimizer/Inst/lib/Phase1/PrimInfo.cpp:1.12	Mon May 12 21:00:24 2003
+++ llvm/lib/Reoptimizer/Inst/lib/Phase1/PrimInfo.cpp	Tue May 13 12:29:50 2003
@@ -80,6 +80,9 @@
     //   // invoked at the instrumentation that corresponds to this structure instance.
     //   unsigned paramSize;
     //
+    //   // Pointer to memory for instFunc's return value
+    //   void* paramMem;
+    //   
     //   // Pointer to instrumentation function
     //   void* instFunc;
     //
@@ -97,6 +100,7 @@
     fields.push_back(PointerType::get(Type::UShortTy)); // unsigned short* loadVar;
     fields.push_back(Type::UIntTy);                     // unsigned gbtStartIdx;
     fields.push_back(Type::UIntTy);                     // unsigned paramSize;
+    fields.push_back(PointerType::get(Type::VoidTy));   // void* paramMem;
     fields.push_back(PointerType::get(Type::VoidTy));   // void* instFunc;
 
     sm_structType = StructType::get(fields);
@@ -115,6 +119,7 @@
     initFlds.push_back(ConstantPointerRef::get(loadVar));
     initFlds.push_back(ConstantUInt::get(Type::UIntTy, startLinkIdx));
     initFlds.push_back(ConstantUInt::get(Type::UIntTy, paramSize));
+    initFlds.push_back(Constant::getNullValue(PointerType::get(Type::VoidTy)));
     initFlds.push_back(ConstantExpr::getCast(ConstantPointerRef::get(instFunc),
                                              PointerType::get(Type::VoidTy)));
     return ConstantStruct::get(st, initFlds);