From 3bbba9602b2aed484eae32aac77379886b9ec7cd Mon Sep 17 00:00:00 2001
From: ghizard <50744617+ghizard@users.noreply.github.com>
Date: Tue, 4 Oct 2022 06:51:58 -0400
Subject: [PATCH] GP-2647 Add/Modify system properties for PDB Universal

---
 .../app/util/bin/format/pdb2/pdbreader/PdbLog.java   |  2 +-
 .../util/pdb/pdbapplicator/PdbApplicatorOptions.java | 12 ++++++------
 .../RuntimeScripts/Common/support/launch.properties  |  7 +++++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/PdbLog.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/PdbLog.java
index 52cbf879c9..f52f50a374 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/PdbLog.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/PdbLog.java
@@ -32,7 +32,7 @@ public class PdbLog {
 
 	private static Writer nullWriter;
 	private static Writer fileWriter;
-	private static final boolean SYSTEM_LOGGING_ENABLED = Boolean.getBoolean("pdb.logging");
+	private static final boolean SYSTEM_LOGGING_ENABLED = Boolean.getBoolean("ghidra.pdb.logging");
 	private static boolean enabled = SYSTEM_LOGGING_ENABLED;
 
 	/**
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbApplicatorOptions.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbApplicatorOptions.java
index 60693fb83c..75d5d102f1 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbApplicatorOptions.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbApplicatorOptions.java
@@ -31,8 +31,8 @@ import ghidra.util.exception.AssertException;
  */
 public class PdbApplicatorOptions {
 
-	// Developer turn on/off options that are in still in development.
-	private static final boolean developerMode = false;
+	// Developer turn on/off options that are in still in development. See launch.properties.
+	private static final boolean DEVELOPER_MODE = Boolean.getBoolean("ghidra.pdb.developerMode");
 
 	// Applicator Control.
 	private static final String OPTION_NAME_PROCESSING_CONTROL = "Control";
@@ -181,13 +181,13 @@ public class PdbApplicatorOptions {
 	private void registerOptions(Options options, boolean enableControl) {
 		HelpLocation help = null;
 
-		if (developerMode || enableControl) {
+		if (DEVELOPER_MODE || enableControl) {
 			options.registerOption(OPTION_NAME_PROCESSING_CONTROL, PdbApplicatorControl.ALL, help,
 				OPTION_DESCRIPTION_PROCESSING_CONTROL);
 		}
 
 		// PdbApplicatorOptions
-		if (developerMode) {
+		if (DEVELOPER_MODE) {
 
 			options.registerOption(OPTION_NAME_APPLY_CODE_SCOPE_BLOCK_COMMENTS,
 				applyCodeScopeBlockComments, help,
@@ -232,12 +232,12 @@ public class PdbApplicatorOptions {
 
 	private void loadOptions(Options options, boolean enableControl) {
 
-		if (developerMode || enableControl) {
+		if (DEVELOPER_MODE || enableControl) {
 			control = options.getEnum(OPTION_NAME_PROCESSING_CONTROL, PdbApplicatorControl.ALL);
 		}
 
 		// PdbApplicatorOptions
-		if (developerMode) {
+		if (DEVELOPER_MODE) {
 
 			applyCodeScopeBlockComments = options.getBoolean(
 				OPTION_NAME_APPLY_CODE_SCOPE_BLOCK_COMMENTS, applyCodeScopeBlockComments);
diff --git a/Ghidra/RuntimeScripts/Common/support/launch.properties b/Ghidra/RuntimeScripts/Common/support/launch.properties
index 45329d0cbc..b0565ab802 100644
--- a/Ghidra/RuntimeScripts/Common/support/launch.properties
+++ b/Ghidra/RuntimeScripts/Common/support/launch.properties
@@ -91,5 +91,8 @@ VMARGS=--add-opens=java.desktop/sun.awt.image=ALL-UNNAMED
 # Limit on XML parsing. See https://docs.oracle.com/javase/tutorial/jaxp/limits/limits.html
 #VMARGS=-Djdk.xml.totalEntitySizeLimit=50000000
 
-# Enables Pdb debug logging during import and analysis to .ghidra/.ghidra_ver/pdb.analyzer.log
-#VMARGS=-Dpdb.logging=true
+# Enables PDB debug logging during import and analysis to .ghidra/.ghidra_ver/pdb.analyzer.log
+#VMARGS=-Dghidra.pdb.logging=true
+
+# Enables PDB developer mode
+#VMARGS=-Dghidra.pdb.developerMode=true