diff options
Diffstat (limited to 'includes/stg')
| -rw-r--r-- | includes/stg/DLL.h | 4 | ||||
| -rw-r--r-- | includes/stg/HaskellMachRegs.h | 14 | ||||
| -rw-r--r-- | includes/stg/MachRegs.h | 18 | ||||
| -rw-r--r-- | includes/stg/MiscClosures.h | 6 | ||||
| -rw-r--r-- | includes/stg/RtsMachRegs.h | 18 | ||||
| -rw-r--r-- | includes/stg/Ticky.h | 6 |
6 files changed, 33 insertions, 33 deletions
diff --git a/includes/stg/DLL.h b/includes/stg/DLL.h index cf857a8682..7ab3594ce1 100644 --- a/includes/stg/DLL.h +++ b/includes/stg/DLL.h @@ -46,7 +46,7 @@ sources are being processed. This is only the case when using Win32 DLLs. ] */ -#ifdef COMPILING_RTS +#if defined(COMPILING_RTS) #define DLL_IMPORT DLLIMPORT #define DLL_IMPORT_RTS #define DLL_IMPORT_DATA_VAR(x) x @@ -65,7 +65,7 @@ #endif -#ifdef COMPILING_STDLIB +#if defined(COMPILING_STDLIB) #define DLL_IMPORT_STDLIB #else #define DLL_IMPORT_STDLIB DLLIMPORT diff --git a/includes/stg/HaskellMachRegs.h b/includes/stg/HaskellMachRegs.h index 89a2b95399..c92f6867c1 100644 --- a/includes/stg/HaskellMachRegs.h +++ b/includes/stg/HaskellMachRegs.h @@ -24,7 +24,7 @@ * the stack, and components of an unboxed tuple will be returned on * the stack rather than in registers. */ -#ifdef NO_REGS +#if defined(NO_REGS) #define MACHREGS_NO_REGS 1 @@ -32,11 +32,11 @@ #define MACHREGS_NO_REGS 0 -#ifdef i386_TARGET_ARCH +#if defined(i386_TARGET_ARCH) #define MACHREGS_i386 1 #endif -#ifdef x86_64_TARGET_ARCH +#if defined(x86_64_TARGET_ARCH) #define MACHREGS_x86_64 1 #endif @@ -45,19 +45,19 @@ #define MACHREGS_powerpc 1 #endif -#ifdef sparc_TARGET_ARCH +#if defined(sparc_TARGET_ARCH) #define MACHREGS_sparc 1 #endif -#ifdef arm_TARGET_ARCH +#if defined(arm_TARGET_ARCH) #define MACHREGS_arm 1 #endif -#ifdef aarch64_TARGET_ARCH +#if defined(aarch64_TARGET_ARCH) #define MACHREGS_aarch64 1 #endif -#ifdef darwin_TARGET_OS +#if defined(darwin_TARGET_OS) #define MACHREGS_darwin 1 #endif diff --git a/includes/stg/MachRegs.h b/includes/stg/MachRegs.h index f58e49e626..eab4a306ed 100644 --- a/includes/stg/MachRegs.h +++ b/includes/stg/MachRegs.h @@ -81,16 +81,16 @@ Leaving SpLim out of the picture. -------------------------------------------------------------------------- */ -#ifdef MACHREGS_i386 +#if defined(MACHREGS_i386) #define REG(x) __asm__("%" #x) -#ifndef not_doing_dynamic_linking +#if !defined(not_doing_dynamic_linking) #define REG_Base ebx #endif #define REG_Sp ebp -#ifndef STOLEN_X86_REGS +#if !defined(STOLEN_X86_REGS) #define STOLEN_X86_REGS 4 #endif @@ -315,7 +315,7 @@ the stack. See Note [Overlapping global registers] for implications. #define REG_R7 r20 #define REG_R8 r21 -#ifdef MACHREGS_darwin +#if defined(MACHREGS_darwin) #define REG_F1 f14 #define REG_F2 f15 @@ -629,7 +629,7 @@ the stack. See Note [Overlapping global registers] for implications. * communicate with PrimOps and RTS functions. */ -#ifndef MAX_REAL_VANILLA_REG +#if !defined(MAX_REAL_VANILLA_REG) # if defined(REG_R10) # define MAX_REAL_VANILLA_REG 10 # elif defined(REG_R9) @@ -655,7 +655,7 @@ the stack. See Note [Overlapping global registers] for implications. # endif #endif -#ifndef MAX_REAL_FLOAT_REG +#if !defined(MAX_REAL_FLOAT_REG) # if defined(REG_F4) # define MAX_REAL_FLOAT_REG 4 # elif defined(REG_F3) @@ -669,7 +669,7 @@ the stack. See Note [Overlapping global registers] for implications. # endif #endif -#ifndef MAX_REAL_DOUBLE_REG +#if !defined(MAX_REAL_DOUBLE_REG) # if defined(REG_D2) # define MAX_REAL_DOUBLE_REG 2 # elif defined(REG_D1) @@ -679,7 +679,7 @@ the stack. See Note [Overlapping global registers] for implications. # endif #endif -#ifndef MAX_REAL_LONG_REG +#if !defined(MAX_REAL_LONG_REG) # if defined(REG_L1) # define MAX_REAL_LONG_REG 1 # else @@ -687,7 +687,7 @@ the stack. See Note [Overlapping global registers] for implications. # endif #endif -#ifndef MAX_REAL_XMM_REG +#if !defined(MAX_REAL_XMM_REG) # if defined(REG_XMM6) # define MAX_REAL_XMM_REG 6 # elif defined(REG_XMM5) diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h index 725323b395..4e8fe68bd6 100644 --- a/includes/stg/MiscClosures.h +++ b/includes/stg/MiscClosures.h @@ -35,7 +35,7 @@ # define RTS_FUN_DECL(f) extern DLL_IMPORT_RTS StgFunPtr f(void) #endif -#ifdef TABLES_NEXT_TO_CODE +#if defined(TABLES_NEXT_TO_CODE) # define RTS_RET(f) RTS_INFO(f##_info) # define RTS_ENTRY(f) RTS_INFO(f##_info) # define RTS_FUN(f) RTS_FUN_INFO(f##_info) @@ -318,7 +318,7 @@ RTS_RET(stg_block_takemvar); RTS_RET(stg_block_readmvar); RTS_FUN_DECL(stg_block_putmvar); RTS_RET(stg_block_putmvar); -#ifdef mingw32_HOST_OS +#if defined(mingw32_HOST_OS) RTS_FUN_DECL(stg_block_async); RTS_RET(stg_block_async); RTS_FUN_DECL(stg_block_async_void); @@ -395,7 +395,7 @@ RTS_FUN_DECL(stg_tryReadMVarzh); RTS_FUN_DECL(stg_waitReadzh); RTS_FUN_DECL(stg_waitWritezh); RTS_FUN_DECL(stg_delayzh); -#ifdef mingw32_HOST_OS +#if defined(mingw32_HOST_OS) RTS_FUN_DECL(stg_asyncReadzh); RTS_FUN_DECL(stg_asyncWritezh); RTS_FUN_DECL(stg_asyncDoProczh); diff --git a/includes/stg/RtsMachRegs.h b/includes/stg/RtsMachRegs.h index 627bdfeebb..e1233a1a55 100644 --- a/includes/stg/RtsMachRegs.h +++ b/includes/stg/RtsMachRegs.h @@ -14,8 +14,8 @@ #pragma once -#ifdef UnregisterisedCompiler -#ifndef NO_REGS +#if defined(UnregisterisedCompiler) +#if !defined(NO_REGS) #define NO_REGS #endif #endif @@ -30,7 +30,7 @@ * the stack, and components of an unboxed tuple will be returned on * the stack rather than in registers. */ -#ifdef NO_REGS +#if defined(NO_REGS) #define MACHREGS_NO_REGS 1 @@ -38,11 +38,11 @@ #define MACHREGS_NO_REGS 0 -#ifdef i386_HOST_ARCH +#if defined(i386_HOST_ARCH) #define MACHREGS_i386 1 #endif -#ifdef x86_64_HOST_ARCH +#if defined(x86_64_HOST_ARCH) #define MACHREGS_x86_64 1 #endif @@ -51,19 +51,19 @@ #define MACHREGS_powerpc 1 #endif -#ifdef sparc_HOST_ARCH +#if defined(sparc_HOST_ARCH) #define MACHREGS_sparc 1 #endif -#ifdef arm_HOST_ARCH +#if defined(arm_HOST_ARCH) #define MACHREGS_arm 1 #endif -#ifdef aarch64_HOST_ARCH +#if defined(aarch64_HOST_ARCH) #define MACHREGS_aarch64 1 #endif -#ifdef darwin_HOST_OS +#if defined(darwin_HOST_OS) #define MACHREGS_darwin 1 #endif diff --git a/includes/stg/Ticky.h b/includes/stg/Ticky.h index 1e16a1ae08..5e2c372610 100644 --- a/includes/stg/Ticky.h +++ b/includes/stg/Ticky.h @@ -35,7 +35,7 @@ extern W_ top_ct[]; same declarations for both extern decls (which are included everywhere) and initializations (which only happen once) TICKY_C is defined only in rts/Ticky.c */ -#ifdef TICKY_C +#if defined(TICKY_C) #define INIT(ializer) = ializer #define EXTERN #else @@ -197,8 +197,8 @@ EXTERN StgInt RET_UNBOXED_TUP_hst[TICKY_BIN_COUNT] INIT({0}); Note that these macros must be defined whether TICKY_TICKY is defined or not. */ - -#ifndef CMINUSMINUS + +#if !defined(CMINUSMINUS) #define TICK_BUMP_BY(ctr,n) ctr = (StgInt) ctr + n #define TICK_BUMP(ctr) TICK_BUMP_BY(ctr,1) |