diff -rC 2 simpa-vanilla/PA2.0.2/Implementations/ARM/sim-panalyzer-2.0/libpanalyzer/memory_panalyzer.c simpa-patched/PA2.0.2/Implementations/ARM/sim-panalyzer-2.0/libpanalyzer/memory_panalyzer.c
*** simpa-vanilla/PA2.0.2/Implementations/ARM/sim-panalyzer-2.0/libpanalyzer/memory_panalyzer.c	2004-03-17 03:52:11.000000000 +0000
--- simpa-patched/PA2.0.2/Implementations/ARM/sim-panalyzer-2.0/libpanalyzer/memory_panalyzer.c	2005-03-26 09:29:46.000000000 +0000
***************
*** 128,134 ****
  
  	if(buffer)
  		/* counting number of transitions of data bus */
! 		// nswitchings = obtain_nswitchings(buffer, pspec->bus, pspec->bsize);
! 		nswitchings = obtain_nswitchings(buffer, pspec->bus, 4/*pspec->bsize*/); /* Ludo: I guess they mean something like bussize or so. pspec->bsize is wrong, since for a cache for example this is the blocksize. When accessing an element from the cache, you have to count the switchings for a machineword only. */
  	else
  		/* from fixed activity factor: see technology.h  */
--- 128,139 ----
  
  	if(buffer)
+     {
+         unsigned sz = ( 4 < pspec -> bsize ) ? 4 : pspec -> bsize ;
+ 
  		/* counting number of transitions of data bus */
! 		//nswitchings = obtain_nswitchings(buffer, pspec->bus, pspec->bsize);
! 		//nswitchings = obtain_nswitchings(buffer, pspec->bus, 4/*pspec->bsize*/); /* Ludo: I guess they mean something like bussize or so. pspec->bsize is wrong, since for a cache for example this is the blocksize. When accessing an element from the cache, you have to count the switchings for a machineword only. */
! 		nswitchings = obtain_nswitchings(buffer, pspec->bus, sz);
!     }
  	else
  		/* from fixed activity factor: see technology.h  */
diff -rC 2 simpa-vanilla/PA2.0.2/Implementations/ARM/sim-panalyzer-2.0/libpanalyzer/uarch_panalyzer.h simpa-patched/PA2.0.2/Implementations/ARM/sim-panalyzer-2.0/libpanalyzer/uarch_panalyzer.h
*** simpa-vanilla/PA2.0.2/Implementations/ARM/sim-panalyzer-2.0/libpanalyzer/uarch_panalyzer.h	2004-03-17 03:52:12.000000000 +0000
--- simpa-patched/PA2.0.2/Implementations/ARM/sim-panalyzer-2.0/libpanalyzer/uarch_panalyzer.h	2005-03-26 09:28:47.000000000 +0000
***************
*** 80,84 ****
  	fu_cache_pspec_t *btb;
  	fu_clock_pspec_t *clock;
! 	fu_clock_pspec_t *logic;
  	
  #ifdef FP_PANALYZER_H 	
--- 80,84 ----
  	fu_cache_pspec_t *btb;
  	fu_clock_pspec_t *clock;
! 	fu_logic_pspec_t *logic;
  	
  #ifdef FP_PANALYZER_H