Merge remote-tracking branch 'origin/patch'

Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/util/InstructionAdapterFromPrototype.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.
@@ -145,7 +145,7 @@ public interface InstructionAdapterFromPrototype extends TraceInstruction {
 
 	@Override
 	default String getSeparator(int opIndex) {
-		return getPrototype().getSeparator(opIndex, getInstructionContext());
+		return getPrototype().getSeparator(opIndex);
 	}
 
 	@Override