Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds back bits 57 & 56 #1645

Merged
merged 4 commits into from
Sep 24, 2024
Merged

Adds back bits 57 & 56 #1645

merged 4 commits into from
Sep 24, 2024

Conversation

wmat
Copy link
Collaborator

@wmat wmat commented Sep 23, 2024

Adds back bits 57 & 56 to Sscofpmf and Smcntrpmf. @gfavor and @bcstrongx , can you please make sure I added these bits back correctly?

Adds back bits 57 & 56 to Sscofpmf and Smcntrpmf.
@wmat
Copy link
Collaborator Author

wmat commented Sep 23, 2024

Fixes #1578 (comment)

src/smcntrpmf.adoc Outdated Show resolved Hide resolved
Copy link
Collaborator

@gfavor gfavor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall looks fine. Just one simple "typo" correction to the Smcntrpmf change - for which I created a comment. Presuming that will be fixed, I approve this set of changes.

Fixing 57:0 to be 57
src/smcntrpmf.adoc Outdated Show resolved Hide resolved
src/smcntrpmf.adoc Outdated Show resolved Hide resolved
src/sscofpmf.adoc Show resolved Hide resolved
@wmat
Copy link
Collaborator Author

wmat commented Sep 23, 2024

So everyone is in agreement and this is good to merge now?

@bcstrongx
Copy link
Collaborator

I don't see any changes based on our comments? There should only be 1 file changed (sscofpmf.adoc).

@ved-rivos
Copy link
Collaborator

@bcstrongx for smcntrpmf, there is one change:
"Bits 57:56 are reserved for possible future modes." should be replaced by "Bits 57:56 are reserved."

@atishp04
Copy link
Contributor

@bcstrongx for smcntrpmf, there is one change: "Bits 57:56 are reserved for possible future modes." should be replaced by "Bits 57:56 are reserved."

Ahh I see this now. I was referring to this in my earlier comment. Please ignore my previous comment if this is what going to be planned change for smcntrpmf.

@bcstrongx
Copy link
Collaborator

@ved-rivos I removed that text a while back:
340d4b1

57:0 are all reserved in m{instret|cycle}cfg.

As per the conversation on the original PR, it was decided that no changes to
Smcntrpmf are required.
As per conversation, no changes are required to Smcntrpmf
@wmat
Copy link
Collaborator Author

wmat commented Sep 24, 2024

So only Sscofpmf has changes now, with the exception of the deletion of an extra space at the end of a line in Smcntrpmf. With approvals, this can be merged now?

@ved-rivos
Copy link
Collaborator

So only Sscofpmf has changes now, with the exception of the deletion of an extra space at the end of a line in Smcntrpmf. With approvals, this can be merged now?

LGTM!

@wmat wmat merged commit e867a4e into main Sep 24, 2024
2 checks passed
@wmat wmat deleted the fixes-for-sscofpmt-smcntrpmf branch September 24, 2024 16:54
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.

5 participants