Peter Rugg
1859e86b4e
Merge branch 'pdr32-wip' into HEAD
2020-04-22 18:11:37 +01:00
Peter Rugg
3b30d2db36
Add BuildCap unsealing
2020-04-22 15:52:23 +01:00
Peter Rugg
8cc8f71cb9
Perform bounds check on requested length rather than rounded length.
...
This prevents issues with overflow in the top, and should be correct
based on the rounding used in the SetBounds function.
2020-04-22 14:27:11 +01:00
Peter Rugg
a89a606a6d
Factor out Opcodes and CSRs into separate files
2020-04-21 20:36:56 +01:00
Peter Rugg
3693326b62
Don't sign extend CSetBoundsImm immediate
2020-04-21 16:45:04 +01:00
Peter Rugg
8a4fa786dd
Add CToPtr special case
2020-04-21 13:52:33 +01:00
Peter Rugg
1773530c72
Attempt to enable AUIPCC
2020-04-20 23:11:58 +01:00
Peter Rugg
923d4915cb
Make SetBounds legal
2020-04-20 23:05:26 +01:00
Peter Rugg
8e01cf68df
More concise FShow for CapChecks
2020-04-20 21:28:09 +01:00
Peter Rugg
b4be80eba1
Bounds Check fixes
2020-04-20 21:23:42 +01:00
Peter Rugg
7db3fa539f
Add ALU bounds check
2020-04-20 11:21:51 +01:00
Marno van der Maas
b063497052
CHERI update to ReadMe
2020-04-18 09:47:56 +01:00
Peter Rugg
1bb53e5e86
Merge branch 'CHERI' into pdr32-wip
2020-04-16 20:58:37 +01:00
Peter Rugg
f1e04486b7
Work on SCR-related instructions
2020-04-16 20:53:08 +01:00
Peter Rugg
34c4e0f2fa
Comment out user exception delegation SCRs since the corresponding CSRs are not yet supported
2020-04-16 20:43:44 +01:00
Peter Rugg
8269a0625e
Initial implementation of set bounds
2020-04-16 20:39:54 +01:00
jon
4b2c3b1114
An attempt at doing the "right thing" with Jr targets and links with respect to PCC.
...
This is not easy to test until we have CSetBounds.
2020-04-16 18:07:39 +01:00
jon
a77ecc59af
Checkpoint work to propagate register numbers into the exception code.
...
There's another half of this left to do to propagate all the way into the CSR file.
2020-04-16 17:28:28 +01:00
Jessica Clarke
3add2cac5e
Move MakeReset0.v to src_bsc_lib_RTL like Piccolo and Flute
...
This ensures it's shared across all simulator builds.
2020-04-16 17:19:16 +01:00
Jessica Clarke
a2aee1969d
verilator_config.vlt: Revert "fix"
...
lint_off -rule is a very new feature that requires Verilator v4.026
released in Jan 2020, and is thus not in Ubuntu 18.04. Any breakage with
newer versions should be fixed in some other backwards-compatible way.
2020-04-16 17:12:27 +01:00
jon
9bb3e835ac
Fix operand of CCall.
...
Also fix one case of CCopyType where it is meant to return nullWithAddr(-1).
2020-04-16 11:38:38 +01:00
jon
c056d40a3a
Trace the register that has been decoded rather than picking out the bits from the instruction.
...
Duh.
2020-04-15 14:08:36 +01:00
Peter Rugg
a0fb527ad7
Raise illegalInstruction for currently unsupported exceptions
2020-04-15 14:07:36 +01:00
Peter Rugg
e773cb0232
Add CIncOffsetImm
2020-04-15 14:06:46 +01:00
jon
9685bf1931
Implement CCall, hopefully as well as CJALR.
...
This passes the unmodified TestRIG routine for CHERI Control Flow, which is very promising indeed!
There are some cases that are not covered there, but a lot is covered.
2020-04-14 18:10:53 +01:00
Peter Rugg
72dc8f8bad
Fix cap instructions not being sent to ALU
2020-04-07 19:55:09 +01:00
jon
56885f06c0
Changes for CJALR-only TestRIG to work.
...
This includes replacing register read values with nullCap if reading x0, which is generally necessary.
This is more-or-less using a new mechanism which shouldn't actually be necessary if the default value in the register file is nullCap.
(In RVFI_DII, we initialise with the almightyCap instead.)
2020-04-07 16:32:31 +01:00
Peter Rugg
ae78cd3d6a
Don't track built files
2020-04-07 13:56:34 +01:00
Alexandre Joannou
198ce853bf
Bump BlueStuff, cheri-cap-lib and BSV-RVFI-DII submodules
2020-04-07 12:48:37 +01:00
jon
beaf771e13
Bump subrepo.
2020-04-07 12:39:00 +01:00
jon
2918854bbc
Add missing ifdef.
2020-04-07 12:37:14 +01:00
jon
850e632140
Changes for CJALR to work in a basic case, as well as piping CHERI exceptions through to commit, though the register isn't piped and I've undone some useful work for that piping. Oh well.
2020-04-06 18:18:05 +01:00
Peter Rugg
4ce8f54903
Add initial exception checks
2020-04-06 12:26:19 +01:00
jon
1ecdf73dd3
Make CJALR work like JALR but without an immediate. Seems to work!
...
Obviously doesn't throw capability exceptions yet...
2020-04-03 17:57:57 +01:00
jon
d07d6f4761
Add OpCHERI to the function that rationalises opcodes.
2020-04-03 16:42:14 +01:00
Peter Rugg
f20c644bae
Add startings of decoding
2020-04-02 21:08:59 +01:00
jon
2c6ad40f93
Check the already decoded destination to decide to populate the register write data field in RVFI.
2020-04-02 17:10:52 +01:00
jon
b656f46859
Both enable tracing of floating-point register writes in RVFI-DII, and then properly not use them (since we're not expected to).
...
This is better than using nonsense as we were previously doing on floating point instructions.
2020-04-02 16:28:18 +01:00
jon
7618c5cec8
Trap on access of fcsr when floating point is not enabled.
2020-04-02 13:05:42 +01:00
jon
4714070aef
Trace the next PC correctly for mret.
2020-04-01 18:43:48 +01:00
jon
c2917d558f
Bump library version to that required by current design.
2020-04-01 14:44:21 +01:00
Peter Rugg
fe2420e42f
Allow running isa_tests on CPUs with <=4 cores
2020-03-31 17:34:41 +01:00
Jonathan Woodruff
81da99237e
Move the register file to CapReg format, and pipe CapPipe around the pipeline.
2020-03-31 15:44:23 +01:00
Jonathan Woodruff
0580a24b86
Bump library to version including new casts needed for recent changes.
2020-03-31 15:43:14 +01:00
Jonathan Woodruff
480b5923da
Make type of register file generic.
2020-03-30 15:20:28 +01:00
Jonathan Woodruff
dbcc4a6c22
Re-add dummy Mem.hex file.
2020-03-30 15:18:01 +01:00
Jonathan Woodruff
db41e2b9ed
An initial implementation of mccsr.
2020-03-27 17:47:02 +00:00
Alexandre Joannou
b5b2b4fe5c
Port AXI4 changes from Flute
2020-03-27 16:45:26 +00:00
Alexandre Joannou
92815e957e
Add BlueStuff to Makefile
2020-03-27 16:45:24 +00:00
Jonathan Woodruff
ded8dc72e7
Do the MTCC->PCC->MEPCC shuffle on trap.
2020-03-27 15:55:02 +00:00
