X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FCmm.h;h=c238a84238b8bf7ed18cb9050d80e84d2c2f6cee;hb=1a0c116d27a9032611c05efe2b0b07e1eae35dce;hp=25ffb5d24f61ff10a751b648c2fc4cfd64e6ce51;hpb=9cef40bd4dd2536c7a370a1a9b78461c152805cc;p=ghc-hetmet.git diff --git a/includes/Cmm.h b/includes/Cmm.h index 25ffb5d..c238a84 100644 --- a/includes/Cmm.h +++ b/includes/Cmm.h @@ -273,6 +273,8 @@ #include "DerivedConstants.h" #include "ClosureTypes.h" #include "StgFun.h" +#include "OSThreads.h" +#include "SMP.h" /* * Need MachRegs, because some of the RTS code is conditionally @@ -463,18 +465,13 @@ #define TICK_SLOW_CALL_ppppp() TICK_BUMP(SLOW_CALL_ppppp_ctr) #define TICK_SLOW_CALL_pppppp() TICK_BUMP(SLOW_CALL_pppppp_ctr) -#ifdef TICKY_TICKY -#define TICK_HISTO_BY(histo,n,i) \ - W_ __idx; \ - __idx = (n); \ - if (__idx > 8) { \ - __idx = 8; \ - } \ - CLong[histo##_hst + _idx*SIZEOF_LONG] \ - = histo##_hst + __idx*SIZEOF_LONG] + i; -#else +/* NOTE: TICK_HISTO_BY and TICK_HISTO + currently have no effect. + The old code for it didn't typecheck and I + just commented it out to get ticky to work. + - krc 1/2007 */ + #define TICK_HISTO_BY(histo,n,i) /* nothing */ -#endif #define TICK_HISTO(histo,n) TICK_HISTO_BY(histo,n,1)