Skip to content

Fix size mismatch and tag typo in register type merging #117

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

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

Fix size mismatch and tag typo in register type merging #117

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
6 changes: 5 additions & 1 deletion src/descriptors-register.adb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ package body Descriptors.Register is
elsif Is_Register_Property (Tag) then
Read_Register_Property (Child, Result.Reg_Properties);

elsif Tag = "modifiedWriteValue" then
elsif Tag = "modifiedWriteValues" then
Result.Mod_Write_Values := Get_Value (Child);

elsif Tag = "readAction" then
Expand Down Expand Up @@ -228,6 +228,10 @@ package body Descriptors.Register is
return Unbounded.Null_Unbounded_String;
end if;

if R1.Reg_Properties.Size /= R2.Reg_Properties.Size then
return Unbounded.Null_Unbounded_String;
end if;

if R1.Dim /= R2.Dim then
return Unbounded.Null_Unbounded_String;
end if;
Expand Down