Revert GP-1575_emteere_FDErecordFix

Author: ghidra1

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/AbstractDwarfEHDecoder.java

@@ -333,13 +333,7 @@ private long resolveRelativeOffset(long val, DwarfDecodeContext context)
 
 		switch (appMode) {
 			case DW_EH_PE_absptr:
-				// if the program has been re-based, need to add in the image base difference.
-				//  but only if there are no relocations at this location
-				if (prog.getRelocationTable().getRelocation(addr) == null) {
-					long programBaseAddressFixup = context.getOriginalImageBaseOffset();
-
-					val = val + programBaseAddressFixup;
-				}
+				// just pass this through
 				break;
 
 			case DW_EH_PE_aligned:

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/DwarfDecodeContext.java

@@ -15,7 +15,6 @@
  */
 package ghidra.app.plugin.exceptionhandlers.gcc;
 
-import ghidra.app.util.opinion.ElfLoader;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.listing.Function;
 import ghidra.program.model.listing.Program;
@@ -35,7 +34,6 @@ public class DwarfDecodeContext {
 	private Object decodedValue;
 	private int encodedLength;
 	private MemBuffer buffer;
-	private long originalImageBaseOffset;  // offset from image base used in original dwarf, and the actual load image base
 
 	/**
 	 * Constructs a Dwarf decode context.
@@ -98,8 +96,6 @@ public DwarfDecodeContext(Program program, Address readAddr, MemoryBlock ehBlock
 		this.ehBlock = ehBlock;
 		this.functionEntryPoint = entryPoint;
 
-		Long oib = ElfLoader.getElfOriginalImageBase(program);
-		this.originalImageBaseOffset = program.getImageBase().getOffset() - oib.longValue();
 	}
 
 	/**
@@ -184,12 +180,4 @@ public MemoryBlock getEhBlock() {
 	public Address getFunctionEntryPoint() {
 		return functionEntryPoint;
 	}
-
-	/**
-	 * Gets the offset from the programs image base and the dwarf original image base
-	 * @return offset that if added to the current image base would be the original dwarf image base
-	 */
-	public long getOriginalImageBaseOffset() {
-		return originalImageBaseOffset;
-	}
 }