Ghidra is a software reverse engineering (SRE) framework
Merge remote-tracking branch 'origin/GP-6347_ryanmkurtz_sourcelanguages--SQUASHED' (Closes #8740)
Ryan Kurtzf7ac2c4c061d
diff --cc Ghidra/Features/Rust/certification.manifestindex 0000000000,1104fd1b36..a4608ef9aamode 000000,100644..100644--- a/Ghidra/Features/Rust/certification.manifest+++ b/Ghidra/Features/Rust/certification.manifest@@@ -1,0 -1,16 +1,17 @@@+ ##VERSION: 2.0++##MODULE IP: Apache License 2.0+ Module.manifest||GHIDRA||||END|+ README.md||GHIDRA||||END|+ data/extensions.json||GHIDRA||||END|+ data/extensions/unix32/cc.xml||GHIDRA||||END|+ data/extensions/unix32/probe_fixup.xml||GHIDRA||||END|+ data/extensions/unix32/try_fixup.xml||GHIDRA||||END|+ data/extensions/unix64/cc.xml||GHIDRA||||END|+ data/extensions/unix64/probe_fixup.xml||GHIDRA||||END|+ data/extensions/unix64/try_fixup.xml||GHIDRA||||END|+ data/extensions/windows32/probe_fixup.xml||GHIDRA||||END|+ data/extensions/windows32/try_fixup.xml||GHIDRA||||END|+ data/extensions/windows64/probe_fixup.xml||GHIDRA||||END|+ data/extensions/windows64/try_fixup.xml||GHIDRA||||END|+ data/typeinfo/rust-common.gdt||GHIDRA||||END|+ data/types.json||GHIDRA||||END|diff --cc Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/sourcelanguage/DataArchiveUtils.javaindex 0000000000,7ea870c242..179173255amode 000000,100644..100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/sourcelanguage/DataArchiveUtils.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/sourcelanguage/DataArchiveUtils.java@@@ -1,0 -1,79 +1,79 @@@+ /* ###+ * IP: GHIDRA+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+ package ghidra.app.util.sourcelanguage;++ import java.io.*;+ import java.util.ArrayList;+ import java.util.List;++ import com.google.gson.Gson;+ import com.google.gson.stream.JsonReader;++ import generic.jar.ResourceFile;+ import ghidra.app.util.importer.MessageLog;+ import ghidra.app.util.sourcelanguage.SourceLanguageDataArchive.DataArchiveRule;+ import ghidra.app.util.sourcelanguage.SourceLanguageSpecExtension.SpecExtensionRule;+ import ghidra.program.database.SpecExtension;+ import ghidra.program.model.listing.Program;+ import ghidra.util.task.TaskMonitor;++ public class DataArchiveUtils {++ /**+ * An entry from a spec extension JSON configuration file+ *+ * @param processor The name of the processor (could be empty/null for wildcard)+ * @param endian The processor endianness ("little" or "big") (could be empty/null for wildcard)+ * @param size The processor size (i.e., "32, "64", etc) (could be empty/null for wildcard)+ * @param variant The processor variant (could be empty/null for wildcard)+ * @param formats The names of the binary file formats (could be empty/null for wildcard)+ * @param file The file path (relative to the JSON configuration file) of the data archive file+ * to add+ */+ private record JsonEntry(String processor, String endian, String size, String variant,+ List<String> formats, String file) {}++ /**+ * {@return a {@link List} of {@link SpecExtensionRule}s based on the given JSON configuration- * file++ * file}+ *+ * @param jsonFile The JSON configuration file+ * @param program The {@link Program}+ * @param log The error log+ * @param monitor The monitor+ * @throws IOException if there was a problem reading the JSON configuration file or the+ * {@link SpecExtension} XML files it references+ */+ public static List<DataArchiveRule> readDataArchiveJsonConfig(ResourceFile jsonFile,+ Program program, MessageLog log, TaskMonitor monitor) throws IOException {+ List<DataArchiveRule> ret = new ArrayList<>();+ try (JsonReader reader = new JsonReader(new InputStreamReader(jsonFile.getInputStream()))) {+ JsonEntry[] entries = new Gson().fromJson(reader, JsonEntry[].class);+ if (entries == null) {+ throw new EOFException(jsonFile + " was at end of file");+ }+ for (JsonEntry entry : entries) {+ if (entry == null) {+ continue;+ }+ ResourceFile file = new ResourceFile(jsonFile.getParentFile(), entry.file());+ ret.add(new DataArchiveRule(entry.processor(), entry.endian(), entry.size(),+ entry.variant(), entry.formats(), file));+ }+ }+ return ret;+ }+ }diff --cc Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/sourcelanguage/SpecExtensionUtils.javaindex 0000000000,237f201752..49bfc37ac4mode 000000,100644..100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/sourcelanguage/SpecExtensionUtils.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/sourcelanguage/SpecExtensionUtils.java@@@ -1,0 -1,107 +1,107 @@@+ /* ###+ * IP: GHIDRA+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+ package ghidra.app.util.sourcelanguage;++ import java.io.*;+ import java.util.*;++ import com.google.gson.Gson;+ import com.google.gson.stream.JsonReader;++ import generic.jar.ResourceFile;+ import ghidra.app.util.importer.MessageLog;+ import ghidra.app.util.sourcelanguage.SourceLanguageSpecExtension.SpecExtensionRule;+ import ghidra.program.database.SpecExtension;+ import ghidra.program.model.listing.Program;+ import ghidra.util.task.TaskMonitor;++ public class SpecExtensionUtils {++ /**+ * An entry from a spec extension JSON configuration file+ *+ * @param processor The name of the processor (required)+ * @param endian The processor endianness ("little" or "big") (could be empty/null for wildcard)+ * @param size The processor size (i.e., "32, "64", etc) (could be empty/null for wildcard)+ * @param variant The processor variant (could be empty/null for wildcard)+ * @param formats The names of the binary file formats (could be empty/null for wildcard)+ * @param directory The directory path (relative to the JSON configuration file) of the spec+ * extension files to add+ */+ private record JsonEntry(String processor, String endian, String size, String variant,+ List<String> formats, String directory) {}+++ /**+ * {@return the given {@link SpecExtension} XML file's contents}+ *+ * @param xmlFile A {@link SpecExtension} XML file+ * @throws IOException if there was a problem reading the XML file+ */+ public static String readSpecExtensionXmlFile(ResourceFile xmlFile) throws IOException {+ return new String(xmlFile.getInputStream().readAllBytes());+ }++ /**+ * {@return a {@link List} of {@link SpecExtension} XML file contents found in the given+ * directory}+ *+ * @param dir A directory containing {@link SpecExtension} XML files+ * @throws IOException if there was a problem reading the XML files+ */+ public static List<String> readSpecExtensionDir(ResourceFile dir) throws IOException {+ List<String> ret = new ArrayList<>();+ ResourceFile[] files = Objects.requireNonNullElse(dir.listFiles(), new ResourceFile[0]);+ for (ResourceFile f : files) {+ ret.add(readSpecExtensionXmlFile(f));+ }+ return ret;+ }++ /**+ * {@return a {@link List} of {@link SpecExtensionRule}s based on the given JSON configuration- * file++ * file}+ *+ * @param jsonFile The JSON configuration file+ * @param program The {@link Program}+ * @param log The error log+ * @param monitor The monitor+ * @throws IOException if there was a problem reading the JSON configuration file or the+ * {@link SpecExtension} XML files it references+ */+ public static List<SpecExtensionRule> readSpecExtensionJsonConfig(ResourceFile jsonFile,+ Program program, MessageLog log, TaskMonitor monitor) throws IOException {+ List<SpecExtensionRule> ret = new ArrayList<>();+ try (JsonReader reader = new JsonReader(new InputStreamReader(jsonFile.getInputStream()))) {+ JsonEntry[] entries = new Gson().fromJson(reader, JsonEntry[].class);+ if (entries == null) {+ throw new EOFException(jsonFile + " was at end of file");+ }+ for (JsonEntry entry : entries) {+ if (entry == null) {+ continue;+ }+ ResourceFile dir = new ResourceFile(jsonFile.getParentFile(), entry.directory());+ List<String> specExtensionXmls = readSpecExtensionDir(dir);+ for (String xml : specExtensionXmls) {+ ret.add(new SpecExtensionRule(entry.processor(), entry.endian(),+ entry.size(), entry.variant(), entry.formats(), xml));+ }+ }+ }+ return ret;+ }+ }