[cdt-patch] put framework for mixed assembly instruction

["Alain Magloire" <alain@xxxxxxx>]

Put the framework in CDI API to retrieve a mixed source and
assembly instruction.  Still for this to be usefull the CEditor
will have to be change to show "mixed" mode.


Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/ChangeLog,v
retrieving revision 1.9
diff -u -r1.9 ChangeLog
--- ChangeLog	11 Oct 2002 21:41:50 -0000	1.9
+++ ChangeLog	12 Oct 2002 01:18:09 -0000
@@ -4,6 +4,13 @@
 
 2002-10-11 Mikhail Khodjaiants
 	* DisassemblyStorage.java: Changed the format of the disassembly view's output.
+2002-10-11 Alain Magloire
+
+	* ICDISourceManager.java (getMixedInstructions): Three
+	new methods to get the src and the intructions.
+	
+	* ICIDMixedInstruction:  New Class that return the mixed
+	of source location and assembly instructions.
 
 2002-10-10 Mikhail Khodjaiants
 	* CVariable.java: Made the 'fChanged' field protected to access to it from the derived class (CRegister).
Index: src/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java,v
retrieving revision 1.9
diff -u -r1.9 ICDISourceManager.java
--- src/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java	10 Oct 2002 15:16:14 -0000	1.9
+++ src/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java	12 Oct 2002 01:18:10 -0000
@@ -8,6 +8,7 @@
 import java.io.File;
 
 import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction;
+import org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction;
 
 /**
  * 
@@ -74,5 +75,29 @@
 	 * @throws CDIException on failure
 	 */
 	ICDIInstruction[] getInstructions(String filename,  int linenum, int lines) throws CDIException;
+
+	/**
+	 *  @param startAddress is the begining address
+	 *  @param endAddress is the end address
+	 *  @throws CDIException on failure.
+	 */
+	ICDIMixedInstruction[] getMixedInstructions(long startAddress, long endAddress)  throws CDIException;
+
+	/**
+	 * @param filename is the name of the file to disassemble
+	 * @param linenum is the line number to disassemble around
+	 * @param lines is the number of disassembly to produced
+	 * @throws CDIException on failure
+	 */
+	ICDIMixedInstruction[] getMixedInstructions(String filename,  int linenum) throws CDIException;
+
+	/**
+	 * @param filename is the name of the file to disassemble
+	 * @param linenum is the line number to disassemble around
+	 * @param lines is the number of disassembly to produced
+	 * @throws CDIException on failure
+	 */
+	ICDIMixedInstruction[] getMixedInstructions(String filename,  int linenum, int lines) throws CDIException;
+
 
 }
Index: src/org/eclipse/cdt/debug/core/cdi/model/ICDIMixedInstruction.java
===================================================================
RCS file: src/org/eclipse/cdt/debug/core/cdi/model/ICDIMixedInstruction.java
diff -N src/org/eclipse/cdt/debug/core/cdi/model/ICDIMixedInstruction.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/cdt/debug/core/cdi/model/ICDIMixedInstruction.java	12 Oct 2002 01:18:10 -0000
@@ -0,0 +1,29 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+package org.eclipse.cdt.debug.core.cdi.model;
+
+/**
+ * 
+ * Represents a machine instruction.
+ * 
+ * @since Jul 10, 2002
+ */
+public interface ICDIMixedInstruction extends ICDIObject {
+	/**
+	 * @return the line Number.
+	 */
+	int getLineNumber();
+	
+	/**
+	 * @return the file name
+	 */
+	String getFileName();
+	
+	/**
+	 * @return the array of instruction.
+	 */
+	ICDIInstruction[] getInstructions();
+}