suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,498 Commits 1 Branch 2 Tags 31 MiB
8f943c9ac1
Commit Graph

147 Commits

Author SHA1 Message Date
Neil Brown
cc6dce5ead Tidied up the export/import lists for GenerateC and GenerateCPPCSP 2008-03-23 12:40:06 +00:00
Neil Brown
bc7e682119 Added a Concat operator for lists, and added support for it (and list assignment) to the backends 2008-03-21 19:20:15 +00:00
Neil Brown
80ffc87f94 Added a newline at the end of the generated C++ files 2008-03-21 18:47:09 +00:00
Neil Brown
839d92546b Altered the backends to support lists and foreach loops over lists (at least in the C++ part) 2008-03-19 17:20:52 +00:00
Adam Sampson
b1416bb0cf Change A.Dimension to take an Expression, not an Int. 
This touches an awful lot of code, but cgtest07/17 (arrays and retyping) pass.

This is useful because there are going to be places in the future where we'll
want to represent dimensions that are known at runtime but not at compile time
-- for example, mobile allocations, or dynamically-sized arrays. It simplifies
the code in a number of places.

However, we do now need to be careful that expressions containing variables do
not leak into the State, since they won't be affected by later passes.

Two caveats (marked as FIXMEs in the source):

- Retypes checking in the occam parser is disabled, since the plan is to move
  it out to a pass anyway.
- There's some (now very obvious) duplication, particularly in the backend, of
  bits of code that construct expressions for the total size of an array
  (either in bytes or elements); this should be moved to a couple of helper
  functions that everything can use.
 2008-03-18 16:45:38 +00:00
Adam Sampson
7eaab68f04 Implement TLP output channels using a CIF helper process. 
Input channels will be similar, but are stubbed out for now.
 2008-03-11 18:47:48 +00:00
Neil Brown
9533fa9926 Reversed the effect of an earlier patch (to put timers back in the C++ backend) now that I've seen Adam's patch that fixes it anyway 2008-03-09 19:04:34 +00:00
Neil Brown
3189c066b5 Fixed genRetypeSizes and its associated tests in light of the new array sizes passes 2008-03-09 16:58:05 +00:00
Neil Brown
c733ac2cff Fixed the C++ backends so that it continues to declare timer variables, even though the C backend doesn't any more 2008-03-09 12:48:26 +00:00
Neil Brown
ba75f5b06c Removed the initialiser expression on the Declaration item in the AST 2008-03-09 00:23:13 +00:00
Neil Brown
ba9ac70d7c Changed the C and C++ backends to write directly to the output file, to save building up the strings in memory 2008-03-08 14:10:05 +00:00
Neil Brown
c87581e490 Tidied up the export list for the GenerateC module 2008-03-08 14:03:10 +00:00
Neil Brown
5197435b2c Removed a lot of old comments and support code relating to the way arrays used to be handled in the C++ backend 2008-03-08 13:52:50 +00:00
Neil Brown
3c070f035c Removed the code for initialising members - it is unneeded, and will no longer work until the ensuing _sizes declaration 2008-03-08 00:09:28 +00:00
Neil Brown
a4646f88fa Removed the C++ version of genDeclaration, deferring instead to the C version 2008-03-08 00:08:19 +00:00
Neil Brown
24ddcf6f0d Changed chansToAny to use the makeGeneric pass structure 2008-03-07 23:32:00 +00:00
Neil Brown
ffc4594604 Removed some more unneeded code from GenerateCPPCSP, deferring to the C implementation 2008-03-07 15:49:09 +00:00
Neil Brown
6106fc13a1 Removed a leftover suffix involved in declaring channel arrays 2008-03-06 21:04:11 +00:00
Neil Brown
4c1f2a1930 Adjusted the C++ (a lot) and C (a little) backends to reflect array _sizes changes, and added the new array passes to the overall pass list 
Now that I have begun moving all the _sizes stuff forward into proper compiler passes, much of the code for handling arrays in the backends is going to become redundant:

- The tockArrayView class should eventually disappear; now that _sizes are pulled forward, there's no advantage of having this extra class (compared to just doing C and C++ arrays in the same, C-based, style)
- The declaration and use of the _sizes array everywhere should go, now that it is inserted in an earlier pass

I haven't removed as much as I should from the C backend; I am wary to touch it when Adam is about to move it over to the new CIF anyway
 2008-03-06 19:08:38 +00:00
Neil Brown
a9692f884a Added a constructor to record types to help build record literals (especially those that contain array literals) 2008-02-29 16:44:00 +00:00
Adam Sampson
2f7539bcdb Convert the C backend to the new CIF API (mostly). 
Most of this is mechanical: changing function names, and carrying the "wptr"
argument around. I've made the code for computing Expressions from Structureds
a bit more generic too.

The only complex bit is the handling of PAR processes, which I'm not very happy
with at the moment; they used to use the normal C calling convention, but now
you need to pack the arguments into the workspace. I'm handling this at the
moment by generating wrapper functions that do the unpacking, but it would be
better in the future to make the wrapper PROCs that we already generate have
the right interface.

This won't work for programs that use any of the top-level channels yet, since
there are no handlers for them.
 2008-03-07 17:50:10 +00:00
Neil Brown
49585a1922 Added a constructor to record types to help build record literals (especially those that contain array literals) 2008-02-29 16:44:00 +00:00
Neil Brown
d73f2f509c Added some template types to one of the uses of tockArrayView to please the C++ compiler, and adjusted the tests accordingly 2008-02-28 15:32:26 +00:00
Neil Brown
9ab4563a2c Moved the definition of record types into the forward declarations 2008-02-27 18:25:14 +00:00
Neil Brown
9d1c170b34 Added a size suffix to the code generated for C/C++ integer and real literals (where needed) 2008-02-26 18:09:21 +00:00
Neil Brown
2e6718ac50 Changed all the lists of passes to add pre- and post- properties 2008-02-19 09:43:40 +00:00
Neil Brown
360abc195e Moved the enabling/disabling of passes based on CompState from PassList to the point of the declaration of the passes 2008-02-16 11:09:25 +00:00
Neil Brown
3ce0eaf452 Made the first adjustment to the Pass system, ready to introduce properties and a dependency graph. For now passes are still executed in list order 2008-02-16 10:19:14 +00:00
Neil Brown
7e7625385d Pulled out various types and definitions from GenerateC into a common module, GenerateCBased 2008-02-08 01:08:42 +00:00
Neil Brown
a143fb75ef Changed all the C/C++ backend functions to stop passing round GenOps everywhere; they now all properly pull it from the monad 2008-02-08 01:01:44 +00:00
Neil Brown
df832b450d Changed the C/C++ backends to read GenOps from a reader-monad rather than passing the ops around (rough draft) 2008-02-08 00:33:44 +00:00
Neil Brown
acd57d74de Changed the A.Structured type to be parameterised 
This patch is actually an amalgam of multiple (already large) patches.  Those patches conflicted (parameterised Structured vs. changes to usage checking and FlowGraph) and encountered a nasty bug in darcs 1 involving exponential time (see http://wiki.darcs.net/DarcsWiki/ConflictsFAQ for more details).  Reasoning that half an hour (of 100% CPU use) was too long to apply patches, I opted to re-record the parameterised Structured changes as this new large patch.  Here are the commit messages originally used for the patches (which, as mentioned, were already large patches):

A gigantic patch switching all the non-test modules over to using parameterised A.Structured
Changed the FlowGraph module again to handle any sort of Structured you want to pass to it (mainly for testing)
A further gigantic patch changing all the tests to work with the new parameterised Structured
Fixed a nasty bug involving functions being named incorrectly inside transformInputCase
Added a hand-written instance of Data for Structured that allows us to use ext1M properly
Fixed a few warnings in the code
 2008-02-05 19:40:27 +00:00
Neil Brown
edc3a7e910 Removed the die function (that has no source position) and as far as possible replaced all its uses with dieP and a valid position 2008-01-28 17:21:13 +00:00
Neil Brown
7433e49d49 Added support for List types to the C and C++ backend, in genType at least 2007-10-27 11:24:24 +00:00
Neil Brown
7f59eec189 Changed the C and C++ backends (and tests) to handle declarations with initialisers properly 2007-10-25 00:27:12 +00:00
Neil Brown
6b95827cab Added an optional initialiser-expression to Declaration in the AST, and changed the rest of the code accordingly 2007-10-24 23:50:00 +00:00
Neil Brown
83f654a273 Implemented the code for ClearMobile in the C and C++ backends 2007-10-24 20:54:37 +00:00
Neil Brown
dd86b240b5 Implemented (most of the needed) support for AllocMobile in the C and C++ backends 2007-10-24 19:32:58 +00:00
Neil Brown
9f78582391 Added support for mobile types to the genType functions in the C and C++ backends 2007-10-21 14:37:05 +00:00
Neil Brown
12191cb36a Changed the C and C++ backends to take in a Structured rather than a Process as the top-level item 2007-10-17 13:25:21 +00:00
Neil Brown
30b7cc686b Doubled the stack size for C++CSP processes, in order to get cg test 08 passing 2007-10-14 13:25:31 +00:00
Neil Brown
0fc7ceaf68 Fixed an issue where the size in counted array inputs in C++ was not being correctly calculated 2007-10-14 11:09:35 +00:00
Neil Brown
c19ae03116 Added a pass that changes all C++CSP channels to be of type tockSendableArrayOfBytes, so that the channels can be retyped into each other 2007-10-14 10:28:43 +00:00
Neil Brown
3c101bae19 Removed my old cgmap function, in favour of the identical library function mapM_ 2007-10-14 00:14:19 +00:00
Neil Brown
fd74473b9b Removed a big load of unused code from the C++ code generation, that was related to the old way of handling protocols 2007-10-14 00:08:13 +00:00
Neil Brown
e9dbfbab3c Added the input-case to case pass to the pass-list, and therefore removed all code dealing with input-case statements in the C and C++ backends (and corresponding tests) 2007-10-14 00:01:44 +00:00
Neil Brown
9e21e4fc0d Added a C++ implementation of the genRetypeSizes function 2007-10-13 17:57:23 +00:00
Neil Brown
c74ae12810 Changed the type of genBytesIn again, to remove redundancy in its parameters 2007-10-13 16:16:52 +00:00
Neil Brown
a98ff8cad0 Removed the horrible tockBool type, now that we are no longer using vectors to store C++ arrays 2007-10-13 15:40:39 +00:00
Neil Brown
ed38f80db0 Changed the type of genRetypeSizes to removed the unused AbbrevMode parameter 2007-10-13 15:38:04 +00:00
Neil Brown
ffd09847fe Removed genBytesIn' from the GenOps, in favour of adding a parameter to genBytesIn, and changed the tests and code accordingly 2007-10-13 14:51:29 +00:00
Neil Brown
d5d4580aa3 Changed the type of genSlice, and put the C++ version into the GenOps dictionary, as well as adding tests for the function 2007-10-13 13:20:40 +00:00
Neil Brown
886659fd09 Changed the C++ backend to pass the RETYPES tests (primarily white-space changes, and also reordering the parameters for tockArrayView) 2007-10-13 12:58:20 +00:00
Neil Brown
ec43e592f0 Fixed the initialisation of C++ channel arrays to initialise the correct array 2007-10-11 01:32:36 +00:00
Neil Brown
8d0b5fbe1a Added a helper function for receiving an array of bytes, and changed the C++CSP backend and tests to use the function 2007-10-11 00:51:07 +00:00
Neil Brown
cc2040679b Changed the C and C++ backends to pass the input tests 2007-10-10 20:46:23 +00:00
Neil Brown
5b10466e68 Fixed the channel arrays (and abbreviations thereof) to have the correct types (correcting an earlier mistake), and added helper functions to the support headers for easy initialisation of the arrays 2007-10-07 23:03:15 +00:00
Neil Brown
5e1e51ac15 Refactored the C++ genOutputItem to merge some duplicate code 2007-10-06 23:08:05 +00:00
Neil Brown
9af1ec78bb Fixed all the tests for sending items in C++, and made the tests pass 2007-10-06 23:05:03 +00:00
Neil Brown
6d29bbd260 Added some tests for outputs in the C and C++ backends, but the C++ backend needs fixing 2007-10-06 18:20:55 +00:00
Neil Brown
3b20d18937 Added tests for the genOutput and genOutputCase functions, corrected the C++ code, and added some helper functions to the C++ support header 2007-10-06 17:05:49 +00:00
Neil Brown
97ee0c4a4e Added tests for ProtocolCase in introduceSpec, and made the C++ version behave the same as the C version 2007-10-06 16:35:02 +00:00
Neil Brown
03a4b8e41b Removed the generate of tuples for sequential protocols in C++, since we're now using a byte-array approach 2007-10-06 16:22:51 +00:00
Neil Brown
062851dabf Added tests for introduceSpec and Is, for all types except arrays 2007-10-06 15:55:18 +00:00
Neil Brown
c3fad80f06 Changed the behaviour of the C++ version of declareArraySizes, moving towards potentially merging more of the C++ array handling with the C array handling 2007-10-06 12:49:30 +00:00
Neil Brown
e7cdaf2e90 Changed the type of genArraySizesLiteral, added tests for the C++ version and implemented the C++ version 2007-10-06 12:31:14 +00:00
Neil Brown
8ea4ad79e8 Changed the type of declareArraySizes, and added a C++ implementation of it 2007-10-06 12:22:40 +00:00
Neil Brown
071172954d Removed redundant/common code in the C++ backend relating to arrays 2007-10-06 11:59:29 +00:00
Neil Brown
a583403372 Removed the C++ code for IsChannelArray, so that the C version is used instead 2007-10-06 11:40:10 +00:00
Neil Brown
c521187cd2 Added a genArrayStoreName function to GenOps and implemented it for both C and C++ 2007-10-06 11:30:03 +00:00
Neil Brown
9d5164d9c1 Changed the generation of the record structs to use the altered genDeclaration (that can now generate declarations for inside records) 2007-10-05 20:06:11 +00:00
Neil Brown
904d1e8f5f Changed the genDeclaration function so that it can either generate stand-alone declarations (as it did before), or declarations inside records 2007-10-05 19:01:42 +00:00
Neil Brown
34609f1fee Corrected the C++ tests and implementation of arrays inside records -- the dimensions of the tockArrayView were not being set, but they should be. 2007-10-05 17:52:37 +00:00
Neil Brown
8cd20b9906 Changed the C++ implementation of introduceSpec to fall through to the C implementation for all unhandled cases (which will remove duplicate code) 2007-10-05 17:51:00 +00:00
Neil Brown
9effe37977 Removed the declareType function from GenOps (it has been merged with genType) and changed the C++ channel types to pass the new genType tests 2007-10-05 17:01:17 +00:00
Neil Brown
1f8a5555ac Added a test for genIf in the C and C++ backends 2007-10-04 14:36:56 +00:00
Neil Brown
af74ac1039 Added a test of genGetTime for the C and C++ backends 2007-10-04 14:06:15 +00:00
Neil Brown
b4ac249367 Changed the C and C++ channel arrays to be actual arrays of channels, not arrays of channel pointers as they were before. 
The effects of this change will not be fully tested until further tests have been written (especially for genVariable).
 2007-10-04 00:53:25 +00:00
Neil Brown
93610a5837 Changed the C++ arrays to use standard C-like arrays rather than std::vector as they used to 2007-10-04 00:19:38 +00:00
Neil Brown
b8556bfe6d Refactored some of the tested functions in the C and C++ backends to use genSizeSuffix rather than using _sizes/.extent directly 2007-10-04 00:07:15 +00:00
Neil Brown
f3e15b6f78 Changed the C genOverArray function to pass the test, and removed the now-redundant C++ version 2007-10-03 23:18:53 +00:00
Neil Brown
65fb758dbd Added tests for genDeclaration, and tweaked the backends to make the tests pass 2007-10-03 17:58:59 +00:00
Neil Brown
1f8bb0e44a Removed the genVariable' function from GenOps 
Now that the C++ generator no longer overrides genVariable', it seems wise to remove it from the GenOps function dictionary.

You can call it via either genVariable or genVariableUnchecked anyway, so genVariable' is just used by the two former functions as implementation.  It can easily be put back into the dictionary later on, if that turns out to be necessary.
 2007-10-03 16:57:03 +00:00
Neil Brown
9b96ea9899 Removed the C++CSP implementation of genVariable' by adding a new function (genDirectedVariable) that represents the only change from the C version (and added C and C++ version of genDirectedVariable accordingly) 2007-10-03 16:55:48 +00:00
Neil Brown
4111dd3cb7 Added a test for genArraySubscript, and made the C and C++ backends pass it 2007-10-03 16:43:07 +00:00
Neil Brown
e17367edfa Simplified the GenOps by removing a function (genArrayAbbrev) that did not need to be in there 2007-10-03 15:23:32 +00:00
Neil Brown
8a2894893c Changed the GenerateC[PPCSP] modules to pass the current tests (just a matter of changing the spacing in the output) 2007-10-03 14:08:34 +00:00
Neil Brown
639b662a98 Starting making the spacing in the generated C and C++ code consistent, so that it passes the tests 2007-10-02 14:50:04 +00:00
Neil Brown
15ecb2b178 Added the -fwarn-type-defaults compiler option (for when integer literals are given a default type) and fixed the few warnings that arose from doing so 2007-09-27 13:29:16 +00:00
Neil Brown
38c409d378 Added the -fwarn-unused-imports compiler option to warn about unused imports, and then set about pruning and ordering (mostly in my code) the import lists for all the modules 2007-09-27 13:13:46 +00:00
Neil Brown
4a0732629d Added support for the new AlternativeWait guard to the C++ backend 2007-09-27 10:05:31 +00:00
Neil Brown
41d4923e9c Added support for the new Wait process to the C and C++ backends 2007-09-26 23:18:21 +00:00
Neil Brown
b280158e26 Added code in the C and C++ backends for handling the new Time type and GetTime statements in the AST 2007-09-19 10:34:49 +00:00
Neil Brown
3e342a621c Added ShowOccam and ShowRain type-classes, and changed existing code to use these new show methods in error messages 
The function showCode shows code as either occam or Rain depending on the frontend.  This is then used by a formatCode function that acts similar to 
printf, which makes it easy to format error messages that use showCode.
 2007-09-16 17:20:57 +00:00
Neil Brown
8af4a9f687 Added generation of forward declarations to the C and C++ backends. 
These declarations are necessary for recursive functions/procs, so that the (forward) declarations are visible to the implementations.

Later on, the declarations could be moved into header files, which would allow multiple source files to be compiled (generating multiple header files) and linked together using the gcc linker.  Alternatively, external C/C++ programs could use code originally written in occam/Rain by including the header files.
 2007-09-12 12:09:35 +00:00
Neil Brown
aefb02caa6 Added missing cases for A.DirectedVariable in the C and C++ backends 2007-09-12 10:17:15 +00:00
Neil Brown
2ff46a9041 Rearranged the Rain source files, renamed a couple of Rain files, and changed the Makefile accordingly. 2007-09-10 17:28:57 +00:00