Neil Brown
f69030df34
Changed the names of generated tock files to have ".tock" before the extension
...
This helps avoid collisions with pre-existing files, especially .inc files (but also .c and .h)
2009-04-02 15:40:39 +00:00
Neil Brown
ea14f568fa
Removed genProcName
...
Everything that used it has now switched back to genName, as we don't need this occam_ prefix with the new name munging stuff from earlier patches.
2009-04-02 15:39:19 +00:00
Neil Brown
37ff130ec9
Stopped static being generated in front of typedef
2009-04-01 19:58:30 +00:00
Neil Brown
ef36c39c38
Stopped the C code generating extern declarations for occam PROCs (it should only do this for C PROCs)
2009-04-01 19:51:43 +00:00
Neil Brown
e28bff5a50
Added code to put static before every identifier that is not being exported, to avoid collisions between occam files
2009-04-01 19:50:15 +00:00
Neil Brown
a1d9fcdff2
Fixed a bug in the C types for arrays of channel-ends
2009-04-01 19:25:19 +00:00
Neil Brown
7e7a437a3b
Switched to using a different kind of pragma for occam externals, and munged the names to avoid collisions
...
The separately compiled occam PROCs now use #PRAGMA OCCAMEXTERNAL, which also discards the "= number" thing at the end. These PROCs then need to be processed differently when adding on the sizes (C externals have one size per dimension, occam externals have the normal array of sizes).
We also now record which processes were originally at the top-level, and keep their original names (i.e. minus the _u43 suffixes) plus an "occam_" prefix to avoid collisions.
2009-04-01 19:21:40 +00:00
Neil Brown
8153cfc659
Added code for full compilation mode to include the relevant C files from occam #USE directives, and link to the relevant object files
2009-04-01 18:32:39 +00:00
Neil Brown
d457b793c0
Added code that allows any external PROCs not beginning with B or C to be handled as normal
...
This shows that my current scheme is a bit of a hack; if an occam programmer starts a normal PROC with B or C, it will be treated funny during separate compilation. In future I probably need some new form of #PRAGMA to support separate compilation, different from that used to interface with C.
2009-04-01 17:29:32 +00:00
Neil Brown
db9b8e9d91
Changed where we generate the .inc file from being in the backend, to being a pass just after type-checking
...
We need to generate the externals after we've inferred channel directions, but before we do further work (like adding _sizes parameters and so on).
2009-04-01 16:54:07 +00:00
Neil Brown
abce001bab
Added a command line option to indicate that there is no main PROC
2009-04-01 15:29:22 +00:00
Neil Brown
219bfd9ce1
Modified the C backend so that it will put the forward declarations into a header file and include that
2009-04-01 14:35:47 +00:00
Neil Brown
e9730bfe1e
Got the C++ backend working again, on the cgtests at least
2009-04-01 15:25:18 +00:00
Neil Brown
e91c075bcf
Fixed up a lot of the failing tests
...
I changed a little bit of the code, but mainly the tests. Several of the remaining failures are actually real failures, so I need to dig through the rest carefully. A lot are failing because the C++ backend is broken.
2009-04-01 11:49:37 +00:00
Neil Brown
bea4dcfd80
Took out some C garbage, which gets around 200 more tests passing
2009-03-31 18:02:39 +00:00
Neil Brown
2941cbd049
Fixed a problem with record abbreviations being pulled all the way up to the top (which C doesn't like)
2009-03-31 16:50:42 +00:00
Neil Brown
91ce2fe960
Fixed generation of actuals that are ActualExpression (ExprVariable {})
2009-03-31 16:08:37 +00:00
Neil Brown
edc336de7a
Fixed a bug when generating some no-arg PROCs
2009-03-31 10:50:52 +00:00
Neil Brown
dbf886996a
Removed various bits of old code relating to the old sizes mechanism
2009-03-31 10:50:04 +00:00
Neil Brown
a10921d53a
Fixed the last few uses of genSizeSuffix in GenerateC to use the new system instead
2009-03-31 09:35:59 +00:00
Neil Brown
f749967af4
Added some cases inside genVariable to handle the VariableSizes item
...
For mobile arrays, this uses the ->dimensions member. For normal arrays, it uses the associated sizes array (by looking it up in CompState).
2009-03-31 09:34:36 +00:00
Neil Brown
298ba6465a
Removed genSizeSuffix and turned most uses of it into calls to genDynamicDim
2009-03-31 09:29:55 +00:00
Neil Brown
b8daebfbc3
Made genDynamicDim a top-level function, and change its implementation to use VariableSizes rather than C-specific stuff
2009-03-31 09:28:45 +00:00
Neil Brown
ecc42f704d
Fixed all the nasty hacks from earlier relating to running processes in parallel
2009-03-27 21:35:28 +00:00
Neil Brown
0ca5bb17d7
A collection of nasty hacks to get Tock's replicated PARs working, and to stop memory leaking
...
All the changes in this patch should be undone as soon as possible (building the list of workspaces, and how we sort out the enrollment counts -- that should be done by pulling up PAR replicator counts outside the whole PAR), but for now, it works.
2009-03-27 17:26:37 +00:00
Neil Brown
2237d15247
Various fixes in the C backend to get oak working
2009-03-27 16:29:06 +00:00
Neil Brown
574694d078
Fixed some stuff on external PROCs (the adding of sizes parameters)
2009-03-26 23:58:08 +00:00
Neil Brown
eb99480484
Finished off the support for external C functions
2009-03-26 22:37:28 +00:00
Neil Brown
733293745e
Added a work-around for generating infinity and NaN in the C backend
2009-03-26 18:39:23 +00:00
Neil Brown
1c4d44b739
Fixed generation of C types for channels (somewhere, one is being abbreviated with ValAbbrev, so I'll allow it for now)
2009-03-25 18:27:13 +00:00
Neil Brown
45b22472c3
Changed the rest of tock to reflect the changes to the Is constructor
2009-03-24 23:57:24 +00:00
Neil Brown
eaa8ece954
Fixed allocation of mobile channel bundles, as apparently a clone is unnecessary
2009-03-24 23:54:13 +00:00
Neil Brown
e269efe388
Added some quick hacks to make recursive PROCs work
...
This is along the lines of the Tock ticket. cgtest90 (recursive FUNCTIONs) now passes, but cgtest91 (recursive PROCs) doesn't, because it uses barriers.
2009-03-24 00:14:14 +00:00
Neil Brown
e08197bbef
Added various bits for shared channels, which now means that cgtest86 compiles and passes
2009-03-24 00:08:02 +00:00
Neil Brown
10b4cd7cfc
Realised that allocating mobile arrays as arrays of bytes screws up the resize intrinsic, and gave it a helping hand
2009-03-23 21:28:28 +00:00
Neil Brown
d3f4ff1a9a
Corrected BYTESIN for mobile arrays
2009-03-23 21:18:52 +00:00
Neil Brown
658bfd08e4
Added some code to deal with channel bundles
2009-03-23 21:14:10 +00:00
Neil Brown
7458014c2c
Fixed the C types for records, again
2009-03-23 21:13:55 +00:00
Neil Brown
585a5ed477
Realised that mobile arrays should be allocated after all, unless they are missing a dimension
2009-03-23 21:13:13 +00:00
Neil Brown
3739ff7cbd
Added some extra paranoid bracketing
2009-03-23 21:12:46 +00:00
Neil Brown
9c433b248a
Tried using my new CCSP helper function to allocate arrays
2009-03-23 18:59:57 +00:00
Neil Brown
e8fec8585b
Stopped mobile arrays being allocated after declaration (with random size!)
2009-03-23 15:56:04 +00:00
Neil Brown
919781eabc
Fixed the generation of mobile array dereferences
2009-03-23 15:55:38 +00:00
Neil Brown
4493b3d9e4
Removed some of the mobile passes at Carl's suggestion that I didn't need them anyway
2009-03-23 15:51:11 +00:00
Neil Brown
228523e7e7
Added the generation of IsDefined checks, and stopped them being applied to derefenced arrays
2009-03-23 15:48:24 +00:00
Neil Brown
fae0d6d6a2
Made intrinsic PROCs take the workspace as a parameter, and turned . to _ in their names (and implemented the RESIZE.MOBILE.ARRAY.1D intrinsic)
2009-03-23 15:46:24 +00:00
Neil Brown
3ae4824184
Added a missing case to the C backend
2009-03-22 22:49:10 +00:00
Neil Brown
0fc7266c29
Fixed various things to do with abbreviating sizes arrays, and corrected array assignment and the mobile type for Bool
2009-03-22 22:32:56 +00:00
Neil Brown
7b52565270
Fixed a few things that work around the user data types problem
2009-03-22 21:06:31 +00:00
Neil Brown
0a97946fbf
Fixed various type-checking things related to mobile types
2009-03-22 21:05:36 +00:00
