Commit 742c8cc2 authored by Lazlo Domoszlai's avatar Lazlo Domoszlai

complete the implementation of the DisableRTSFlags option

parent bd7daad8
...@@ -41,7 +41,7 @@ where ...@@ -41,7 +41,7 @@ where
FlagsToApplicationOptions :: !Int !ApplicationOptions -> ApplicationOptions; FlagsToApplicationOptions :: !Int !ApplicationOptions -> ApplicationOptions;
FlagsToApplicationOptions flags applicationOptions FlagsToApplicationOptions flags applicationOptions
= {applicationOptions & sgc=showgc,pss=printstacksize,marking_collection=marking_collection,set=showexectime, = {applicationOptions & sgc=showgc,pss=printstacksize,marking_collection=marking_collection,set=showexectime,
o=output, memoryProfiling=memoryProfiling, write_stderr_to_file=write_stderr_to_file}; o=output, memoryProfiling=memoryProfiling, write_stderr_to_file=write_stderr_to_file, disable_rts_flags=disable_rts_flags};
where where
showgc showgc
= (flags bitand 2) <> 0; = (flags bitand 2) <> 0;
...@@ -62,6 +62,8 @@ where ...@@ -62,6 +62,8 @@ where
= BasicValuesOnly; = BasicValuesOnly;
// otherwise // otherwise
= ShowConstructors; = ShowConstructors;
disable_rts_flags
= (flags bitand 8192) <> 0;
write_options_file :: !{#.Char} !.Int !.Int !.Int !.Int !.Int !.Int !Bool !*a -> *(!Bool,!*a) | FileSystem a; write_options_file :: !{#.Char} !.Int !.Int !.Int !.Int !.Int !.Int !Bool !*a -> *(!Bool,!*a) | FileSystem a;
......
...@@ -883,7 +883,7 @@ where ...@@ -883,7 +883,7 @@ where
ApplicationOptionsToFlags :: !ApplicationOptions -> Int ApplicationOptionsToFlags :: !ApplicationOptions -> Int
ApplicationOptionsToFlags {sgc,pss,marking_collection,set,o,memoryProfiling,write_stderr_to_file} ApplicationOptionsToFlags {sgc,pss,marking_collection,set,o,memoryProfiling,write_stderr_to_file}
= showgc+printstacksize+showexectime+cons+marking_collection_mask+memory_profiling_mask+write_stderr_to_file_mask = showgc+printstacksize+showexectime+cons+marking_collection_mask+memory_profiling_mask+write_stderr_to_file_mask+disable_rts_flags_mask
where where
showgc showgc
| sgc = 2 | sgc = 2
...@@ -910,6 +910,10 @@ where ...@@ -910,6 +910,10 @@ where
NoReturnType -> 16 NoReturnType -> 16
NoConsole -> 16 NoConsole -> 16
disable_rts_flags_mask
| disable_rts_flags = 8192
= 0
(FWI) infixl (FWI) infixl
(FWI) f i :== fwritei i f (FWI) f i :== fwritei i f
......
...@@ -288,6 +288,7 @@ eqAppOpts ao1 ao2 ...@@ -288,6 +288,7 @@ eqAppOpts ao1 ao2
ao1.sgc == ao2.sgc && ao1.sgc == ao2.sgc &&
ao1.pss == ao2.pss && ao1.pss == ao2.pss &&
ao1.marking_collection == ao2.marking_collection && ao1.marking_collection == ao2.marking_collection &&
ao1.disable_rts_flags == ao2.disable_rts_flags &&
ao1.o == ao2.o && ao1.o == ao2.o &&
ao1.fn == ao2.fn && ao1.fn == ao2.fn &&
ao1.fs == ao2.fs && ao1.fs == ao2.fs &&
......
...@@ -918,7 +918,7 @@ where ...@@ -918,7 +918,7 @@ where
ApplicationOptionsToFlags :: !ApplicationOptions -> Int ApplicationOptionsToFlags :: !ApplicationOptions -> Int
ApplicationOptionsToFlags {sgc,pss,marking_collection,set,o,memoryProfiling,write_stderr_to_file} ApplicationOptionsToFlags {sgc,pss,marking_collection,set,o,memoryProfiling,write_stderr_to_file}
= showgc+printstacksize+showexectime+cons+marking_collection_mask+memory_profiling_mask+write_stderr_to_file_mask = showgc+printstacksize+showexectime+cons+marking_collection_mask+memory_profiling_mask+write_stderr_to_file_mask+disable_rts_flags_mask
where where
showgc showgc
| sgc = 2 | sgc = 2
...@@ -945,6 +945,10 @@ where ...@@ -945,6 +945,10 @@ where
NoReturnType -> 16 NoReturnType -> 16
NoConsole -> 16 NoConsole -> 16
disable_rts_flags_mask
| disable_rts_flags = 8192
= 0
(FWI) infixl (FWI) infixl
(FWI) f i :== fwritei i f (FWI) f i :== fwritei i f
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment