mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 01:35:39 +02:00
Code Issues Wiki Activity

2005-07-10 Alain Magloire

Browse source 
Fix for PR 100992: Setting breakpoints for methods
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
This commit is contained in:
Alain Magloire 2005-07-11 20:45:45 +00:00
parent b305b10095
commit ef2c62d0bf
2 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debug/org.eclipse.cdt.debug.mi.core/ChangeLog
View file

@ -1,3 +1,7 @@
2005-07-10 Alain Magloire
Fix for PR 100992: Setting breakpoints for methods
* cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
2005-07-07 Alain Magloire 2005-07-07 Alain Magloire
Try to suspend the target before disconnecting. Try to suspend the target before disconnecting.
* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java * cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java

52
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
View file

@ -929,31 +929,43 @@ public class BreakpointManager extends Manager {
} }
line.append(no); line.append(no);
} else if (bkpt instanceof FunctionBreakpoint) { } else if (bkpt instanceof FunctionBreakpoint) {
if (file != null && file.length() > 0) {
line.append(file).append(':');
}
if (function != null && function.length() > 0) { if (function != null && function.length() > 0) {
// GDB does not seem to accept function arguments when // if the function contains :: assume the user
// we use file name: // knows the exact funciton
// (gdb) break file.c:Test(int) int colon = function.indexOf("::"); //$NON-NLS-1$
// Will fail, altought it can accept this if (colon != -1) {
// (gdb) break file.c:main
// so fall back to the line number or
// just the name of the function if lineno is invalid.
int paren = function.indexOf('(');
if (paren != -1) {
if (no <= 0) {
String func = function.substring(0, paren);
line.append(func);
} else {
line.append(no);
}
} else {
line.append(function); line.append(function);
} else {
if (file != null && file.length() > 0) {
line.append(file).append(':');
}
// GDB does not seem to accept function arguments when
// we use file name:
// (gdb) break file.c:Test(int)
// Will fail, altought it can accept this
// (gdb) break file.c:main
// so fall back to the line number or
// just the name of the function if lineno is invalid.
int paren = function.indexOf('(');
if (paren != -1) {
if (no <= 0) {
String func = function.substring(0, paren);
line.append(func);
} else {
line.append(no);
}
} else {
line.append(function);
}
} }
} else { } else {
// ??? // ???
line.append(no); if (file != null && file.length() > 0) {
line.append(file).append(':');
}
if (no > 0) {
line.append(no);
}
} }
} else if (bkpt instanceof AddressBreakpoint) { } else if (bkpt instanceof AddressBreakpoint) {
line.append('*').append(locator.getAddress()); line.append('*').append(locator.getAddress());