comparison MasterLoop.c @ 49:4fbc2165e493

Merge not sure what it did, actually -- still learning how merge works
author Me
date Tue, 26 Oct 2010 18:31:34 -0700
parents e3b78148e9de
children 984f7d78bfdf
comparison
equal deleted inserted replaced
12:0a6a2ab1c131 13:73dfae1847f5
98 98
99 99
100 masterLoopStartPt: 100 masterLoopStartPt:
101 //============================= MEASUREMENT STUFF ======================== 101 //============================= MEASUREMENT STUFF ========================
102 #ifdef MEAS__TIME_MASTER 102 #ifdef MEAS__TIME_MASTER
103 int startStamp, endStamp;
103 //Total Master time includes one coreloop time -- just assume the core 104 //Total Master time includes one coreloop time -- just assume the core
104 // loop time is same for Master as for AppVPs, even though it will be 105 // loop time is same for Master as for AppVPs, even though it will be
105 // smaller due to high predictability of the fixed jmp. 106 // smaller due to high predictability of the fixed jmp.
106 saveLowTimeStampCountInto( masterPr->startMasterTSCLow ); 107 saveLowTimeStampCountInto( startStamp );
107 #endif 108 #endif
108 //======================================================================== 109 //========================================================================
109 110
110 masterEnv = _VMSMasterEnv; 111 masterEnv = _VMSMasterEnv;
111 112
162 163
163 jmpPt = _VMSMasterEnv->coreLoopStartPt; 164 jmpPt = _VMSMasterEnv->coreLoopStartPt;
164 coreLoopFramePtr = masterPr->coreLoopFramePtr;//need this only 165 coreLoopFramePtr = masterPr->coreLoopFramePtr;//need this only
165 coreLoopStackPtr = masterPr->coreLoopStackPtr;//shouldn't need -- safety 166 coreLoopStackPtr = masterPr->coreLoopStackPtr;//shouldn't need -- safety
166 167
168 //============================= MEASUREMENT STUFF ========================
167 #ifdef MEAS__TIME_MASTER 169 #ifdef MEAS__TIME_MASTER
168 saveLowTimeStampCountInto( masterPr->endMasterTSCLow ); 170 saveLowTimeStampCountInto( endStamp );
171 addIntervalToHist(startStamp,endStamp,_VMSMasterEnv->stats->masterTimeHist);
169 #endif 172 #endif
173 //========================================================================
170 174
171 asm volatile("movl %0, %%eax; \ 175 asm volatile("movl %0, %%eax; \
172 movl %%esp, (%%eax); \ 176 movl %%esp, (%%eax); \
173 movl %1, %%eax; \ 177 movl %1, %%eax; \
174 movl %%ebp, (%%eax); \ 178 movl %%ebp, (%%eax); \