ELF
+ ++Writes an ELF program that was imported with the ELF loader back to its original file + layout. Any file-backed bytes that were modified by the user in the program database will + be reflected in the new file.
+ ++ +
Writing back a modified Memory + Map is not supported.
+
Ghidra Zip File (.gzf)
@@ -320,7 +334,7 @@- Address Space - Specifies which address space to export as Intel Hex format - only supports one address space. This option will be intialized to the "default" + only supports one address space. This option will be initialized to the "default" address space.
- Record Size - Specifies the size (in bytes) of each record in the output file. The default 16. @@ -330,6 +344,20 @@ 2 bytes will be dropped.
PE
+ ++Writes a PE program that was imported with the PE loader back to its original file + layout. Any file-backed bytes that were modified by the user in the program database will + be reflected in the new file.
+ ++ +
+
XML
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AbstractDemanglerAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AbstractDemanglerAnalyzer.java index 6722672bfa..7763217f21 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AbstractDemanglerAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AbstractDemanglerAnalyzer.java @@ -57,19 +57,38 @@ public abstract class AbstractDemanglerAnalyzer extends AbstractAnalyzer { public boolean added(Program program, AddressSetView set, TaskMonitor monitor, MessageLog log) throws CancelledException { + try { + monitor.setIndeterminate(true); + return doAdded(program, set, monitor, log); + } + finally { + monitor.setIndeterminate(false); + } + } + + private boolean doAdded(Program program, AddressSetView set, TaskMonitor monitor, + MessageLog log) + throws CancelledException { + DemanglerOptions options = getOptions(); if (!validateOptions(options, log)) { log.appendMsg(getName(), "Invalid demangler options--cannot demangle"); return false; } - monitor.initialize(100); + int count = 0; + + String defaultMessage = monitor.getMessage(); SymbolTable symbolTable = program.getSymbolTable(); SymbolIterator it = symbolTable.getPrimarySymbolIterator(set, true); while (it.hasNext()) { monitor.checkCanceled(); + if (++count % 100 == 0) { + monitor.setMessage(defaultMessage + " - " + count + " symbols"); + } + Symbol symbol = it.next(); if (skipSymbol(symbol)) { continue; @@ -81,12 +100,6 @@ public abstract class AbstractDemanglerAnalyzer extends AbstractAnalyzer { if (demangled != null) { apply(program, address, demangled, options, log, monitor); } - - Address min = set.getMinAddress(); - Address max = set.getMaxAddress(); - int distance = (int) (address.getOffset() - min.getOffset()); - int percent = (int) ((distance / max.getOffset()) * 100); - monitor.setProgress(percent); } return true; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java index 01838c2ed7..d8a52fba89 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java @@ -1110,7 +1110,14 @@ public class AutoAnalysisManager implements DomainObjectListener, DomainObjectCl int answer = OptionDialog.showYesNoDialog(tool.getToolFrame(), "Analyze", "" + HTMLUtilities.escapeHTML(program.getDomainFile().getName()) + " has not been analyzed. Would you like to analyze it now?"); - return answer == OptionDialog.OPTION_ONE; // Analyze + //Set to false for now. ANALYZED is a tri-valued variable: + // null means not asked. + // false means asked but could still turn true when analysis happens. + // true means analysis has started. + //Setting false here only works due to this code only being reachable + // because of the behavior of GhidraProgramUtilities.shouldAskToAnalyze(program) above. + GhidraProgramUtilities.setAnalyzedFlag(program, false); + return answer == OptionDialog.OPTION_ONE; //Analyze } return false; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisPlugin.java index 13e4f68cfa..802540285e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisPlugin.java @@ -190,10 +190,12 @@ public class AutoAnalysisPlugin extends Plugin implements AutoAnalysisManagerLis if (!showOptionsDialog(program)) { return; } - GhidraProgramUtilities.setAnalyzedFlag(program, true); analysisMgr.initializeOptions(); // options may have changed + // At this point, any analysis that is done is consider to be true for analyzed. + GhidraProgramUtilities.setAnalyzedFlag(program, true); + // start analysis to set the flag, but it probably won't do more. A bit goofy but better // than the way it was //TODO simplify all this after creating a taskManager per program instead of per tool. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/DWARFAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/DWARFAnalyzer.java index 45627bfbdf..6a501ea5e1 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/DWARFAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/DWARFAnalyzer.java @@ -34,6 +34,8 @@ import ghidra.util.exception.CancelledException; import ghidra.util.task.TaskMonitor; public class DWARFAnalyzer extends AbstractAnalyzer { + private static final String DWARF_LOADED_OPTION_NAME = "DWARF Loaded"; + private static final String OPTION_IMPORT_DATATYPES = "Import data types"; private static final String OPTION_IMPORT_DATATYPES_DESC = "Import data types defined in the DWARF debug info."; @@ -84,6 +86,7 @@ public class DWARFAnalyzer extends AbstractAnalyzer { "Automatically extracts DWARF info from an ELF file."; private DWARFImportOptions importOptions = new DWARFImportOptions(); + private long lastTxId = -1; public DWARFAnalyzer() { super(DWARF_ANALYZER_NAME, DWARF_ANALYZER_DESCRIPTION, AnalyzerType.BYTE_ANALYZER); @@ -105,22 +108,24 @@ public class DWARFAnalyzer extends AbstractAnalyzer { public boolean added(Program program, AddressSetView set, TaskMonitor monitor, MessageLog log) throws CancelledException { - if (!canAnalyze(program)) { - // Check again because external DWARF data (ie. dSYM files) could have been moved - // between the time canAnalyze() was called the first time and when this method - // is called - log.appendMsg("Unable to find DWARF information, skipping DWARF analysis"); - return false; + long txId = program.getCurrentTransaction().getID(); + if (txId == lastTxId) { + // Only run once per analysis session - as denoted by being in the same transaction + return true; } + lastTxId = txId; - if (DWARFProgram.alreadyDWARFImported(program)) { - Msg.warn(this, "DWARF already imported, skipping. (Detected DWARF program module)"); + Options propList = program.getOptions(Program.PROGRAM_INFO); + boolean alreadyLoaded = propList.getBoolean(DWARF_LOADED_OPTION_NAME, false) || + oldCheckIfDWARFImported(program); + if (alreadyLoaded) { + Msg.info(this, "DWARF already imported, skipping."); return false; } DWARFSectionProvider dsp = DWARFSectionProviderFactory.createSectionProviderFor(program); if (dsp == null) { - // silently return, canAnalyze() was false positive + log.appendMsg("Unable to find DWARF information, skipping DWARF analysis"); return false; } @@ -139,6 +144,7 @@ public class DWARFAnalyzer extends AbstractAnalyzer { DWARFImportSummary parseResults = dp.parse(); parseResults.logSummaryResults(); } + propList.setBoolean(DWARF_LOADED_OPTION_NAME, true); return true; } catch (CancelledException ce) { @@ -157,9 +163,16 @@ public class DWARFAnalyzer extends AbstractAnalyzer { return false; } + private boolean oldCheckIfDWARFImported(Program prog) { + // this was the old way of checking if the DWARF analyzer had already been run. Keep + // it around for a little bit so existing programs that have already imported DWARF data + // don't get re-run. Remove after a release or two. + return DWARFFunctionImporter.hasDWARFProgModule(prog, DWARFProgram.DWARF_ROOT_NAME); + } + @Override public boolean canAnalyze(Program program) { - return DWARFProgram.isDWARF(program, null); + return DWARFProgram.isDWARF(program); } @Override diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clipboard/CodeBrowserClipboardProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clipboard/CodeBrowserClipboardProvider.java index eb3e5a4c09..216a85bbd6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clipboard/CodeBrowserClipboardProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clipboard/CodeBrowserClipboardProvider.java @@ -24,6 +24,8 @@ import java.util.concurrent.CopyOnWriteArraySet; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import org.apache.commons.lang3.StringUtils; + import docking.ActionContext; import docking.ComponentProvider; import docking.dnd.GenericDataFlavor; @@ -303,12 +305,9 @@ public class CodeBrowserClipboardProvider extends ByteCopier private Transferable copyAddress() { AddressSetView addressSet = getSelectedAddresses(); - StringBuilder buffy = new StringBuilder(); AddressIterator it = addressSet.getAddresses(true); - while (it.hasNext()) { - buffy.append(it.next()).append('\n'); - } - return createStringTransferable(buffy.toString()); + String joined = StringUtils.join((Iterator) it, "\n"); + return createStringTransferable(joined); } protected Transferable copyCode(TaskMonitor monitor) { @@ -377,8 +376,8 @@ public class CodeBrowserClipboardProvider extends ByteCopier private boolean pasteLabelsComments(Transferable pasteData, boolean pasteLabels, boolean pasteComments) { try { - List list = (List) pasteData.getTransferData( - CodeUnitInfoTransferable.localDataTypeFlavor); + List list = + (List) pasteData.getTransferData(CodeUnitInfoTransferable.localDataTypeFlavor); ListEach button press will use the selected items as the items to be processed. While the - * items are scheduled to be processed, they will still be in the table, painted light gray. - * Attempting to reschedule any of these pending items will have no effect. Each time the + * + *
Each button press will use the selected items as the items to be processed. While the
+ * items are scheduled to be processed, they will still be in the table, painted light gray.
+ * Attempting to reschedule any of these pending items will have no effect. Each time the
* button is pressed, a new {@link SwingWorker} is created, which will put the processing into
* a background thread. Further, by using multiple workers, the work will be performed in
* parallel.
@@ -113,8 +114,7 @@ public class TableChooserDialog extends DialogComponentProvider
table.installNavigation(goToService, navigatable);
}
table.getSelectionModel()
- .addListSelectionListener(
- e -> setOkEnabled(table.getSelectedRowCount() > 0));
+ .addListSelectionListener(e -> setOkEnabled(table.getSelectedRowCount() > 0));
GhidraTableFilterPanel This method should be called after all custom columns have been added via
+ * {@link #addCustomColumn(ColumnDisplay)}.
+ *
+ * @param index the view's 0-based column index
+ * @see #setSortState(TableSortState)
+ * @throws IllegalArgumentException if an invalid column is requested for sorting
+ */
+ public void setSortColumn(int index) {
+ setSortState(TableSortState.createDefaultSortState(index));
+ }
+
+ /**
+ * Sets the column sort state for this dialog. The {@link TableSortState} allows for
+ * combinations of sorted columns in ascending or descending order.
+ *
+ * This method should be called after all custom columns have been added via
+ * {@link #addCustomColumn(ColumnDisplay)}.
+ *
+ * @param state the sort state
+ * @see #setSortColumn(int)
+ * @throws IllegalArgumentException if an invalid column is requested for sorting
+ */
+ public void setSortState(TableSortState state) {
+ AtomicReference
+ * This indicates an empty range, in which case the caller may want to take
+ * special steps to avoid issues with Ghidra ranges.
+ *
+ * Only seen in extremely old gcc versions. Typically the low & high
+ * pc values are omitted if the CU is empty.
+ *
+ * @return boolean true if the LowPC and HighPC values are present and equal
+ */
+ public boolean isLowPCEqualHighPC() {
+ AttrInfo low = findAttribute(DWARFAttribute.DW_AT_low_pc);
+ AttrInfo high = findAttribute(DWARFAttribute.DW_AT_high_pc);
+ if (low != null && high != null && low.form == high.form &&
+ low.attr instanceof DWARFNumericAttribute &&
+ high.attr instanceof DWARFNumericAttribute) {
+ DWARFNumericAttribute lowVal = (DWARFNumericAttribute) low.attr;
+ DWARFNumericAttribute highVal = (DWARFNumericAttribute) high.attr;
+ return lowVal.getValue() == highVal.getValue();
+ }
+ return false;
+ }
+
/**
* A simple class used by findAttribute() to return the found attribute, along with
* the DIE it was found in, and the DWARFForm type of the raw attribute.
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFCompileUnit.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFCompileUnit.java
index 2b46c53442..3c8bd88929 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFCompileUnit.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFCompileUnit.java
@@ -49,11 +49,14 @@ public class DWARFCompileUnit {
String comp_dir = diea.getString(DWARFAttribute.DW_AT_comp_dir, null);
Number high_pc = null, low_pc = null, language = null, stmt_list = null;
+
if (diea.hasAttribute(DWARFAttribute.DW_AT_low_pc)) {
low_pc = diea.getLowPC(0);
}
- if (diea.hasAttribute(DWARFAttribute.DW_AT_high_pc)) {
+ // if lowPC and highPC values are the same, don't read the high value
+ // because Ghidra can't express an empty range.
+ if (diea.hasAttribute(DWARFAttribute.DW_AT_high_pc) && !diea.isLowPCEqualHighPC()) {
high_pc = diea.getHighPC();
}
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFFunctionImporter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFFunctionImporter.java
index 786da2b95c..5cdfc55a1c 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFFunctionImporter.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFFunctionImporter.java
@@ -15,10 +15,11 @@
*/
package ghidra.app.util.bin.format.dwarf4.next;
-import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
+import java.io.IOException;
+
import ghidra.app.cmd.comments.AppendCommentCmd;
import ghidra.app.cmd.label.SetLabelPrimaryCmd;
import ghidra.app.util.bin.format.dwarf4.*;
@@ -202,26 +203,26 @@ public class DWARFFunctionImporter {
return;
}
- DWARFFunction function = new DWARFFunction(prog.getName(diea));
- function.namespace = function.dni.getParentNamespace(currentProgram);
+ DWARFFunction dfunc = new DWARFFunction(prog.getName(diea));
+ dfunc.namespace = dfunc.dni.getParentNamespace(currentProgram);
Number lowPC = diea.getLowPC(0);
- function.address = toAddr(lowPC);
- function.highAddress =
+ dfunc.address = toAddr(lowPC);
+ dfunc.highAddress =
diea.hasAttribute(DWARFAttribute.DW_AT_high_pc) ? toAddr(diea.getHighPC()) : null;
- String previousFunctionProcessed = functionsProcessed.get(function.address);
+ String previousFunctionProcessed = functionsProcessed.get(dfunc.address);
if (previousFunctionProcessed != null) {
// Msg.info(this, "Duplicate function defintion found for " + dni.getCategoryPath() +
// " at " + function.address + " in DIE " + diea.getHexOffset() + ", skipping");
markAllChildrenAsProcessed(diea.getHeadFragment());
return;
}
- functionsProcessed.put(function.address,
- function.dni.getNamespacePath() + " DIE: " + diea.getHexOffset());
+ functionsProcessed.put(dfunc.address,
+ dfunc.dni.getNamespacePath() + " DIE: " + diea.getHexOffset());
// Check if the function is an external function
- function.isExternal = diea.getBool(DWARFAttribute.DW_AT_external, false);
+ dfunc.isExternal = diea.getBool(DWARFAttribute.DW_AT_external, false);
// Retrieve the frame base if it exists
DWARFLocation frameLoc = null;
@@ -229,9 +230,9 @@ public class DWARFFunctionImporter {
List
* If the program is an Elf binary, it must have (at least) ".debug_info" and ".debug_abbr" program sections.
*
@@ -67,17 +63,17 @@ public class DWARFProgram implements Closeable {
* original binary file on the native filesystem. (ie. outside of Ghidra). See the DSymSectionProvider
* for more info.
*
- * @param program
- * @param monitor
- * @return
+ * @param program {@link Program} to test
+ * @return boolean true if program has DWARF info, false if not
*/
- public static boolean isDWARF(Program program, TaskMonitor monitor) {
+ public static boolean isDWARF(Program program) {
String format = program.getExecutableFormat();
- if (ElfLoader.ELF_NAME.equals(format)) {
+ if (ElfLoader.ELF_NAME.equals(format) &&
+ DWARFSectionProviderFactory.createSectionProviderFor(program) != null) {
return true;
}
- else if (MachoLoader.MACH_O_NAME.equals(format) &&
+ if (MachoLoader.MACH_O_NAME.equals(format) &&
DSymSectionProvider.getDSYMForProgram(program) != null) {
return true;
}
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/sectionprovider/DWARFSectionProviderFactory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/sectionprovider/DWARFSectionProviderFactory.java
index 7ea6cdce59..7cb75f4a24 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/sectionprovider/DWARFSectionProviderFactory.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/sectionprovider/DWARFSectionProviderFactory.java
@@ -15,14 +15,14 @@
*/
package ghidra.app.util.bin.format.dwarf4.next.sectionprovider;
-import ghidra.program.model.listing.Program;
-import ghidra.util.Msg;
-
import java.io.Closeable;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
+import ghidra.program.model.listing.Program;
+import ghidra.util.Msg;
+
/**
* Auto-detects which {@link DWARFSectionProvider} matches a Ghidra program.
*/
@@ -44,7 +44,6 @@ public class DWARFSectionProviderFactory {
static {
sectionProviderFactoryFuncs.add(BaseSectionProvider::createSectionProviderFor);
sectionProviderFactoryFuncs.add(DSymSectionProvider::createSectionProviderFor);
- sectionProviderFactoryFuncs.add(ElfSectionProvider::createSectionProviderFor);
}
/**
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/sectionprovider/ElfSectionProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/sectionprovider/ElfSectionProvider.java
deleted file mode 100644
index 4eb692cabc..0000000000
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/sectionprovider/ElfSectionProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ###
- * 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.bin.format.dwarf4.next.sectionprovider;
-
-import ghidra.app.util.bin.*;
-import ghidra.app.util.bin.format.elf.*;
-import ghidra.app.util.opinion.ElfLoader;
-import ghidra.program.model.listing.Program;
-
-import java.io.File;
-import java.io.IOException;
-
-import generic.continues.RethrowContinuesFactory;
-
-/**
- * Fetches DWARF section data from ELF files, directly, without going through
- * the Ghidra memory block api. This section provider usually isn't needed as
- * ELF sections are normally provided as Ghidra memory blocks. In case of extra-
- * large binaries, Ghidra may not be able to map the debug sections into memory
- * and this section provider will allow the DWARF analyzer to still function.
- */
-public class ElfSectionProvider implements DWARFSectionProvider {
-
- private ElfHeader header;
- private RandomAccessByteProvider provider;
-
- public static ElfSectionProvider createSectionProviderFor(Program program) {
- if (ElfLoader.ELF_NAME.equals(program.getExecutableFormat())) {
- try {
- File exePath = new File(program.getExecutablePath());
- return new ElfSectionProvider(exePath);
- }
- catch (IOException ioe) {
- // ignore
- }
- }
- return null;
- }
-
- public ElfSectionProvider(File exeFile) throws IOException {
- provider = new RandomAccessByteProvider(exeFile);
- try {
- // Parse the ELF header to get the sections
- header = ElfHeader.createElfHeader(RethrowContinuesFactory.INSTANCE, provider);
- header.parse();
- }
- catch (ElfException e) {
- provider.close();
- throw new IOException("Error parsing ELF", e);
- }
- }
-
- @Override
- public ByteProvider getSectionAsByteProvider(String sectionName) throws IOException {
-
- ElfSectionHeader section = header.getSection("." + sectionName);
-
- return (section != null) ? new ByteProviderWrapper(section.getReader().getByteProvider(),
- section.getOffset(), section.getSize()) : null;
- }
-
- @Override
- public void close() {
- try {
- provider.close();
- }
- catch (IOException e) {
- // ignore
- }
- }
-
- @Override
- public boolean hasSection(String... sectionNames) {
- for (String sectionName : sectionNames) {
- if (header.getSection("." + sectionName) == null) {
- return false;
- }
- }
- return true;
- }
-
-}
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfSymbol.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfSymbol.java
index 297dedfd3b..170c317d97 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfSymbol.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfSymbol.java
@@ -103,11 +103,24 @@ public class ElfSymbol implements ByteArrayConverter {
private String nameAsString;
+ /**
+ * create an ElfSymbol()
+ * Warning! the routine initSymbolName() must be called on the symbol later
+ * to initialize the string name. This is a performance enhancement.
+ *
+ * @param reader to read symbol from
+ * @param symbolIndex index of the symbol to read
+ * @param symbolTable symbol table to associate the symbol to
+ * @param stringTable string table to read symbols from
+ * @param header else header
+ * @return newly created ElfSymbol
+ *
+ * @throws IOException if an issue with reading occurs
+ */
public static ElfSymbol createElfSymbol(FactoryBundledWithBinaryReader reader, int symbolIndex,
- ElfSymbolTable symbolTable, ElfStringTable stringTable, ElfHeader header)
- throws IOException {
+ ElfSymbolTable symbolTable, ElfHeader header) throws IOException {
ElfSymbol elfSymbol = (ElfSymbol) reader.getFactory().create(ElfSymbol.class);
- elfSymbol.initElfSymbol(reader, symbolIndex, symbolTable, stringTable, header);
+ elfSymbol.initElfSymbol(reader, symbolIndex, symbolTable, header);
return elfSymbol;
}
@@ -117,49 +130,6 @@ public class ElfSymbol implements ByteArrayConverter {
public ElfSymbol() {
}
- private void initElfSymbol(FactoryBundledWithBinaryReader reader, int symbolIndex,
- ElfSymbolTable symbolTable, ElfStringTable stringTable, ElfHeader header)
- throws IOException {
- this.header = header;
- this.symbolTable = symbolTable;
- this.symbolTableIndex = symbolIndex;
-
- if (header.is32Bit()) {
- st_name = reader.readNextInt();
- st_value = reader.readNextInt() & Conv.INT_MASK;
- st_size = reader.readNextInt() & Conv.INT_MASK;
- st_info = reader.readNextByte();
- st_other = reader.readNextByte();
- st_shndx = reader.readNextShort();
- }
- else {
- st_name = reader.readNextInt();
- st_info = reader.readNextByte();
- st_other = reader.readNextByte();
- st_shndx = reader.readNextShort();
- st_value = reader.readNextLong();
- st_size = reader.readNextLong();
- }
-
- if (st_name == 0) {
- if (getType() == STT_SECTION) {
- ElfSectionHeader[] sections = header.getSections();
- if (st_shndx < 0 || st_shndx >= sections.length) {
- //invalid section reference...
- //this is a bug in objcopy, whereby sections are removed
- //but the corresponding section symbols are left behind.
- }
- else {
- ElfSectionHeader section = sections[st_shndx];
- nameAsString = section.getNameAsString();
- }
- }
- }
- else {
- nameAsString = stringTable.readString(reader, st_name);
- }
- }
-
/**
* Creates a new section symbol.
* @param header the corresponding ELF header
@@ -209,6 +179,69 @@ public class ElfSymbol implements ByteArrayConverter {
this.symbolTableIndex = symbolIndex;
}
+ private void initElfSymbol(FactoryBundledWithBinaryReader reader, int symbolIndex,
+ ElfSymbolTable symbolTable, ElfHeader header) throws IOException {
+ this.header = header;
+ this.symbolTable = symbolTable;
+ this.symbolTableIndex = symbolIndex;
+
+ if (header.is32Bit()) {
+ st_name = reader.readNextInt();
+ st_value = reader.readNextInt() & Conv.INT_MASK;
+ st_size = reader.readNextInt() & Conv.INT_MASK;
+ st_info = reader.readNextByte();
+ st_other = reader.readNextByte();
+ st_shndx = reader.readNextShort();
+ }
+ else {
+ st_name = reader.readNextInt();
+ st_info = reader.readNextByte();
+ st_other = reader.readNextByte();
+ st_shndx = reader.readNextShort();
+ st_value = reader.readNextLong();
+ st_size = reader.readNextLong();
+ }
+
+ if (st_name == 0) {
+ if (getType() == STT_SECTION) {
+ ElfSectionHeader[] sections = header.getSections();
+ if (st_shndx < 0 || st_shndx >= sections.length) {
+ //invalid section reference...
+ //this is a bug in objcopy, whereby sections are removed
+ //but the corresponding section symbols are left behind.
+ }
+ else {
+ ElfSectionHeader section = sections[st_shndx];
+ nameAsString = section.getNameAsString();
+ }
+ }
+ }
+ else {
+ // The string name will be initialized later
+ // in a call to initSymbolName()
+ }
+ }
+
+ /**
+ * Initialize the string name of the symbol.
+ *
+ * NOTE: This routine MUST be called for each
+ * ELFSymbol after the elf symbols have been created.
+ *
+ * This is done separately from the initial symbol entry read because
+ * the string names are in a separate location. If they are read
+ * at the same time the reading buffer will jump around and significantly
+ * degrade reading performance.
+ *
+ * @param reader to read from
+ * @param stringTable stringTable to initialize symbol name
+ */
+ public void initSymbolName(FactoryBundledWithBinaryReader reader, ElfStringTable stringTable) {
+ if (nameAsString == null) {
+ nameAsString = stringTable.readString(reader, st_name);
+ }
+ }
+
/**
* Get the symbol table containing this symbol
* @return symbol table
@@ -249,27 +282,37 @@ public class ElfSymbol implements ByteArrayConverter {
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj) {
return true;
- if (obj == null)
+ }
+ if (obj == null) {
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
+ }
ElfSymbol other = (ElfSymbol) obj;
- if (st_info != other.st_info)
+ if (st_info != other.st_info) {
return false;
- if (st_name != other.st_name)
+ }
+ if (st_name != other.st_name) {
return false;
- if (st_other != other.st_other)
+ }
+ if (st_other != other.st_other) {
return false;
- if (st_shndx != other.st_shndx)
+ }
+ if (st_shndx != other.st_shndx) {
return false;
- if (st_size != other.st_size)
+ }
+ if (st_size != other.st_size) {
return false;
- if (st_value != other.st_value)
+ }
+ if (st_value != other.st_value) {
return false;
- if (symbolTableIndex != other.symbolTableIndex)
+ }
+ if (symbolTableIndex != other.symbolTableIndex) {
return false;
+ }
return true;
}
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfSymbolTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfSymbolTable.java
index 09eea496c9..fcb4631af9 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfSymbolTable.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfSymbolTable.java
@@ -18,6 +18,7 @@ package ghidra.app.util.bin.format.elf;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
import ghidra.app.util.bin.ByteArrayConverter;
import ghidra.app.util.bin.format.FactoryBundledWithBinaryReader;
@@ -96,15 +97,26 @@ public class ElfSymbolTable implements ElfFileSection, ByteArrayConverter {
long entryPos = reader.getPointerIndex();
+ // load the all the symbol entries first, don't initialize the string name
+ // that will be done later to help localize memory access
for (int i = 0; i < symbolCount; i++) {
// Reposition reader to start of symbol element since ElfSymbol object
// may not consume all symbol element data
reader.setPointerIndex(entryPos);
- ElfSymbol sym = ElfSymbol.createElfSymbol(reader, i, this, stringTable, header);
+ ElfSymbol sym = ElfSymbol.createElfSymbol(reader, i, this, header);
symbolList.add(sym);
entryPos += entrySize;
}
+ // sort the entries by the index in the string table, so don't jump around reading
+ List The View Settings option describes how the graph will be zoomed when it is first
+ loaded. The values are: There are various edge color and highlight color options available to change. The
highlight colors are those to be used when the flow animations take place. The Use Dim Return Edges option makes default code block return flow edges
+ lighter than conditional edges. This makes it easier for users to scan the
+ graph and ignore return flows.
+ Edges returning to the default code flow are painted lighter to de-emphasize them. This
* could be made into an option.
- *
- * Edge routing herein defaults to 'simple routing'; 'complex routing' is a user option.
+ *
+ * Edge routing herein defaults to 'simple routing'; 'complex routing' is a user option.
* Simple routing will reduce edge noise as much as possible by combining/overlapping edges that
* flow towards the bottom of the function (returning code flow). Also, edges may fall behind
* vertices for some functions. Complex routing allows the user to visually follow the flow
* of an individual edge. Complex routing will prevent edges from overlapping and will route
- * edges around vertices. Simple routing is better when the layout of the vertices is
- * important to the user; complex routing is better when edges/relationships are more
+ * edges around vertices. Simple routing is better when the layout of the vertices is
+ * important to the user; complex routing is better when edges/relationships are more
* important to the user.
- *
+ *
* TODO ideas:
* -paint fallthrough differently for all, or just for those returning to the baseline
*/
@@ -113,7 +114,7 @@ public class DecompilerNestedLayout extends AbstractFGLayout {
@Override
protected double getCondenseFactor() {
- // our layout needs more spacing because we have custom edge routing that we want to
+ // our layout needs more spacing because we have custom edge routing that we want to
// stand out
return .3;
}
@@ -201,7 +202,7 @@ public class DecompilerNestedLayout extends AbstractFGLayout {
continue;
}
- //
+ //
// Special case: fallthrough--don't label this...not sure how to tell fallthrough. For
// now assume that any column below or backwards is fallthrough. However,
// do label fallthrough if it is the only edge.
@@ -231,10 +232,10 @@ public class DecompilerNestedLayout extends AbstractFGLayout {
MapIMAGE_FILE_HEADER in bytes.
*/
- public final static int IMAGE_SIZEOF_FILE_HEADER = 20;
+ public final static int IMAGE_SIZEOF_FILE_HEADER = 20;
/**
* Relocation info stripped from file.
*/
- public final static int IMAGE_FILE_RELOCS_STRIPPED = 0x0001;
- /**
- * File is executable (no unresolved externel references).
- */
- public final static int IMAGE_FILE_EXECUTABLE_IMAGE = 0x0002;
- /**
- * Line nunbers stripped from file.
- */
- public final static int IMAGE_FILE_LINE_NUMS_STRIPPED = 0x0004;
- /**
- * Local symbols stripped from file.
- */
- public final static int IMAGE_FILE_LOCAL_SYMS_STRIPPED = 0x0008;
- /**
- * Agressively trim working set
- */
- public final static int IMAGE_FILE_AGGRESIVE_WS_TRIM = 0x0010;
- /**
- * App can handle >2gb addresses
- */
- public final static int IMAGE_FILE_LARGE_ADDRESS_AWARE = 0x0020;
- /**
- * Bytes of machine word are reversed.
- */
- public final static int IMAGE_FILE_BYTES_REVERSED_LO = 0x0080;
- /**
- * 32 bit word machine.
- */
- public final static int IMAGE_FILE_32BIT_MACHINE = 0x0100;
- /**
- * Debugging info stripped from file in .DBG file
- */
- public final static int IMAGE_FILE_DEBUG_STRIPPED = 0x0200;
- /**
- * If Image is on removable media, copy and run from the swap file.
- */
- public final static int IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP = 0x0400;
- /**
- * If Image is on Net, copy and run from the swap file.
- */
- public final static int IMAGE_FILE_NET_RUN_FROM_SWAP = 0x0800;
- /**
- * System File.
- */
- public final static int IMAGE_FILE_SYSTEM = 0x1000;
- /**
- * File is a DLL.
- */
- public final static int IMAGE_FILE_DLL = 0x2000;
- /**
- * File should only be run on a UP machine
- */
- public final static int IMAGE_FILE_UP_SYSTEM_ONLY = 0x4000;
- /**
- * Bytes of machine word are reversed.
- */
- public final static int IMAGE_FILE_BYTES_REVERSED_HI = 0x8000;
+ public final static int IMAGE_FILE_RELOCS_STRIPPED = 0x0001;
+ /**
+ * File is executable (no unresolved externel references).
+ */
+ public final static int IMAGE_FILE_EXECUTABLE_IMAGE = 0x0002;
+ /**
+ * Line nunbers stripped from file.
+ */
+ public final static int IMAGE_FILE_LINE_NUMS_STRIPPED = 0x0004;
+ /**
+ * Local symbols stripped from file.
+ */
+ public final static int IMAGE_FILE_LOCAL_SYMS_STRIPPED = 0x0008;
+ /**
+ * Agressively trim working set
+ */
+ public final static int IMAGE_FILE_AGGRESIVE_WS_TRIM = 0x0010;
+ /**
+ * App can handle >2gb addresses
+ */
+ public final static int IMAGE_FILE_LARGE_ADDRESS_AWARE = 0x0020;
+ /**
+ * Bytes of machine word are reversed.
+ */
+ public final static int IMAGE_FILE_BYTES_REVERSED_LO = 0x0080;
+ /**
+ * 32 bit word machine.
+ */
+ public final static int IMAGE_FILE_32BIT_MACHINE = 0x0100;
+ /**
+ * Debugging info stripped from file in .DBG file
+ */
+ public final static int IMAGE_FILE_DEBUG_STRIPPED = 0x0200;
+ /**
+ * If Image is on removable media, copy and run from the swap file.
+ */
+ public final static int IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP = 0x0400;
+ /**
+ * If Image is on Net, copy and run from the swap file.
+ */
+ public final static int IMAGE_FILE_NET_RUN_FROM_SWAP = 0x0800;
+ /**
+ * System File.
+ */
+ public final static int IMAGE_FILE_SYSTEM = 0x1000;
+ /**
+ * File is a DLL.
+ */
+ public final static int IMAGE_FILE_DLL = 0x2000;
+ /**
+ * File should only be run on a UP machine.
+ */
+ public final static int IMAGE_FILE_UP_SYSTEM_ONLY = 0x4000;
+ /**
+ * Bytes of machine word are reversed.
+ */
+ public final static int IMAGE_FILE_BYTES_REVERSED_HI = 0x8000;
- public final static String [] CHARACTERISTICS = {
- "Relocation info stripped from file",
- "File is executable (i.e. no unresolved externel references)",
- "Line nunbers stripped from file",
- "Local symbols stripped from file",
- "Agressively trim working set",
- "App can handle >2gb addresses",
- "Bytes of machine word are reversed",
- "32 bit word machine",
- "Debugging info stripped from file in .DBG file",
- "If Image is on removable media, copy and run from the swap file",
- "If Image is on Net, copy and run from the swap file",
- "System file",
- "File is a DLL",
- "File should only be run on a UP machine",
- "Bytes of machine word are reversed"
- };
+ /**
+ * Magic value in LordPE's Symbol Table pointer field.
+ */
+ private final static int LORDPE_SYMBOL_TABLE = 0x726F4C5B;
+ /**
+ * Magic value in LordPE's Number of Symbols field.
+ */
+ private final static int LORDPE_NUMBER_OF_SYMBOLS = 0x5D455064;
- private short machine;
- private short numberOfSections;
- private int timeDateStamp;
- private int pointerToSymbolTable;
- private int numberOfSymbols;
- private short sizeOfOptionalHeader; // delta between start of OptionalHeader and start of section table
- private short characteristics;
+ public final static String[] CHARACTERISTICS = { "Relocation info stripped from file",
+ "File is executable (i.e. no unresolved externel references)",
+ "Line nunbers stripped from file", "Local symbols stripped from file",
+ "Agressively trim working set", "App can handle >2gb addresses",
+ "Bytes of machine word are reversed", "32 bit word machine",
+ "Debugging info stripped from file in .DBG file",
+ "If Image is on removable media, copy and run from the swap file",
+ "If Image is on Net, copy and run from the swap file", "System file", "File is a DLL",
+ "File should only be run on a UP machine", "Bytes of machine word are reversed" };
- private SectionHeader [] sectionHeaders;
- private ListIMAGE_NT_HEADERS32 and
- * IMAGE_NT_HEADERS64 structs as defined in
+ * IMAGE_NT_HEADERS64 structs as defined in
* winnt.h.
*
* typedef struct _IMAGE_NT_HEADERS {
@@ -39,8 +39,8 @@ import ghidra.util.task.TaskMonitorAdapter;
* IMAGE_OPTIONAL_HEADER32 OptionalHeader;
* };
*
- *
- *
+ *
+ *
*/
public class NTHeader implements StructConverter, OffsetValidator {
/**
@@ -82,8 +82,8 @@ public class NTHeader implements StructConverter, OffsetValidator {
public NTHeader() {
}
- private void initNTHeader(FactoryBundledWithBinaryReader reader, int index, SectionLayout layout,
- boolean advancedProcess, boolean parseCliHeaders)
+ private void initNTHeader(FactoryBundledWithBinaryReader reader, int index,
+ SectionLayout layout, boolean advancedProcess, boolean parseCliHeaders)
throws InvalidNTHeaderException, IOException {
this.reader = reader;
this.index = index;
@@ -172,9 +172,9 @@ public class NTHeader implements StructConverter, OffsetValidator {
//low alignment mode?
//
if (optionalHeader != null) {
- if (optionalHeader.getFileAlignment() == optionalHeader.getSectionAlignment()
- && optionalHeader.getSectionAlignment() < 800
- && optionalHeader.getFileAlignment() > 1) {
+ if (optionalHeader.getFileAlignment() == optionalHeader.getSectionAlignment() &&
+ optionalHeader.getSectionAlignment() < 800 &&
+ optionalHeader.getFileAlignment() > 1) {
return rva;
}
}
@@ -270,6 +270,7 @@ public class NTHeader implements StructConverter, OffsetValidator {
fileHeader.processSections(optionalHeader);
fileHeader.processSymbols();
+ fileHeader.processImageRuntimeFunctionEntries();
if (advancedProcess) {
optionalHeader.processDataDirectories(TaskMonitorAdapter.DUMMY_MONITOR);
@@ -278,7 +279,7 @@ public class NTHeader implements StructConverter, OffsetValidator {
void writeHeader(RandomAccessFile raf, DataConverter dc) throws IOException {
- raf.seek( index );
+ raf.seek(index);
raf.write(dc.getBytes(signature));
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliAbstractSig.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliAbstractSig.java
index e82c38b122..303b5138b7 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliAbstractSig.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliAbstractSig.java
@@ -4,9 +4,9 @@
* 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.
@@ -107,12 +107,12 @@ public abstract class CliAbstractSig extends CliBlob implements CliRepresentable
ELEMENT_TYPE_VALUETYPE(0x11),
ELEMENT_TYPE_VAR(0x13), // "Class type variable VAR"
(0x16),
-
+
ELEMENT_TYPE_MVAR(0x1e), // Method type variable MVAR
-
+
ELEMENT_TYPE_INTERNAL(0x21), // Internal (generated internally, "will not be persisted in any way")
ELEMENT_TYPE_MAX(0x22),
-
+
*/
switch (typeCode) {
@@ -431,32 +431,95 @@ public abstract class CliAbstractSig extends CliBlob implements CliRepresentable
}
public class CliTypeFnPtr extends CliSigType {
- private CliAbstractSig sig;
- private boolean isDefSig; // true => MethodDef, false => MethodRef
+ private long dataOffset;
+
+ private CliRetType retType;
+ private CliParam params[];
+ private int sizeOfCount;
+ private byte flags;
+ private int genericParamCount;
+ private int sizeOfGenericCount;
+
+ private int sentinelIndex; // SENTINEL is before the parameter index in this field
+
+ private final int FNPTR_FLAGS_DEFAULT = 0x00;
+ private final int FNPTR_FLAGS_VARARG = 0x05;
+ private final int FNPTR_FLAGS_GENERIC = 0x10;
+ private final int FNPTR_FLAGS_HASTHIS = 0x20;
+ private final int FNPTR_FLAGS_EXPLICITTHIS = 0x40;
public CliTypeFnPtr(BinaryReader reader, CliElementType typeCode) throws IOException {
super(typeCode);
- // TODO: MethodDef and MethodRef sig need to have static isX(reader) methods so I can tell the difference
- //sig = new CliSigMethodRef(blob); // MethodRef is just Def plus possible sentinel and minus potential XORed args in the first byte
+
+ sentinelIndex = -1;
+
+ dataOffset = reader.getPointerIndex();
+
+ // Flags is similar to a MethodDef unless vararg is used.
+ flags = reader.readNextByte();
+
+ if ((flags & FNPTR_FLAGS_GENERIC) == FNPTR_FLAGS_GENERIC) {
+ long origIndex = reader.getPointerIndex();
+ genericParamCount = decodeCompressedUnsignedInt(reader);
+ sizeOfGenericCount = (int) (reader.getPointerIndex() - origIndex);
+ }
+
+ long origIndex = reader.getPointerIndex();
+ int paramCount = decodeCompressedUnsignedInt(reader);
+ this.sizeOfCount = (int) (reader.getPointerIndex() - origIndex);
+
+ try {
+ retType = new CliRetType(reader);
+ }
+ catch (InvalidInputException e) {
+ retType = null;
+ }
+ params = new CliParam[paramCount];
+
+ for (int i = 0; i < paramCount; i++) {
+ if (reader.peekNextByte() == CliElementType.ELEMENT_TYPE_SENTINEL.id()) {
+ reader.readNextByte();
+ sentinelIndex = i;
+ }
+ try {
+ params[i] = new CliParam(reader);
+ }
+ catch (InvalidInputException e) {
+ params[i] = null;
+ }
+ }
}
@Override
public String getRepresentation() {
- return "FnPtr " + sig.getRepresentation();
+ return "FnPtr " /*+ sig.getRepresentation()*/;
}
@Override
public String getShortRepresentation() {
- return "FnPtr " + sig.getShortRepresentation();
+ return "FnPtr " /*+ sig.getShortRepresentation()*/;
}
@Override
public DataType getDefinitionDataType() {
- StructureDataType struct = new StructureDataType(new CategoryPath(PATH), "FnPtr", 0);
- struct.add(CliTypeCodeDataType.dataType, "FnPtr", "FnPtr");
- struct.add(DWORD, "MethodDefOrRef", "index into blob heap");
+ StructureDataType struct =
+ new StructureDataType(new CategoryPath(PATH), "FnPtr_" + dataOffset, 0);
+ struct.add(CliTypeCodeDataType.dataType, CliElementType.ELEMENT_TYPE_FNPTR.toString(),
+ "");
+ struct.add(BYTE, "Flags", "ORed VARARG/GENERIC/HASTHIS/EXPLICITTHIS");
+
+ if (genericParamCount > 0) {
+ struct.add(getDataTypeForBytes(sizeOfGenericCount), "GenParamCount",
+ "Number of generic paramameters for the method");
+ }
+ struct.add(getDataTypeForBytes(sizeOfCount), "ParamCount",
+ "Number of parameter types to follow RetType");
+ struct.add(retType.getDefinitionDataType(), "RetType", null);
+
+ for (int i = 0; i < params.length; i++) {
+ struct.add(params[i].getDefinitionDataType(), "Param" + i, null);
+ }
return struct;
- // TODO: Return the correct size of a signature reference (always 4B in this context perchance?)
}
}
@@ -552,17 +615,18 @@ public abstract class CliAbstractSig extends CliBlob implements CliRepresentable
}
public class CliTypeVarOrMvar extends CliSigType {
+ private long dataOffset;
private int number;
private int numberBytes;
public CliTypeVarOrMvar(BinaryReader reader, CliElementType typeCode) throws IOException {
super(typeCode);
- long origIndex = reader.getPointerIndex();
+ dataOffset = reader.getPointerIndex();
number = decodeCompressedUnsignedInt(reader);
long endIndex = reader.getPointerIndex();
- numberBytes = (int) (endIndex - origIndex);
+ numberBytes = (int) (endIndex - dataOffset);
}
@Override
@@ -572,9 +636,9 @@ public abstract class CliAbstractSig extends CliBlob implements CliRepresentable
@Override
public DataType getDefinitionDataType() {
- StructureDataType struct =
- new StructureDataType(new CategoryPath(PATH), "VarOrMvar", 0);
- struct.add(BYTE, "Type", "Var or Mvar");
+ StructureDataType struct = new StructureDataType(new CategoryPath(PATH),
+ baseTypeCode.toString() + "_" + dataOffset, 0);
+ struct.add(CliTypeCodeDataType.dataType, baseTypeCode.toString(), "");
struct.add(getDataTypeForBytes(numberBytes), "number", null);
return struct;
}
@@ -582,16 +646,24 @@ public abstract class CliAbstractSig extends CliBlob implements CliRepresentable
public class CliTypePtr extends CliSigType {
private List
+
+
+
+
+
diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/FGProvider.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/FGProvider.java
index 40d6e65325..509ca88a7e 100644
--- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/FGProvider.java
+++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/FGProvider.java
@@ -578,6 +578,10 @@ public class FGProvider extends VisualGraphComponentProvider
" +
"See help for more";
+ private static final String DEFAULT_VERTEX_BACKGROUND_COLOR_KEY = "Default Vertex Color";
+ private static final String DEFAULT_VERTEX_BACKGROUND_COLOR_DESCRPTION =
+ "The default background color applied to each vertex";
+
private static final String DEFAULT_GROUP_BACKGROUND_COLOR_KEY = "Default Group Color";
private static final String DEFAULT_GROUP_BACKGROUND_COLOR_DESCRPTION =
"The default background color applied to newly created group vertices";
@@ -80,11 +84,14 @@ public class FunctionGraphOptions extends VisualGraphOptions {
"Signals that any user color changes to a group vertex will apply that same color to " +
"all grouped vertices as well.";
+ public static final Color DEFAULT_VERTEX_BACKGROUND_COLOR = Color.WHITE;
public static final Color DEFAULT_GROUP_BACKGROUND_COLOR = new Color(226, 255, 155);
private static final Color HOVER_HIGHLIGHT_FALL_THROUGH_COLOR = new Color(255, 127, 127);
private static final Color HOVER_HIGHLIGHT_UNCONDITIONAL_COLOR = new Color(127, 127, 255);
private static final Color HOVER_HIGHLIGHT_CONDITIONAL_COLOR = Color.GREEN;
+ private Color defaultVertexBackgroundColor = DEFAULT_VERTEX_BACKGROUND_COLOR;
+
private boolean updateGroupColorsAutomatically = true;
private Color defaultGroupBackgroundColor = DEFAULT_GROUP_BACKGROUND_COLOR;
@@ -104,6 +111,10 @@ public class FunctionGraphOptions extends VisualGraphOptions {
private Map
* UserAdmin.invocation - identifies the name of the application used when displaying usage text.
- * UserAdmin.serverDir - identifies the server directory instead of passing on command line.
+ * UserAdmin.config - identifies the config file instead of passing on command line.
*
* @param args command line arguments
*/
@@ -75,22 +75,18 @@ public class ServerAdmin implements GhidraLaunchable {
* The following properties may be set:
*
* UserAdmin.invocation - identifies the name of the application used when displaying usage text.
- * UserAdmin.serverDir - identifies the server directory instead of passing on command line.
+ * UserAdmin.config - identifies the config file instead of passing on command line.
*
* @param args command line arguments
*/
public void execute(String[] args) {
- File serverDir = null;
-
int ix = 0;
- if (args.length != 0 && !args[0].startsWith("-")) {
- serverDir = new File(args[ix++]);
- }
- else {
- serverDir = getServerDirFromConfig();
- }
+ String configFilePath = args.length != 0 && !args[0].startsWith("-") ? args[ix++]
+ : System.getProperty(CONFIG_FILE_PROPERTY);
+
+ File serverDir = getServerDirFromConfig(configFilePath);
if (serverDir == null || (args.length - ix) == 0) {
displayUsage("");
System.exit(-1);
@@ -105,9 +101,7 @@ public class ServerAdmin implements GhidraLaunchable {
System.exit(-1);
}
- if (propertyUsed) {
- System.out.println("Using server directory: " + serverDir);
- }
+ System.out.println("Using server directory: " + serverDir);
File userFile = new File(serverDir, UserManager.USER_PASSWORD_FILE);
if (!serverDir.isDirectory() || !userFile.isFile()) {
@@ -423,18 +417,32 @@ public class ServerAdmin implements GhidraLaunchable {
}
}
- private File getServerDirFromConfig() {
- String p = System.getProperty(CONFIG_FILE_PROPERTY);
- if (p == null) {
+ /**
+ * Parse contents of specified configFilePath as server.conf to determine
+ * repositories root directory. If configFilePath corresponds to a directory,
+ * that directory will be treated as the repositories root directory.
+ * @param configFilePath path to server.conf or repositories root directory
+ * @return repositories root directory
+ */
+ private File getServerDirFromConfig(String configFilePath) {
+
+ if (configFilePath == null) {
return null;
}
- propertyUsed = true;
- File configFile = new File(p);
+ File configFile = new File(configFilePath);
if (!configFile.exists()) {
System.out.println("Config file not found: " + configFile.getAbsolutePath());
+ return null;
}
+ if (configFile.isDirectory()) {
+ // If specified path is a directory treat as the server root
+ return configFile;
+ }
+
+ System.out.println("Using config file: " + configFilePath);
+
Properties config = new Properties();
InputStream in = null;
try {
@@ -455,8 +463,9 @@ public class ServerAdmin implements GhidraLaunchable {
}
}
- p = config.getProperty(SERVER_DIR_CONFIG_PROPERTY);
+ String p = config.getProperty(SERVER_DIR_CONFIG_PROPERTY);
if (p == null) {
+ System.out.println("Failed to find property: " + SERVER_DIR_CONFIG_PROPERTY);
return null;
}
File dir = new File(p);
@@ -482,8 +491,8 @@ public class ServerAdmin implements GhidraLaunchable {
}
String invocationName = System.getProperty(INVOCATION_NAME_PROPERTY);
System.err.println("Usage: " +
- (invocationName != null ? invocationName : "java " + UserAdmin.class.getName()) +
- (propertyUsed ? "" : "