GP-1585: Change TargetBreakpointLocation to range, not address,length

Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface2/DbgModelTargetBreakpointLocation.java

@@ -16,12 +16,12 @@
 package agent.dbgeng.model.iface2;
 
 import ghidra.dbg.target.TargetBreakpointLocation;
-import ghidra.program.model.address.Address;
+import ghidra.program.model.address.AddressRange;
 
 public interface DbgModelTargetBreakpointLocation
 		extends DbgModelTargetObject, TargetBreakpointLocation {
 
 	@Override
-	public Address getAddress();
+	public AddressRange getRange();
 
 }

Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface2/DbgModelTargetBreakpointSpec.java

@@ -24,6 +24,7 @@ import agent.dbgeng.model.iface1.DbgModelTargetBptHelper;
 import ghidra.dbg.target.*;
 import ghidra.dbg.target.TargetBreakpointSpecContainer.TargetBreakpointKindSet;
 import ghidra.program.model.address.*;
+import ghidra.util.Msg;
 
 public interface DbgModelTargetBreakpointSpec extends //
 		DbgModelTargetObject, //
@@ -99,12 +100,13 @@ public interface DbgModelTargetBreakpointSpec extends //
 				setBreakpointId(idstr);
 				//String uidstr = unique.getCachedAttribute(VALUE_ATTRIBUTE_NAME).toString();
 				String enstr = enabled.getCachedAttribute(VALUE_ATTRIBUTE_NAME).toString();
+				Address address = null;
 				try {
-					Address address = space.getAddress(addstr);
+					address = space.getAddress(addstr);
-					map.put(ADDRESS_ATTRIBUTE_NAME, address);
+					//map.put(ADDRESS_ATTRIBUTE_NAME, address);
 				}
 				catch (AddressFormatException e) {
-					e.printStackTrace();
+					Msg.error(this, "Could not parse breakpoint address", e);
 				}
 				map.put(SPEC_ATTRIBUTE_NAME, this);
 				map.put(EXPRESSION_ATTRIBUTE_NAME, addstr);
@@ -113,7 +115,15 @@ public interface DbgModelTargetBreakpointSpec extends //
 				map.put(ENABLED_ATTRIBUTE_NAME, enstr.equals("-1"));
 				setEnabled(enstr.equals("-1"), "Refreshed");
 				int size = getBreakpointInfo().getSize();
-				map.put(LENGTH_ATTRIBUTE_NAME, size);
+				//map.put(LENGTH_ATTRIBUTE_NAME, size);
+				if (address != null) {
+					try {
+						map.put(RANGE_ATTRIBUTE_NAME, new AddressRangeImpl(address, size));
+					}
+					catch (AddressOverflowException e) {
+						Msg.error(this, "Address overflow in breakpoint range", e);
+					}
+				}
 
 				String oldval = (String) getCachedAttribute(DISPLAY_ATTRIBUTE_NAME);
 				String display = "[" + idstr + "] " + addstr;
@@ -125,9 +135,13 @@ public interface DbgModelTargetBreakpointSpec extends //
 
 	private long orZero(Long l) {
 		if (l == null) {
-			return 0;
+			Msg.warn(this, "Breakpoint had null offset. Defaulting to ram:00000000");
 		}
-		return l;
+		return l == null ? 0 : l;
+	}
+
+	private int orOne(Integer i) {
+		return i == null ? 1 : i;
 	}
 
 	public default Address doGetAddress() {
@@ -135,6 +149,14 @@ public interface DbgModelTargetBreakpointSpec extends //
 		return getModel().getAddress("ram", orZero(info.getOffset()));
 	}
 
+	public default AddressRange doGetRange() {
+		DbgBreakpointInfo info = getBreakpointInfo();
+		AddressSpace ram = getModel().getAddressSpace("ram");
+		Address min = ram.getAddress(orZero(info.getOffset()));
+		Address max = min.add(orOne(info.getSize()) - 1);
+		return new AddressRangeImpl(min, max);
+	}
+
 	public default void updateInfo(DbgBreakpointInfo oldInfo, DbgBreakpointInfo newInfo,
 			String reason) {
 		synchronized (this) {
@@ -147,6 +169,7 @@ public interface DbgModelTargetBreakpointSpec extends //
 	/**
 	 * Update the enabled field
 	 * 
+	 * <p>
 	 * This does not actually toggle the breakpoint. It just updates the field and calls the proper
 	 * listeners. To actually toggle the breakpoint, use {@link #toggle(boolean)} instead, which if
 	 * effective, should eventually cause this method to be called.

Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/impl/DbgModelTargetBreakpointSpecImpl.java

@@ -67,20 +67,18 @@ public class DbgModelTargetBreakpointSpecImpl extends DbgModelTargetObjectImpl
 	protected boolean enabled;
 
 	public void changeAttributeSet(String reason) {
-		this.changeAttributes(List.of(), List.of(), Map.of( //
+		this.changeAttributes(List.of(), List.of(), Map.of(
-			DISPLAY_ATTRIBUTE_NAME, "[" + info.getNumber() + "] " + info.getExpression(), //
+			DISPLAY_ATTRIBUTE_NAME, "[" + info.getNumber() + "] " + info.getExpression(),
-			ADDRESS_ATTRIBUTE_NAME, doGetAddress(), //
+			RANGE_ATTRIBUTE_NAME, doGetRange(),
-			LENGTH_ATTRIBUTE_NAME, info.getSize(), //
+			SPEC_ATTRIBUTE_NAME, this,
-			SPEC_ATTRIBUTE_NAME, this, //
+			EXPRESSION_ATTRIBUTE_NAME, info.getExpression(),
-			EXPRESSION_ATTRIBUTE_NAME, info.getExpression(), //
+			KINDS_ATTRIBUTE_NAME, getKinds(),
-			KINDS_ATTRIBUTE_NAME, getKinds() //
+
-		), reason);
+			BPT_TYPE_ATTRIBUTE_NAME, info.getType().name(),
-		this.changeAttributes(List.of(), List.of(), Map.of( //
+			BPT_DISP_ATTRIBUTE_NAME, info.getDisp().name(),
-			BPT_TYPE_ATTRIBUTE_NAME, info.getType().name(), //
+			BPT_PENDING_ATTRIBUTE_NAME, info.getPending(),
-			BPT_DISP_ATTRIBUTE_NAME, info.getDisp().name(), //
+			BPT_TIMES_ATTRIBUTE_NAME, info.getTimes()),
-			BPT_PENDING_ATTRIBUTE_NAME, info.getPending(), //
+			reason);
-			BPT_TIMES_ATTRIBUTE_NAME, info.getTimes() //
-		), reason);
 	}
 
 	private final ListenerSet<TargetBreakpointAction> actions =

Ghidra/Debug/Debugger-agent-dbgmodel/src/main/resources/agent/dbgmodel/model/impl/dbgmodel_schema.xml

@@ -503,8 +503,7 @@
 		<attribute name="_container" schema="BreakpointContainer" />
 		<attribute name="_affects" schema="LIST_OBJECT" hidden="yes" />
 		<attribute name="_spec" schema="BreakpointSpec" />
-        <attribute name="_length" schema="INT" hidden="yes" />
+		<attribute name="_range" schema="RANGE" hidden="yes" />
-        <attribute name="_address" schema="ADDRESS" required="yes" hidden="yes" />
 		<attribute name="_modified" schema="BOOL" hidden="yes" />
 		<attribute name="_display" schema="STRING" hidden="yes" />
 		<attribute name="_kind" schema="STRING" fixed="yes" hidden="yes" />
@@ -585,6 +584,5 @@
 		<attribute name="_order" schema="INT" hidden="yes" />
 		<attribute schema="VOID" />
 	</schema>
-    <schema name="UPDATE_MODE" elementResync="NEVER" attributeResync="NEVER">
+	<schema name="UPDATE_MODE" elementResync="NEVER" attributeResync="NEVER"></schema>
-    </schema>
 </context>

Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelTargetBreakpointLocation.java

@@ -28,7 +28,7 @@ import ghidra.dbg.target.TargetBreakpointLocation;
 import ghidra.dbg.target.TargetObject;
 import ghidra.dbg.target.schema.*;
 import ghidra.dbg.util.PathUtils;
-import ghidra.program.model.address.Address;
+import ghidra.program.model.address.*;
 import ghidra.util.Msg;
 
 @TargetObjectSchemaInfo(
@@ -55,8 +55,7 @@ public class GdbModelTargetBreakpointLocation
 	protected final GdbModelImpl impl;
 	protected final GdbBreakpointLocation loc;
 
-	protected Address address;
+	protected AddressRange range;
-	protected Integer length;
 	protected String display;
 
 	public GdbModelTargetBreakpointLocation(GdbModelTargetBreakpointSpec spec,
@@ -67,8 +66,8 @@ public class GdbModelTargetBreakpointLocation
 		impl.addModelObject(loc, this);
 
 		if (!spec.info.getType().isWatchpoint()) {
-			this.address = doGetAddress();
+			Address addr = impl.space.getAddress(loc.addrAsLong());
-			this.length = 1;
+			this.range = new AddressRangeImpl(addr, addr);
 			doChangeAttributes("Initialized");
 		}
 	}
@@ -76,8 +75,7 @@ public class GdbModelTargetBreakpointLocation
 	protected void doChangeAttributes(String reason) {
 		this.changeAttributes(List.of(), Map.of(
 			SPEC_ATTRIBUTE_NAME, parent,
-			ADDRESS_ATTRIBUTE_NAME, address,
+			RANGE_ATTRIBUTE_NAME, range,
-			LENGTH_ATTRIBUTE_NAME, length,
 			DISPLAY_ATTRIBUTE_NAME, display = computeDisplay()),
 			reason);
 		placeLocations();
@@ -112,29 +110,26 @@ public class GdbModelTargetBreakpointLocation
 				throw new AssertionError("Unexpected result count: " + result);
 			}
 
-			address = impl.space.getAddress(vals.get(0));
+			range = makeRange(impl.space.getAddress(vals.get(0)), vals.get(1).intValue());
-			length = vals.get(1).intValue();
 			doChangeAttributes("Initialized");
 		}).exceptionally(ex -> {
 			Msg.warn(this, "Could not evaluated breakpoint location and/or size: " + ex);
-			address = impl.space.getAddress(0);
+			Address addr = impl.space.getAddress(0);
-			length = 1;
+			range = new AddressRangeImpl(addr, addr);
 			doChangeAttributes("Defaulted for eval/parse error");
 			return null;
 		});
 	}
 
 	protected String computeDisplay() {
-		return String.format("%d.%d %s", parent.info.getNumber(), loc.getSub(), address);
+		return String.format("%d.%d %s", parent.info.getNumber(), loc.getSub(),
+			range.getMinAddress());
 	}
 
-	protected Address doGetAddress() {
+	// Avoid the checked exception on new AddressRangeImpl(min, length)
-		return impl.space.getAddress(loc.addrAsLong());
+	protected static AddressRange makeRange(Address min, int length) {
-	}
+		Address max = min.add(length - 1);
-
+		return new AddressRangeImpl(min, max);
-	@Override
-	public Integer getLength() {
-		return length;
 	}
 
 	protected void placeLocations() {
@@ -161,6 +156,11 @@ public class GdbModelTargetBreakpointLocation
 		}
 	}
 
+	@Override
+	public AddressRange getRange() {
+		return range;
+	}
+
 	@Override
 	public GdbModelTargetBreakpointSpec getSpecification() {
 		return parent;

Ghidra/Debug/Debugger-agent-lldb/src/main/java/agent/lldb/model/iface2/LldbModelTargetBreakpointLocation.java

@@ -16,13 +16,13 @@
 package agent.lldb.model.iface2;
 
 import ghidra.dbg.target.TargetBreakpointLocation;
-import ghidra.program.model.address.Address;
+import ghidra.program.model.address.AddressRange;
 
 public interface LldbModelTargetBreakpointLocation
 		extends LldbModelTargetObject, TargetBreakpointLocation {
 
 	@Override
-	public Address getAddress();
+	AddressRange getRange();
 
 	public int getLocationId();
 }

Ghidra/Debug/Debugger-agent-lldb/src/main/java/agent/lldb/model/impl/LldbModelTargetBreakpointLocationImpl.java

@@ -25,7 +25,7 @@ import ghidra.dbg.target.TargetObject;
 import ghidra.dbg.target.schema.TargetAttributeType;
 import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
 import ghidra.dbg.util.PathUtils;
-import ghidra.program.model.address.Address;
+import ghidra.program.model.address.*;
 
 @TargetObjectSchemaInfo(
 	name = "BreakpointLocation",
@@ -46,11 +46,9 @@ public class LldbModelTargetBreakpointLocationImpl extends LldbModelTargetObject
 	protected LldbModelTargetAbstractXpointSpec spec;
 	protected SBBreakpointLocation loc;
 
-	protected Address address;
+	protected AddressRange range;
-	protected Integer length;
 	protected String display;
 
-
 	public LldbModelTargetBreakpointLocationImpl(LldbModelTargetAbstractXpointSpec spec,
 			SBBreakpointLocation loc) {
 		super(spec.getModel(), spec, keyLocation(loc), loc, "BreakpointLocation");
@@ -60,21 +58,28 @@ public class LldbModelTargetBreakpointLocationImpl extends LldbModelTargetObject
 		doChangeAttributes("Initialization");
 	}
 
+	// TODO: A separate class for Impl wrapping SBWatchpoint?
 	public LldbModelTargetBreakpointLocationImpl(LldbModelTargetAbstractXpointSpec spec,
 			SBWatchpoint wpt) {
 		super(spec.getModel(), spec, keyLocation(wpt), wpt, "BreakpointLocation");
 		this.loc = null;
 
-		address = getModel().getAddress("ram", wpt.GetWatchAddress().longValue());
+		Address address = getModel().getAddress("ram", wpt.GetWatchAddress().longValue());
+		long length = wpt.GetWatchSize();
 		this.changeAttributes(List.of(), Map.of(
 			SPEC_ATTRIBUTE_NAME, parent,
-			ADDRESS_ATTRIBUTE_NAME, address,
+			RANGE_ATTRIBUTE_NAME, range = makeRange(address, length),
-			LENGTH_ATTRIBUTE_NAME, length = (int) wpt.GetWatchSize(),
 			DISPLAY_ATTRIBUTE_NAME, display = getDescription(1)),
 			"Initialization");
 		placeLocations();
 	}
 
+	protected static AddressRange makeRange(Address min, long length) {
+		Address max = min.add(length - 1);
+		return new AddressRangeImpl(min, max);
+	}
+
+	@Override
 	public String getDescription(int level) {
 		Object modelObject = getModelObject();
 		SBStream stream = new SBStream();
@@ -91,12 +96,10 @@ public class LldbModelTargetBreakpointLocationImpl extends LldbModelTargetObject
 	}
 
 	protected void doChangeAttributes(String reason) {
-		address = getModel().getAddress("ram", loc.GetLoadAddress().longValue());
+		Address address = getModel().getAddress("ram", loc.GetLoadAddress().longValue());
-		length = 1;
 		this.changeAttributes(List.of(), Map.of(
 			SPEC_ATTRIBUTE_NAME, parent,
-			ADDRESS_ATTRIBUTE_NAME, address,
+			RANGE_ATTRIBUTE_NAME, range = new AddressRangeImpl(address, address),
-			LENGTH_ATTRIBUTE_NAME, length,
 			DISPLAY_ATTRIBUTE_NAME, display = getDescription(1)),
 			reason);
 		placeLocations();
@@ -104,7 +107,8 @@ public class LldbModelTargetBreakpointLocationImpl extends LldbModelTargetObject
 
 	protected void placeLocations() {
 		LldbModelTargetSession parentSession = getParentSession();
-		Map<String, ? extends TargetObject> cachedElements = parentSession.getProcesses().getCachedElements();
+		Map<String, ? extends TargetObject> cachedElements =
+			parentSession.getProcesses().getCachedElements();
 		for (TargetObject obj : cachedElements.values()) {
 			if (obj instanceof LldbModelTargetProcess) {
 				LldbModelTargetProcessImpl process = (LldbModelTargetProcessImpl) obj;
@@ -123,19 +127,16 @@ public class LldbModelTargetBreakpointLocationImpl extends LldbModelTargetObject
 		TargetObject modelObject = getModel().getModelObject(getManager().getCurrentProcess());
 		if (modelObject instanceof LldbModelTargetProcess) {
 			LldbModelTargetProcess targetProcess = (LldbModelTargetProcess) modelObject;
-			LldbModelTargetBreakpointLocationContainer locs = (LldbModelTargetBreakpointLocationContainer) targetProcess.getCachedAttribute("Breakpoints");			
+			LldbModelTargetBreakpointLocationContainer locs =
+				(LldbModelTargetBreakpointLocationContainer) targetProcess
+						.getCachedAttribute("Breakpoints");
 			locs.removeBreakpointLocation(this);
 		}
 	}
 
 	@Override
-	public Integer getLength() {
+	public AddressRange getRange() {
-		return length;
+		return range;
-	}
-
-	@Override
-	public Address getAddress() {
-		return address;
 	}
 
 	@Override

Ghidra/Debug/Debugger-agent-lldb/src/main/java/agent/lldb/model/impl/LldbModelTargetBreakpointSpecImpl.java

@@ -56,6 +56,7 @@ public class LldbModelTargetBreakpointSpecImpl extends LldbModelTargetAbstractXp
 		super(breakpoints, info, "BreakpointSpec");
 	}
 
+	@Override
 	public String getDescription(int level) {
 		SBStream stream = new SBStream();
 		SBBreakpoint bpt = (SBBreakpoint) getModelObject();
@@ -63,16 +64,17 @@ public class LldbModelTargetBreakpointSpecImpl extends LldbModelTargetAbstractXp
 		return stream.GetData();
 	}
 
+	@Override
 	protected TargetBreakpointKindSet computeKinds(Object from) {
 		if (from instanceof SBBreakpoint) {
 			SBBreakpoint bpt = (SBBreakpoint) from;
-			return bpt.IsHardware() ? 
+			return bpt.IsHardware() ? TargetBreakpointKindSet.of(TargetBreakpointKind.HW_EXECUTE)
-				TargetBreakpointKindSet.of(TargetBreakpointKind.HW_EXECUTE) : 
+					: TargetBreakpointKindSet.of(TargetBreakpointKind.SW_EXECUTE);
-				TargetBreakpointKindSet.of(TargetBreakpointKind.SW_EXECUTE);
 		}
 		return TargetBreakpointKindSet.of();
 	}
 
+	@Override
 	public void updateInfo(Object info, String reason) {
 		setModelObject(info);
 		updateAttributesFromInfo(reason);
@@ -91,6 +93,7 @@ public class LldbModelTargetBreakpointSpecImpl extends LldbModelTargetAbstractXp
 		});
 	}
 
+	@Override
 	public void updateAttributesFromInfo(String reason) {
 		SBBreakpoint bpt = (SBBreakpoint) getModelObject();
 		String description = getDescription(1);
@@ -118,15 +121,17 @@ public class LldbModelTargetBreakpointSpecImpl extends LldbModelTargetAbstractXp
 			LldbModelTargetBreakpointLocationImpl loc =
 				(LldbModelTargetBreakpointLocationImpl) elements[0];
 			this.changeAttributes(List.of(), List.of(), Map.of( //
-				TargetBreakpointLocation.ADDRESS_ATTRIBUTE_NAME, loc.address //
+				TargetBreakpointLocation.RANGE_ATTRIBUTE_NAME, loc.range //
 			), reason);
 		}
 	}
 
+	@Override
 	public ListenerSet<TargetBreakpointAction> getActions() {
 		return actions;
 	}
 
+	@Override
 	public LldbModelTargetBreakpointLocation findLocation(Object obj) {
 		if (!(obj instanceof BigInteger)) {
 			return null;

Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsProvider.java

@@ -70,7 +70,8 @@ import ghidra.framework.options.annotation.*;
 import ghidra.framework.plugintool.*;
 import ghidra.framework.plugintool.annotation.AutoConfigStateField;
 import ghidra.framework.plugintool.annotation.AutoServiceConsumed;
-import ghidra.program.model.address.*;
+import ghidra.program.model.address.Address;
+import ghidra.program.model.address.AddressRange;
 import ghidra.program.model.listing.Program;
 import ghidra.program.util.ProgramLocation;
 import ghidra.program.util.ProgramSelection;
@@ -2097,9 +2098,9 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
 		if (listingService == null || listingService == null) {
 			return;
 		}
+		// TODO: Could probably inspect schema for any attribute of type Address[Range], or String
 		if (value == null) {
-			value =
+			value = object.getCachedAttribute(TargetObject.PREFIX_INVISIBLE + "address");
-				object.getCachedAttribute(TargetBreakpointLocation.ADDRESS_ATTRIBUTE_NAME);
 		}
 		if (value == null) {
 			value = object.getCachedAttribute(TargetObject.PREFIX_INVISIBLE + "range");
@@ -2112,19 +2113,16 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
 		}
 
 		Address addr = null;
-		if (value instanceof Address) {
+		if (value instanceof Address a) {
-			addr = (Address) value;
+			addr = a;
 		}
-		else if (value instanceof AddressRangeImpl) {
+		else if (value instanceof AddressRange range) {
-			AddressRangeImpl range = (AddressRangeImpl) value;
 			addr = range.getMinAddress();
 		}
-		else if (value instanceof Long) {
+		else if (value instanceof Long lval) {
-			Long lval = (Long) value;
 			addr = object.getModel().getAddress("ram", lval);
 		}
-		else if (value instanceof String) {
+		else if (value instanceof String sval) {
-			String sval = (String) value;
 			addr = stringToAddress(object, addr, sval);
 		}
 		if (addr != null) {

Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/breakpoint/LogicalBreakpointInternal.java

@@ -23,8 +23,7 @@ import ghidra.app.services.LogicalBreakpoint;
 import ghidra.app.services.TraceRecorder;
 import ghidra.dbg.target.*;
 import ghidra.dbg.target.TargetBreakpointSpec.TargetBreakpointKind;
-import ghidra.program.model.address.Address;
+import ghidra.program.model.address.*;
-import ghidra.program.model.address.AddressSet;
 import ghidra.program.model.listing.*;
 import ghidra.program.util.ProgramLocation;
 import ghidra.trace.model.Trace;
@@ -394,10 +393,11 @@ public interface LogicalBreakpointInternal extends LogicalBreakpoint {
 			Set<TargetBreakpointKind> tKinds = TraceRecorder.traceToTargetBreakpointKinds(kinds);
 			Address targetAddr = computeTargetAddress();
 			for (TargetBreakpointLocation loc : recorder.collectBreakpoints(null)) {
-				if (!targetAddr.equals(loc.getAddress())) {
+				AddressRange range = loc.getRange();
+				if (!targetAddr.equals(range.getMinAddress())) {
 					continue;
 				}
-				if (length != loc.getLength().longValue()) {
+				if (length != range.getLength()) {
 					continue;
 				}
 				TargetBreakpointSpec spec = loc.getSpecification();
@@ -413,10 +413,11 @@ public interface LogicalBreakpointInternal extends LogicalBreakpoint {
 			Set<TargetBreakpointKind> tKinds = TraceRecorder.traceToTargetBreakpointKinds(kinds);
 			Address targetAddr = computeTargetAddress();
 			for (TargetBreakpointLocation loc : recorder.collectBreakpoints(null)) {
-				if (!targetAddr.equals(loc.getAddress())) {
+				AddressRange range = loc.getRange();
+				if (!targetAddr.equals(range.getMinAddress())) {
 					continue;
 				}
-				if (length != loc.getLength().longValue()) {
+				if (length != range.getLength()) {
 					continue;
 				}
 				TargetBreakpointSpec spec = loc.getSpecification();

Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/DefaultBreakpointRecorder.java

@@ -31,18 +31,6 @@ import ghidra.util.exception.DuplicateNameException;
 
 public class DefaultBreakpointRecorder implements ManagedBreakpointRecorder {
 
-	public static AddressRange range(Address min, Integer length) {
-		if (length == null) {
-			length = 1;
-		}
-		try {
-			return new AddressRangeImpl(min, length);
-		}
-		catch (AddressOverflowException e) {
-			throw new AssertionError(e);
-		}
-	}
-
 	protected static String nameBreakpoint(TargetBreakpointLocation bpt) {
 		if (bpt instanceof TargetBreakpointSpec) {
 			return bpt.getIndex();
@@ -93,8 +81,7 @@ public class DefaultBreakpointRecorder implements ManagedBreakpointRecorder {
 		}
 		String path = PathUtils.toString(loc.getPath());
 		String name = nameBreakpoint(loc);
-		Address traceAddr = recorder.getMemoryMapper().targetToTrace(loc.getAddress());
+		AddressRange traceRange = recorder.getMemoryMapper().targetToTrace(loc.getRange());
-		AddressRange traceRange = range(traceAddr, loc.getLength());
 		try {
 			TargetBreakpointSpec spec = loc.getSpecification();
 			boolean enabled = spec.isEnabled();
@@ -151,11 +138,9 @@ public class DefaultBreakpointRecorder implements ManagedBreakpointRecorder {
 		}, path);
 	}
 
-	protected void doBreakpointLocationChanged(long snap, int length, Address traceAddr,
+	protected void doBreakpointLocationChanged(long snap, AddressRange traceRng, String path) {
-			String path) {
 		for (TraceBreakpoint traceBpt : breakpointManager.getBreakpointsByPath(path)) {
-			AddressRange range = range(traceAddr, length);
+			if (traceBpt.getRange().equals(traceRng)) {
-			if (traceBpt.getRange().equals(range)) {
 				continue; // Nothing to change
 			}
 			// TODO: Verify all other attributes match?
@@ -167,7 +152,7 @@ public class DefaultBreakpointRecorder implements ManagedBreakpointRecorder {
 					traceBpt.setClearedSnap(snap - 1);
 				}
 				TraceBreakpoint newtraceBpt =
-					breakpointManager.placeBreakpoint(path, snap, range,
+					breakpointManager.placeBreakpoint(path, snap, traceRng,
 						traceBpt.getThreads(), traceBpt.getKinds(), traceBpt.isEnabled(snap),
 						traceBpt.getComment());
 				// placeBreakpoint resets the name - maybe pass name in?
@@ -182,11 +167,11 @@ public class DefaultBreakpointRecorder implements ManagedBreakpointRecorder {
 	}
 
 	@Override
-	public void breakpointLocationChanged(int length, Address traceAddr, String path)
+	public void breakpointLocationChanged(AddressRange traceRng, String path)
 			throws AssertionError {
 		long snap = recorder.getSnap();
 		recorder.parTx.execute("Breakpoint length changed", () -> {
-			doBreakpointLocationChanged(snap, length, traceAddr, path);
+			doBreakpointLocationChanged(snap, traceRng, path);
 		}, path);
 	}
 

Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/TraceObjectManager.java

@@ -30,7 +30,7 @@ import ghidra.async.AsyncLazyMap;
 import ghidra.dbg.target.*;
 import ghidra.dbg.util.PathUtils;
 import ghidra.dbg.util.PathUtils.PathComparator;
-import ghidra.program.model.address.Address;
+import ghidra.program.model.address.AddressRange;
 import ghidra.trace.model.breakpoint.TraceBreakpoint;
 import ghidra.trace.model.breakpoint.TraceBreakpointKind;
 import ghidra.trace.model.memory.TraceMemoryRegion;
@@ -496,12 +496,10 @@ public class TraceObjectManager {
 
 	public void attributesChangedBreakpointLocation(TargetObject obj, Map<String, ?> added) {
 		TargetBreakpointLocation loc = (TargetBreakpointLocation) obj;
-		if (added.containsKey(TargetBreakpointLocation.LENGTH_ATTRIBUTE_NAME) ||
+		if (added.containsKey(TargetBreakpointLocation.RANGE_ATTRIBUTE_NAME)) {
-			added.containsKey(TargetBreakpointLocation.ADDRESS_ATTRIBUTE_NAME)) {
+			AddressRange traceRng = recorder.getMemoryMapper().targetToTrace(loc.getRange());
-			Address traceAddr = recorder.getMemoryMapper().targetToTrace(loc.getAddress());
 			String path = loc.getJoinedPath(".");
-			int length = loc.getLengthOrDefault(1);
+			recorder.breakpointRecorder.breakpointLocationChanged(traceRng, path);
-			recorder.breakpointRecorder.breakpointLocationChanged(length, traceAddr, path);
 		}
 	}
 

Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/interfaces/ManagedBreakpointRecorder.java

@@ -19,7 +19,7 @@ import java.util.Collection;
 import java.util.Set;
 
 import ghidra.dbg.target.*;
-import ghidra.program.model.address.Address;
+import ghidra.program.model.address.AddressRange;
 import ghidra.trace.model.breakpoint.TraceBreakpoint;
 import ghidra.trace.model.breakpoint.TraceBreakpointKind;
 import ghidra.trace.model.thread.TraceThread;
@@ -41,11 +41,10 @@ public interface ManagedBreakpointRecorder {
 	/**
 	 * The range of a breakpoint location has changed
 	 * 
-	 * @param length the new length
+	 * @param traceRng the address range of the location in the trace
-	 * @param traceAddr the address of the location in the trace
 	 * @param path the dot-separated path of the breakpoint location in the model
 	 */
-	void breakpointLocationChanged(int length, Address traceAddr, String path);
+	void breakpointLocationChanged(AddressRange traceRng, String path);
 
 	/**
 	 * A breakpoint specification has changed (typically, toggled)

Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointLocation.java

@@ -18,6 +18,7 @@ package ghidra.dbg.target;
 import ghidra.dbg.DebuggerTargetObjectIface;
 import ghidra.dbg.target.schema.TargetAttributeType;
 import ghidra.program.model.address.Address;
+import ghidra.program.model.address.AddressRange;
 
 /**
  * The location of a breakpoint
@@ -31,20 +32,33 @@ import ghidra.program.model.address.Address;
 @DebuggerTargetObjectIface("BreakpointLocation")
 public interface TargetBreakpointLocation extends TargetObject {
 
-	String ADDRESS_ATTRIBUTE_NAME = PREFIX_INVISIBLE + "address";
+	String RANGE_ATTRIBUTE_NAME = PREFIX_INVISIBLE + "range";
-	// NOTE: address and length are treated separately (not using AddressRange)
-	// On GDB, e.g., the length may not be offered immediately.
-	String LENGTH_ATTRIBUTE_NAME = PREFIX_INVISIBLE + "length";
 	String SPEC_ATTRIBUTE_NAME = PREFIX_INVISIBLE + "spec";
 
+	/**
+	 * The range covered by this location
+	 * 
+	 * <p>
+	 * Typically, watchpoints (or access breakpoints) have a length, so the range would cover all
+	 * addresses in the variable being watched. Execution breakpoints likely have a "length" of 1,
+	 * meaning they cover only the address of the trap.
+	 * 
+	 * @return the address range of the location
+	 */
+	@TargetAttributeType(name = RANGE_ATTRIBUTE_NAME, hidden = true)
+	public default AddressRange getRange() {
+		return getTypedAttributeNowByName(RANGE_ATTRIBUTE_NAME, AddressRange.class, null);
+	}
+
 	/**
 	 * The minimum address of this location
 	 * 
 	 * @return the address
+	 * @deprecated use {@link #getRange()} instead
 	 */
-	@TargetAttributeType(name = ADDRESS_ATTRIBUTE_NAME, required = true, hidden = true)
+	@Deprecated(forRemoval = true, since = "10.2")
 	public default Address getAddress() {
-		return getTypedAttributeNowByName(ADDRESS_ATTRIBUTE_NAME, Address.class, null);
+		return getRange().getMinAddress();
 	}
 
 	/**
@@ -53,18 +67,26 @@ public interface TargetBreakpointLocation extends TargetObject {
 	 * <p>
 	 * In most cases, where the length is not available, a length of 1 should be presumed.
 	 * 
-	 * <p>
-	 * TODO: Should this be Long?
-	 * 
 	 * @return the length, or {@code null} if not known
+	 * @deprecated use {@link #getRange()} instead
 	 */
-	@TargetAttributeType(name = LENGTH_ATTRIBUTE_NAME, hidden = true)
+	@Deprecated(forRemoval = true, since = "10.2")
 	public default Integer getLength() {
-		return getTypedAttributeNowByName(LENGTH_ATTRIBUTE_NAME, Integer.class, null);
+		AddressRange range = getRange();
+		return range == null ? null : (int) range.getLength();
 	}
 
+	/**
+	 * Get the length, defaulting to a given fallback, usually 1
+	 * 
+	 * @param fallback the fallback value
+	 * @return the length, or the fallback
+	 * @deprecated use {@link #getRange()} instead
+	 */
+	@Deprecated(forRemoval = true, since = "10.2")
 	public default int getLengthOrDefault(int fallback) {
-		return getTypedAttributeNowByName(LENGTH_ATTRIBUTE_NAME, Integer.class, fallback);
+		Integer length = getLength();
+		return length == null ? 1 : length;
 	}
 
 	/**
@@ -72,7 +94,8 @@ public interface TargetBreakpointLocation extends TargetObject {
 	 * 
 	 * <p>
 	 * If the debugger does not separate specifications from actual breakpoints, then the
-	 * "specification" is this breakpoint. Otherwise, the specification is the parent.
+	 * "specification" is this breakpoint. Otherwise, the specification is identified by an
+	 * attribute, usually a link.
 	 * 
 	 * @return the reference to the specification
 	 */

Ghidra/Debug/Framework-Debugging/src/test/java/ghidra/dbg/model/TestDebuggerObjectModel.java

@@ -92,8 +92,8 @@ public class TestDebuggerObjectModel extends EmptyDebuggerObjectModel {
 	}
 
 	protected TestTargetBreakpoint newTestTargetBreakpoint(TestTargetBreakpointContainer container,
-			int num, Address address, int length, Set<TargetBreakpointKind> kinds) {
+			int num, AddressRange range, Set<TargetBreakpointKind> kinds) {
-		return new TestTargetBreakpoint(container, num, address, length, kinds);
+		return new TestTargetBreakpoint(container, num, range, kinds);
 	}
 
 	protected TestTargetMemory newTestTargetMemory(TestTargetProcess process, AddressSpace space) {

Ghidra/Debug/Framework-Debugging/src/test/java/ghidra/dbg/model/TestTargetBreakpoint.java

@@ -21,24 +21,23 @@ import java.util.concurrent.CompletableFuture;
 import ghidra.dbg.target.*;
 import ghidra.dbg.target.TargetBreakpointSpecContainer.TargetBreakpointKindSet;
 import ghidra.dbg.util.PathUtils;
-import ghidra.program.model.address.Address;
+import ghidra.program.model.address.*;
 
 public class TestTargetBreakpoint
 		extends DefaultTestTargetObject<TestTargetBreakpoint, TestTargetBreakpointContainer>
 		implements TargetBreakpointSpec, TargetBreakpointLocation, TargetDeletable {
 
-	public TestTargetBreakpoint(TestTargetBreakpointContainer parent, int num, Address address,
+	public TestTargetBreakpoint(TestTargetBreakpointContainer parent, int num, AddressRange range,
-			int length, Set<TargetBreakpointKind> kinds) {
+			Set<TargetBreakpointKind> kinds) {
 		super(parent, PathUtils.makeKey(PathUtils.makeIndex(num)), "Breakpoint");
 
 		changeAttributes(List.of(), Map.of(
 			SPEC_ATTRIBUTE_NAME, this,
-			ADDRESS_ATTRIBUTE_NAME, address,
+			RANGE_ATTRIBUTE_NAME, range,
 			ENABLED_ATTRIBUTE_NAME, true,
-			EXPRESSION_ATTRIBUTE_NAME, address.toString(),
+			EXPRESSION_ATTRIBUTE_NAME, range.getMinAddress().toString(),
-			KINDS_ATTRIBUTE_NAME, TargetBreakpointKindSet.copyOf(kinds),
+			KINDS_ATTRIBUTE_NAME, TargetBreakpointKindSet.copyOf(kinds)),
-			LENGTH_ATTRIBUTE_NAME, length //
+			"Initialized");
-		), "Initialized");
 	}
 
 	@Override

Ghidra/Debug/Framework-Debugging/src/test/java/ghidra/dbg/model/TestTargetBreakpointContainer.java

@@ -57,8 +57,7 @@ public class TestTargetBreakpointContainer
 	public CompletableFuture<Void> placeBreakpoint(AddressRange range,
 			Set<TargetBreakpointKind> kinds) {
 		TestTargetBreakpoint bpt =
-			getModel().newTestTargetBreakpoint(this, counter.getAndIncrement(),
+			getModel().newTestTargetBreakpoint(this, counter.getAndIncrement(), range, kinds);
-				range.getMinAddress(), (int) range.getLength(), kinds);
 		changeElements(List.of(), List.of(bpt), "Breakpoint Added");
 		return getModel().future(null);
 	}

Ghidra/Debug/Framework-Debugging/src/test/java/ghidra/dbg/test/AbstractDebuggerModelBreakpointsTest.java

@@ -16,7 +16,8 @@
 package ghidra.dbg.test;
 
 import static org.junit.Assert.*;
-import static org.junit.Assume.*;
+import static org.junit.Assume.assumeNotNull;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -31,7 +32,6 @@ import ghidra.dbg.target.TargetBreakpointSpecContainer.TargetBreakpointKindSet;
 import ghidra.dbg.target.schema.TargetObjectSchema;
 import ghidra.dbg.util.DebuggerCallbackReorderer;
 import ghidra.program.model.address.AddressRange;
-import ghidra.program.model.address.AddressRangeImpl;
 import ghidra.util.Msg;
 
 /**
@@ -141,10 +141,10 @@ public abstract class AbstractDebuggerModelBreakpointsTest extends AbstractDebug
 			if (spec == null) { // Mid construction?
 				continue;
 			}
-			if (l.getAddress() == null || l.getLength() == null) {
+			AddressRange actualRange = l.getRange();
+			if (actualRange == null) {
 				continue;
 			}
-			AddressRange actualRange = new AddressRangeImpl(l.getAddress(), l.getLength());
 			if (!actualRange.contains(range.getMinAddress()) ||
 				!actualRange.contains(range.getMaxAddress())) {
 				continue;

Ghidra/Debug/Framework-Debugging/src/test/resources/ghidra/dbg/model/test_schema.xml

@@ -318,8 +318,7 @@
 		<attribute name="_container" schema="BreakpointContainer" />
 		<attribute name="_affects" schema="LIST_OBJECT" hidden="yes" />
 		<attribute name="_spec" schema="Breakpoint" />
-        <attribute name="_length" schema="INT" hidden="yes" />
+		<attribute name="_range" schema="RANGE" hidden="yes" />
-        <attribute name="_address" schema="ADDRESS" required="yes" hidden="yes" />
 		<attribute name="_modified" schema="BOOL" hidden="yes" />
 		<attribute name="_display" schema="STRING" hidden="yes" />
 		<attribute name="_kind" schema="STRING" fixed="yes" hidden="yes" />

Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/breakpoint/DBTraceBreakpointManager.java

@@ -24,6 +24,7 @@ import java.util.concurrent.locks.ReadWriteLock;
 import com.google.common.collect.Range;
 
 import db.DBHandle;
+import ghidra.dbg.target.TargetBreakpointLocation;
 import ghidra.program.model.address.*;
 import ghidra.program.model.lang.Language;
 import ghidra.trace.database.DBTrace;
@@ -142,7 +143,8 @@ public class DBTraceBreakpointManager
 	public Collection<? extends TraceBreakpoint> getBreakpointsAt(long snap, Address address) {
 		if (trace.getObjectManager().hasSchema()) {
 			return trace.getObjectManager()
-					.getObjectsContaining(snap, address, TraceObjectBreakpointLocation.KEY_RANGE,
+					.getObjectsContaining(snap, address,
+						TargetBreakpointLocation.RANGE_ATTRIBUTE_NAME,
 						TraceObjectBreakpointLocation.class);
 		}
 		return delegateRead(address.getAddressSpace(), m -> m.getBreakpointsAt(snap, address),
@@ -154,7 +156,8 @@ public class DBTraceBreakpointManager
 			AddressRange range) {
 		if (trace.getObjectManager().hasSchema()) {
 			return trace.getObjectManager()
-					.getObjectsIntersecting(span, range, TraceObjectBreakpointLocation.KEY_RANGE,
+					.getObjectsIntersecting(span, range,
+						TargetBreakpointLocation.RANGE_ATTRIBUTE_NAME,
 						TraceObjectBreakpointLocation.class);
 		}
 		return delegateRead(range.getAddressSpace(), m -> m.getBreakpointsIntersecting(span, range),

Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/breakpoint/DBTraceObjectBreakpointLocation.java

@@ -44,7 +44,7 @@ public class DBTraceObjectBreakpointLocation
 
 	protected class BreakpointChangeTranslator extends Translator<TraceBreakpoint> {
 		protected BreakpointChangeTranslator(DBTraceObject object, TraceBreakpoint iface) {
-			super(KEY_RANGE, object, iface);
+			super(TargetBreakpointLocation.RANGE_ATTRIBUTE_NAME, object, iface);
 		}
 
 		@Override
@@ -64,7 +64,7 @@ public class DBTraceObjectBreakpointLocation
 
 		@Override
 		protected boolean appliesToKey(String key) {
-			return KEY_RANGE.equals(key) ||
+			return TargetBreakpointLocation.RANGE_ATTRIBUTE_NAME.equals(key) ||
 				TargetObject.DISPLAY_ATTRIBUTE_NAME.equals(key) ||
 				TargetBreakpointSpec.ENABLED_ATTRIBUTE_NAME.equals(key) ||
 				KEY_COMMENT.equals(key);
@@ -122,7 +122,7 @@ public class DBTraceObjectBreakpointLocation
 	@Override
 	public void setRange(Range<Long> lifespan, AddressRange range) {
 		try (LockHold hold = object.getTrace().lockWrite()) {
-			object.setValue(lifespan, KEY_RANGE, range);
+			object.setValue(lifespan, TargetBreakpointLocation.RANGE_ATTRIBUTE_NAME, range);
 			this.range = range;
 		}
 	}
@@ -133,8 +133,8 @@ public class DBTraceObjectBreakpointLocation
 			if (object.getLife().isEmpty()) {
 				return range;
 			}
-			return range = TraceObjectInterfaceUtils.getValue(object, getPlacedSnap(), KEY_RANGE,
+			return range = TraceObjectInterfaceUtils.getValue(object, getPlacedSnap(),
-				AddressRange.class, range);
+				TargetBreakpointLocation.RANGE_ATTRIBUTE_NAME, AddressRange.class, range);
 		}
 	}
 
@@ -325,7 +325,7 @@ public class DBTraceObjectBreakpointLocation
 	}
 
 	public TraceAddressSpace getTraceAddressSpace() {
-		return spaceForValue(computeMinSnap(), KEY_RANGE);
+		return spaceForValue(computeMinSnap(), TargetBreakpointLocation.RANGE_ATTRIBUTE_NAME);
 	}
 
 	@Override

Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/target/DBTraceObject.java

@@ -27,11 +27,10 @@ import com.google.common.collect.*;
 
 import db.DBRecord;
 import db.StringField;
-import ghidra.dbg.target.TargetBreakpointLocation;
 import ghidra.dbg.target.TargetObject;
 import ghidra.dbg.target.schema.TargetObjectSchema;
 import ghidra.dbg.util.*;
-import ghidra.program.model.address.*;
+import ghidra.program.model.address.AddressSpace;
 import ghidra.trace.database.DBTrace;
 import ghidra.trace.database.DBTraceUtils;
 import ghidra.trace.database.breakpoint.DBTraceObjectBreakpointLocation;
@@ -728,47 +727,6 @@ public class DBTraceObject extends DBAnnotatedObject implements TraceObject {
 		return manager.doCreateValue(lifespan, this, key, value);
 	}
 
-	// HACK: Because breakpoint uses address,length instead of range. FIXME!
-	protected void applyBreakpointRangeHack(Range<Long> lifespan, String key, Object value,
-			ConflictResolution resolution) {
-		/**
-		 * NOTE: This should only be happening in Target/TraceBreakpointLocation, but I suppose
-		 * anything using this scheme should be hacked.
-		 */
-		Address address;
-		int length;
-		if (key == TargetBreakpointLocation.ADDRESS_ATTRIBUTE_NAME &&
-			value instanceof Address) {
-			address = (Address) value;
-			InternalTraceObjectValue lengthObj = getValue(DBTraceUtils.lowerEndpoint(lifespan),
-				TargetBreakpointLocation.LENGTH_ATTRIBUTE_NAME);
-			if (lengthObj == null || !(lengthObj.getValue() instanceof Integer)) {
-				return;
-			}
-			length = (Integer) lengthObj.getValue();
-		}
-		else if (key == TargetBreakpointLocation.LENGTH_ATTRIBUTE_NAME &&
-			value instanceof Integer) {
-			length = (Integer) value;
-			InternalTraceObjectValue addressObj = getValue(DBTraceUtils.lowerEndpoint(lifespan),
-				TargetBreakpointLocation.ADDRESS_ATTRIBUTE_NAME);
-			if (addressObj == null || !(addressObj.getValue() instanceof Address)) {
-				return;
-			}
-			address = (Address) addressObj.getValue();
-		}
-		else {
-			return;
-		}
-		try {
-			setValue(lifespan, TraceObjectBreakpointLocation.KEY_RANGE,
-				new AddressRangeImpl(address, length), resolution);
-		}
-		catch (AddressOverflowException e) {
-			Msg.warn(this, "Could not set range: " + e);
-		}
-	}
-
 	@Override
 	public InternalTraceObjectValue setValue(Range<Long> lifespan, String key, Object value,
 			ConflictResolution resolution) {
@@ -812,8 +770,6 @@ public class DBTraceObject extends DBAnnotatedObject implements TraceObject {
 			};
 			InternalTraceObjectValue result = setter.set(lifespan, value);
 
-			// NB. This hack will cause more value events. good.
-			applyBreakpointRangeHack(lifespan, key, value, resolution);
 			DBTraceObject child = setter.canonicalLifeChanged;
 			if (child != null) {
 				child.emitEvents(

Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/breakpoint/TraceObjectBreakpointLocation.java

@@ -31,14 +31,11 @@ import ghidra.util.exception.DuplicateNameException;
 	shortName = "breakpoint location",
 	fixedKeys = {
 		TargetObject.DISPLAY_ATTRIBUTE_NAME,
-		TargetBreakpointLocation.ADDRESS_ATTRIBUTE_NAME,
+		TargetBreakpointLocation.RANGE_ATTRIBUTE_NAME,
-		TargetBreakpointLocation.LENGTH_ATTRIBUTE_NAME,
 		TraceObjectBreakpointLocation.KEY_COMMENT,
-		TraceObjectBreakpointLocation.KEY_RANGE,
 	})
 public interface TraceObjectBreakpointLocation extends TraceBreakpoint, TraceObjectInterface {
 	String KEY_COMMENT = "_comment";
-	String KEY_RANGE = "_range"; // Duplicates address,length
 
 	TraceObjectBreakpointSpec getSpecification();