top fixes

profezzorn · May 25, 2024 · fad953e · fad953e
1 parent 5c1edfe
commit fad953e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/common/scoped_cycle_counter.h b/common/scoped_cycle_counter.h
@@ -17,25 +17,27 @@ class ScopedCycleCounter {
   ScopedCycleCounter(uint64_t& dest) :
     dest_(dest) {
 #ifndef DISABLE_DIAGNOSTIC_COMMANDS
+    noInterrupts();
     cycles_ = getCycles();
+    interrupts();
 #endif    
   }
   ~ScopedCycleCounter() {
 #ifndef DISABLE_DIAGNOSTIC_COMMANDS
+    noInterrupts();
     uint32_t cycles;
     cycles = getCycles() - cycles_;
-    noInterrupts();
     counted_cycles_ += cycles;
     interrupts();
     dest_ += cycles;
 #endif
   }
 private:
-  static uint32_t counted_cycles_;
+  static volatile uint32_t counted_cycles_;
   uint32_t cycles_;
   uint64_t& dest_;
 };
 
-uint32_t ScopedCycleCounter::counted_cycles_ = 0;
+volatile uint32_t ScopedCycleCounter::counted_cycles_ = 0;
 
 #endif