Simon Marlow [Thu, 19 Apr 2007 14:19:05 +0000 (14:19 +0000)]
we weren't adding breakpoints on parenthesised expressions
Simon Marlow [Thu, 19 Apr 2007 09:49:09 +0000 (09:49 +0000)]
Get the InteractiveContext right when stopped at a breakpoint
we shouldn't be binding 'it' until the computation has actually finished.
Simon Marlow [Thu, 19 Apr 2007 09:48:06 +0000 (09:48 +0000)]
more layering cleanup: BreakArray should come from GHC
Simon Marlow [Wed, 18 Apr 2007 14:42:01 +0000 (14:42 +0000)]
update the help text
Pepe Iborra [Thu, 19 Apr 2007 11:53:37 +0000 (11:53 +0000)]
add some DEBUG assertions
Pepe Iborra [Thu, 19 Apr 2007 11:52:20 +0000 (11:52 +0000)]
When possible, replace unification by matching in the RTTI steps
(RTTI is used in the :print command)
This gives a decent efficiency improvement
Pepe Iborra [Sat, 14 Apr 2007 17:30:46 +0000 (17:30 +0000)]
:print command - Do not compute all the custom printers, only the first one matching
Pepe Iborra [Fri, 30 Mar 2007 09:19:18 +0000 (09:19 +0000)]
Add GhciMonad to the package.conf.in Modules list
When I factored the GhciMonad out of InteractiveUI.hs, I forgot to expose it in the ghc package
simonpj@microsoft.com [Wed, 18 Apr 2007 16:05:19 +0000 (16:05 +0000)]
Fix bat-script generation for MSys
The bat-script generation was using the wrong paths, in
ghc-inplace
ghc-pkg
hsc2hs
plus there was a double-backslah in the latter two which was wrong.
This patch fixes both. See "MSys Note 3" in compiler/Makefile
Ian Lynagh [Wed, 18 Apr 2007 15:55:22 +0000 (15:55 +0000)]
Pass configure arguments to the library configure scripts
Simon Marlow [Wed, 18 Apr 2007 14:22:17 +0000 (14:22 +0000)]
Add support for breaking by function name: ':break foo'
This is a bit hacky; it grabs the source location from the Name and
tries to set a breakpoint at that location, which in most cases
should be the breakpoint covering the whole definition.
Simon Marlow [Wed, 18 Apr 2007 14:20:36 +0000 (14:20 +0000)]
improve completion for debugger commands
Simon Marlow [Wed, 18 Apr 2007 14:20:08 +0000 (14:20 +0000)]
unused import
Simon Marlow [Wed, 18 Apr 2007 13:41:16 +0000 (13:41 +0000)]
Restore the interactive context when resuming a breakpoint
So that we don't accumulate bindings from previous breakpoints, which
could lead to a space leak.
Simon Marlow [Wed, 18 Apr 2007 13:40:51 +0000 (13:40 +0000)]
remove dead code
Simon Marlow [Wed, 18 Apr 2007 13:38:56 +0000 (13:38 +0000)]
add ':show context' which lists the current stack of breakpoint contexts
Simon Marlow [Wed, 18 Apr 2007 13:38:24 +0000 (13:38 +0000)]
handle out-of-range lines in :break more gracefully
Simon Marlow [Wed, 18 Apr 2007 12:49:48 +0000 (12:49 +0000)]
small cleanup: showForUser -> printForUser, eliminate some duplicate code
Ian Lynagh [Wed, 18 Apr 2007 12:45:36 +0000 (12:45 +0000)]
Check we have all the corelibs when we boot
Simon Marlow [Wed, 18 Apr 2007 12:41:24 +0000 (12:41 +0000)]
add missing module
Simon Marlow [Wed, 18 Apr 2007 11:47:00 +0000 (11:47 +0000)]
Various cleanups and improvements to the breakpoint support
- move parts of the debugger implementation below the GHC API where
they belong. There is still more in Debugger that violates the
layering, hopefully I'll get to that later.
- instead of returning an IO action from runStmt for resuming,
return a ResumeHandle that is passed to GHC.resume.
- breakpoints now return [Name] which is displayed in the same
way as when a binding statement is executed.
- :load, :add, :reload now clear the active breakpoints and context
- :break gives a sensible error when used on a non-interpreted module
- export breakpoint-related types from GHC
- remove a bunch of layer-violating imports from InteractiveUI
- remove some more vestiges of the old breakpoint code (topLevel in
the GHCi state).
- remove TickTree and use a simple array instead, cached per module
Simon Marlow [Wed, 18 Apr 2007 11:25:11 +0000 (11:25 +0000)]
add module header
Simon Marlow [Tue, 17 Apr 2007 14:35:12 +0000 (14:35 +0000)]
remove extraneous "+1"; column numbers start at zero
Ian Lynagh [Wed, 18 Apr 2007 11:31:22 +0000 (11:31 +0000)]
Add distclean target for libraries/ (== clean target)
Tyson Whitehead [Tue, 10 Apr 2007 14:17:09 +0000 (14:17 +0000)]
Distinguish between userError (i.e., deliberate failure) and other immediate and embedded exceptions for TH splices for trac #1265
Simon Marlow [Tue, 17 Apr 2007 14:24:58 +0000 (14:24 +0000)]
Re-working of the breakpoint support
This is the result of Bernie Pope's internship work at MSR Cambridge,
with some subsequent improvements by me. The main plan was to
(a) Reduce the overhead for breakpoints, so we could enable
the feature by default without incurrent a significant penalty
(b) Scatter more breakpoint sites throughout the code
Currently we can set a breakpoint on almost any subexpression, and the
overhead is around 1.5x slower than normal GHCi. I hope to be able to
get this down further and/or allow breakpoints to be turned off.
This patch also fixes up :print following the recent changes to
constructor info tables. (most of the :print tests now pass)
We now support single-stepping, which just enables all breakpoints.
:step <expr> executes <expr> with single-stepping turned on
:step single-steps from the current breakpoint
The mechanism is quite different to the previous implementation. We
share code with the HPC (haskell program coverage) implementation now.
The coverage pass annotates source code with "tick" locations which
are tracked by the coverage tool. In GHCi, each "tick" becomes a
potential breakpoint location.
Previously breakpoints were compiled into code that magically invoked
a nested instance of GHCi. Now, a breakpoint causes the current
thread to block and control is returned to GHCi.
See the wiki page for more details and the current ToDo list:
http://hackage.haskell.org/trac/ghc/wiki/NewGhciDebugger
Simon Marlow [Tue, 17 Apr 2007 09:25:59 +0000 (09:25 +0000)]
remove the ITBL_SIZE constants which were wrong, but fortunately unused
Simon Marlow [Tue, 17 Apr 2007 09:25:26 +0000 (09:25 +0000)]
con_desc should be an OFFSET_FIELD
Simon Marlow [Mon, 16 Apr 2007 08:27:32 +0000 (08:27 +0000)]
fix building with pre-6.4
Ian Lynagh [Mon, 16 Apr 2007 21:13:42 +0000 (21:13 +0000)]
Change tabs to spaces in string literals
Ian Lynagh [Mon, 16 Apr 2007 19:15:24 +0000 (19:15 +0000)]
Remove whitespace, mostly tabs, from string literals
Simon Marlow [Mon, 16 Apr 2007 14:22:23 +0000 (14:22 +0000)]
MERGE: another attempt at a workaround for #1110 (Vista bug)
now instead of setting GCC_EXEC_PREFIX, we just add the appropriate
gcc-lib directory to the front of PATH before invoking gcc.
Simon Marlow [Mon, 16 Apr 2007 14:19:02 +0000 (14:19 +0000)]
MERGE: Fix a few uses of the wrong return convention for the scheduler
We changed the convention a while ago so that BaseReg is returned to
the scheduler in R1, because BaseReg may change during the run of a
thread, e.g. during a foreign call. A few places got missed,
mostly for very rare events.
Should fix concprog001, although I'm not able to reliably reproduce
the failure.
Ian Lynagh [Mon, 16 Apr 2007 13:24:21 +0000 (13:24 +0000)]
stm doesn't need to be a core-package
Ian Lynagh [Mon, 16 Apr 2007 13:23:32 +0000 (13:23 +0000)]
Split objects when building libraries (if SplitObjs is YES)
Simon Marlow [Mon, 16 Apr 2007 11:04:33 +0000 (11:04 +0000)]
tab, verttab, formfeed, and CR are not allowed in strings
See #1277
Simon Marlow [Mon, 16 Apr 2007 13:04:57 +0000 (13:04 +0000)]
Add missing special case for GHC.Prim
The special cases for GHC.Prim are a bit fragile. We were relying on
(a) the base package to be already registered and (b) the base package
not to be hidden. These used to be true with the old library build
system, but aren't true now. I'm still not sure why we aren't seeing
failures at the moment, but this patch at least fixes the build with
'setup makefile'.
Ian Lynagh [Sun, 15 Apr 2007 16:27:17 +0000 (16:27 +0000)]
Don't try to install docs stuff if NO_HADDOCK_DOCS=YES
Ian Lynagh [Sun, 15 Apr 2007 16:23:15 +0000 (16:23 +0000)]
Implement ifBuildable
ifBuildable only runs a command it is given if the library in . either
must be built (core-package - readline) or is buildable.
wolfgang.thaller@gmx.net [Sat, 14 Apr 2007 21:40:27 +0000 (21:40 +0000)]
make opt_HiVersion an Integer instead of Int to prevent overflow
When a snapshot version number is included, opt_HiVersion tends to exceed the range of a 32bit Int.
MERGE TO STABLE
Ian Lynagh [Fri, 13 Apr 2007 23:05:55 +0000 (23:05 +0000)]
Allow ProjectTags to be specified in mk/build.mk
ProjectTags is expected to be of the form -tag1-tag2 (i.e. the same as
Cabal tags). These are appended to the GHC version number.
wolfgang.thaller@gmx.net [Thu, 12 Apr 2007 21:47:01 +0000 (21:47 +0000)]
Fix a typo related to i386 PIC code generation
A recent patch accidentally had x86_TARGET_ARCH instead of i386_TARGET_ARCH.
wolfgang.thaller@gmx.net [Thu, 12 Apr 2007 21:45:15 +0000 (21:45 +0000)]
Darwin/x86_64 linker support
Initial support for loading x86_64 Mach-O files
Ian Lynagh [Thu, 12 Apr 2007 22:36:36 +0000 (22:36 +0000)]
autoreconf -> sh boot
wolfgang.thaller@gmx.net [Thu, 12 Apr 2007 21:53:13 +0000 (21:53 +0000)]
Darwin/i386 NCG: fix assembly syntax in symbol stubs
In i386 position-independent symbol stubs, the NCG used to print
jmp %edx
instead of
jmp *%edx
Apple's assembler used to silently accept this, but has recently started to print warnings about it.
MERGE TO STABLE.
wolfgang.thaller@gmx.net [Thu, 12 Apr 2007 21:17:12 +0000 (21:17 +0000)]
Darwin Linker: Do not add local symbols to lochash
... so that GHCi doesn't complain about duplicate symbols when two C modules define the same static variable.
MERGE TO STABLE.
wolfgang.thaller@gmx.net [Thu, 12 Apr 2007 21:01:55 +0000 (21:01 +0000)]
Handle Weak Definitions in the Darwin Linker
The __i686.get_pc_thunk symbols generated by gcc's PIC code generator are weak definitions that appear in every object file, so we need to deal with them.
MERGE TO STABLE.
Ian Lynagh [Thu, 12 Apr 2007 22:30:14 +0000 (22:30 +0000)]
Check boot seems to have been run before we let make proceed
Simon Marlow [Thu, 12 Apr 2007 13:21:15 +0000 (13:21 +0000)]
wibble to prep-bin-dist-mingw target
Simon Marlow [Thu, 12 Apr 2007 13:17:02 +0000 (13:17 +0000)]
tidy up the binary-dist targets a bit more
Simon Marlow [Wed, 11 Apr 2007 14:57:36 +0000 (14:57 +0000)]
further tweak the comments
Simon Marlow [Wed, 11 Apr 2007 14:51:55 +0000 (14:51 +0000)]
fix comment
Simon Marlow [Wed, 11 Apr 2007 14:48:25 +0000 (14:48 +0000)]
do the right thing by default with a current mingw
and hopefully be a bit cleverer about finding things automatically.
Simon Marlow [Thu, 12 Apr 2007 13:13:27 +0000 (13:13 +0000)]
MERGE: add prep-bin-dist-mingw to binary-dist target, and add a separate target for
publish-binary-dist
Simon Marlow [Thu, 12 Apr 2007 13:10:12 +0000 (13:10 +0000)]
MERGE: fixes to prep-bin-dist-mingw, and add separate rule to tar the bindist
Simon Marlow [Wed, 11 Apr 2007 14:52:35 +0000 (14:52 +0000)]
call prep-bin-dist-mingw as part of binary-dist, before we make the tarball
Ian Lynagh [Wed, 11 Apr 2007 21:38:33 +0000 (21:38 +0000)]
Remove redundant import
Simon Marlow [Wed, 11 Apr 2007 10:18:02 +0000 (10:18 +0000)]
Rationalise GhcMode, HscTarget and GhcLink
This patch cleans up the GHC API, and adds some functionality: we can
now compile to object code inside GHCi.
Previously we had:
data GhcMode
= BatchCompile
| Interactive
| OneShot
| JustTypecheck
| MkDepend
data HscTarget
= HscC
| HscAsm
| HscJava
| HscInterpreted
| HscNothing
There was redundancy here; if GhcMode is Interactive, then only
HscInterpreted makes sense, and JustTypecheck required HscNothing.
Now we have:
data GhcMode
= CompManager -- ^ --make, GHCi, etc.
| OneShot -- ^ ghc -c Foo.hs
| MkDepend -- ^ ghc -M, see Finder for why we need this
and HscTarget remains as before.
Previously GhcLink looked like this:
data GhcLink = NoLink | StaticLink
Now we have:
data GhcLink = NoLink | LinkBinary | LinkInMemory
The idea being that you can have an HscTarget of HscAsm (for example)
and still link in memory.
There are two new flags:
-fobject-code selects object code as the target (selects
either -fasm or -fvia-C, whichever is the default)
This can be usd with ':set' in GHCi, or on the command line.
-fbyte-code sets byte-code as the target. Only works in GHCi.
One day maybe this could save the byte code in a file
when used outside GHCi.
(names chosen for consistency with -fno-code).
Changes to the GHC API: newSession no longer takes the GhcMode
argument. The GhcMode defaults to CompManager, which is usually what
you want. To do JustTypecheck now, just set hscTarget to HscNothing.
Ian Lynagh [Wed, 11 Apr 2007 01:22:58 +0000 (01:22 +0000)]
Use "$@" rather than $* when calling things in darcs-all
Ian Lynagh [Wed, 11 Apr 2007 00:25:16 +0000 (00:25 +0000)]
Build library Setup.hs's with -Wall
Ian Lynagh [Tue, 10 Apr 2007 22:03:06 +0000 (22:03 +0000)]
parsec, regex-base, regex-compat, regex-posix are no longer core-packages
Ian Lynagh [Tue, 10 Apr 2007 22:00:15 +0000 (22:00 +0000)]
Replace genprimopcode's parsec parser with an alex+happy parser
This use was the only thing keeping parsec in core-packages, and
we already have a dependency on alex+happy anyway.
Ian Lynagh [Tue, 10 Apr 2007 21:56:47 +0000 (21:56 +0000)]
Don't use regexps in the GHC sources
3 small regexps were responsible for pulling 3 packages into core-packages.
The new code should also do a better job of hiding
"call-clobbered register used" warnings.
Ian Lynagh [Tue, 10 Apr 2007 21:52:52 +0000 (21:52 +0000)]
Use a boot script instead of having autoreconf recurse
It used to be the case that
autoreconf
in the root would also autoreconf in any libraries that need it, and
./configure
in the root would also configure all the libraries.
However, cabal now configures the libraries, so they were getting
configured twice.
Thus now a small shellscript, boot, autoreconfs the root and all libraries
that need it, and ./configure in the root doesn't configure the libraries.
Ian Lynagh [Mon, 9 Apr 2007 13:57:34 +0000 (13:57 +0000)]
Tweak AC_MSG_RESULTs
Ian Lynagh [Mon, 9 Apr 2007 13:46:40 +0000 (13:46 +0000)]
Allow the version date to be overridden with VERSION_DATE
Ian Lynagh [Fri, 6 Apr 2007 19:04:59 +0000 (19:04 +0000)]
Use cp -R rather than cp -a for portability reasons
Ian Lynagh [Fri, 6 Apr 2007 15:18:22 +0000 (15:18 +0000)]
Fixes for building the libraries with cabal on Windows
* configure can be told where ld is
* make an hsc2hs-inplace.bat
* tell Setup configure about foo.bar rather than foo on Windows
* tell Setup configure to pass a --with-cc=$(CC) argument to ./configure
Aaron Tomb [Mon, 13 Nov 2006 23:01:32 +0000 (23:01 +0000)]
Fix external core syntax (though not full compilation)
This patch updates the External Core creator, pretty-printer, and parser to
agree on a concrete syntax for External Core, including the constructs
required by the change to System FC. Code to create valid ASTs from External
Core files will come later, as will bits for renaming, typechecking, and
desugaring.
Ian Lynagh [Fri, 6 Apr 2007 00:11:37 +0000 (00:11 +0000)]
Remove code that is dead, as we require __GLASGOW_HASKELL__ >= 504
Ian Lynagh [Fri, 16 Mar 2007 17:00:03 +0000 (17:00 +0000)]
Don't break when asked to install-docs
(we don't actually do anything useful either, because Cabal doesn't have
an install-docs option).
Ian Lynagh [Fri, 16 Mar 2007 16:59:57 +0000 (16:59 +0000)]
Add a comment
Ian Lynagh [Sat, 10 Mar 2007 01:25:58 +0000 (01:25 +0000)]
Make building binary dists work with cabalised libraries
Ian Lynagh [Thu, 8 Mar 2007 16:32:47 +0000 (16:32 +0000)]
Build the libraries with cabal
red5_2@hotmail.com [Sun, 1 Apr 2007 16:31:32 +0000 (16:31 +0000)]
fix adjustor generation on ia64 (test case ffi009)
Some fixes to adjustor functions. The 8-byte address returned by the
allocator is adjusted to be aligned to 16-byte boundaries. Fixed a typo
in inserting an immediate address into an instruction.
This fixes the calls to 5-argument and 6-argument functions in ffi009.
Some functions still break. I suspect it's related to passing arguments on
the stack.
red5_2@hotmail.com [Tue, 27 Mar 2007 04:18:11 +0000 (04:18 +0000)]
save two more FP registers on ia64
Save/restore two more registers in StgCRun(). The extra
registers are used by ffi009.hs, when compiling with gcc 4.1.2.
Simon Marlow [Wed, 4 Apr 2007 15:50:01 +0000 (15:50 +0000)]
add a safety net to avoid generating bogus code
Simon Marlow [Wed, 4 Apr 2007 14:10:13 +0000 (14:10 +0000)]
add comments about ticky RTS ways
Simon Marlow [Wed, 4 Apr 2007 14:08:05 +0000 (14:08 +0000)]
slight doc wibble for the -r flag
Simon Marlow [Wed, 4 Apr 2007 10:30:27 +0000 (10:30 +0000)]
MERGE: Fix bug exposed by conc052.
A thread that was blocked on a blackhole but can now be woken up could
possibly be treated as unreachable by the GC, and sent the
NonTermination exception.
This can give rise to spurious <<loop>>s in concurrent programs, so
it's a good one to fix.
Simon Marlow [Wed, 4 Apr 2007 08:40:18 +0000 (08:40 +0000)]
HANDLE --> (void *), we can't rely on having included windows.h here
HANDLE is defined to be (void *) anyway, so this shouldn't hurt
Ian Lynagh [Wed, 4 Apr 2007 00:34:25 +0000 (00:34 +0000)]
Fix C/Haskell type mismatches
Ian Lynagh [Wed, 4 Apr 2007 00:03:47 +0000 (00:03 +0000)]
Fix typo
Ian Lynagh [Tue, 3 Apr 2007 19:53:24 +0000 (19:53 +0000)]
Fix C/Haskell type mismatches
simonpj@microsoft.com [Mon, 2 Apr 2007 07:38:35 +0000 (07:38 +0000)]
Make type-tidying work for coercion variables
When tidying a TyVar binder, we must tidy its kind if it's a coercion
variable! I had forgotten to do this, which is a serious bug. As a
result some more complicated programs were getting a Lint error when
reading in interface files. Score one for Core Lint!
Ian Lynagh [Sun, 1 Apr 2007 18:57:41 +0000 (18:57 +0000)]
Make error message output order consistent
Alec Berryman [Tue, 6 Mar 2007 17:30:11 +0000 (17:30 +0000)]
Fix darcs-all to be usable with shells other than bash
Manuel M T Chakravarty [Mon, 2 Apr 2007 08:24:24 +0000 (08:24 +0000)]
Fixed desugaring of parallel array comprehensions
** MERGE into 6.6.1 **
simonpj@microsoft.com [Fri, 30 Mar 2007 14:43:44 +0000 (14:43 +0000)]
The ru_local field of a CoreRule is False for implicit Ids
MERGE to 6.6.1
For class-ops, record selectors, data constructors, we want the ru_local
field of the Rule to be False. We do not attach the rule to the binding
for the Id, because there simply isn't a binding until the code gen stage.
(NB: the ru_local field is different to the orphan-hood of the rule.)
This fixes a bug that meant that RULES on class ops were never exported.
simonpj@microsoft.com [Fri, 30 Mar 2007 14:00:33 +0000 (14:00 +0000)]
Match the type of an Id during rule matching
Please MERGE to 6.6.1
Consider this RULE
forall (c::Char->Int) (x::Char).
f (c x) = "RULE FIRED"
Well, this should only match on arguments of the specified type
But we simply weren't checking this condition before. Now we are.
Test is simplrun008
Ian Lynagh [Wed, 28 Mar 2007 23:51:54 +0000 (23:51 +0000)]
Add filepath library
Ian Lynagh [Thu, 29 Mar 2007 16:42:38 +0000 (16:42 +0000)]
Fix the type of wgencat
Ian Lynagh [Thu, 29 Mar 2007 14:16:31 +0000 (14:16 +0000)]
Document that ghci now adds () to the start of the type defaulting list
Lemmih [Wed, 28 Mar 2007 22:47:42 +0000 (22:47 +0000)]
Refactoring in HscMain.lhs
I realized that compiling many files is just like compiling a single file
several times. This does sound a bit stupid and I wonder why I didn't
catch it before.
Lemmih [Wed, 28 Mar 2007 22:01:09 +0000 (22:01 +0000)]
Typo in comment.
Simon Marlow [Wed, 28 Mar 2007 10:29:38 +0000 (10:29 +0000)]
remove old library doc link (#1098), and point to HackageDB
wolfgang.thaller@gmx.net [Tue, 27 Mar 2007 21:01:22 +0000 (21:01 +0000)]
Make GHC main program depend on the libHSghc_dyn when GhcBuildDylibs==YES
When building a dynamic GHC, we obviously want to build the dynamic library
libHSghc_dyn.[so|dylib] before building the compiler executable.
MERGE TO STABLE
wolfgang.thaller@gmx.net [Tue, 27 Mar 2007 20:17:00 +0000 (20:17 +0000)]
Use a sensible set of compiler options for building dynamic libraries on Mac OS X
The official options to use for building a dylib on Mac OS X are now
-undefined dynamic_lookup -single_module -Wl,-macosx_version_min -Wl,10.3
... which should work on all arches (10.3 or later).
MERGE TO STABLE
Simon Marlow [Tue, 27 Mar 2007 15:45:54 +0000 (15:45 +0000)]
make GHCi use base:Prelude, not just Prelude
The module that GHCi uses for its default scope should be exactly
base:Prelude, not whatever Prelude is found on the search path.
Simon Marlow [Tue, 27 Mar 2007 15:37:23 +0000 (15:37 +0000)]
more improvements for #1119
When GHCi compiles its code framgents for setting buffering, it wants
to refer to base:System.IO rather than whatever System.IO is on the
search path, unfortunately there's no way to do this in source code,
so to hack around it we set the search path to empty before compiling
these expressions (not forgetting to flush the finder cache
afterward).