Simon Marlow [Tue, 21 Mar 2006 11:27:02 +0000 (11:27 +0000)]
tiny cleanup
Simon Marlow [Tue, 21 Mar 2006 10:17:50 +0000 (10:17 +0000)]
powerpc64 does not support GHCi right now
Simon Marlow [Tue, 21 Mar 2006 08:41:03 +0000 (08:41 +0000)]
oops, remove temporary testing code
Simon Marlow [Mon, 20 Mar 2006 16:34:39 +0000 (16:34 +0000)]
stopTicker(): wait for the timer thread to exit
Simon Marlow [Mon, 20 Mar 2006 09:11:23 +0000 (09:11 +0000)]
fix Win32 build
Lemmih [Sat, 18 Mar 2006 17:30:34 +0000 (17:30 +0000)]
Documentation for -fno-code and -fwrite-iface.
Lemmih [Sat, 18 Mar 2006 17:18:48 +0000 (17:18 +0000)]
Don't generate stub files when -fno-code is given.
Lemmih [Sat, 18 Mar 2006 17:17:28 +0000 (17:17 +0000)]
-fno-code shouldn't be a mode.
I've removed -fno-code from Main to make it work
equally well with --make and -c.
I've also allowed it not to write hi files unless
-fwrite-iface is given.
Lemmih [Sun, 12 Mar 2006 13:23:28 +0000 (13:23 +0000)]
Cleanup after the OPTIONS parsing was moved.
Simon Marlow [Fri, 17 Mar 2006 15:47:34 +0000 (15:47 +0000)]
fix build for certain picky versions of gcc
Simon Marlow [Fri, 17 Mar 2006 15:07:52 +0000 (15:07 +0000)]
forkProcess(): watch out for ThreadRelocated
simonpj@microsoft.com [Fri, 17 Mar 2006 12:52:41 +0000 (12:52 +0000)]
Make -fliberate-case work for GADTs
Simon Marlow [Thu, 16 Mar 2006 16:59:09 +0000 (16:59 +0000)]
turn on unregisterised by default for alpha, hppa
Simon Marlow [Thu, 16 Mar 2006 16:03:22 +0000 (16:03 +0000)]
remove accidental extra in previous patch
Simon Marlow [Thu, 16 Mar 2006 14:49:14 +0000 (14:49 +0000)]
fix a warning
Simon Marlow [Thu, 16 Mar 2006 14:48:56 +0000 (14:48 +0000)]
fix up Win32 build
Simon Marlow [Thu, 16 Mar 2006 14:27:27 +0000 (14:27 +0000)]
sanity checking: make sure we don't mix registerised and unreg'd code
Simon Marlow [Thu, 16 Mar 2006 13:58:09 +0000 (13:58 +0000)]
fix non-threaded way
lennart.augustsson@credit-suisse.com [Thu, 2 Mar 2006 21:07:24 +0000 (21:07 +0000)]
Free all memory when shutting down. XXX not implemented for Posix.
Simon Marlow [Thu, 16 Mar 2006 12:55:38 +0000 (12:55 +0000)]
Improvements to forkProcess()
fixes failures in yesterday's testsuite run
Simon Marlow [Thu, 16 Mar 2006 12:52:56 +0000 (12:52 +0000)]
discardTask(): reset task->tso to avoid confusion later
Simon Marlow [Wed, 15 Mar 2006 14:50:41 +0000 (14:50 +0000)]
Improvements to shutting down of the runtime
Yet another attempt at shutdown & interruption. This one appears to
work better; ^C is more responsive in multi threaded / SMP, and I
fixed one case where the runtime wasn't responding to ^C at all.
Simon Marlow [Tue, 14 Mar 2006 17:08:13 +0000 (17:08 +0000)]
improve panic messages a bit, with the GHC version and platform
Lemmih [Tue, 14 Mar 2006 16:00:26 +0000 (16:00 +0000)]
Bug fixes in my refactored RnNames code.
Simon Marlow [Tue, 14 Mar 2006 11:41:53 +0000 (11:41 +0000)]
ENTER(): avoid re-reading the info pointer of the closure when entering it
This fixes another instance of a subtle SMP bug (see patch "really
nasty bug in SMP").
Simon Marlow [Tue, 14 Mar 2006 11:26:04 +0000 (11:26 +0000)]
small improvements to the debug printer
Simon Marlow [Tue, 14 Mar 2006 11:25:50 +0000 (11:25 +0000)]
Make it a fatal error to try to enter a PAP
This is just an assertion, in effect: we should never enter a PAP, but
for convenience we previously attached the PAP apply code to the PAP
info table. The problem with this was that it makes it harder to track
down bugs that result in entering a PAP...
Simon Marlow [Tue, 14 Mar 2006 11:21:19 +0000 (11:21 +0000)]
Fix a really nasty bug in SMP
In SMP mode a THUNK can change to an IND at any time. The generic
apply code (stg_ap_p etc.) examines a closure to determine how to
apply it to its arguments, if it is a THUNK it must enter it first in
order to evaluate it. The problem was that in order to enter the
THUNK, we were re-reading the info pointer, and possibly ending up
with an IND instead of the original THUNK. It isn't safe to enter the
IND, because it points to a function (functions are never "entered",
only applied). Solution: we must not re-read the info pointer.
Simon Marlow [Mon, 13 Mar 2006 15:53:47 +0000 (15:53 +0000)]
fix bug in previous patch to this file
Simon Marlow [Mon, 13 Mar 2006 15:41:02 +0000 (15:41 +0000)]
add another SMP assertion
Simon Marlow [Mon, 13 Mar 2006 15:40:44 +0000 (15:40 +0000)]
fix a rather subtle SMP bug in anyWorkForMe()
Simon Marlow [Fri, 10 Mar 2006 20:44:49 +0000 (20:44 +0000)]
Enable shortcutting of stack squeezing
Not sure why it was disabled, probably by accident.
Simon Marlow [Fri, 10 Mar 2006 20:43:43 +0000 (20:43 +0000)]
extra sanity checking: call checkTSO() in resumeThread()
Simon Marlow [Fri, 10 Mar 2006 20:42:56 +0000 (20:42 +0000)]
Give WHITEHOLE the BLACKHOLE closure type, instead of INVALID_OBJECT
Just to keep sanity checking happy, and so we don't need a completely
new closure type.
Simon Marlow [Mon, 13 Mar 2006 13:32:11 +0000 (13:32 +0000)]
Look for a package.conf.d directory containing per-package .conf files
Contributed by Duncan Coutts, with changes to merge into the HEAD.
This isn't the full deal, ghc-pkg still modifies files only, but it's
enough to help the Gentoo folk along.
Ian Lynagh [Tue, 7 Mar 2006 16:11:40 +0000 (16:11 +0000)]
Move the very broad "i[[3456]]86-*-gnu*" HostPlatform pattern to the end.
Simon Marlow [Fri, 10 Mar 2006 11:04:09 +0000 (11:04 +0000)]
fix the build with GHC 6.4 (not 6.4.1)
Lemmih [Fri, 10 Mar 2006 02:14:42 +0000 (02:14 +0000)]
Wibble in HscMain.
Lemmih [Fri, 10 Mar 2006 02:05:14 +0000 (02:05 +0000)]
Initial foundation for quickcheck tests.
I have no idea how to use the testsuite so I'll start
making QuickCheck tests instead.
I've included tests for 'HeaderInfo.getOptions'.
Lemmih [Fri, 10 Mar 2006 01:10:35 +0000 (01:10 +0000)]
Parse OPTIONS properly and cache the result.
Use the lexer to parse OPTIONS, LANGUAGE and INCLUDE pragmas.
This gives us greater flexibility and far better error
messages. However, I had to make a few quirks:
* The token parser is written manually since Happy doesn't
like lexer errors (we need to extract options before the
buffer is passed through 'cpp'). Still better than
manually parsing a String, though.
* The StringBuffer API has been extended so files can be
read in blocks.
I also made a new field in ModSummary called ms_hspp_opts
which stores the updated DynFlags. Oh, and I took the liberty
of moving 'getImports' into HeaderInfo together with
'getOptions'.
Lemmih [Wed, 8 Mar 2006 17:52:10 +0000 (17:52 +0000)]
Fix -ddump-if-trace
Lemmih [Wed, 8 Mar 2006 17:50:36 +0000 (17:50 +0000)]
Bug fix in the new HscMain code.
I'm not sure what really happens here but this is how it's
done in the old HscMain code and it appears to work.
Simon Marlow [Tue, 7 Mar 2006 09:59:49 +0000 (09:59 +0000)]
fix one #ifdef SMP that didn't get turned into #ifdef THREADED_RTS
Simon Marlow [Tue, 7 Mar 2006 09:38:00 +0000 (09:38 +0000)]
x86_64: add -fno-builtin to gcc command line for .hc files.
This seems to be required now that we're stealing more registers.
Lemmih [Tue, 7 Mar 2006 07:37:36 +0000 (07:37 +0000)]
More work thrown at HscMain.
MkIface.writeIfaceFile doesn't check GhcMode anymore. All it does
is what the name say: write an interface to disk.
I've refactored HscMain so the logic is easier to manage. That means
we can avoid running the simplifier when typechecking (: And best of
all, HscMain doesn't use GhcMode at all, anymore!
The new HscMain intro looks like this:
It's the task of the compilation proper to compile Haskell, hs-boot and
core files to either byte-code, hard-code (C, asm, Java, ect) or to
nothing at all (the module is still parsed and type-checked. This
feature is mostly used by IDE's and the likes).
Compilation can happen in either 'one-shot', 'batch', 'nothing',
or 'interactive' mode. 'One-shot' mode targets hard-code, 'batch' mode
targets hard-code, 'nothing' mode targets nothing and 'interactive' mode
targets byte-code.
The modes are kept separate because of their different types and meanings.
In 'one-shot' mode, we're only compiling a single file and can therefore
discard the new ModIface and ModDetails. This is also the reason it only
targets hard-code; compiling to byte-code or nothing doesn't make sense
when we discard the result.
'Batch' mode is like 'one-shot' except that we keep the resulting ModIface
and ModDetails. 'Batch' mode doesn't target byte-code since that require
us to return the newly compiled byte-code.
'Nothing' mode has exactly the same type as 'batch' mode but they're still
kept separate. This is because compiling to nothing is fairly special: We
don't output any interface files, we don't run the simplifier and we don't
generate any code.
'Interactive' mode is similar to 'batch' mode except that we return the
compiled byte-code together with the ModIface and ModDetails.
Lemmih [Mon, 6 Mar 2006 03:34:26 +0000 (03:34 +0000)]
Make it clear when the symbols are using by the interpreter.
wolfgang.thaller@gmx.net [Mon, 6 Mar 2006 03:48:20 +0000 (03:48 +0000)]
Use Darwin-compatible x86 assembly syntax in SMP.h (lock/cmpxchg with a slash)
wolfgang.thaller@gmx.net [Mon, 6 Mar 2006 03:47:20 +0000 (03:47 +0000)]
Darwin/x86: Implement object splitting
wolfgang.thaller@gmx.net [Mon, 6 Mar 2006 03:30:52 +0000 (03:30 +0000)]
Mach-O Linker: handle multiple import sections
In the rare event that a .o file contains more than one flavour of a
[non]lazy pointers sections, resolve all of them, not just one.
Lemmih [Mon, 6 Mar 2006 01:39:26 +0000 (01:39 +0000)]
Import symbols needed by the interpreter.
Lemmih [Sun, 5 Mar 2006 17:35:39 +0000 (17:35 +0000)]
The parser needs a set of parentheses when we don't use unsafeCoerce.
Lemmih [Sat, 4 Mar 2006 19:14:10 +0000 (19:14 +0000)]
'have_object' isn't needed in a typed environment.
Lemmih [Sat, 4 Mar 2006 18:54:35 +0000 (18:54 +0000)]
FIXME's.
Lemmih [Sat, 4 Mar 2006 16:53:03 +0000 (16:53 +0000)]
Why name a function 'getGhciMode' when it returns GhcMode?
I've changed the name to 'getGhcMode'. If someone changes
it back, please write an explanation above it.
Lemmih [Sat, 4 Mar 2006 13:41:50 +0000 (13:41 +0000)]
Enumerate imports and remove dead code.
Lemmih [Sat, 4 Mar 2006 13:30:08 +0000 (13:30 +0000)]
Use hscCodeGenNothing instead of hscCodeGenSimple.
Lemmih [Sat, 4 Mar 2006 13:27:12 +0000 (13:27 +0000)]
Comments and esthetical changes.
Lemmih [Sat, 4 Mar 2006 13:03:27 +0000 (13:03 +0000)]
Remove the old HscMain code.
Lemmih [Sat, 4 Mar 2006 12:41:11 +0000 (12:41 +0000)]
Use the new HscMain API in DriverPipeline.
Lemmih [Sat, 4 Mar 2006 12:40:51 +0000 (12:40 +0000)]
Export the new HscMain API.
Lemmih [Sat, 4 Mar 2006 12:39:57 +0000 (12:39 +0000)]
Allow hscCompileMake to target HscNothing.
Lemmih [Sat, 4 Mar 2006 12:35:55 +0000 (12:35 +0000)]
Description of the new HscMain.
Lemmih [Sat, 4 Mar 2006 00:24:40 +0000 (00:24 +0000)]
Initial hack on the new low-level compiler API.
None of the new code is in use yet.
The current Haskell compiler (HscMain.hscMain) isn't as typed
and as hack-free as we'd like. Here's a list of the things it
does wrong:
* In one shot mode, it returns the new interface as _|_,
when recompilation isn't required. It's then up to the
users of hscMain to keep their hands off the result.
* (Maybe ModIface) is passed around when it's known that it's
a Just. Hey, we got a type-system, let's use it.
* In one shot mode, the backend is returning _|_ for the
new interface. This is done to prevent space leaks since
we know that the result of a one shot compilation is never
used. Again, it's up to the users of hscMain to keep their
hands off the result.
* It is allowed to compile a hs-boot file to bytecode even
though that doesn't make sense (it always returns
Nothing::Maybe CompiledByteCode).
* Logic and grunt work is completely mixed. The frontend
and backend keeps checking what kind of input they're handling.
This makes it very hard to get an idea of what the functions
actually do.
* Extra work is performed when using a null code generator.
The new code refactors out the frontends (Haskell, Core), the
backends (Haskell, boot) and the code generators (one-shot, make,
nothing, interactive) and allows them to be combined in typesafe ways.
A one-shot compilation doesn't return new interfaces at all so we
don't need the _|_ space-leak hack. In 'make' mode (when not
targeting bytecode) the result doesn't contain
Nothing::Maybe CompiledByteCode. In interactive mode, the result
is always a CompiledByteCode. The code gens are completely separate
so compiling to Nothing doesn't perform any extra work.
DriverPipeline needs a bit of work before it can use the new
API.
Simon Marlow [Fri, 3 Mar 2006 13:31:35 +0000 (13:31 +0000)]
callerSaveVolatileRegs: fix the Nothing case
When the volatile regs attached to a CmmCall is Nothing, it means
"save everything", not "save nothing".
wolfgang.thaller@gmx.net [Thu, 9 Feb 2006 06:16:09 +0000 (06:16 +0000)]
Darwin/x86: Support __IMPORT segments in the Linker
wolfgang.thaller@gmx.net [Sun, 5 Feb 2006 16:26:18 +0000 (16:26 +0000)]
Darwin/x86 Mangler: Make sure each imported symbol stub gets a separate chunk.
wolfgang.thaller@gmx.net [Sun, 5 Feb 2006 16:24:53 +0000 (16:24 +0000)]
Darwin/x86: Print 64-bit literals in a way Apple understands.
wolfgang.thaller@gmx.net [Fri, 3 Feb 2006 03:52:20 +0000 (03:52 +0000)]
Darwin/x86: Handle IMPORT sections in mangler
simonpj@microsoft.com [Thu, 2 Mar 2006 17:52:47 +0000 (17:52 +0000)]
Fix free-variable finder
After a long hunt I discovered that the reason that GHC.Enum.eftIntFB
was being marked as a loop-breaker was the bizare behaviour of exprFreeVars,
which returned not only the free variables of an expression but also the
free variables of RULES attached to variables occuring in the expression!
This was clearly deliberate (the comment was CoreFVs rev 1.1 in 1999) but
I've removed it; I've left the comment with further notes in case there
turns out to be a Deep Reason.
Simon Marlow [Thu, 2 Mar 2006 17:05:05 +0000 (17:05 +0000)]
Make -split-objs work with --make
This turned out to be a lot easier than I thought. Just moving a few
bits of -split-objs support from the build system into the compiler
was enough. The only thing that Cabal needs to do in order to support
-split-objs now is to pass the names of the split objects rather than
the monolithic ones to 'ar'.
Simon Marlow [Thu, 2 Mar 2006 16:30:59 +0000 (16:30 +0000)]
fix for compiling the base package with --make
Simon Marlow [Thu, 2 Mar 2006 14:16:28 +0000 (14:16 +0000)]
replace several 'fromJust's with 'expectJust's
Simon Marlow [Thu, 2 Mar 2006 14:08:18 +0000 (14:08 +0000)]
minor cleanup; remove one use of fromJust
simonpj@microsoft.com [Thu, 2 Mar 2006 13:52:58 +0000 (13:52 +0000)]
Sigh: one more fix to undoing the erroneous patch
Lemmih [Wed, 1 Mar 2006 19:41:45 +0000 (19:41 +0000)]
Remember the free vars in HsRule.
simonpj@microsoft.com [Wed, 1 Mar 2006 17:56:00 +0000 (17:56 +0000)]
Complete undo of Simplify-the-IdInfo-before-any-RHSs
Simon Marlow [Wed, 1 Mar 2006 16:53:41 +0000 (16:53 +0000)]
Disable the NCG if GhcUnregisterised=YES
The NCG cannot be used in an unregisterised compiler, so there's no
point in including it.
simonpj@microsoft.com [Wed, 1 Mar 2006 16:14:23 +0000 (16:14 +0000)]
Undo patch Simplify-the-IdInfo-before-any-RHSs
Sadly the above patch wasn't right, because it fouls
up pre/postInlineUnconditionally. This patch puts
things back as they were functionally, but with slightly
tidied-up code.
Simon Marlow [Wed, 1 Mar 2006 16:07:01 +0000 (16:07 +0000)]
fix parse error
Simon Marlow [Wed, 1 Mar 2006 14:09:31 +0000 (14:09 +0000)]
fix compilation with older GHCs
Simon Marlow [Wed, 1 Mar 2006 13:07:36 +0000 (13:07 +0000)]
update docs w.r.t. dllMain() definition (EXTFUN is no more)
Simon Marlow [Wed, 1 Mar 2006 13:20:18 +0000 (13:20 +0000)]
add comments
Simon Marlow [Wed, 1 Mar 2006 13:19:48 +0000 (13:19 +0000)]
add ':set prompt' command
contributed by Neil Mitchell <ndmitchell@gmail.com>, with docs by me.
Simon Marlow [Wed, 1 Mar 2006 11:35:36 +0000 (11:35 +0000)]
Add support for Data.Char.generalCategory to libcompat
this is so that the stage1 compiler has proper support for Unicode.
Should fix these errors:
lexical error in string/character literal at character '\8759'
when building the stage2 compiler.
Simon Marlow [Tue, 28 Feb 2006 16:37:24 +0000 (16:37 +0000)]
takeMVar/putMVar were missing some write barriers when modifying a TSO
This relates to the recent introduction of clean/dirty TSOs, and the
consqeuent write barriers required. We were missing some write
barriers in the takeMVar/putMVar family of primops, when performing
the take/put directly on another TSO.
Fixes #705, and probably some test failures.
Simon Marlow [Tue, 28 Feb 2006 15:36:40 +0000 (15:36 +0000)]
A better x86_64 register mapping, with more argument registers.
Now that we can handle using C argument registers as global registers,
extend the x86_64 register mapping. We now have 5 integer argument
registers, 4 float, and 2 double (all caller-saves). This results in a
reasonable speedup on x86_64.
Simon Marlow [Tue, 28 Feb 2006 15:31:34 +0000 (15:31 +0000)]
filter the messages generated by gcc
Eliminate things like "warning: call-clobbered register used as global
register variable", which is an non-suppressible warning from gcc.
Simon Marlow [Tue, 28 Feb 2006 15:29:42 +0000 (15:29 +0000)]
Allow C argument regs to be used as global regs (R1, R2, etc.)
The problem here was that we generated C calls with expressions
involving R1 etc. as parameters. When some of the R registers are
also C argument registers, both GCC and the native code generator
generate incorrect code. The hacky workaround is to assign
problematic arguments to temporaries first; fortunately this works
with both GCC and the NCG, but we have to be careful not to undo this
with later optimisations (see changes to CmmOpt).
Simon Marlow [Tue, 28 Feb 2006 15:25:24 +0000 (15:25 +0000)]
pass arguments to unknown function calls in registers
We now have more stg_ap entry points: stg_ap_*_fast, which take
arguments in registers according to the platform calling convention.
This is faster if the function being called is evaluated and has the
right arity, which is the common case (see the eval/apply paper for
measurements).
We still need the stg_ap_*_info entry points for stack-based
application, such as an overflows when a function is applied to too
many argumnets. The stg_ap_*_fast functions actually just check for
an evaluated function, and if they don't find one, push the args on
the stack and invoke stg_ap_*_info. (this might be slightly slower in
some cases, but not the common case).
Simon Marlow [Tue, 28 Feb 2006 15:18:15 +0000 (15:18 +0000)]
fix live register annotations on foreign calls
fix one incorrect case, and made several more accurate
simonpj@microsoft.com [Tue, 28 Feb 2006 13:31:57 +0000 (13:31 +0000)]
Simplify the IdInfo before any RHSs
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Simplfy (i.e. substitute) the IdInfo of a recursive group of Ids
before looking at the RHSs of *any* of them. That way, the rules
are available throughout the letrec, which means we don't have to
be careful about function to put first.
Before, we just simplified the IdInfo of f before looking at f's RHS,
but that's not so good when f and g both have RULES, and both rules
mention the other.
This change makes things simpler, but shouldn't change performance.
simonpj@microsoft.com [Tue, 28 Feb 2006 11:45:02 +0000 (11:45 +0000)]
Add floating-point symbols to the list
Simon Marlow [Mon, 27 Feb 2006 15:38:28 +0000 (15:38 +0000)]
slightly better dependencies for GenApply.hs
Simon Marlow [Mon, 27 Feb 2006 15:28:22 +0000 (15:28 +0000)]
x86_64: include .type and .size directives in the output, for valgrind
kr.angelov@gmail.com [Wed, 22 Feb 2006 20:29:12 +0000 (20:29 +0000)]
The initStablePtrTable should be called before ACQUIRE_LOCK(&stable_mutex)
kr.angelov@gmail.com [Wed, 22 Feb 2006 20:17:21 +0000 (20:17 +0000)]
support LOCK_DEBUG for Windows
Simon Marlow [Mon, 27 Feb 2006 11:11:03 +0000 (11:11 +0000)]
mmap() errors on Darwin: use errorBelch/exit instead of barf()
The most likely cause is out-of-memory, not an RTS error.
Simon Marlow [Mon, 27 Feb 2006 10:59:39 +0000 (10:59 +0000)]
remove empty .SECONDARY target
This works around a problem with recent versions of GNU make that take
a long time when all targets are declared intermediate with
.SECONDARY. See
https://savannah.gnu.org/bugs/?func=detailitem&item_id=15584
for discussion of the GNU make issue.
claus.reinke@talk21.com [Sat, 25 Feb 2006 21:59:45 +0000 (21:59 +0000)]
these tables have four columns, not three
Lemmih [Sun, 26 Feb 2006 12:04:07 +0000 (12:04 +0000)]
Remove comment about imports and exports not being in the renamer result.