1.1 --- a/VMS.h	Fri Mar 09 22:30:26 2012 -0800
     1.2 +++ b/VMS.h	Sat Mar 10 20:35:38 2012 -0800
     1.3 @@ -52,7 +52,8 @@
     1.4  
     1.5  //============================ HW Dependent Fns ================================
     1.6  
     1.7 -#include "VMS__HW_dependent.h"
     1.8 +#include "Hardware_Dependent/VMS__HW_measurement.h"
     1.9 +#include "Hardware_Dependent/VMS__primitives.h"
    1.10  
    1.11  //============================= Statistics ==================================
    1.12  
    1.13 @@ -114,9 +115,9 @@
    1.14     void       *framePtr;
    1.15     void       *resumeInstrPtr;
    1.16     
    1.17 -   void       *coreLoopStartPt;  //allows proto-runtime to be linked later
    1.18 -   void       *coreLoopFramePtr; //restore before jmp back to core loop
    1.19 -   void       *coreLoopStackPtr; //restore before jmp back to core loop
    1.20 +   void       *coreCtlrStartPt;  //allows proto-runtime to be linked later
    1.21 +   void       *coreCtlrFramePtr; //restore before jmp back to core controller
    1.22 +   void       *coreCtlrStackPtr; //restore before jmp back to core controller
    1.23  
    1.24     SchedSlot  *schedSlot;
    1.25     VMSReqst   *requests;
    1.26 @@ -151,7 +152,7 @@
    1.27     MallocArrays   *freeLists;
    1.28     int32            amtOfOutstandingMem; //total currently allocated
    1.29  
    1.30 -   void            *coreLoopReturnPt;//addr to jump to to re-enter coreLoop
    1.31 +   void            *coreCtlrReturnPt;//addr to jump to to re-enter coreCtlr
    1.32  
    1.33     int32            setupComplete;
    1.34     int32            numMasterInARow[NUM_CORES];//detect back-to-back masterVP
    1.35 @@ -198,8 +199,8 @@
    1.36  
    1.37  //=======================  OS Thread related  ===============================
    1.38  
    1.39 -void * coreLoop( void *paramsIn );  //standard PThreads fn prototype
    1.40 -void * coreLoop_Seq( void *paramsIn );  //standard PThreads fn prototype
    1.41 +void * coreController( void *paramsIn );  //standard PThreads fn prototype
    1.42 +void * coreCtlr_Seq( void *paramsIn );  //standard PThreads fn prototype
    1.43  void masterLoop( void *initData, SlaveVP *masterVP );
    1.44  
    1.45  
    1.46 @@ -214,8 +215,8 @@
    1.47  
    1.48  volatile MasterEnv      *_VMSMasterEnv __align_to_cacheline__;
    1.49  
    1.50 -pthread_t       coreLoopThdHandles[ NUM_CORES ];  //pthread's virt-procr state
    1.51 -ThdParams      *coreLoopThdParams [ NUM_CORES ];
    1.52 +pthread_t       coreCtlrThdHandles[ NUM_CORES ];  //pthread's virt-procr state
    1.53 +ThdParams      *coreCtlrThdParams [ NUM_CORES ];
    1.54  pthread_mutex_t suspendLock   = PTHREAD_MUTEX_INITIALIZER;
    1.55  pthread_cond_t  suspendCond  = PTHREAD_COND_INITIALIZER;
    1.56