simonpj [Fri, 10 Oct 2003 12:42:19 +0000 (12:42 +0000)]
[project @ 2003-10-10 12:42:19 by simonpj]
GHC 5 hi-boot file
simonpj [Fri, 10 Oct 2003 09:39:34 +0000 (09:39 +0000)]
[project @ 2003-10-10 09:39:33 by simonpj]
Make rule importing work properly
simonpj [Fri, 10 Oct 2003 09:39:06 +0000 (09:39 +0000)]
[project @ 2003-10-10 09:39:06 by simonpj]
Fix hi-boot file for GHC 5xx
simonpj [Fri, 10 Oct 2003 07:34:35 +0000 (07:34 +0000)]
[project @ 2003-10-10 07:34:34 by simonpj]
Wibbles
stolz [Thu, 9 Oct 2003 16:57:17 +0000 (16:57 +0000)]
[project @ 2003-10-09 16:57:17 by stolz]
Hrmbl. []-wibble.
simonpj [Thu, 9 Oct 2003 15:38:24 +0000 (15:38 +0000)]
[project @ 2003-10-09 15:38:22 by simonpj]
Wibles
simonpj [Thu, 9 Oct 2003 14:31:05 +0000 (14:31 +0000)]
[project @ 2003-10-09 14:31:05 by simonpj]
Forgot to remove HsCore (now IfaceSyn)
stolz [Thu, 9 Oct 2003 13:59:33 +0000 (13:59 +0000)]
[project @ 2003-10-09 13:59:33 by stolz]
FreeBSD 4.X has an emtpy wctype.h, so test one of the affected
functions in Unicode.hsc if it's really there.
simonpj [Thu, 9 Oct 2003 13:17:09 +0000 (13:17 +0000)]
[project @ 2003-10-09 13:17:09 by simonpj]
Enable crudePprType without DEBUG
simonpj [Thu, 9 Oct 2003 13:11:31 +0000 (13:11 +0000)]
[project @ 2003-10-09 13:11:30 by simonpj]
Oops; forgot to add this entire directory!
simonpj [Thu, 9 Oct 2003 12:00:18 +0000 (12:00 +0000)]
[project @ 2003-10-09 12:00:18 by simonpj]
Add these two files to the preceding mega-commit
simonpj [Thu, 9 Oct 2003 11:59:43 +0000 (11:59 +0000)]
[project @ 2003-10-09 11:58:39 by simonpj]
-------------------------
GHC heart/lung transplant
-------------------------
This major commit changes the way that GHC deals with importing
types and functions defined in other modules, during renaming and
typechecking. On the way I've changed or cleaned up numerous other
things, including many that I probably fail to mention here.
Major benefit: GHC should suck in many fewer interface files when
compiling (esp with -O). (You can see this with -ddump-rn-stats.)
It's also some 1500 lines of code shorter than before.
** So expect bugs! I can do a 3-stage bootstrap, and run
** the test suite, but you may be doing stuff I havn't tested.
** Don't update if you are relying on a working HEAD.
In particular, (a) External Core and (b) GHCi are very little tested.
But please, please DO test this version!
------------------------
Big things
------------------------
Interface files, version control, and importing declarations
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* There is a totally new data type for stuff that lives in interface files:
Original names IfaceType.IfaceExtName
Types IfaceType.IfaceType
Declarations (type,class,id) IfaceSyn.IfaceDecl
Unfoldings IfaceSyn.IfaceExpr
(Previously we used HsSyn for type/class decls, and UfExpr for unfoldings.)
The new data types are in iface/IfaceType and iface/IfaceSyn. They are
all instances of Binary, so they can be written into interface files.
Previous engronkulation concering the binary instance of RdrName has
gone away -- RdrName is not an instance of Binary any more. Nor does
Binary.lhs need to know about the ``current module'' which it used to,
which made it specialised to GHC.
A good feature of this is that the type checker for source code doesn't
need to worry about the possibility that we might be typechecking interface
file stuff. Nor does it need to do renaming; we can typecheck direct from
IfaceSyn, saving a whole pass (module TcIface)
* Stuff from interface files is sucked in *lazily*, rather than being eagerly
sucked in by the renamer. Instead, we use unsafeInterleaveIO to capture
a thunk for the unfolding of an imported function (say). If that unfolding
is every pulled on, TcIface will scramble over the unfolding, which may
in turn pull in the interface files of things mentioned in the unfolding.
The External Package State is held in a mutable variable so that it
can be side-effected by this lazy-sucking-in process (which may happen
way later, e.g. when the simplifier runs). In effect, the EPS is a kind
of lazy memo table, filled in as we suck things in. Or you could think
of it as a global symbol table, populated on demand.
* This lazy sucking is very cool, but it can lead to truly awful bugs. The
intent is that updates to the symbol table happen atomically, but very bad
things happen if you read the variable for the table, and then force a
thunk which updates the table. Updates can get lost that way. I regret
this subtlety.
One example of the way it showed up is that the top level of TidyPgm
(which updates the global name cache) to be much more disciplined about
those updates, since TidyPgm may itself force thunks which allocate new
names.
* Version numbering in interface files has changed completely, fixing
one major bug with ghc --make. Previously, the version of A.f changed
only if A.f's type and unfolding was textually different. That missed
changes to things that A.f's unfolding mentions; which was fixed by
eagerly sucking in all of those things, and listing them in the module's
usage list. But that didn't work with --make, because they might have
been already sucked in.
Now, A.f's version changes if anything reachable from A.f (via interface
files) changes. A module with unchanged source code needs recompiling
only if the versions of any of its free variables changes. [This isn't
quite right for dictionary functions and rules, which aren't mentioned
explicitly in the source. There are extensive comments in module MkIface,
where all version-handling stuff is done.]
* We don't need equality on HsDecls any more (because they aren't used in
interface files). Instead we have a specialised equality for IfaceSyn
(eqIfDecl etc), which uses IfaceEq instead of Bool as its result type.
See notes in IfaceSyn.
* The horrid bit of the renamer that tried to predict what instance decls
would be needed has gone entirely. Instead, the type checker simply
sucks in whatever instance decls it needs, when it needs them. Easy!
Similarly, no need for 'implicitModuleFVs' and 'implicitTemplateHaskellFVs'
etc. Hooray!
Types and type checking
~~~~~~~~~~~~~~~~~~~~~~~
* Kind-checking of types is far far tidier (new module TcHsTypes replaces
the badly-named TcMonoType). Strangely, this was one of my
original goals, because the kind check for types is the Right Place to
do type splicing, but it just didn't fit there before.
* There's a new representation for newtypes in TypeRep.lhs. Previously
they were represented using "SourceTypes" which was a funny compromise.
Now they have their own constructor in the Type datatype. SourceType
has turned back into PredType, which is what it used to be.
* Instance decl overlap checking done lazily. Consider
instance C Int b
instance C a Int
These were rejected before as overlapping, because when seeking
(C Int Int) one couldn't tell which to use. But there's no problem when
seeking (C Bool Int); it can only be the second.
So instead of checking for overlap when adding a new instance declaration,
we check for overlap when looking up an Inst. If we find more than one
matching instance, we see if any of the candidates dominates the others
(in the sense of being a substitution instance of all the others);
and only if not do we report an error.
------------------------
Medium things
------------------------
* The TcRn monad is generalised a bit further. It's now based on utils/IOEnv.lhs,
the IO monad with an environment. The desugarer uses the monad too,
so that anything it needs can get faulted in nicely.
* Reduce the number of wired-in things; in particular Word and Integer
are no longer wired in. The latter required HsLit.HsInteger to get a
Type argument. The 'derivable type classes' data types (:+:, :*: etc)
are not wired in any more either (see stuff about derivable type classes
below).
* The PersistentComilerState is now held in a mutable variable
in the HscEnv. Previously (a) it was passed to and then returned by
many top-level functions, which was painful; (b) it was invariably
accompanied by the HscEnv. This change tidies up top-level plumbing
without changing anything important.
* Derivable type classes are treated much more like 'deriving' clauses.
Previously, the Ids for the to/from functions lived inside the TyCon,
but now the TyCon simply records their existence (with a simple boolean).
Anyone who wants to use them must look them up in the environment.
This in turn makes it easy to generate the to/from functions (done
in types/Generics) using HsSyn (like TcGenDeriv for ordinary derivings)
instead of CoreSyn, which in turn means that (a) we don't have to figure
out all the type arguments etc; and (b) it'll be type-checked for us.
Generally, the task of generating the code has become easier, which is
good for Manuel, who wants to make it more sophisticated.
* A Name now says what its "parent" is. For example, the parent of a data
constructor is its type constructor; the parent of a class op is its
class. This relationship corresponds exactly to the Avail data type;
there may be other places we can exploit it. (I made the change so that
version comparison in interface files would be a bit easier; but in
fact it tided up other things here and there (see calls to
Name.nameParent). For example, the declaration pool, of declararations
read from interface files, but not yet used, is now keyed only by the 'main'
name of the declaration, not the subordinate names.
* New types OccEnv and OccSet, with the usual operations.
OccNames can be efficiently compared, because they have uniques, thanks
to the hashing implementation of FastStrings.
* The GlobalRdrEnv is now keyed by OccName rather than RdrName. Not only
does this halve the size of the env (because we don't need both qualified
and unqualified versions in the env), but it's also more efficient because
we can use a UniqFM instead of a FiniteMap.
Consequential changes to Provenance, which has moved to RdrName.
* External Core remains a bit of a hack, as it was before, done with a mixture
of HsDecls (so that recursiveness and argument variance is still inferred),
and IfaceExprs (for value declarations). It's not thoroughly tested.
------------------------
Minor things
------------------------
* DataCon fields dcWorkId, dcWrapId combined into a single field
dcIds, that is explicit about whether the data con is a newtype or not.
MkId.mkDataConWorkId and mkDataConWrapId are similarly combined into
MkId.mkDataConIds
* Choosing the boxing strategy is done for *source* type decls only, and
hence is now in TcTyDecls, not DataCon.
* WiredIn names are distinguished by their n_sort field, not by their location,
which was rather strange
* Define Maybes.mapCatMaybes :: (a -> Maybe b) -> [a] -> [b]
and use it here and there
* Much better pretty-printing of interface files (--show-iface)
Many, many other small things.
------------------------
File changes
------------------------
* New iface/ subdirectory
* Much of RnEnv has moved to iface/IfaceEnv
* MkIface and BinIface have moved from main/ to iface/
* types/Variance has been absorbed into typecheck/TcTyDecls
* RnHiFiles and RnIfaces have vanished entirely. Their
work is done by iface/LoadIface
* hsSyn/HsCore has gone, replaced by iface/IfaceSyn
* typecheck/TcIfaceSig has gone, replaced by iface/TcIface
* typecheck/TcMonoType has been renamed to typecheck/TcHsType
* basicTypes/Var.hi-boot and basicTypes/Generics.hi-boot have gone altogether
wolfgang [Wed, 8 Oct 2003 10:37:25 +0000 (10:37 +0000)]
[project @ 2003-10-08 10:37:25 by wolfgang]
Remove apostrophe from #error directive text, as gcc doesn't like that,
even if the #error is ifdef'd out.
All other C compilers I know claim that this is correct C :-(.
merge to stable
wolfgang [Wed, 8 Oct 2003 09:42:35 +0000 (09:42 +0000)]
[project @ 2003-10-08 09:42:34 by wolfgang]
Mac OS X/PowerPC:
Learn to cope with out-of-range relative jumps.
PowerPC relative branch instructions have a 24 bit displacement field.
As PPC code is always 4-byte-aligned, this yields a +-32MB range.
If a particular imported symbol is outside this range, we have to redirect
the jump to a short piece of new code that just loads the 32bit absolute
address and jumps there.
panne [Sun, 5 Oct 2003 20:18:36 +0000 (20:18 +0000)]
[project @ 2003-10-05 20:18:36 by panne]
Unbreak the 2nd stage of non-threaded-RTS builds by #ifdefing out a
call to wakeBlockedWorkerThread. This should probably fixed more
cleanly by taking an OO view, i.e. always defining this function, but
doing nothing in the non-threaded case. The final decision on this
issue is left to the Masters of the Threads (tm)...
panne [Sun, 5 Oct 2003 20:14:49 +0000 (20:14 +0000)]
[project @ 2003-10-05 20:14:49 by panne]
Merged Ross' patch for Hugs:
Tweak to the FPTOOLS_HAVE_OPENGL: when testing for the GLUT lib,
include the GL/GLU/GLX libs just discovered. While most platforms
don't require this, mysteriously some (e.g. OpenBSD) do.
simonmar [Fri, 3 Oct 2003 13:14:53 +0000 (13:14 +0000)]
[project @ 2003-10-03 13:14:53 by simonmar]
Fix typo.
sof [Thu, 2 Oct 2003 22:31:49 +0000 (22:31 +0000)]
[project @ 2003-10-02 22:31:46 by sof]
Fix handling of unused-matches for parallel list comprs. e.g, for,
[ e | v1 <- e11 | v2 <- e21 ]
'e' wasn't considered part of v1 & v2's scope. Is now.
sof [Thu, 2 Oct 2003 19:44:09 +0000 (19:44 +0000)]
[project @ 2003-10-02 19:44:09 by sof]
parStmtErr: typo
sof [Thu, 2 Oct 2003 19:21:00 +0000 (19:21 +0000)]
[project @ 2003-10-02 19:20:59 by sof]
Extend -Werror's scope to also include the desugarer.
Note: -Werror doesn't give you the union of warnings from the renamer,
TC and desugarer before bailing out, but one pass at a time.
wolfgang [Wed, 1 Oct 2003 21:16:12 +0000 (21:16 +0000)]
[project @ 2003-10-01 21:16:12 by wolfgang]
Un-break non-threaded RTS
(hopefully; I have no time to test it right now)
sof [Wed, 1 Oct 2003 17:01:28 +0000 (17:01 +0000)]
[project @ 2003-10-01 17:01:28 by sof]
enableTimingStats():
bring back -Rghc-timing output when compiled with >= 4.11
(was >= 5.05, which looks unnecessarily restrictive.)
sof [Wed, 1 Oct 2003 16:45:10 +0000 (16:45 +0000)]
[project @ 2003-10-01 16:45:10 by sof]
outCLine: Use "#line n <filename>", not "# n <filename>". The latter
isn't ISO (and causes breakage when compiling output with
MSVC.)
wolfgang [Wed, 1 Oct 2003 10:57:44 +0000 (10:57 +0000)]
[project @ 2003-10-01 10:57:39 by wolfgang]
New implementation & changed type signature of forkProcess
forkProcess now has the following type:
forkProcess :: IO () -> IO ProcessID
forkProcessAll has been removed as it is unimplementable in the threaded RTS.
forkProcess using the old type (IO (Maybe ProcessID)) was impossible to
implement correctly in the non-threaded RTS and very hard to implement
in the threaded RTS.
The new type signature allows a clean and simple implementation.
wolfgang [Wed, 1 Oct 2003 10:49:09 +0000 (10:49 +0000)]
[project @ 2003-10-01 10:49:07 by wolfgang]
Threaded RTS:
Don't start new worker threads earlier than necessary.
After this commit, a Haskell program that uses neither forkOS nor forkIO is
really single-threaded (rather than using two OS threads internally).
Some details:
Worker threads are now only created when a capability is released, and
only when
(there are no worker threads)
&& (there are runnable Haskell threads ||
there are Haskell threads blocked on IO or threadDelay)
awaitEvent can now be called from bound thread scheduling loops
(so that we don't have to create a worker thread just to run awaitEvent)
wolfgang [Wed, 1 Oct 2003 10:36:49 +0000 (10:36 +0000)]
[project @ 2003-10-01 10:36:49 by wolfgang]
Make sure that the sequence
rts_lock();
rts_unlock(); /* (with nothing in between) */
doesn't crash the threaded RTS.
simonmar [Wed, 1 Oct 2003 09:08:10 +0000 (09:08 +0000)]
[project @ 2003-10-01 09:08:10 by simonmar]
rts_getBool: we should check the constructor tag instead of comparing
directly against False_closure and True_closure, since we might be
using the dynamically-linked versions of these.
This may or may not be the cause of bug [ 792761 ] rts_getBool: not a
Bool.
simonmar [Mon, 29 Sep 2003 11:03:29 +0000 (11:03 +0000)]
[project @ 2003-09-29 11:03:29 by simonmar]
oops, we need to include -fignore-interface-pragmas and
-fomit-interface-pragmas in the default set of options.
simonmar [Mon, 29 Sep 2003 10:49:59 +0000 (10:49 +0000)]
[project @ 2003-09-29 10:49:59 by simonmar]
Uncomment Alex version test: Alex 2.0 is now required to build GHC.
wolfgang [Sun, 28 Sep 2003 19:44:15 +0000 (19:44 +0000)]
[project @ 2003-09-28 19:44:14 by wolfgang]
More Mac OS X-specific gcc 3.3 fixes
merge to stable
panne [Fri, 26 Sep 2003 13:32:14 +0000 (13:32 +0000)]
[project @ 2003-09-26 13:32:14 by panne]
Warning police
panne [Fri, 26 Sep 2003 12:12:35 +0000 (12:12 +0000)]
[project @ 2003-09-26 12:12:35 by panne]
Warning police
panne [Fri, 26 Sep 2003 12:11:18 +0000 (12:11 +0000)]
[project @ 2003-09-26 12:11:18 by panne]
Added prototypes for __hscore_[gs]et_saved_termios to make Linker.c
happy and avoid warnings in RtsStartup.c
panne [Fri, 26 Sep 2003 09:26:13 +0000 (09:26 +0000)]
[project @ 2003-09-26 09:26:12 by panne]
Saving/restoring termios is only done for GHC
simonmar [Fri, 26 Sep 2003 09:17:28 +0000 (09:17 +0000)]
[project @ 2003-09-26 09:17:28 by simonmar]
Update Linker following changes to saved_termios.
simonpj [Fri, 26 Sep 2003 09:01:08 +0000 (09:01 +0000)]
[project @ 2003-09-26 09:01:08 by simonpj]
Better error trace when cat_evals crashes
panne [Thu, 25 Sep 2003 15:14:44 +0000 (15:14 +0000)]
[project @ 2003-09-25 15:14:41 by panne]
To fix dynamic linking issues with Hugs, access saved_termios via
getter/setter.
simonmar [Thu, 25 Sep 2003 09:19:23 +0000 (09:19 +0000)]
[project @ 2003-09-25 09:19:23 by simonmar]
Add saved_termios symbol
simonmar [Wed, 24 Sep 2003 13:20:03 +0000 (13:20 +0000)]
[project @ 2003-09-24 13:20:03 by simonmar]
remove docs for -fwith option
simonmar [Wed, 24 Sep 2003 13:04:58 +0000 (13:04 +0000)]
[project @ 2003-09-24 13:04:45 by simonmar]
The concensus seems to be that 'with' should go away now, after its
customary period of deprecation. Hugs has already removed it, so
we're following suit.
simonmar [Wed, 24 Sep 2003 11:06:54 +0000 (11:06 +0000)]
[project @ 2003-09-24 11:06:51 by simonmar]
Move forkOS_createThread into the RTS so its implementation can be
dependent on RTS_SUPPORTS_THREADS, which means we can provide a stub
implementation in the !RTS_SUPPORTS_THREADS case, and hence not depend
on pthread_create, which requires -lpthread. The upshot is that GHCi
now works again when !RTS_SUPPORTS_THREADS.
simonmar [Wed, 24 Sep 2003 10:32:12 +0000 (10:32 +0000)]
[project @ 2003-09-24 10:32:11 by simonmar]
If we change the terminal settings as a result of hSetBuffering or
hSetEcho, then restore them again in hs_exit(). This is just good
citizenship on Unixy platforms.
We *don't* just automatically save the terminal settings and restore
them at the end, because that would prevent implementing stty-like
programs in Haskell. This scheme is a compromise that hopefully DTRT
in most cases.
sof [Tue, 23 Sep 2003 17:07:39 +0000 (17:07 +0000)]
[project @ 2003-09-23 17:07:39 by sof]
wibble
sof [Tue, 23 Sep 2003 16:52:45 +0000 (16:52 +0000)]
[project @ 2003-09-23 16:52:44 by sof]
If the user explicitly did an instances-only import, i.e.,
"import Foo ()", don't emit an unused-import warning.
wolfgang [Tue, 23 Sep 2003 16:43:00 +0000 (16:43 +0000)]
[project @ 2003-09-23 16:43:00 by wolfgang]
Mac OS X uses .dylib instead of .so, recognize that properly.
simonmar [Tue, 23 Sep 2003 16:02:34 +0000 (16:02 +0000)]
[project @ 2003-09-23 16:02:34 by simonmar]
Change some statics to dynamics, and remove a couple of obsolete options.
simonmar [Tue, 23 Sep 2003 16:01:22 +0000 (16:01 +0000)]
[project @ 2003-09-23 16:01:22 by simonmar]
Some wibbles to the optimisation section.
simonmar [Tue, 23 Sep 2003 15:38:36 +0000 (15:38 +0000)]
[project @ 2003-09-23 15:38:35 by simonmar]
Add a BF_PINNED block flag, and attach it to blocks containing pinned
objects (in addition to the usual BF_LARGE).
In heapCensus, we now ignore blocks containing pinned objects, because
they might contain gaps, and in any case it isn't clear that we want
to include the whole block in a heap census, because much of it might
well be dead. Ignoring it isn't right either, though, so this patch
just fixes the crash and leaves a ToDo.
simonmar [Tue, 23 Sep 2003 15:31:02 +0000 (15:31 +0000)]
[project @ 2003-09-23 15:31:02 by simonmar]
Fix for clearing the evacuated flag on a block: don't throw away other
flag settings in the process.
simonpj [Tue, 23 Sep 2003 15:29:02 +0000 (15:29 +0000)]
[project @ 2003-09-23 15:29:02 by simonpj]
--------------------------
Much grunting about let-floating
--------------------------
We want to avoid putting bindings between the '=' of a defn and a '\':
let { f = let ... in \y-> ... } in ...
Reason: float-in often follows float-out, and it may then add yte
more bindings there, some of which may be strict. But f may by
not be marked as not-demanded (for other reasons: see the call to
zapDemandInfo in Simplify.completeLazyBind); and now the strict binding
may not be able to float out again. (Well, it triggers the ASSERT in
simplLazyBind.)
So this commit adds FloatOut.floatNonRecRhs (to complement floatRhs) which
is a big more vigorous about floating out.
But that in turn showed up a pile of gore to do with unlifted bindings.
We can't have them showing up at top level. After thrashing in the swamp
for a while, I eventually arranged that
let x# = e in b
(where x# has an unlifted type) is treated exactly like
case e of x# -> b
That is, it is never floated. Yes, we lose opportunities to float some
(very cheap! unlifted let-bindings are always cheap) out of a lambda,
but we're missing much bigger opportunities already. For example:
\x -> f (h y)
where h :: Int -> Int# is expensive. We'd like to float the (h y) outside
the \x, but we don't because it's unboxed. Possible solution: box it.
Anyway, that's for the future.
simonpj [Tue, 23 Sep 2003 15:15:03 +0000 (15:15 +0000)]
[project @ 2003-09-23 15:15:02 by simonpj]
--------------------------
Move demand-zapping code to where it belongs
--------------------------
A rather subtle point in the simplifier concerns the zapping of demand-info
when the RHS of a binding is a value. This used to be tucked away inside
IdInfo where it was hard to find. This commit moves the code to Simplify,
so it occurs where you'd look for it. Along with copious comments.
See the zapDemandInfo in Simplify.completeLazyBind
simonpj [Tue, 23 Sep 2003 15:10:43 +0000 (15:10 +0000)]
[project @ 2003-09-23 15:10:43 by simonpj]
Add more informative assertion
simonpj [Tue, 23 Sep 2003 15:10:23 +0000 (15:10 +0000)]
[project @ 2003-09-23 15:10:23 by simonpj]
Comment only
simonpj [Tue, 23 Sep 2003 15:09:56 +0000 (15:09 +0000)]
[project @ 2003-09-23 15:09:56 by simonpj]
Remove redundant where
simonpj [Tue, 23 Sep 2003 15:09:09 +0000 (15:09 +0000)]
[project @ 2003-09-23 15:09:09 by simonpj]
--------------------------
Make MachString literals a bit bigger
--------------------------
Up to now, unboxed string literals of up to 3 characters had
size 1, which means they are inlined in place of a variable.
That seems over-eager (duplication), so I've upped their size a bit.
simonmar [Tue, 23 Sep 2003 15:05:18 +0000 (15:05 +0000)]
[project @ 2003-09-23 15:05:18 by simonmar]
Fixes for the DEBUG case.
simonmar [Tue, 23 Sep 2003 14:33:05 +0000 (14:33 +0000)]
[project @ 2003-09-23 14:32:57 by simonmar]
- Convert many of the optimisation options into dynamic options (that is,
they can be mentioned in {-# OPTIONS #-} pragmas).
- Add a new way to specify constructor-field unboxing on a selective
basis. To tell the compiler to unbox a constructor field, do this:
data T = T !!Int
and GHC will store that field unboxed if possible. If it isn't possible
(say, because the field has a sum type) then the annotation is ignored.
The -funbox-strict-fields flag is now a dynamic flag, and has the same
effect as replacing all the '!' annotations with '!!'.
simonmar [Tue, 23 Sep 2003 14:25:48 +0000 (14:25 +0000)]
[project @ 2003-09-23 14:25:48 by simonmar]
Allow .so or .dll libraries to be named explicitly on the command line.
wolfgang [Sun, 21 Sep 2003 22:20:57 +0000 (22:20 +0000)]
[project @ 2003-09-21 22:20:51 by wolfgang]
Bound Threads
=============
Introduce a way to use foreign libraries that rely on thread local state
from multiple threads (mainly affects the threaded RTS).
See the file threads.tex in CVS at haskell-report/ffi/threads.tex
(not entirely finished yet) for a definition of this extension. A less formal
description is also found in the documentation of Control.Concurrent.
The changes mostly affect the THREADED_RTS (./configure --enable-threaded-rts),
except for saving & restoring errno on a per-TSO basis, which is also necessary
for the non-threaded RTS (a bugfix).
Detailed list of changes
------------------------
- errno is saved in the TSO object and restored when necessary:
ghc/includes/TSO.h, ghc/rts/Interpreter.c, ghc/rts/Schedule.c
- rts_mainLazyIO is no longer needed, main is no special case anymore
ghc/includes/RtsAPI.h, ghc/rts/RtsAPI.c, ghc/rts/Main.c, ghc/rts/Weak.c
- passCapability: a new function that releases the capability and "passes"
it to a specific OS thread:
ghc/rts/Capability.h ghc/rts/Capability.c
- waitThread(), scheduleWaitThread() and schedule() get an optional
Capability *initialCapability passed as an argument:
ghc/includes/SchedAPI.h, ghc/rts/Schedule.c, ghc/rts/RtsAPI.c
- Bound Thread scheduling (that's what this is all about):
ghc/rts/Schedule.h, ghc/rts/Schedule.c
- new Primop isCurrentThreadBound#:
ghc/compiler/prelude/primops.txt.pp, ghc/includes/PrimOps.h, ghc/rts/PrimOps.hc,
ghc/rts/Schedule.h, ghc/rts/Schedule.c
- a simple function, rtsSupportsBoundThreads, that returns true if THREADED_RTS
is defined:
ghc/rts/Schedule.h, ghc/rts/Schedule.c
- a new implementation of forkProcess (the old implementation stays in place
for the non-threaded case). Partially broken; works for the standard
fork-and-exec case, but not for much else. A proper forkProcess is
really next to impossible to implement:
ghc/rts/Schedule.c
- Library support for bound threads:
Control.Concurrent.
rtsSupportsBoundThreads, isCurrentThreadBound, forkOS,
runInBoundThread, runInUnboundThread
libraries/base/Control/Concurrent.hs, libraries/base/Makefile,
libraries/base/include/HsBase.h, libraries/base/cbits/forkOS.c (new file)
igloo [Sun, 21 Sep 2003 13:26:05 +0000 (13:26 +0000)]
[project @ 2003-09-21 13:26:05 by igloo]
Generalise the x86-64 hack to all 64-bit arches.
igloo [Sun, 21 Sep 2003 13:22:03 +0000 (13:22 +0000)]
[project @ 2003-09-21 13:22:01 by igloo]
Alpha fixes.
igloo [Sun, 21 Sep 2003 13:09:12 +0000 (13:09 +0000)]
[project @ 2003-09-21 13:09:12 by igloo]
Change IF_OS_darwin to IF_ARCH_powerpc so addImportNat is imported in
exactly the case in which it is used.
igloo [Sun, 21 Sep 2003 13:07:07 +0000 (13:07 +0000)]
[project @ 2003-09-21 13:07:07 by igloo]
Add cases for:
arm-unknown-linux
hppa-unknown-linux
m68k-unknown-linux
mips-unknown-linux
s390-ibm-linux
ross [Sat, 20 Sep 2003 17:26:49 +0000 (17:26 +0000)]
[project @ 2003-09-20 17:26:46 by ross]
Re-arrange the interface to TcMatches to allow typechecking of case
commands (part of arrow notation):
* replace the export of the internal tcGRHSs with a more specific
tcGRHSsPat for checking PatMonoBinds.
* generalize match contexts in the same way as stmt contexts, to include
a typechecker for the bodies of alts.
This should probably be reviewed, but I hope it can make it into STABLE
after a while.
ross [Sat, 20 Sep 2003 17:24:47 +0000 (17:24 +0000)]
[project @ 2003-09-20 17:24:47 by ross]
fixes to desugaring of arrow notation:
* fix free variable calculation for if's
* various fixes for case
please merge to STABLE
wolfgang [Fri, 19 Sep 2003 18:56:00 +0000 (18:56 +0000)]
[project @ 2003-09-19 18:56:00 by wolfgang]
POSIX threads should be pthread_detach-ed after they are created.
Otherwise they'll stick around waiting for a pthread_join.
(This wasn't really a problem because our worker threads never exit anyway).
simonmar [Fri, 19 Sep 2003 15:58:00 +0000 (15:58 +0000)]
[project @ 2003-09-19 15:58:00 by simonmar]
The whole family of index<blah>OffForeignPtr# primops has been broken
for some time now. This commit fixes them.
I'm tempted to get rid of them altogether, since arguably the
withForeignPtr interface subsumes all this. But if you want to index
off a ForeignPtr in pure code, you have to use unsafePerformIO, which
is hard to optimise away (GHC doesn't do it), so these primops still
have their uses.
simonmar [Fri, 19 Sep 2003 09:12:22 +0000 (09:12 +0000)]
[project @ 2003-09-19 09:12:22 by simonmar]
Be a bit more honest about how easy it is to port the linker.
simonmar [Fri, 19 Sep 2003 09:04:09 +0000 (09:04 +0000)]
[project @ 2003-09-19 09:04:09 by simonmar]
Add irix_TARGET_OS support.
sof [Wed, 17 Sep 2003 21:20:16 +0000 (21:20 +0000)]
[project @ 2003-09-17 21:20:16 by sof]
usage_text[]: -k doc wibble
panne [Wed, 17 Sep 2003 08:39:26 +0000 (08:39 +0000)]
[project @ 2003-09-17 08:39:26 by panne]
Simplified my previous quick-fix-after-some-beers
mthomas [Wed, 17 Sep 2003 04:35:01 +0000 (04:35 +0000)]
[project @ 2003-09-17 04:35:01 by mthomas]
Switch examples on/off
panne [Tue, 16 Sep 2003 17:50:15 +0000 (17:50 +0000)]
[project @ 2003-09-16 17:50:15 by panne]
Make "one of the most hammered bits in the whole compiler" (quotation
from the source code :-) compile without _ccall_
ross [Tue, 16 Sep 2003 17:09:53 +0000 (17:09 +0000)]
[project @ 2003-09-16 17:09:53 by ross]
CasmTarget is gone
simonmar [Tue, 16 Sep 2003 13:06:21 +0000 (13:06 +0000)]
[project @ 2003-09-16 13:06:21 by simonmar]
-funfold-casms-in-hi-file is no more.
simonmar [Tue, 16 Sep 2003 13:03:49 +0000 (13:03 +0000)]
[project @ 2003-09-16 13:03:37 by simonmar]
Legacy Removal
~~~~~~~~~~~~~~
The following features have been consigned to the bit bucket:
_ccall_
_casm_
``....'' (lit-lits)
the CCallable class
the CReturnable class
sof [Mon, 15 Sep 2003 20:39:38 +0000 (20:39 +0000)]
[project @ 2003-09-15 20:39:38 by sof]
factor out code that handles depositing of work items on the
thread pool's request queue.
- when it looks as if a new worker thread needs to be created, give
up our quantum first in the hope that this might at the last minute
turn up more idle worker threads.
- add comment re: trimming pool size.
Merged to STABLE eventually; I may continue tinkering with this code
some more over the next day or two.
simonmar [Mon, 15 Sep 2003 14:20:45 +0000 (14:20 +0000)]
[project @ 2003-09-15 14:20:45 by simonmar]
Update comment for GhcUnregisterised.
wolfgang [Sun, 14 Sep 2003 22:02:29 +0000 (22:02 +0000)]
[project @ 2003-09-14 22:02:29 by wolfgang]
comment wibble
(merge to stable)
chak [Sun, 14 Sep 2003 13:50:58 +0000 (13:50 +0000)]
[project @ 2003-09-14 13:50:57 by chak]
* Corrected some outdated comments re variables and type checking
* Added some more details about type checking
dons [Sun, 14 Sep 2003 09:04:40 +0000 (09:04 +0000)]
[project @ 2003-09-14 09:04:40 by dons]
sparc-unknown-openbsd exists and is supported.
Also, we run on Solaris 2.6 as well as 2.7.
matthewc [Sat, 13 Sep 2003 11:48:29 +0000 (11:48 +0000)]
[project @ 2003-09-13 11:48:29 by matthewc]
Update IA64 status (supported except no NCG)
sof [Fri, 12 Sep 2003 16:32:13 +0000 (16:32 +0000)]
[project @ 2003-09-12 16:32:13 by sof]
delayzh_fast: comment only
sof [Fri, 12 Sep 2003 16:26:05 +0000 (16:26 +0000)]
[project @ 2003-09-12 16:26:05 by sof]
- Sleep()'s resolution is millisecs, not microsecs.
- adopt a more agressive policy for augmenting the thread pool
to handle incoming requests (see code comments for details.)
The previous policy ran the risk of starvation in rare (and hard
to reproduce) cases, as spotted after having chased a bug
for two days.
Merge to STABLE
sof [Fri, 12 Sep 2003 16:16:43 +0000 (16:16 +0000)]
[project @ 2003-09-12 16:16:43 by sof]
- awaitRequests() comments
- code reformatting
Merge to STABLE
sof [Fri, 12 Sep 2003 14:42:36 +0000 (14:42 +0000)]
[project @ 2003-09-12 14:42:36 by sof]
comment wibble
simonmar [Fri, 12 Sep 2003 09:46:37 +0000 (09:46 +0000)]
[project @ 2003-09-12 09:46:37 by simonmar]
Ignore lines containing
#pragma .*
generated by GCC 3.3's CPP on MacOS X, apparently.
simonpj [Thu, 11 Sep 2003 16:46:15 +0000 (16:46 +0000)]
[project @ 2003-09-11 16:46:15 by simonpj]
Make sure that exprIsTrivial responds "False" to
(scc "foo" x)
We do not treat (_scc_ "foo" x) as trivial, because
a) it really generates code, (and a heap object when it's
a function arg) to capture the cost centre
b) see the note [SCC-and-exprIsTrivial] in Simplify.simplLazyBind
wolfgang [Thu, 11 Sep 2003 15:36:37 +0000 (15:36 +0000)]
[project @ 2003-09-11 15:36:37 by wolfgang]
The FP_CHECK_CONSTS test for the errno constants requires stdio.h to be
included, at least on Mac OS X.
MERGE TO STABLE.
wolfgang [Thu, 11 Sep 2003 15:12:25 +0000 (15:12 +0000)]
[project @ 2003-09-11 15:12:25 by wolfgang]
Mac OS X:
Bypass the dlfcn compatibility layer in lookupSymbol, use Apple's
NSModule functions directly instead. This protects us from differences
between different implementations of the dlcompat library (regarding
treatment of prefixed underscores).
Note that the compatibility layer is still used in addDLL (it's needed by
the POSIX library anyway).
Also, add a little more sanity checking (checkProddableBlock) to the Mach-O
linker itself.
MERGE TO STABLE
simonmar [Thu, 11 Sep 2003 14:34:25 +0000 (14:34 +0000)]
[project @ 2003-09-11 14:34:24 by simonmar]
Document -fth and -fimplicit-params
simonpj [Thu, 11 Sep 2003 14:20:40 +0000 (14:20 +0000)]
[project @ 2003-09-11 14:20:40 by simonpj]
--------------------------
Allow recursive dictionaries
--------------------------
In response to various bleatings, here's a lovely fix that involved simply
inverting two lines of code, to allow recursive dictionaries. Here's
the comment. (typecheck/should_run/tc030 tests it)
Note [RECURSIVE DICTIONARIES]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Consider
data D r = ZeroD | SuccD (r (D r));
instance (Eq (r (D r))) => Eq (D r) where
ZeroD == ZeroD = True
(SuccD a) == (SuccD b) = a == b
_ == _ = False;
equalDC :: D [] -> D [] -> Bool;
equalDC = (==);
We need to prove (Eq (D [])). Here's how we go:
d1 : Eq (D [])
by instance decl, holds if
d2 : Eq [D []]
where d1 = dfEqD d2
by instance decl of Eq, holds if
d3 : D []
where d2 = dfEqList d2
d1 = dfEqD d2
But now we can "tie the knot" to give
d3 = d1
d2 = dfEqList d2
d1 = dfEqD d2
and it'll even run! The trick is to put the thing we are trying to prove
(in this case Eq (D []) into the database before trying to prove its
contributing clauses.
simonpj [Thu, 11 Sep 2003 14:18:38 +0000 (14:18 +0000)]
[project @ 2003-09-11 14:18:38 by simonpj]
Add comments, change a WARN to an ASSERT
simonpj [Thu, 11 Sep 2003 13:41:38 +0000 (13:41 +0000)]
[project @ 2003-09-11 13:41:38 by simonpj]
Undo bogus claim that
_scc_ "foo" x == x
This just isn't right in general, for example when x is a
top-level function.
simonmar [Thu, 11 Sep 2003 10:36:56 +0000 (10:36 +0000)]
[project @ 2003-09-11 10:36:56 by simonmar]
HEAD is now 6.3
simonmar [Thu, 11 Sep 2003 10:35:28 +0000 (10:35 +0000)]
[project @ 2003-09-11 10:35:28 by simonmar]
When setting TARGETPLATFORM, we should also set foo_TARGET_ARCH,
bar_TARGET_OS, etc.
simonmar [Thu, 11 Sep 2003 10:26:31 +0000 (10:26 +0000)]
[project @ 2003-09-11 10:26:31 by simonmar]
Add missing 'cd T' to the porting instructions.
simonmar [Thu, 11 Sep 2003 09:29:22 +0000 (09:29 +0000)]
[project @ 2003-09-11 09:29:22 by simonmar]
The reify keywords should be valid when template haskell is turned on.
sof [Thu, 11 Sep 2003 05:05:34 +0000 (05:05 +0000)]
[project @ 2003-09-11 05:05:34 by sof]
hGetStringBuffer: open file in binary mode
sof [Thu, 11 Sep 2003 00:58:02 +0000 (00:58 +0000)]
[project @ 2003-09-11 00:58:02 by sof]
Fix race condition re: WorkItems and SubmitWork().
It is unsafe to access a WorkItem after it has been queued, since
a worker thread may have already serviced (and freed) it.
Hence, return request IDs without looking at the WorkItem.
If desired, this one could be merged to STABLE.