Disabled foldr generation again, it should either be updated to the
shorter form from my last commits, but preferably foldl should be
abstracted to handle both.
In particular:
* The globalNameTable was moved into Generate.
* A large part of mkConcSm was moved into Generate.
* A BuiltinBuilder now accepts Either CoreBndr VHDLName and
[Either CoreExpr AST.Expr], so we can reuse them even when we no longer
have a CoreBndrs (this does not happen yet, though).
Christiaan Baaij [Thu, 25 Jun 2009 09:16:27 +0000 (11:16 +0200)]
Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Unify all BuiltinBuilder functions.
Give HighOrdAlu an and operation.
Let tfvec_len and tfvec_elem give a proper error message.
No longer use a view pattern in HsTools.
By create a few wrapper functions, we can still leave the functions mostly
unchanged, but register them all with the same interface in the
GlobalNameTable.
Christiaan Baaij [Wed, 24 Jun 2009 10:35:50 +0000 (12:35 +0200)]
Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Put the Builders in the VHDLSession.
Remove the globalNameTable from the VHDLState.
Swap the VHDLState and VHDLSession type names.
The globalNameTable is never modified, so it can just be referenced
directly. Additionally, having it in the VHDLSession prevents us from
putting the Builder type in the VHDLSession Monad.
Christiaan Baaij [Tue, 23 Jun 2009 14:22:58 +0000 (16:22 +0200)]
Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Add a hardware module for a generalized Alu.
Make mkConcSm support a = b style bindings.
Make appsimpl also simplify dataconstructors.
Make subeverywhere support NonRec Lets.
These were previously left alone, since they were considered already
simple (they're simple variable references). However, a dataconstructor
can be translated to a VHDL expression, which can be assigned to a signal,
but not used in the port map of an component instantiation.
Also prevent letremovetop from inlining the datacon again.
Christiaan Baaij [Tue, 23 Jun 2009 13:39:25 +0000 (15:39 +0200)]
Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Support turning dataconstructors into VHDL constants.
Use varToVHDLExpr in mkConcSm.
Christiaan Baaij [Tue, 23 Jun 2009 13:10:21 +0000 (15:10 +0200)]
Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Ignore cast expressions when generating VHDL.
Add Cast propagation transform.
Make subeverywhere support Cast expressions.
Remove a double line introduced a few commits back.
Make subeverywhere complain for unknown expressions.
Do not apply eta expansion to application arguments.
Doing this can introduce expressions such as:
map (\x -> foo x) xs
which is of course not really what we want. By limiting eta expansion in
this way, we'll still get it where we really want it: At the top level.
Christiaan Baaij [Tue, 23 Jun 2009 11:38:35 +0000 (13:38 +0200)]
Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Always add a clk port map on instantiations.
Delete all old .vhdl files before writing new ones.
Prepend "comp_ins_" to component instantiation labels.
Remove dummy mkConcSm clause for r = r bindings.
Return multiple statements instead of a block.
Let mkConcSm return a list of ConcSms.
Christiaan Baaij [Tue, 23 Jun 2009 10:24:25 +0000 (12:24 +0200)]
Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Don't generate a signal for the output port.
Perform subsititutions one after another.
Previously, multiple substitutions would be done in a single run of
substExpr, but that did not properly handle the case where one of the
to-be-substituted values appears in the to-be-substituted values. For
example, when performing the substitution [(a, b), (b, c)] on the
expression a, we would get b (while we want to get c).
Christiaan Baaij [Mon, 22 Jun 2009 13:17:07 +0000 (15:17 +0200)]
Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Append the Unique to generated VHDL entity id's.
Generate the VHDLId of an entity in a single place.
Remove the old builtin function support.
Add error message to mkConcSm for unsupported expressions.
Fix definition of hwor builtin operator.
Generate the VHDLId of an entity in a single place.
Additionally, make the SignatureMap indexed by CoreBndr instead of String.
This was previously not possible, because the builtin function also needed
to be in the signature map. This is no longer the case.
Christiaan Baaij [Mon, 22 Jun 2009 11:39:00 +0000 (13:39 +0200)]
Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Check parameter counts in mkConcSm instead of the actual generate functions.
Make the hw functions builtin operators instead of components.
Fix typo.
Christiaan Baaij [Mon, 22 Jun 2009 10:22:31 +0000 (12:22 +0200)]
Added subtype declarations to TypeMap, removed SubtypeMap.
Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project: (32 commits)
Support application of dataconstructors.
Make mkAssign support assigning to a VHDLName as well.
Split off record field selection AST construction.
Only try to generate builtin functions for global binders.
Never try to normalize global binders.
Split off assignment generating code.
Support single-alt selector case expressions.
Add pprString convenience method.
Support single-constructor algebraic types.
Move type registration out of construct_vhdl_ty.
Split off the VHDL type generating code.
Actually use the introduced let from a few commits back...
Error out when normalizing polymorphic functions.
Add an empty let before starting normalization.
Add and use a mkFunction utility function.
Make beta reduction of Case expressions work for type arguments.
Add function propagation transform.
Improve debug output timing.
Don't propagate types with free tyvars.
Add is_applicable predicate.
...
Only try to generate builtin functions for global binders.
Since builtin functions will always come from elsewhere, these will
always be global. Functions for which we can generate components, on the
other hand, will always be local.
Previously, there was some duplicate AST building code for assignments in
mkConcSm. This is not split of into mkAssign, mkUncondAssign and
mkCondAssign.
construct_vhdl_ty now only creates the type and does not register it in
the session. Additionally, we save only the TypeDef in the session instead
of the TypeDec, since the latter contains the VHDLId which we also store
separately. This means we'll create the TypeDecs later, when outputint the
types VHDL package.
Previously, the vhdl_ty function did builtin type lookups, cached custom
types and creating new custom types. Now, the latter is moved into the new
function create_vhdl_ty.