From 50c54df14a97e55a7792e3d4bc4485f8e6ade756 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Mon, 3 Aug 2009 21:02:29 +0000 Subject: [PATCH] move StgEntCounter type into its own header --- includes/Rts.h | 26 +------------------------- includes/rts/Ticky.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 includes/rts/Ticky.h diff --git a/includes/Rts.h b/includes/Rts.h index 7358c36..f4cf545 100644 --- a/includes/Rts.h +++ b/includes/Rts.h @@ -173,6 +173,7 @@ void _assertFail(const char *filename, unsigned int linenum) #include "rts/IOManager.h" #include "rts/Linker.h" #include "rts/Threads.h" +#include "rts/Ticky.h" #include "rts/Timer.h" #include "rts/Stable.h" @@ -263,29 +264,4 @@ TICK_VAR(2) } #endif - -/* krc: I put this here because I don't think - it needs to be visible externally. - It used to be in StgTicky.h, but I got rid - of that. */ - -/* ----------------------------------------------------------------------------- - The StgEntCounter type - needed regardless of TICKY_TICKY - -------------------------------------------------------------------------- */ - -typedef struct _StgEntCounter { - /* Using StgWord for everything, becuase both the C and asm code - generators make trouble if you try to pack things tighter */ - StgWord registeredp; /* 0 == no, 1 == yes */ - StgInt arity; /* arity (static info) */ - StgInt stk_args; /* # of args off stack */ - /* (rest of args are in registers) */ - char *str; /* name of the thing */ - char *arg_kinds; /* info about the args types */ - StgInt entry_count; /* Trips to fast entry code */ - StgInt allocs; /* number of allocations by this fun */ - struct _StgEntCounter *link;/* link to chain them all together */ -} StgEntCounter; - - #endif /* RTS_H */ diff --git a/includes/rts/Ticky.h b/includes/rts/Ticky.h new file mode 100644 index 0000000..d7e09fc --- /dev/null +++ b/includes/rts/Ticky.h @@ -0,0 +1,31 @@ +/* ----------------------------------------------------------------------------- + * + * (c) The GHC Team, 1998-2009 + * + * TICKY_TICKY types + * + * ---------------------------------------------------------------------------*/ + +#ifndef RTS_TICKY_H +#define RTS_TICKY_H + +/* ----------------------------------------------------------------------------- + The StgEntCounter type - needed regardless of TICKY_TICKY + -------------------------------------------------------------------------- */ + +typedef struct _StgEntCounter { + /* Using StgWord for everything, becuase both the C and asm code + generators make trouble if you try to pack things tighter */ + StgWord registeredp; /* 0 == no, 1 == yes */ + StgInt arity; /* arity (static info) */ + StgInt stk_args; /* # of args off stack */ + /* (rest of args are in registers) */ + char *str; /* name of the thing */ + char *arg_kinds; /* info about the args types */ + StgInt entry_count; /* Trips to fast entry code */ + StgInt allocs; /* number of allocations by this fun */ + struct _StgEntCounter *link;/* link to chain them all together */ +} StgEntCounter; + +#endif /* RTS_TICKY_H */ + -- 1.7.10.4