Skip to content

Merge Develop#82

Merged
PhilippvK merged 69 commits into
coredsl2from
develop
Apr 27, 2026
Merged

Merge Develop#82
PhilippvK merged 69 commits into
coredsl2from
develop

Conversation

@PhilippvK
Copy link
Copy Markdown
Member

Since tag 0.0.7 was create we should be save to merge the recent dev changes

jokap11 and others added 30 commits March 20, 2026 22:45
Removed patch_model for ExprVisitor
1to1 mapping from xmnn-isax-flow/cdsl/top.core_desc to etiss
for pre patch_model to current flow
Caution: Most of the transform is generated by Copilot
1to1 mapping from xmnn-isax-flow/cdsl/top.core_desc to etiss
for pre patch_model to current flow
PhilippvK and others added 23 commits April 16, 2026 15:01
Left or Right might be complex expression but not both. Just propagate
base_address
@PhilippvK PhilippvK self-assigned this Apr 24, 2026
@jokap11
Copy link
Copy Markdown
Collaborator

jokap11 commented Apr 25, 2026

I agree with merging. I have rebased my branch to the last commit of develop:
https://github.com/tum-ei-eda/M2-ISA-R/tree/meta_type_refactor

@PhilippvK PhilippvK merged commit 64c4208 into coredsl2 Apr 27, 2026
1 check passed
@PhilippvK
Copy link
Copy Markdown
Member Author

I agree with merging. I have rebased my branch to the last commit of develop: https://github.com/tum-ei-eda/M2-ISA-R/tree/meta_type_refactor

I accidentally did a rebase merge to the coredsl2 branch. Can you please try to rebase your branch on top of coredsl, too?

@jokap11
Copy link
Copy Markdown
Collaborator

jokap11 commented Apr 27, 2026

I agree with merging. I have rebased my branch to the last commit of develop: https://github.com/tum-ei-eda/M2-ISA-R/tree/meta_type_refactor

I accidentally did a rebase merge to the coredsl2 branch. Can you please try to rebase your branch on top of coredsl, too?

Well you didnt break anything ;)

hans@lenovo:~/m2isar/arch_type/M2-ISA-R$ git log
commit b4d0e168641fb4b41e185bea14320f5013b2ab4f (HEAD -> meta_type_refactor, origin/meta_type_refactor)
Author: jokap11 <johannes.kappes@tuwien.ac.at>
Date:   Fri Apr 24 19:20:14 2026 +0200

    [Metamodel] Refactor Literal and one common PrimitiveKind type
    
    Merge Literal subclasses to one main
    DataType removed by PrimitiveKind

commit ec225df2cd64285ec5903157b4beffc56826ff03
Merge: dd96ed5 e225763
Author: Philipp van Kempen <philipp.van-kempen@tum.de>
Date:   Fri Apr 24 17:03:41 2026 +0200

    Merge remote-tracking branch 'origin/coredsl2' into develop

commit e225763fe9d562632814c8c77df50a5491d97899 (coredsl2)
Merge: 1efc178 76595d7
Author: Philipp van Kempen <philipp.van-kempen@tum.de>
Date:   Fri Apr 24 16:55:03 2026 +0200

    Merge pull request #34 from tum-ei-eda/fix-48bit-only
    
    etiss_instruction.mako: fix support for 48-bit instrs


Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants