From 290e039e8b2b553fddfa3d9fc7d390541c0893c9 Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Fri, 20 Aug 2021 14:36:39 -0400
Subject: [PATCH] GP-1226: Attempting to make missing prototypes in trace less
 disruptive

---
 .../ghidra/trace/database/listing/DBTraceInstruction.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstruction.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstruction.java
index f7e1db5dfd..6812ecf3a5 100644
--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstruction.java
+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstruction.java
@@ -40,6 +40,7 @@ import ghidra.trace.model.listing.TraceInstruction;
 import ghidra.trace.model.symbol.TraceReference;
 import ghidra.trace.util.*;
 import ghidra.util.LockHold;
+import ghidra.util.Msg;
 import ghidra.util.database.DBCachedObjectStore;
 import ghidra.util.database.DBObjectColumn;
 import ghidra.util.database.annot.*;
@@ -139,8 +140,10 @@ public class DBTraceInstruction extends AbstractDBTraceCodeUnit<DBTraceInstructi
 		prototype = space.manager.getPrototypeByKey(prototypeKey);
 		if (prototype == null) {
 			// TODO: Better to just load a sentinel? Why bail on the whole thing?
-			throw new IOException(
-				"Instruction table is corrupt. Missing prototype: " + prototypeKey);
+			Msg.error(this,
+				"Instruction table is corrupt for address " + getMinAddress() +
+					". Missing prototype " + prototypeKey);
+			prototype = new InvalidPrototype(getTrace().getBaseLanguage());
 		}
 		flowOverride = FlowOverride.values()[(flags & FLOWOVERRIDE_SET_MASK) >> FLOWOVERRIDE_SHIFT];