Skip to content

Merge S->X

Created by: silabs-robin

This PR merges S->X, thereby fixing the problem that the 40x was not runnable with the latest updates to the new ISS infrastructure. @silabs-mateilga, @eroom1966, @MikeOpenHWGroup , please review carefully to see if my porting makes sense.

Summary:

  • Merged cv32e40s/dev directly into cv32e40x/dev
    • (Manually resolved merge conflicts)
  • Copied (and renamed) 40s files into the 40x directory
    • Carefully picked relevant parts of the diff
    • (Ignored all non-iss-related changes)

Step-wise diffs (to ease the review):

Test status:

  • ci_check passes 13/16 tests
    • Fails in {debug_test, illegal, corev_rand_interrupt}.
    • (All fails seem related to the ISS/RTL disagreeing about tdata1 reset value)
  • Fv, is still runable

(ps. With so much code in common, we could be smarter about putting shared code in separate files to keep these diffs easier to merge/review.)

(ps. Yes, we hoped to only be focusing on the S, but design make changes on the X before merging to the S, so then we seem forced to maintain the cv32e40x/dev.)

Merge request reports

Loading