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

GP-1106: Platform naming convention now supports different

Browse Source 
architectures. Support for building on ARM.
This commit is contained in:
Ryan Kurtz
2021-07-07 09:25:39 -04:00
parent b55d1049d4
commit 00533b2869
43 changed files with 523 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/FileFormats/src/main/java/ghidra/file/jad/JadProcessWrapper.java
View File

@@ -114,8 +114,8 @@ public class JadProcessWrapper {
private static String getJadPath() throws IOException {
File jadExecutableFile =
Application.getOSFile((Platform.CURRENT_PLATFORM == Platform.WIN_32 ||
Platform.CURRENT_PLATFORM == Platform.WIN_64) ? "jad.exe" : "jad");
Application.getOSFile((Platform.CURRENT_PLATFORM == Platform.WIN_X86_32 ||
Platform.CURRENT_PLATFORM == Platform.WIN_X86_64) ? "jad.exe" : "jad");
String jadPath = jadExecutableFile.getAbsolutePath();
return jadPath;

12
Ghidra/Features/FileFormats/src/main/java/ghidra/file/jad/OldJad.java
View File

@@ -15,15 +15,15 @@
*/
package ghidra.file.jad;
import java.io.*;
import java.util.ArrayList;
import java.util.List;
import ghidra.framework.Application;
import ghidra.framework.Platform;
import ghidra.util.SystemUtilities;
import ghidra.util.task.TaskMonitor;
import java.io.*;
import java.util.ArrayList;
import java.util.List;
/**
*
* Wrapper class for JAD, a java decompiler.
@@ -136,8 +136,8 @@ class OldJad {
}
private String getJadPath() throws FileNotFoundException {
if (Platform.CURRENT_PLATFORM == Platform.WIN_32 ||
Platform.CURRENT_PLATFORM == Platform.WIN_64) {
if (Platform.CURRENT_PLATFORM == Platform.WIN_X86_32 ||
Platform.CURRENT_PLATFORM == Platform.WIN_X86_64) {
File jadExecutableFile = Application.getOSFile("jad.exe");
String jadPath = jadExecutableFile.getAbsolutePath();
return jadPath;