summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2021-07-23 05:05:57 +0000
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-08-09 15:11:58 -0400
commitdb7098fe7aa3f7324d146821334b774032ea87bd (patch)
tree1e77b0e16ced9e72d0ba53202e9b172f02fc6b62
parent748636388b052d22859b7265dec776edfa12a68c (diff)
downloadhaskell-db7098fe7aa3f7324d146821334b774032ea87bd.tar.gz
Clean up whitespace in /includes
I need to do this now or when I move these files the linter will be mad.
-rw-r--r--includes/rts/Adjustor.h2
-rw-r--r--includes/rts/BlockSignals.h4
-rw-r--r--includes/rts/Bytecodes.h120
-rw-r--r--includes/rts/Config.h2
-rw-r--r--includes/rts/Flags.h52
-rw-r--r--includes/rts/Signals.h2
-rw-r--r--includes/rts/storage/FunTypes.h18
-rw-r--r--includes/stg/DLL.h2
-rw-r--r--includes/stg/Ticky.h6
9 files changed, 104 insertions, 104 deletions
diff --git a/includes/rts/Adjustor.h b/includes/rts/Adjustor.h
index efaee2cade..8965c7c8bb 100644
--- a/includes/rts/Adjustor.h
+++ b/includes/rts/Adjustor.h
@@ -14,7 +14,7 @@
#pragma once
/* Creating and destroying an adjustor thunk */
-void* createAdjustor (int cconv,
+void* createAdjustor (int cconv,
StgStablePtr hptr,
StgFunPtr wptr,
char *typeString);
diff --git a/includes/rts/BlockSignals.h b/includes/rts/BlockSignals.h
index 7d0af0aa94..46b0b0f562 100644
--- a/includes/rts/BlockSignals.h
+++ b/includes/rts/BlockSignals.h
@@ -2,7 +2,7 @@
*
* (c) The GHC Team, 1998-2009
*
- * RTS signal handling
+ * RTS signal handling
*
* Do not #include this file directly: #include "Rts.h" instead.
*
@@ -22,7 +22,7 @@
* Temporarily block the delivery of further console events. Needed to
* avoid race conditions when GCing the queue of outstanding handlers or
* when emptying the queue by running the handlers.
- *
+ *
*/
void blockUserSignals(void);
diff --git a/includes/rts/Bytecodes.h b/includes/rts/Bytecodes.h
index 859892de2d..b97d4d4f60 100644
--- a/includes/rts/Bytecodes.h
+++ b/includes/rts/Bytecodes.h
@@ -23,87 +23,87 @@
I hope that's clear :-)
*/
-#define bci_STKCHECK 1
-#define bci_PUSH_L 2
-#define bci_PUSH_LL 3
-#define bci_PUSH_LLL 4
+#define bci_STKCHECK 1
+#define bci_PUSH_L 2
+#define bci_PUSH_LL 3
+#define bci_PUSH_LLL 4
#define bci_PUSH8 5
#define bci_PUSH16 6
#define bci_PUSH32 7
#define bci_PUSH8_W 8
#define bci_PUSH16_W 9
#define bci_PUSH32_W 10
-#define bci_PUSH_G 11
-#define bci_PUSH_ALTS 12
-#define bci_PUSH_ALTS_P 13
-#define bci_PUSH_ALTS_N 14
-#define bci_PUSH_ALTS_F 15
-#define bci_PUSH_ALTS_D 16
-#define bci_PUSH_ALTS_L 17
-#define bci_PUSH_ALTS_V 18
+#define bci_PUSH_G 11
+#define bci_PUSH_ALTS 12
+#define bci_PUSH_ALTS_P 13
+#define bci_PUSH_ALTS_N 14
+#define bci_PUSH_ALTS_F 15
+#define bci_PUSH_ALTS_D 16
+#define bci_PUSH_ALTS_L 17
+#define bci_PUSH_ALTS_V 18
#define bci_PUSH_PAD8 19
#define bci_PUSH_PAD16 20
#define bci_PUSH_PAD32 21
#define bci_PUSH_UBX8 22
#define bci_PUSH_UBX16 23
#define bci_PUSH_UBX32 24
-#define bci_PUSH_UBX 25
-#define bci_PUSH_APPLY_N 26
-#define bci_PUSH_APPLY_F 27
-#define bci_PUSH_APPLY_D 28
-#define bci_PUSH_APPLY_L 29
-#define bci_PUSH_APPLY_V 30
-#define bci_PUSH_APPLY_P 31
-#define bci_PUSH_APPLY_PP 32
-#define bci_PUSH_APPLY_PPP 33
-#define bci_PUSH_APPLY_PPPP 34
-#define bci_PUSH_APPLY_PPPPP 35
-#define bci_PUSH_APPLY_PPPPPP 36
-/* #define bci_PUSH_APPLY_PPPPPPP 37 */
-#define bci_SLIDE 38
-#define bci_ALLOC_AP 39
-#define bci_ALLOC_AP_NOUPD 40
-#define bci_ALLOC_PAP 41
-#define bci_MKAP 42
-#define bci_MKPAP 43
-#define bci_UNPACK 44
-#define bci_PACK 45
-#define bci_TESTLT_I 46
-#define bci_TESTEQ_I 47
-#define bci_TESTLT_F 48
-#define bci_TESTEQ_F 49
-#define bci_TESTLT_D 50
-#define bci_TESTEQ_D 51
-#define bci_TESTLT_P 52
-#define bci_TESTEQ_P 53
-#define bci_CASEFAIL 54
-#define bci_JMP 55
-#define bci_CCALL 56
-#define bci_SWIZZLE 57
-#define bci_ENTER 58
-#define bci_RETURN 59
-#define bci_RETURN_P 60
-#define bci_RETURN_N 61
-#define bci_RETURN_F 62
-#define bci_RETURN_D 63
-#define bci_RETURN_L 64
-#define bci_RETURN_V 65
-#define bci_BRK_FUN 66
-#define bci_TESTLT_W 67
-#define bci_TESTEQ_W 68
+#define bci_PUSH_UBX 25
+#define bci_PUSH_APPLY_N 26
+#define bci_PUSH_APPLY_F 27
+#define bci_PUSH_APPLY_D 28
+#define bci_PUSH_APPLY_L 29
+#define bci_PUSH_APPLY_V 30
+#define bci_PUSH_APPLY_P 31
+#define bci_PUSH_APPLY_PP 32
+#define bci_PUSH_APPLY_PPP 33
+#define bci_PUSH_APPLY_PPPP 34
+#define bci_PUSH_APPLY_PPPPP 35
+#define bci_PUSH_APPLY_PPPPPP 36
+/* #define bci_PUSH_APPLY_PPPPPPP 37 */
+#define bci_SLIDE 38
+#define bci_ALLOC_AP 39
+#define bci_ALLOC_AP_NOUPD 40
+#define bci_ALLOC_PAP 41
+#define bci_MKAP 42
+#define bci_MKPAP 43
+#define bci_UNPACK 44
+#define bci_PACK 45
+#define bci_TESTLT_I 46
+#define bci_TESTEQ_I 47
+#define bci_TESTLT_F 48
+#define bci_TESTEQ_F 49
+#define bci_TESTLT_D 50
+#define bci_TESTEQ_D 51
+#define bci_TESTLT_P 52
+#define bci_TESTEQ_P 53
+#define bci_CASEFAIL 54
+#define bci_JMP 55
+#define bci_CCALL 56
+#define bci_SWIZZLE 57
+#define bci_ENTER 58
+#define bci_RETURN 59
+#define bci_RETURN_P 60
+#define bci_RETURN_N 61
+#define bci_RETURN_F 62
+#define bci_RETURN_D 63
+#define bci_RETURN_L 64
+#define bci_RETURN_V 65
+#define bci_BRK_FUN 66
+#define bci_TESTLT_W 67
+#define bci_TESTEQ_W 68
-#define bci_RETURN_T 69
-#define bci_PUSH_ALTS_T 70
+#define bci_RETURN_T 69
+#define bci_PUSH_ALTS_T 70
/* If you need to go past 255 then you will run into the flags */
/* If you need to go below 0x0100 then you will run into the instructions */
-#define bci_FLAG_LARGE_ARGS 0x8000
+#define bci_FLAG_LARGE_ARGS 0x8000
/* If a BCO definitely requires less than this many words of stack,
don't include an explicit STKCHECK insn in it. The interpreter
will check for this many words of stack before running each BCO,
rendering an explicit check unnecessary in the majority of
cases. */
-#define INTERP_STACK_CHECK_THRESH 50
+#define INTERP_STACK_CHECK_THRESH 50
/*-------------------------------------------------------------------------*/
diff --git a/includes/rts/Config.h b/includes/rts/Config.h
index be264592ff..289950af45 100644
--- a/includes/rts/Config.h
+++ b/includes/rts/Config.h
@@ -5,7 +5,7 @@
* Rts settings.
*
* NOTE: assumes #include "ghcconfig.h"
- *
+ *
* NB: THIS FILE IS INCLUDED IN NON-C CODE AND DATA! #defines only please.
*
* To understand the structure of the RTS headers, see the wiki:
diff --git a/includes/rts/Flags.h b/includes/rts/Flags.h
index 23a5d78ea6..11e7bfdaa7 100644
--- a/includes/rts/Flags.h
+++ b/includes/rts/Flags.h
@@ -31,7 +31,7 @@
typedef struct _GC_FLAGS {
FILE *statsFile;
uint32_t giveStats;
-#define NO_GC_STATS 0
+#define NO_GC_STATS 0
#define COLLECT_GC_STATS 1
#define ONELINE_GC_STATS 2
#define SUMMARY_GC_STATS 3
@@ -59,10 +59,10 @@ typedef struct _GC_FLAGS {
uint32_t generations;
bool squeezeUpdFrames;
- bool compact; /* True <=> "compact all the time" */
+ bool compact; /* True <=> "compact all the time" */
double compactThreshold;
- bool sweep; /* use "mostly mark-sweep" instead of copying
+ bool sweep; /* use "mostly mark-sweep" instead of copying
* for the oldest generation */
bool ringBell;
@@ -120,20 +120,20 @@ typedef struct _DEBUG_FLAGS {
typedef struct _COST_CENTRE_FLAGS {
uint32_t doCostCentres;
# define COST_CENTRES_NONE 0
-# define COST_CENTRES_SUMMARY 1
-# define COST_CENTRES_VERBOSE 2 /* incl. serial time profile */
-# define COST_CENTRES_ALL 3
+# define COST_CENTRES_SUMMARY 1
+# define COST_CENTRES_VERBOSE 2 /* incl. serial time profile */
+# define COST_CENTRES_ALL 3
# define COST_CENTRES_JSON 4
- int profilerTicks; /* derived */
- int msecsPerTick; /* derived */
+ int profilerTicks; /* derived */
+ int msecsPerTick; /* derived */
char const *outputFileNameStem;
} COST_CENTRE_FLAGS;
/* See Note [Synchronization of flags and base APIs] */
typedef struct _PROFILING_FLAGS {
uint32_t doHeapProfile;
-# define NO_HEAP_PROFILING 0 /* N.B. Used as indexes into arrays */
+# define NO_HEAP_PROFILING 0 /* N.B. Used as indexes into arrays */
# define HEAP_BY_CCS 1
# define HEAP_BY_MOD 2
# define HEAP_BY_DESCR 4
@@ -149,7 +149,7 @@ typedef struct _PROFILING_FLAGS {
bool startHeapProfileAtStartup; /* true if we start profiling from program startup */
- bool showCCSOnException;
+ bool showCCSOnException;
uint32_t maxRetainerSetSize;
@@ -278,15 +278,15 @@ typedef struct _TICKY_FLAGS {
/* See Note [Synchronization of flags and base APIs] */
typedef struct _RTS_FLAGS {
/* The first portion of RTS_FLAGS is invariant. */
- GC_FLAGS GcFlags;
+ GC_FLAGS GcFlags;
CONCURRENT_FLAGS ConcFlags;
MISC_FLAGS MiscFlags;
- DEBUG_FLAGS DebugFlags;
+ DEBUG_FLAGS DebugFlags;
COST_CENTRE_FLAGS CcFlags;
PROFILING_FLAGS ProfFlags;
TRACE_FLAGS TraceFlags;
- TICKY_FLAGS TickyFlags;
- PAR_FLAGS ParFlags;
+ TICKY_FLAGS TickyFlags;
+ PAR_FLAGS ParFlags;
} RTS_FLAGS;
#if defined(COMPILING_RTS_MAIN)
@@ -308,18 +308,18 @@ extern RTS_FLAGS RtsFlags;
* chars, please!
*/
-#define STATS_FILENAME_MAXLEN 128
-
-#define GR_FILENAME_FMT "%0.124s.gr"
-#define HP_FILENAME_FMT "%0.124s.hp"
-#define LIFE_FILENAME_FMT "%0.122s.life"
-#define PROF_FILENAME_FMT "%0.122s.prof"
-#define PROF_FILENAME_FMT_GUM "%0.118s.%03d.prof"
-#define QP_FILENAME_FMT "%0.124s.qp"
-#define STAT_FILENAME_FMT "%0.122s.stat"
-#define TICKY_FILENAME_FMT "%0.121s.ticky"
-#define TIME_FILENAME_FMT "%0.122s.time"
-#define TIME_FILENAME_FMT_GUM "%0.118s.%03d.time"
+#define STATS_FILENAME_MAXLEN 128
+
+#define GR_FILENAME_FMT "%0.124s.gr"
+#define HP_FILENAME_FMT "%0.124s.hp"
+#define LIFE_FILENAME_FMT "%0.122s.life"
+#define PROF_FILENAME_FMT "%0.122s.prof"
+#define PROF_FILENAME_FMT_GUM "%0.118s.%03d.prof"
+#define QP_FILENAME_FMT "%0.124s.qp"
+#define STAT_FILENAME_FMT "%0.122s.stat"
+#define TICKY_FILENAME_FMT "%0.121s.ticky"
+#define TIME_FILENAME_FMT "%0.122s.time"
+#define TIME_FILENAME_FMT_GUM "%0.118s.%03d.time"
/* an "int" so as to match normal "argc" */
/* Now defined in Stg.h (lib/std/cbits need these too.)
diff --git a/includes/rts/Signals.h b/includes/rts/Signals.h
index d7abbb86c8..96f0756538 100644
--- a/includes/rts/Signals.h
+++ b/includes/rts/Signals.h
@@ -2,7 +2,7 @@
*
* (c) The GHC Team, 1998-2009
*
- * RTS signal handling
+ * RTS signal handling
*
* Do not #include this file directly: #include "Rts.h" instead.
*
diff --git a/includes/rts/storage/FunTypes.h b/includes/rts/storage/FunTypes.h
index 88fcc5878c..3b066ef7dc 100644
--- a/includes/rts/storage/FunTypes.h
+++ b/includes/rts/storage/FunTypes.h
@@ -9,7 +9,7 @@
#pragma once
/* generic - function comes with a small bitmap */
-#define ARG_GEN 0
+#define ARG_GEN 0
/* generic - function comes with a large bitmap */
#define ARG_GEN_BIG 1
@@ -26,16 +26,16 @@
* - utils/genapply/Main.hs: stackApplyTypes
* - GHC.StgToCmm.Layout: stdPattern
*/
-#define ARG_NONE 3
-#define ARG_N 4
-#define ARG_P 5
-#define ARG_F 6
-#define ARG_D 7
-#define ARG_L 8
-#define ARG_V16 9
+#define ARG_NONE 3
+#define ARG_N 4
+#define ARG_P 5
+#define ARG_F 6
+#define ARG_D 7
+#define ARG_L 8
+#define ARG_V16 9
#define ARG_V32 10
#define ARG_V64 11
-#define ARG_NN 12
+#define ARG_NN 12
#define ARG_NP 13
#define ARG_PN 14
#define ARG_PP 15
diff --git a/includes/stg/DLL.h b/includes/stg/DLL.h
index 0c383c54b1..133f4c0d42 100644
--- a/includes/stg/DLL.h
+++ b/includes/stg/DLL.h
@@ -43,7 +43,7 @@
[oh, you want details :) : Data symbols defined by the RTS
have to be accessed through an extra level of indirection
when compiling generated .hc code compared to when the RTS
- sources are being processed. This is only the case when
+ sources are being processed. This is only the case when
using Win32 DLLs. ]
*/
#if defined(COMPILING_RTS)
diff --git a/includes/stg/Ticky.h b/includes/stg/Ticky.h
index cefb674f31..3d9d4aee4f 100644
--- a/includes/stg/Ticky.h
+++ b/includes/stg/Ticky.h
@@ -31,9 +31,9 @@ extern W_ top_ct[];
#endif
/* The rest are not explicitly declared in rts/Ticky.c. Instead
- we use the same trick as in the former StgTicky.h: recycle the
+ we use the same trick as in the former StgTicky.h: recycle the
same declarations for both extern decls (which are included everywhere)
- and initializations (which only happen once)
+ and initializations (which only happen once)
TICKY_C is defined only in rts/Ticky.c */
#if defined(TICKY_C)
#define INIT(ializer) = ializer
@@ -193,7 +193,7 @@ EXTERN StgInt RET_UNBOXED_TUP_hst[TICKY_BIN_COUNT] INIT({0});
We got rid of StgTicky.h, which was previously
defining these macros for the benefit of C code
so, we define them here instead (to be no-ops).
- (since those macros are only defined in Cmm.h)
+ (since those macros are only defined in Cmm.h)
Note that these macros must be defined whether
TICKY_TICKY is defined or not. */