# HG changeset patch
# User Nina Engelhardt <nengel@mailbox.tu-berlin.de>
# Date 1346154007 -7200
# Node ID 833b31a8abc115b6d5b77841e8042231e717dd38
# Parent  6647aea904770351b7273d872740b7e472a4e84d
working version (w/ old hash impl)

diff -r 6647aea90477 -r 833b31a8abc1 SSR_PluginFns.c
--- a/SSR_PluginFns.c	Sun Jul 15 02:03:43 2012 -0700
+++ b/SSR_PluginFns.c	Tue Aug 28 13:40:07 2012 +0200
@@ -118,7 +118,9 @@
       
    while( req != NULL )
     {
-//          semEnv->lastReqType = 0;
+#ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
+          semEnv->lastReqType = 0;
+#endif
       switch( req->reqType )
        { case semantic:     handleSemReq(         req, requestingPr, semEnv);
             break;
@@ -298,12 +300,13 @@
    if(procr->assignCount <= 1){
        newu.ret_ptr = procr->resumeInstrPtr;  
    } else {
-        void* frame_ptr0 = procr->framePtr;                               
+        /*void* frame_ptr0 = procr->framePtr;                               
         void* frame_ptr1 = *((void**)frame_ptr0);                          
         void* frame_ptr2 = *((void**)frame_ptr1);                          
         void* frame_ptr3 = *((void**)frame_ptr2);                          
         void* ret_addr = *((void**)frame_ptr3 + 1);                        
-        newu.ret_ptr = ret_addr; 
+        newu.ret_ptr = ret_addr; */
+       newu.ret_ptr = procr->resumeInstrPtr;
    }
    addToListOfArrays(Unit,newu,semEnv->unitList);
    
diff -r 6647aea90477 -r 833b31a8abc1 SSR_Request_Handlers.c
--- a/SSR_Request_Handlers.c	Sun Jul 15 02:03:43 2012 -0700
+++ b/SSR_Request_Handlers.c	Tue Aug 28 13:40:07 2012 +0200
@@ -428,7 +428,9 @@
  { void *ptr;
  
       DEBUG__printf1(dbgRqstHdlr,"Malloc request from processor %d",requestingPr->slaveID)
-//      semEnv->lastReqType = 1;
+#ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
+      semEnv->lastReqType = 1;
+#endif
    ptr = VMS_PI__malloc( semReq->sizeToMalloc );
    requestingPr->dataRetFromReq = ptr;
    resume_slaveVP( requestingPr, semEnv );
@@ -440,7 +442,9 @@
 handleFree( SSRSemReq *semReq, SlaveVP *requestingPr, SSRSemEnv *semEnv )
  {
          DEBUG__printf1(dbgRqstHdlr,"Free request from processor %d",requestingPr->slaveID)
-//         semEnv->lastReqType = 1;
+#ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
+         semEnv->lastReqType = 1;
+#endif
    VMS_PI__free( semReq->ptrToFree );     
    resume_slaveVP( requestingPr, semEnv );
  }