diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java b/Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java
index 2bf413cddd..4124eeec9a 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java
@@ -493,7 +493,8 @@ public class CodeUnitFormat {
 		InstructionScalarInfo info = new InstructionScalarInfo(representations, primaryRef);
 		if (info.hasSingleAddressWithNoScalars()) {
 			int addressIndex = info.getAddressIndex();
-			return markupAddressAsScalar(inst, primaryRef, representations, addressIndex);
+			return markupAddressAsRegister(inst, primaryRef, representations, addressIndex) ||
+				markupAddressAsScalar(inst, primaryRef, representations, addressIndex);
 		}
 
 		if (info.hasNoScalars()) {
@@ -564,6 +565,21 @@ public class CodeUnitFormat {
 		return primaryRef == null;
 	}
 
+	private boolean markupAddressAsRegister(Instruction instr, Reference primaryRef,
+			List<Object> representationList, int addressIndex) {
+		if (primaryRef != null) {
+			return false;
+		}
+		// NOTE: although preferrable, access type/size is not considered
+		Address addr = (Address) representationList.get(addressIndex);
+		Register reg = instr.getProgram().getRegister(addr);
+		if (reg != null) {
+			representationList.set(addressIndex, reg.getName());
+			return true;
+		}
+		return false;
+	}
+
 	private boolean markupAddressAsScalar(Instruction instr, Reference primaryRef,
 			List<Object> representationList, int addressIndex) {
 		Address addr = (Address) representationList.get(addressIndex);
diff --git a/Ghidra/Processors/PIC/src/main/java/ghidra/app/util/bin/format/elf/extend/PIC30_ElfExtension.java b/Ghidra/Processors/PIC/src/main/java/ghidra/app/util/bin/format/elf/extend/PIC30_ElfExtension.java
index 8442870220..af2fae7d51 100644
--- a/Ghidra/Processors/PIC/src/main/java/ghidra/app/util/bin/format/elf/extend/PIC30_ElfExtension.java
+++ b/Ghidra/Processors/PIC/src/main/java/ghidra/app/util/bin/format/elf/extend/PIC30_ElfExtension.java
@@ -22,7 +22,9 @@ import ghidra.app.util.bin.format.elf.*;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.address.AddressSpace;
 import ghidra.program.model.lang.Language;
+import ghidra.program.model.lang.Register;
 import ghidra.util.exception.CancelledException;
+import ghidra.util.exception.NoValueException;
 import ghidra.util.task.TaskMonitor;
 
 public class PIC30_ElfExtension extends ElfExtension {
@@ -219,6 +221,32 @@ public class PIC30_ElfExtension extends ElfExtension {
 		return language.getDefaultDataSpace().equals(start.getAddressSpace().getPhysicalSpace());
 	}
 	
+	@Override
+	public Address calculateSymbolAddress(ElfLoadHelper elfLoadHelper, ElfSymbol elfSymbol)
+			throws NoValueException {
+
+		if (elfSymbol.getValue() != 0 || !elfSymbol.isGlobal() ||
+			elfSymbol.getSectionHeaderIndex() != 0) {
+			return null;
+		}
+
+		String name = elfSymbol.getNameAsString();
+		if (name == null) {
+			return null;
+		}
+
+		if (name.startsWith("_")) {
+			name = name.substring(1);
+		}
+
+		Register reg = elfLoadHelper.getProgram().getRegister(name);
+		if (reg != null && !reg.getAddress().isRegisterAddress()) {
+			return reg.getAddress(); // only consider memory-based registers
+		}
+
+		return null;
+	}
+
 	private static class PIC30FilteredDataInputStream extends FilterInputStream {
 
 		// BYTES:  <byte> <pad>