1
0
mirror of https://gitlab.com/camelot/kickc.git synced 2025-02-21 22:29:07 +00:00

2984 Commits

Author SHA1 Message Date
jespergravgaard
9dc17caab2 Made statement loops simpler. 2023-04-10 11:37:50 +02:00
jespergravgaard
55bec51f09 Made statement loops simpler. 2023-04-10 11:19:32 +02:00
jespergravgaard
c78b8c59b1 #815 working on moving control flow graphs into procedure compilation. 2023-04-10 10:23:00 +02:00
Sven Van de Velde
a52b5dc4a9 Banking progress
(cherry picked from commit d0abf45529c34e14ed3ce43b9be3a140f78bc4a9)
2023-04-10 07:22:06 +02:00
Sven Van de Velde
c550a122da Banking progress
(cherry picked from commit b98f95facff43c7a0bb8f9e9f902b49cc10ef4fe)
2023-04-10 07:19:35 +02:00
jespergravgaard
40182a6ad6 #815 working on moving control flow graphs into procedure compilation. 2023-04-10 00:08:44 +02:00
jespergravgaard
dfbeba7805 #815 working on moving control flow graphs into procedure compilation. 2023-04-09 23:59:49 +02:00
jespergravgaard
ac96f0b8da #815 working on moving control flow graphs into procedure compilation. 2023-04-09 23:40:37 +02:00
jespergravgaard
1fad48f8bc #815 working on moving control flow graphs into procedure compilation. 2023-04-09 22:49:53 +02:00
jespergravgaard
5905c1d5b6 Now handling uncalled procedures. 2023-04-09 11:24:22 +02:00
jespergravgaard
416184894f #815 working on generalizing the control flow graph and control flow block into an interface. 2023-04-09 00:02:48 +02:00
jespergravgaard
5a74d14b41 #815 working on generalizing the control flow graph and control flow block into an interface. 2023-04-08 22:52:15 +02:00
jespergravgaard
185bd439e4 #815 more procedure compilation 2023-04-06 22:46:28 +02:00
Jesper Balman Gravgaard
adb9688acb Merge branch '814-upgrade-java' into 'master'
Resolve "Upgrade to Java 17 - and upgrade libraries"

Closes #814

See merge request camelot/kickc!42
2023-04-06 07:08:26 +00:00
jespergravgaard
7b1b3d3708 Merge branch 'master' into 814-upgrade-java 2023-04-06 08:55:27 +02:00
jespergravgaard
a12a211d70 #814 Upgrade to Java 17 plus upgraded libraries. 2023-04-06 08:44:31 +02:00
Jesper Balman Gravgaard
7e0986196e Merge branch '372-varcall-progress' into 'master'
Working on #372 varcall. Fixed problem with returning a struct by value.

See merge request camelot/kickc!37
2023-04-05 15:32:31 +00:00
jespergravgaard
271163a25f Merge branch 'master' into 372-varcall-progress 2023-04-05 17:17:16 +02:00
Flight_Control
1499f8cecc - Added javadoc documentation in Bank.java.
- Added reworked procedure-callingconvention-phi-bank-5.c to reflect a good banking example for the documentation.
- Update ref for test cases.
2023-04-05 13:10:18 +02:00
Flight_Control
bdc4e28d0a - Fixed test cases going in error.
- Optimized test cases and documented them properly.
- Remove obscolete ref data.
2023-04-04 23:31:56 +02:00
Jesper Balman Gravgaard
f864f61be2 Merge branch 'add-union-initializer-c99-syntax' into 'master'
Implemented C99 compatible union initializer method, using .member= syntax...

See merge request camelot/kickc!40
2023-04-04 20:35:44 +00:00
Flight_Control
b13262beb8 - Added test cases.
- Merged remaining code change that is not in master remote.
2023-04-04 20:11:09 +02:00
Flight_Control
a6b021aaf0 Merge branch 'jesper_baseline' into far-call-isolated-#508
# Conflicts:
#	src/main/java/dk/camelot64/kickc/model/symbols/Procedure.java
#	src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
2023-04-04 20:03:15 +02:00
Flight_Control
5bd84e7812 - Added test cases.
- Checked asm outputs.
- banking is only implemented for the cx16 for now.
2023-04-04 19:36:11 +02:00
jespergravgaard
f2b9b5bde7 FlightControl fix for #678. Improved doc. 2023-04-04 13:18:58 +02:00
jespergravgaard
b85e6fc715 FlightControl fix for #678. 2023-04-04 13:11:36 +02:00
jespergravgaard
3c52043744 FlightControl fix for #678. 2023-04-04 12:54:28 +02:00
jespergravgaard
5c86d25057 FlightControl fix for #678. 2023-04-04 12:45:38 +02:00
Flight_Control
c5f260e882 Implemented C99 compatible union initializer method.
- Added test cases.
- Reworked parser.
- Added code redesign to avoid crashes in Initializers.java.
2023-04-04 09:30:40 +02:00
jespergravgaard
08ed1deebd Working on #372 varcall. Struct of struct parameters working. 2023-04-03 10:37:54 +02:00
Flight_Control
9db2d9b960 Implemented C99 compatible union initializer method, using .member= syntax...
(cherry picked from commit ef62f80b2b693aa92bcbdfb873bad5f995b4b6ff)
2023-04-03 09:00:01 +02:00
Sven Van de Velde
51623c3657 Implemented C99 compatible union initializer method, using .member= syntax...
(cherry picked from commit f52f851127ab06064c010d310ee7d87f78e1f303)
2023-04-03 08:59:40 +02:00
jespergravgaard
594e8d688c Working on #372 varcall. Pointers to struct working. 2023-04-02 12:18:33 +02:00
jespergravgaard
2dd2f2e081 Working on #372 varcall. Fixed struct in/out by value - also when only called once. 2023-04-02 11:18:07 +02:00
jespergravgaard
9a85048003 Working on #372 varcall. Fixed struct in/out by value - also when only called once. 2023-04-02 11:17:57 +02:00
jespergravgaard
c9720722ad Working on #372 varcall. Fixed problem with returning a struct by value. 2023-04-01 19:30:19 +02:00
Flight_Control
7e5b2caa37 Optimized logic for speed 2023-04-01 07:00:58 +02:00
Flight_Control
fb77d7629d - Optimized the speed of the compilation by reducing the zp coalesce to only zeropage allocated registers.
- All mem[x] type allocated memory or registers is ignored.

(cherry picked from commit 783bd398190b55b0ccea2be937b50eb185bf51bb)
2023-03-29 07:00:14 +02:00
Flight_Control
4706611564 - Mem[x] parameters in a banked function are always allocated in main memory.
- Mem[x] return value(s) in banked functions are always allocated in main memory.
- Mem[x] intermediate value(s) in banked functions are always placed in the designated data segment.

This to accommodate better banking logic for far function calls. (There might be more complexity for other type of variables, but for equinoxe it's working!).

(cherry picked from commit 649a187d7e9290b630a951d8968ce5ece6ba2216)
2023-03-27 21:42:52 +02:00
Flight_Control
b650ba99a9 - Fix far call kernal servicing address! It was wrong! Now it's fixed!
(cherry picked from commit e9ddfaeb3ab519cd393f26ca30632c06c59de1fe)
2023-03-26 18:31:47 +02:00
Flight_Control
2513e59266 - Inline code can never be banked.
(cherry picked from commit 249b7600a9262ea673e63d133db75690af43ca05)
2023-03-26 18:30:53 +02:00
Flight_Control
f81c5ce040 Adding the fix code segment in far call bank.
Added the currentBankLocation to the procedure definition.

(cherry picked from commit 0d90caebe8dd528b2a36d1e151f26820e40e70f5)
(cherry picked from commit 8cbf1b5b4bd7f62326e454bbff7ab5456647615d)
2023-03-26 18:30:09 +02:00
Flight_Control
944fbd3021 - removed gen files 2023-03-26 10:30:23 +02:00
Flight_Control
19b8de78a4 Merge commit 'db49ca6aabe96f0ca9ec355f33a4fadf33324f93' into far-call-isolated 2023-03-26 09:52:14 +02:00
Jesper Balman Gravgaard
7098b28cb2 Merge branch 'error-handling' into 'master'
Catching a RunTimeException only when there is no UnknownFragmentException ...

See merge request camelot/kickc!25
2023-02-18 18:48:24 +00:00
Jesper Balman Gravgaard
addfe05454 Merge branch 'fix-procedure-code-segment-updates' into 'master'
Fixes functions declared in header files not assigned the correct code segment.

See merge request camelot/kickc!26
2023-02-18 18:47:36 +00:00
Flight_Control
5fefeac7b6 Fixes functions declared in header files not assigned the correct code segment.
So the declarations of the functions receive also the currentCodeSegment, but only when the function is defined, the currentCodeSegment is to be assigned to the function (procedure!). During declaration of functions the code segment is likely Code ...
2022-11-22 07:30:22 +01:00
Flight_Control
db49ca6aab Major changes:
- Renamed #pragma far() to #pragma bank() upon design recommendations of @jesper.
- renamed #pragma near to #pragma nobank, to avoid using bank(-1).
- renamed __far directive to __bank directive.
- introduced bank area upon design recommendation of jesper, and replaced this with the already present code segment linkage to banking. So the structured stayed the same, only the naming changed! This unlink from segment indeed makes things easier when no segments are in scope of the program.
- added bank area as part of the fragment signature, so now call_far_[platform]_[bankarea]_prepare.asm, call_far_[platform]_[bankarea]_execute.asm, call_far_[platform]_[bankarea]_finalize.asm are expected to be present in the compiler.
- removed the c code prepare, execute, finalize idea. The fragments seem to be enough for the moment.
- added ram and rom fragments for far calls for the cx16.
- Cleaned banking logic from Statement level.
2022-11-21 18:17:35 +01:00
Flight_Control
1a63d437a0 - Refactored far call logic during parsing. The pragmaFarSegs hash table has been removed from the Pass0GenerateStatementSequence. Instead, a currentFarSegment is controlling the #pragma logic.
- Refactored pragmaCodeSegs HashMap, which has been removed from Pass0GenerateStatementSequence and moved to Program. It controls which code segment have been defined, and a validation is implemented in the far_seg pragmas.
- Refactored __far() to use the code segments, in analogy to far_seg pragmas.
- Refactored Procedure, which implements functions to use the FarSegment to decide on far declaration and far bank retrieval.
- refactored CallingConvention. Removed earlier quick implementation of bankFar variable as a local property, and declaredFar in the Procedure class. Now everyting is controlled through the farSegment.
- Refactored Procedure, the removal of FAR_CALL calling convention. It is wrong to implement FAR_CALL calling convention, because far and near calls can be stack calls, phi calls and even a varcall can be near of far.
- Removed the Pass1ProcedureFar because far and near implementation is not defined in statement level, it is defined on procedure level. But I've kept Pass1ProcedureFar to suppor the logic for inline prepare, execute, finalize routines during further implementation.
- Refactored directive FAR to match the directive far_seg() structure.
- Refactored complete logic during Pass4CodeGeneration to process statement call fragment generation to decide on near or far calls within the logic, taking into account the calling convention used.
- Added new fragments call_far[platform]_prepare.asm, call_far[platform]_execute.asm, call_far[platform]_finalize.asm and deleted call_far[platform]_entry.asm, call_far[platform]_exit.asm
- Renamed pragmas far_seg and near_seg to simply far and near respectively. Updated test cases with this change.
- Added test cases.

TODO: The actual inline implementation of prepare, execute, finalize functions when platform .asm fragments are not used.
TODO: Implementation of the near directive.
2022-11-20 09:56:10 +01:00
Flight_Control
d19c005d79 Fine tune of the phi-far-4 example to clearly illustrate #pragma near_seg utilization. 2022-11-19 08:19:18 +01:00