Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 11:31:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-0 Corrected test failures and fixed cspec encoding bug

Browse Source
This commit is contained in:
ghidra1 2024-11-20 10:04:56 -05:00
parent 22ddbc3f4b
commit ac58d20693
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -630,7 +630,7 @@ public class AutoTableDisassemblerTest extends AbstractGhidraHeadedIntegrationTe
} }
private JButton getActionButton(String actionName) { private JButton getActionButton(String actionName) {
Map<?, ?> actionMap = (Map<?, ?>) getInstanceField("actionMap", dialog); Map<?, ?> actionMap = (Map<?, ?>) getInstanceField("toolbarButtonsByAction", dialog);
Set<?> entrySet = actionMap.entrySet(); Set<?> entrySet = actionMap.entrySet();
for (Object entry : entrySet) { for (Object entry : entrySet) {
Map.Entry<?, ?> mapEntry = (Map.Entry<?, ?>) entry; Map.Entry<?, ?> mapEntry = (Map.Entry<?, ?>) entry;

1
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/protorules/MultiSlotAssign.java
View File

@ -258,6 +258,7 @@ public class MultiSlotAssign extends AssignAction {
encoder.writeString(ATTRIB_STORAGE, resourceType.toString()); encoder.writeString(ATTRIB_STORAGE, resourceType.toString());
} }
encoder.writeBool(ATTRIB_ALIGN, enforceAlignment); encoder.writeBool(ATTRIB_ALIGN, enforceAlignment);
encoder.writeBool(ATTRIB_STACKSPILL, consumeFromStack);
encoder.closeElement(ELEM_JOIN); encoder.closeElement(ELEM_JOIN);
} }