mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2025-02-25 11:57:11 -05:00
parent 22a4de14ea f80934d684
commit fbf4ecb188
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Ghidra/Processors/MIPS/src/main/java/ghidra/app/util/bin/format/elf/extend/MIPS_ElfExtension.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.
@@ -564,7 +564,6 @@ public class MIPS_ElfExtension extends ElfExtension {
processMipsOptions(elfLoadHelper, mipsOptionsAddr); processMipsOptions(elfLoadHelper, mipsOptionsAddr);
} }
if (regInfoAddr != null) { if (regInfoAddr != null) {
// TODO: don't do this if mips options present and processed
processMipsRegInfo(elfLoadHelper, regInfoAddr); processMipsRegInfo(elfLoadHelper, regInfoAddr);
} }
} }
@@ -645,7 +644,7 @@ public class MIPS_ElfExtension extends ElfExtension {
} }
} }
catch (AddressOutOfBoundsException | MemoryAccessException e) { catch (AddressOutOfBoundsException | MemoryAccessException e) {
// ignore // Ignore - No memory defined - possible *.debug file
} }
} }
@@ -723,6 +722,10 @@ public class MIPS_ElfExtension extends ElfExtension {
try { try {
// Create gp0 symbol in default space which represents a constant value (pinned) // Create gp0 symbol in default space which represents a constant value (pinned)
Scalar gp0Value = gpValueComponent.getScalar(0); Scalar gp0Value = gpValueComponent.getScalar(0);
if (gp0Value == null) {
// No memory defined - possible *.debug file
return;
}
long gp0 = gp0Value.getUnsignedValue(); long gp0 = gp0Value.getUnsignedValue();
if (multipleGp0.get() || otherGp0Value != null) { if (multipleGp0.get() || otherGp0Value != null) {
if (multipleGp0.get() || gp0 != otherGp0Value) { if (multipleGp0.get() || gp0 != otherGp0Value) {