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.

Sign up for GitHub

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

Add a hacky if ~IsFault check on combining attrs #11

Open
wants to merge 1 commit into
base: symbolic2
Choose a base branch
from
Open

Add a hacky if ~IsFault check on combining attrs #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion arm-v8.5-a/model/aarch_mem.sail
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3686,7 +3686,16 @@ function CombineS1S2Desc (s1desc, s2desc) = {
result.memattrs = __tc12
}
};
result.memattrs = MemAttrDefaults(result.memattrs);
/* TODO: BS: the original ASL contained just:
*
* result.memattrs = MemAttrDefaults(result.memattrs);
*
* but this reads some uninitialized fields, so
* I modify this to check if it wasn't a fault first
*/
if ~(IsFault(result)) then {
result.memattrs = MemAttrDefaults(result.memattrs);
};
result
}

Expand Down