Matthijs Kooijman [Mon, 22 Jun 2009 13:13:23 +0000 (15:13 +0200)]
Remove the old builtin function support.
Its now replaced by a new structure, no longer needing external VHDL
files.
Christiaan Baaij [Mon, 22 Jun 2009 13:12:06 +0000 (15:12 +0200)]
Filter non-value variables for built-in functions
Matthijs Kooijman [Mon, 22 Jun 2009 12:26:20 +0000 (14:26 +0200)]
Merge git://github.com/darchon/clash into cλash
Matthijs Kooijman [Mon, 22 Jun 2009 12:23:58 +0000 (14:23 +0200)]
Add error message to mkConcSm for unsupported expressions.
Previously, there was only a cryptic message from ghc, now it also
mentions the unsupported expression.
Christiaan Baaij [Mon, 22 Jun 2009 11:39:00 +0000 (13:39 +0200)]
Merge branch 'cλash' of 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 11:38:28 +0000 (13:38 +0200)]
Added support for vectors with arbitrary element types
Matthijs Kooijman [Mon, 22 Jun 2009 11:30:50 +0000 (13:30 +0200)]
Fix definition of hwor builtin operator.
Matthijs Kooijman [Mon, 22 Jun 2009 11:06:33 +0000 (13:06 +0200)]
Check parameter counts in mkConcSm instead of the actual generate functions.
Matthijs Kooijman [Mon, 22 Jun 2009 10:57:20 +0000 (12:57 +0200)]
Make the hw functions builtin operators instead of components.
Matthijs Kooijman [Mon, 22 Jun 2009 10:52:52 +0000 (12:52 +0200)]
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.
...
Conflicts:
VHDL.hs
Matthijs Kooijman [Mon, 22 Jun 2009 08:51:08 +0000 (10:51 +0200)]
Support application of dataconstructors.
This allows one to create algebraic datatypes (and thus, tuples).
Matthijs Kooijman [Mon, 22 Jun 2009 08:35:55 +0000 (10:35 +0200)]
Make mkAssign support assigning to a VHDLName as well.
Previously, assignments could only have a CoreBndr as destination.
Matthijs Kooijman [Mon, 22 Jun 2009 08:28:31 +0000 (10:28 +0200)]
Split off record field selection AST construction.
Matthijs Kooijman [Mon, 22 Jun 2009 08:18:17 +0000 (10:18 +0200)]
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.
Matthijs Kooijman [Mon, 22 Jun 2009 08:17:29 +0000 (10:17 +0200)]
Never try to normalize global binders.
These should mostly (always?) be functions imported from elsewhere (for
which we won't have a value) or dataconstructors.
Matthijs Kooijman [Mon, 22 Jun 2009 07:56:21 +0000 (09:56 +0200)]
Split off assignment generating code.
Previously, there was some duplicate AST building code for assignments in
mkConcSm. This is not split of into mkAssign, mkUncondAssign and
mkCondAssign.
Christiaan Baaij [Mon, 22 Jun 2009 07:19:40 +0000 (09:19 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Recursively normalize binds.
Matthijs Kooijman [Sun, 21 Jun 2009 18:44:27 +0000 (20:44 +0200)]
Support single-alt selector case expressions.
Matthijs Kooijman [Sun, 21 Jun 2009 18:43:46 +0000 (20:43 +0200)]
Add pprString convenience method.
This method can convert any Outputable to a string.
Matthijs Kooijman [Sun, 21 Jun 2009 18:00:48 +0000 (20:00 +0200)]
Support single-constructor algebraic types.
These will generate a VHDL record, with one field for each argument.
Matthijs Kooijman [Sun, 21 Jun 2009 17:56:25 +0000 (19:56 +0200)]
Move type registration out of construct_vhdl_ty.
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.
Matthijs Kooijman [Sun, 21 Jun 2009 16:39:20 +0000 (18:39 +0200)]
Split off the VHDL type generating code.
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.
Matthijs Kooijman [Sun, 21 Jun 2009 16:21:20 +0000 (18:21 +0200)]
Actually use the introduced let from a few commits back...
Matthijs Kooijman [Sun, 21 Jun 2009 16:19:08 +0000 (18:19 +0200)]
Error out when normalizing polymorphic functions.
Matthijs Kooijman [Sun, 21 Jun 2009 16:09:20 +0000 (18:09 +0200)]
Add an empty let before starting normalization.
This ensures that every expression will always contain a let at the top
level, since none of the transforms will remove the last let (lets are
only merged when two are nested).
Matthijs Kooijman [Sun, 21 Jun 2009 15:59:24 +0000 (17:59 +0200)]
Add and use a mkFunction utility function.
This function creates a new function with a given body and adds it to the
TransformMonad state. The function is named after an existing binder, but
with a new Unique.
Matthijs Kooijman [Sun, 21 Jun 2009 15:47:36 +0000 (17:47 +0200)]
Make beta reduction of Case expressions work for type arguments.
Previously, splitFunTy was used, which assumes a function type, while a
type argument is applied to a forall type instead of a function type.
Using applyTypeToArg handles all this for us.
Matthijs Kooijman [Sun, 21 Jun 2009 15:42:46 +0000 (17:42 +0200)]
Add function propagation transform.
This transform propagates arguments that have a function type into (a copy
of) the function that's applied to them.
Matthijs Kooijman [Sun, 21 Jun 2009 15:25:56 +0000 (17:25 +0200)]
Improve debug output timing.
The Before: line is now really printed before the transform, so also when
the transform fails.
Matthijs Kooijman [Sun, 21 Jun 2009 15:24:29 +0000 (17:24 +0200)]
Don't propagate types with free tyvars.
Any free type variables in a type argument wouldn't be in scope in the new
function. Eventually, beta reducation and applicable inlining should make
sure that all type variables are resolved.
Matthijs Kooijman [Sun, 21 Jun 2009 15:23:13 +0000 (17:23 +0200)]
Add is_applicable predicate.
This predicate should have been committed a few commits before.
Matthijs Kooijman [Sun, 21 Jun 2009 15:22:40 +0000 (17:22 +0200)]
Add has_free_tyvars predicate.
Matthijs Kooijman [Sun, 21 Jun 2009 15:14:19 +0000 (17:14 +0200)]
Fix compile error three commits back.
Matthijs Kooijman [Sun, 21 Jun 2009 15:13:22 +0000 (17:13 +0200)]
Let inlinefun also apply polymorphic values.
This generalizes inline fun to inline anything that still needs to be
applied to something to become a simple value.
Matthijs Kooijman [Sun, 21 Jun 2009 14:49:36 +0000 (16:49 +0200)]
Add getGlobalBinders accessor.
Matthijs Kooijman [Sun, 21 Jun 2009 14:48:43 +0000 (16:48 +0200)]
Add functions for creating and referencing type variables.
These functions work for both type variables as well as normal variables,
allowing the code that uses them to work with both.
Matthijs Kooijman [Sun, 21 Jun 2009 14:48:20 +0000 (16:48 +0200)]
Make substitute work for type variables as well.
Matthijs Kooijman [Sun, 21 Jun 2009 14:47:51 +0000 (16:47 +0200)]
Change the debug output of applyboth a bit.
Matthijs Kooijman [Sun, 21 Jun 2009 14:46:05 +0000 (16:46 +0200)]
Add is_poly and is_var predicates.
Matthijs Kooijman [Sun, 21 Jun 2009 11:58:15 +0000 (13:58 +0200)]
Make is_fun also work properly for Type CoreExprs.
Previously, this would generate some debug output from exprType, which
isn't properly defined for Type expressions.
Matthijs Kooijman [Sun, 21 Jun 2009 11:52:55 +0000 (13:52 +0200)]
Remove two old debug traces.
Matthijs Kooijman [Sun, 21 Jun 2009 11:37:52 +0000 (13:37 +0200)]
Add type propagation transform.
This transform propagates type arguments passed to functions into (a copy
of) the called function, effectively removing all type arguments. This is
the first cross-function transformation pass.
Matthijs Kooijman [Sun, 21 Jun 2009 11:37:04 +0000 (13:37 +0200)]
Add cloneVar function to clone a Var.
Matthijs Kooijman [Fri, 19 Jun 2009 14:40:15 +0000 (16:40 +0200)]
Recursively normalize binds.
This allows for functions to use other (user-defined) functions, which
will then also get VHDL generated. Also restructures some code to make
this possible. In particular, the TranslatorState is now no longer used
(but not yet removed).
Christiaan Baaij [Fri, 19 Jun 2009 14:14:28 +0000 (16:14 +0200)]
Added support for (!) function
Christiaan Baaij [Fri, 19 Jun 2009 14:14:02 +0000 (16:14 +0200)]
Added support for RangedWords
Christiaan Baaij [Fri, 19 Jun 2009 11:33:17 +0000 (13:33 +0200)]
Adders.hs explicityly uses Prelude lists function. TFVec function are the default
Christiaan Baaij [Fri, 19 Jun 2009 11:32:48 +0000 (13:32 +0200)]
Added main function to Main module
Christiaan Baaij [Fri, 19 Jun 2009 11:25:24 +0000 (13:25 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Add another higher order testcase, highordtest2.
Support VHDL generation for two-alternative cases.
Conflicts:
Translator.hs
Christiaan Baaij [Fri, 19 Jun 2009 11:22:06 +0000 (13:22 +0200)]
Added function calls
Matthijs Kooijman [Fri, 19 Jun 2009 10:41:49 +0000 (12:41 +0200)]
Add another higher order testcase, highordtest2.
This testcase can be succesfully normalized and translated to VHDL.
Matthijs Kooijman [Fri, 19 Jun 2009 10:39:44 +0000 (12:39 +0200)]
Support VHDL generation for two-alternative cases.
This does not support single alternatives statements yet, and will never
support more than two alternatives. Only supports case statements on Bit
and Bool types for now.
Christiaan Baaij [Fri, 19 Jun 2009 10:17:44 +0000 (12:17 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Use highordtest in main, since that can now be normalized.
Add a (fairly complete) set of transforms.
Add is_lam and is_fun predicates.
Add a inlinebind helper function.
Add a substitute helper function.
Print the type in the transform debug output.
Add infrastructure for running core to core transformations.
Add a higher order testcase.
Add is_wild function to check for wild binders.
Generate VHDL from Core instead of flat functions.
Conflicts:
Translator.hs
VHDL.hs
Christiaan Baaij [Fri, 19 Jun 2009 10:11:49 +0000 (12:11 +0200)]
Started adding builtin functions
Christiaan Baaij [Fri, 19 Jun 2009 08:26:52 +0000 (10:26 +0200)]
Cabalized clash
Christiaan Baaij [Fri, 19 Jun 2009 08:13:43 +0000 (10:13 +0200)]
Added global vector function generation
Matthijs Kooijman [Thu, 18 Jun 2009 13:27:28 +0000 (15:27 +0200)]
Use highordtest in main, since that can now be normalized.
Matthijs Kooijman [Thu, 18 Jun 2009 13:26:38 +0000 (15:26 +0200)]
Add a (fairly complete) set of transforms.
These transforms should normalize most core programs, though this was not
confirmed yet. Also, they do not use any cross-function transforming.
Matthijs Kooijman [Thu, 18 Jun 2009 12:55:14 +0000 (14:55 +0200)]
Add is_lam and is_fun predicates.
Matthijs Kooijman [Thu, 18 Jun 2009 12:48:36 +0000 (14:48 +0200)]
Add a inlinebind helper function.
This function can create a transformation that will inline some bindings
in a let expression, based on a condition function passed in.
Matthijs Kooijman [Thu, 18 Jun 2009 12:47:56 +0000 (14:47 +0200)]
Add a substitute helper function.
This function performs a number of substitutions on a CoreExpr, by using
the CoreSubst module.
Matthijs Kooijman [Thu, 18 Jun 2009 12:47:15 +0000 (14:47 +0200)]
Print the type in the transform debug output.
Matthijs Kooijman [Thu, 18 Jun 2009 09:30:12 +0000 (11:30 +0200)]
Add infrastructure for running core to core transformations.
This does not add any actual transformations, just the supporting
functions and functions to run the transformations.
Matthijs Kooijman [Thu, 18 Jun 2009 08:59:26 +0000 (10:59 +0200)]
Add a higher order testcase.
This testcase is taken from my report and uses some higher order
constructs.
Matthijs Kooijman [Thu, 18 Jun 2009 08:58:54 +0000 (10:58 +0200)]
Add is_wild function to check for wild binders.
Matthijs Kooijman [Mon, 15 Jun 2009 11:42:33 +0000 (13:42 +0200)]
Generate VHDL from Core instead of flat functions.
This bypasses all of the Flatten functionality for now and generates VHDL
directly. The generation only works on very simple Core programs, that are
already in normal form. An example of such a program is the inv function
in Adders.hs.
For now, all state generation is broken again. Support for ValueMaps has
mostly been removed, since in the future tuples will be translated to
records in VHDL instead of being flattened.
Matthijs Kooijman [Fri, 12 Jun 2009 12:02:01 +0000 (14:02 +0200)]
Make listBind support recursive bindings.
This allows listBind to process non-simplified Core modules.
Matthijs Kooijman [Mon, 25 May 2009 09:58:23 +0000 (11:58 +0200)]
Update the hardware models a bit.
Matthijs Kooijman [Thu, 16 Apr 2009 08:00:14 +0000 (10:00 +0200)]
Support binding the scrutinee of a Case expression.
Matthijs Kooijman [Wed, 15 Apr 2009 08:40:11 +0000 (10:40 +0200)]
Derive Show CoreSyn.Note.
Matthijs Kooijman [Tue, 14 Apr 2009 09:51:58 +0000 (11:51 +0200)]
Let VHDL generate a typecast for SizedWord literals.
Matthijs Kooijman [Tue, 14 Apr 2009 09:51:38 +0000 (11:51 +0200)]
Generate VHDL typecasts for literals when needed.
Matthijs Kooijman [Tue, 14 Apr 2009 09:36:24 +0000 (11:36 +0200)]
Put mkConcSm inside the VHDLState monad.
This will allow us to acces the TypeMap for typed literals.
Matthijs Kooijman [Tue, 14 Apr 2009 09:24:34 +0000 (11:24 +0200)]
Add a Type to a Literal SignalExpr.
The Type is still unused, but will be used for making the VHDL backend add
a typecast (since the actual VHDL name for the type is not known
earlier).
Matthijs Kooijman [Thu, 9 Apr 2009 16:29:53 +0000 (18:29 +0200)]
Generalize VHDL type creation for SizedWord and FSVec.
Matthijs Kooijman [Thu, 9 Apr 2009 16:25:53 +0000 (18:25 +0200)]
A word has a width, not a length.
Matthijs Kooijman [Thu, 9 Apr 2009 16:23:23 +0000 (18:23 +0200)]
Properly save state propagated flat functions.
Previously, the propagated state was not properly saved, resulting in
stateful functions being defined, while stateless versions were
instantiated.
Matthijs Kooijman [Thu, 9 Apr 2009 16:21:39 +0000 (18:21 +0200)]
Make the Alu example use 4-bit SizedWord as data.
Since we have no operations on words yet, the alu itself is reduced to a
simple multiplexer for now.
Matthijs Kooijman [Thu, 9 Apr 2009 16:19:59 +0000 (18:19 +0200)]
Add (non-working) support for SizedWord literals.
The VHDL produced by this commit does not compile due to type
incompatibility, some thought is needed here.
Matthijs Kooijman [Thu, 9 Apr 2009 16:18:29 +0000 (18:18 +0200)]
Translate the SizedWord type to a VHDL vector.
Matthijs Kooijman [Thu, 9 Apr 2009 16:17:01 +0000 (18:17 +0200)]
Move eval_type_level_int to CoreTools.
Matthijs Kooijman [Thu, 9 Apr 2009 16:16:32 +0000 (18:16 +0200)]
Import the Types.Data.Num module in eval_tfp_int.
This makes eval_tfp_int actually work, since now the proper instances are
in scope.
Matthijs Kooijman [Thu, 9 Apr 2009 16:15:43 +0000 (18:15 +0200)]
Add a [ModuleName] parameter to toCore.
This allows callers to put any number of modules into scope before
translating to Core. Previously, functions and values could be
automatically imported by using their qualified name, but now also
instances can be used from modules that would not be imported otherwise.
Matthijs Kooijman [Thu, 9 Apr 2009 16:13:10 +0000 (18:13 +0200)]
Fix compilation of CoreTools.
Matthijs Kooijman [Thu, 9 Apr 2009 16:06:47 +0000 (18:06 +0200)]
Add an importModule function.
This function allows us to import a module inside the TcRn monad and
properly handles (family) instances. This is needed for working with the
tfp package.
Matthijs Kooijman [Thu, 9 Apr 2009 16:03:13 +0000 (18:03 +0200)]
Allow references to global values without arguments.
These references are treated as function applications without arguments.
Matthijs Kooijman [Thu, 9 Apr 2009 16:02:00 +0000 (18:02 +0200)]
Move some code out of the flattenExpr to global scope.
Matthijs Kooijman [Thu, 9 Apr 2009 15:58:59 +0000 (17:58 +0200)]
Add sized_word_len, which gets the length from a SizedWord type.
Matthijs Kooijman [Thu, 9 Apr 2009 15:58:21 +0000 (17:58 +0200)]
Add the new CoreTools module.
This module will contain functions to work with specific constructs
represented as Core expressions and types (i.e., it knows about how
certain libraries are structured and uses functions from there).
For now, this contains a single function to translate (the Core
representation of) a type level int from the tfp package to a real Int.
Matthijs Kooijman [Thu, 9 Apr 2009 14:01:39 +0000 (16:01 +0200)]
Add a runTcM utility function.
Matthijs Kooijman [Thu, 9 Apr 2009 14:01:14 +0000 (16:01 +0200)]
Derive Show for HsBinds.
Matthijs Kooijman [Mon, 6 Apr 2009 13:58:15 +0000 (15:58 +0200)]
Use basic identifiers for builtins.
Matthijs Kooijman [Mon, 6 Apr 2009 13:49:10 +0000 (15:49 +0200)]
Make Map.Map an instance of Pretty.
Matthijs Kooijman [Mon, 6 Apr 2009 13:39:30 +0000 (15:39 +0200)]
Use extended VHDL identifiers where possible.
Extended VHDL identifiers support a lot more differen characters, so can
preserve the source identifiers a lot better.
Matthijs Kooijman [Mon, 6 Apr 2009 12:00:20 +0000 (14:00 +0200)]
Use the actual FSVec length to create VHDL vectors.
Matthijs Kooijman [Mon, 6 Apr 2009 11:58:37 +0000 (13:58 +0200)]
Ignore .swp files.
Matthijs Kooijman [Mon, 6 Apr 2009 11:54:00 +0000 (13:54 +0200)]
Add the new HsTools module.
This module provides a number of functions to work with HsExprs, CoreExprs
and various types.
Matthijs Kooijman [Mon, 6 Apr 2009 11:48:31 +0000 (13:48 +0200)]
Add the new GhcTools module.
This module provides a number of functions to work with GHC and the Ghc
monad.
Matthijs Kooijman [Mon, 6 Apr 2009 11:42:19 +0000 (13:42 +0200)]
Cleanup imports and add a vim modeline.