Merge remote-tracking branch 'origin/Ghidra_11.3'

This commit is contained in:
Ryan Kurtz 2025-02-03 15:31:52 -05:00
commit 3773ca550b
2 changed files with 3 additions and 1 deletions

View file

@ -14,6 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle" apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
apply from: "$rootProject.projectDir/gradle/nativeProject.gradle"
apply from: "$rootProject.projectDir/gradle/hasPythonPackage.gradle" apply from: "$rootProject.projectDir/gradle/hasPythonPackage.gradle"
apply plugin: 'eclipse' apply plugin: 'eclipse'

View file

@ -1892,10 +1892,11 @@ TaskList::iterator Heritage::refinement(TaskList::iterator memiter,const vector<
int4 size = (*memiter).size; int4 size = (*memiter).size;
if (size > 1024) return disjoint.end(); if (size > 1024) return disjoint.end();
Address addr = (*memiter).addr; Address addr = (*memiter).addr;
vector<int4> refine(size+1,0); vector<int4> refine(size+1,0); // Add "fencepost" for size position
buildRefinement(refine,addr,readvars); buildRefinement(refine,addr,readvars);
buildRefinement(refine,addr,writevars); buildRefinement(refine,addr,writevars);
buildRefinement(refine,addr,inputvars); buildRefinement(refine,addr,inputvars);
refine.pop_back(); // Remove the fencepost
int4 lastpos = 0; int4 lastpos = 0;
for(int4 curpos=1;curpos < size;++curpos) { // Convert boundary points to partition sizes for(int4 curpos=1;curpos < size;++curpos) { // Convert boundary points to partition sizes
if (refine[curpos] != 0) { if (refine[curpos] != 0) {