Attachment #14570 for bug #69908




/*******************************************************************************
 * Copyright (c) 2004 Intel Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Common Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/cpl-v10.html
 * 
 * Contributors:
 *     Intel Corporation - Initial API and implementation
 *******************************************************************************/
package org.eclipse.cdt.core;


/*
 */
final public class Addr32Factory implements IAddressFactory
{
	
	final public  IAddress getZero() 
	{
		return Addr32.ZERO; 
	}

	final public IAddress getMax() 
	{
		return Addr32.MAX; 
	}
	
	final public IAddress createAddress(String addr) 
	{
		IAddress address=new Addr32(addr);
		return address; 
	}
	
	final public IAddress createAddress(String addr, int radix) 
	{
		IAddress address=new Addr32(addr, radix);
		return address; 
	}
	
}




/*******************************************************************************
 * Copyright (c) 2004 Intel Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Common Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/cpl-v10.html
 * 
 * Contributors:
 *     Intel Corporation - Initial API and implementation
 *******************************************************************************/
package org.eclipse.cdt.core;

import java.math.BigInteger;

/*
 */
final public class Addr32 implements IAddress
{
	public static final Addr32 ZERO=new Addr32(0);
	public static final Addr32 MAX=new Addr32(0xffffffffL);

	public static final BigInteger MAX_OFFSET = BigInteger.valueOf(0xffffffffL);
	
	public static final int BYTES_NUM = 4;
	public static final int DIGITS_NUM = BYTES_NUM * 2;
	public static final int CHARS_NUM = DIGITS_NUM + 2; 
		
	private long address;

	/*
	 * addrBytes should be 4 bytes length
	 */
	public Addr32(byte [] addrBytes)
	{
		/*We should mask out sign bits to have correct value*/
		this.address = ( ( ((long)addrBytes[0]) << 24 ) & 0xFF000000L) + 
                       ( ( ((long)addrBytes[1]) << 16 ) & 0x00FF0000L) +
                       ( ( ((long)addrBytes[2]) << 8  ) & 0x0000FF00L) + 
                       (   ((long)addrBytes[3])         & 0x000000FFL);
	}

	public Addr32(long rawaddress) 
	{
		this.address=rawaddress;
	}

	public Addr32(String addr) 
	{
		addr = addr.toLowerCase();
		if ( addr.startsWith( "0x" ) )
		{		
			this.address = Long.parseLong(addr.substring(2), 16);
		}
		else
		{
			this.address = Long.parseLong(addr, 10);
		}
	}

	public Addr32(String addr, int radix) 
	{
		this.address=Long.parseLong(addr, radix);
	}

	final public IAddress add(BigInteger offset) 
	{
		return new Addr32(this.address +  offset.longValue());
	}

	final public BigInteger getMaxOffset()
	{
		return MAX_OFFSET;
	}

	final public BigInteger distance(IAddress other)
	{
		return BigInteger.valueOf(address - ((Addr32)other).address);
	}
	
	final public int compareTo(IAddress addr) 
	{
		if (address > ((Addr32)addr).address)
		{ 
			return 1;
		}	
		if (address < ((Addr32)addr).address)
		{ 
			return -1;
		}	
		return 0;
	}

	final public boolean isMax() 
	{
		return address == MAX.address;
	}

	final public boolean isZero() 
	{
		return address == ZERO.address;
	}

	final public String toString() 
	{
		return toString(10);		
	}

	final public String toString(int radix) 
	{
		return Long.toString(address, radix);
	}

	final public boolean equals(IAddress x) 
	{
		if (x == this)
			return true;
		if (!(x instanceof Addr32))
			return false;
		return this.address == ((Addr32)x).address;
	}

	final public String toHexAddressString( )
	{
		String addressString = Long.toString(address,16);
		StringBuffer sb = new StringBuffer( CHARS_NUM  );
        int count = DIGITS_NUM - addressString.length();
		sb.append( "0x" );
		for ( int i = 0; i < count ; ++i ) 
		{
			sb.append( '0' );
		}
		sb.append( addressString );
		return sb.toString();
	}

	final public int getCharsNum()
	{
		return CHARS_NUM;
	}
	
}




/*******************************************************************************
 * Copyright (c) 2004 Intel Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Common Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/cpl-v10.html
 * 
 * Contributors:
 *     Intel Corporation - Initial API and implementation
 *******************************************************************************/
package org.eclipse.cdt.core;


/*
 */
final public class Addr64Factory implements IAddressFactory{

    final public  IAddress getZero() 
	{
		return Addr64.ZERO; 
	}

    final public IAddress getMax() 
	{
		return Addr64.MAX; 
	}
	
    final public IAddress createAddress(String addr) 
	{
		IAddress address=new Addr64(addr);
		return address; 
	}
	
    final public IAddress createAddress(String addr, int radix) 
	{
		IAddress address=new Addr64(addr, radix);
		return address; 
	}
}




/*******************************************************************************
 * Copyright (c) 2004 Intel Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Common Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/cpl-v10.html
 * 
 * Contributors:
 *     Intel Corporation - Initial API and implementation
 *******************************************************************************/
package org.eclipse.cdt.core;

import java.math.BigInteger;

/*
 */
final public class Addr64 implements IAddress 
{
	public static final Addr64 ZERO=new Addr64("0");
	public static final Addr64 MAX=new Addr64("ffffffffffffffff",16);

	public static final BigInteger MAX_OFFSET = new BigInteger("ffffffffffffffff",16);
	
    public static final int BYTES_NUM = 8;
    public static final int DIGITS_NUM = BYTES_NUM * 2;
	public static final int CHARS_NUM = DIGITS_NUM + 2; 
	
	private BigInteger address;

	public Addr64(byte [] addrBytes)
	{
		if( addrBytes.length != 8)
			throw(new NumberFormatException("Invalid address array"));
		this.address = new BigInteger(1, addrBytes);
	}
	
	public Addr64(BigInteger rawaddress) 
	{
		this.address=rawaddress;		
	}	
	
	public Addr64(String addr) 
	{
		addr = addr.toLowerCase();
		if ( addr.startsWith( "0x" ) )
		{		
			this.address = new BigInteger(addr.substring(2), 16);
		}
		else
		{
			this.address = new BigInteger(addr, 10);
		}
	}
	
	public Addr64(String addr, int radix) 
	{
		this.address=new BigInteger(addr, radix);
	}

	final public IAddress add(BigInteger offset) 
	{
		return new Addr64(this.address.add(offset));
	}

	final public BigInteger getMaxOffset()
	{
		return MAX_OFFSET;
	}

	final public BigInteger distance(IAddress other)
	{
		return address.add(((Addr64)other).address.negate());
	}

	final public boolean isMax() 
	{
		return address.equals(MAX);
	}

	final public boolean isZero() 
	{
		return address.equals(ZERO);
	}

	final public int compareTo(IAddress addr) 
	{
		return this.address.compareTo(((Addr64)addr).address);
	}

	final public boolean equals(IAddress x) 
	{
		if (x == this)
			return true;
		if (!(x instanceof Addr64))
			return false;
		return this.address.equals(((Addr64)x).address);
	}

	final public String toString() 
	{
		return toString(10);		
	}
	
	final public String toString(int radix) 
	{
		return address.toString(radix);
	}
	
	final public String toHexAddressString( )
	{
		String addressString = address.toString(16);
		StringBuffer sb = new StringBuffer( CHARS_NUM  );
        int count = DIGITS_NUM - addressString.length();
		sb.append( "0x" );
		for ( int i = 0; i < count; ++i ) 
		{
			sb.append( '0' );
		}
		sb.append( addressString );
		return sb.toString();
	}
	
	final public int getCharsNum()
	{
		return CHARS_NUM;
	}
}





/*******************************************************************************
 * Copyright (c) 2004 Intel Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Common Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/cpl-v10.html
 * 
 * Contributors:
 *     Intel Corporation - Initial API and implementation
 *******************************************************************************/
package org.eclipse.cdt.core;


/*
 * This inteface serves as an address factory. If you need to 
 * implement your own addresses, you should extend this.
 * 
 * Please see Addr32Factory and Addr64Factory to see how it can be implemented.
 */
public interface IAddressFactory 
{
	/*
	 * Returns zero address, i.e. minimal possible address
	 */
	IAddress getZero();
	/*
	 * Returns maximal address.
	 */
	IAddress getMax();
	/*
	 * Creates address from string representation. 
	 * 
	 * 1. This method should be able to create address from hex 
	 *    address string (string produced with 
	 *    IAddress.toHexAddressString() method). 
	 * 2. Method should be case insensetive
	 * 3. Method should be able to create address from decimal address 
	 *    representation
	 * 
	 *   Please see Addr32Factory.createAddress() for reference implementation.
	 */
	IAddress createAddress(String addr);
	/*
	 * Creates address from string with given radix. 
	 * 
	 * Given string should not contain any prefixes or sign numbers.
	 * 
	 * Method should be case insensetive
	 */
	IAddress createAddress(String addr, int radix);
}




/*******************************************************************************
 * Copyright (c) 2004 Intel Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Common Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/cpl-v10.html
 * 
 * Contributors:
 *     Intel Corporation - Initial API and implementation
 *******************************************************************************/
package org.eclipse.cdt.core;

import java.math.BigInteger;

/*
 * Represents C/C++ address in CDT. All implementors of this inteface should be 
 * immutable, i.e. all methods should not modify objects, they should return 
 * new object.
 * 
 * Please see Addr32 and Addr64 classes to see how this interface should 
 * be extended
 */
public interface IAddress
{
	/*
	 * Return adds offset to address and returns new address object 
	 * which is the result  
	 */
	IAddress add(BigInteger offset);
	/*
	 * Returns maximal offset possible for address. The offset 
	 * should be Identicall for all addresses of given class. 
	 */
	BigInteger getMaxOffset();
	/*
	 * Returns distance between two addresses. Distance may be positive or negative
	 */
	BigInteger distance(IAddress other);
	/*
	 * Compares two addresses.
	 * 
	 * Returns:
	 *        -1 if this <  addr
	 *         0 if this == addr
	 *         1 if this >  addr
	 */
	int compareTo(IAddress addr);
	/*
	 * Returns true if addresses are equal
	 */
	boolean equals(IAddress addr);
    /*
     * Return true if address is zero, i.e. minimal possible
     */
	boolean isZero();
    /*
     * Return true if address is maximal, i.e. maximal possible
     */
	boolean isMax();
	
	/*
	 * Converts address to string as an unsigned number with given radix
	 */
	String toString(int radix);
	/*
	 * Identical to toString(10)
	 */
	String toString();
	/*
	 * Converts address to the hex representation with '0x' prefix and 
	 * with all leading zeros. The length of returned string should be 
	 * the same for all addresses of given class. I.e. 10 for 32-bit 
	 * addresses and 18 for 64-bit addresses
	 */
	String toHexAddressString();

	/*
	 * Returns amount of symbols in hex representation. Is identical to 
	 * toHexAddressString().length(). It is present for perfomance purpose.
	 */
	int getCharsNum();
}




		 * @param addr
		 * @return ISymbol
		 */
		ISymbol getSymbol(IAddress addr);

		/**
		 * The name of the object

		 */
		String getName();

		IAddressFactory getAddressFactory();
	}

	/**

		 * Address of the symbol
		 * @return
		 */
		IAddress getAddress();

		/**
		 * Size of the symbol.

Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/core/model/IBinaryElement.java (-1 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.cdt.core.model;	11	package org.eclipse.cdt.core.model;
12		12
		13	import org.eclipse.cdt.core.IAddress;
		14
13		15
14	/**	16	/**
15	*/	17	*/
Lines 22-28 Link Here
22	* @exception CModelException if this element does not have address	24	* @exception CModelException if this element does not have address
23	* information.	25	* information.
24	*/	26	*/
25	long getAddress() throws CModelException;	27	IAddress getAddress() throws CModelException;
26		28
27	/**	29	/**
28	* Returns the binary object the element belongs to.	30	* Returns the binary object the element belongs to.

Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/core/model/IBinary.java (+4 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.cdt.core.model;	11	package org.eclipse.cdt.core.model;
12		12
		13	import org.eclipse.cdt.core.IAddressFactory;
		14
13		15
14	/**	16	/**
15	* Represents a Binary file, for example an ELF excutable.	17	* Represents a Binary file, for example an ELF excutable.
Lines 43-46 Link Here
43		45
44	public boolean isLittleEndian();	46	public boolean isLittleEndian();
45		47
		48	public IAddressFactory getAddressFactory();
		49
46	}	50	}




import java.io.IOException;
import java.util.Map;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.IBinary;
import org.eclipse.cdt.core.model.IBinaryElement;

 */
public class BinaryElement extends CElement implements IBinaryElement, ISourceManipulation, ISourceReference {

	IAddress addr;

	public BinaryElement(ICElement parent, String name, int type, IAddress a) {
		super(parent, name, type);
		addr = a;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.cdt.core.model.IBinaryElement#getAddress()
	 */
	public IAddress getAddress() throws CModelException {
		return addr;
	}


Lines 11-16 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/internal/core/model/BinaryFunction.java (-1 / +2 lines)
11		11
12	package org.eclipse.cdt.internal.core.model;	12	package org.eclipse.cdt.internal.core.model;
13		13
		14	import org.eclipse.cdt.core.IAddress;
14	import org.eclipse.cdt.core.model.IBinaryFunction;	15	import org.eclipse.cdt.core.model.IBinaryFunction;
15	import org.eclipse.cdt.core.model.ICElement;	16	import org.eclipse.cdt.core.model.ICElement;
16		17
Lines 18-24 Link Here
18	*/	19	*/
19	public class BinaryFunction extends BinaryElement implements IBinaryFunction {	20	public class BinaryFunction extends BinaryElement implements IBinaryFunction {
20		21
21	public BinaryFunction(ICElement parent, String name, long a) {	22	public BinaryFunction(ICElement parent, String name, IAddress a) {
22	super(parent, name, ICElement.C_FUNCTION, a);	23	super(parent, name, ICElement.C_FUNCTION, a);
23	}	24	}
24		25




import java.util.HashMap;
import java.util.Map;

import org.eclipse.cdt.core.IAddressFactory;
import org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable;
import org.eclipse.cdt.core.IBinaryParser.IBinaryFile;
import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;

	private long longBSS;
	private String endian;
	private String soname;
	private IAddressFactory addressFactory;
	
	private long fLastModification;


		return binaryObject;
	}
	
	public IAddressFactory getAddressFactory() {
		if (isObject() || isExecutable() || isSharedLib() || isCore()) {
			if (addressFactory == null || hasChanged()) {
				addressFactory = getBinaryObject().getAddressFactory();
			}
		}
		return addressFactory;
	}
	
	protected int getType() {
		IBinaryObject obj = getBinaryObject();
		if (obj != null && (fBinType == 0 || hasChanged())) {

			longData = -1;
			longText = -1;
			soname = null;
			addressFactory = null;
		}
		return changed;
	}

Lines 13-18 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/internal/core/model/BinaryModule.java (-2 / +3 lines)
13		13
14	import java.util.Map;	14	import java.util.Map;
15		15
		16	import org.eclipse.cdt.core.IAddress;
16	import org.eclipse.cdt.core.model.CModelException;	17	import org.eclipse.cdt.core.model.CModelException;
17	import org.eclipse.cdt.core.model.IBinary;	18	import org.eclipse.cdt.core.model.IBinary;
18	import org.eclipse.cdt.core.model.IBinaryElement;	19	import org.eclipse.cdt.core.model.IBinaryElement;
Lines 47-54 Link Here
47	/* (non-Javadoc)	48	/* (non-Javadoc)
48	* @see org.eclipse.cdt.core.model.IBinaryElement#getAddress()	49	* @see org.eclipse.cdt.core.model.IBinaryElement#getAddress()
49	*/	50	*/
50	public long getAddress() throws CModelException {	51	public IAddress getAddress() throws CModelException {
51	return 0;	52	return null;
52	}	53	}
53		54
54	/* (non-Javadoc)	55	/* (non-Javadoc)

Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/internal/core/model/BinaryVariable.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.cdt.internal.core.model;	11	package org.eclipse.cdt.internal.core.model;
12		12
		13	import org.eclipse.cdt.core.IAddress;
13	import org.eclipse.cdt.core.model.ICElement;	14	import org.eclipse.cdt.core.model.ICElement;
14	import org.eclipse.cdt.core.model.IVariable;	15	import org.eclipse.cdt.core.model.IVariable;
15		16
Lines 18-24 Link Here
18	*/	19	*/
19	public class BinaryVariable extends BinaryElement implements IVariable {	20	public class BinaryVariable extends BinaryElement implements IVariable {
20		21
21	public BinaryVariable(ICElement parent, String name, long a) {	22	public BinaryVariable(ICElement parent, String name, IAddress a) {
22	super(parent, name, ICElement.C_VARIABLE, a);	23	super(parent, name, ICElement.C_VARIABLE, a);
23	}	24	}
24		25




import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.math.BigInteger;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.utils.spawner.ProcessFactory;

public class Addr2line {

		}
	}

	public String getLine(IAddress address) throws IOException {
		getOutput(address.toString(16));
		return lastline;
	}

	public String getFunction(IAddress address) throws IOException {
		getOutput(address.toString(16));
		return lastsymbol;
	}	


	 *  main
	 *  hello.c:39
	 */
	public String getFileName(IAddress address) throws IOException {
		String filename = null;
		String line = getLine(address);
		int index1, index2;

	 *  main
	 *  hello.c:39
	 */
	public int getLineNumber(IAddress address) throws IOException {
		// We try to get the nearest match
		// since the symbol may not exactly align with debug info.
		// In C line number 0 is invalid, line starts at 1 for file, we use
		// this for validation.
		
		//IPF_TODO: check 
		for (int i = 0; i <= 20; i += 4, address = address.add(BigInteger.valueOf(i))) {
			String line = getLine(address);
			if (line != null) {
				int colon = line.lastIndexOf(':');

Lines 10-17 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/BinaryObjectAdapter.java (-4 / +15 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.cdt.utils;	11	package org.eclipse.cdt.utils;
12		12
		13	import java.math.BigInteger;
13	import java.util.Arrays;	14	import java.util.Arrays;
14		15
		16	import org.eclipse.cdt.core.IAddress;
		17	import org.eclipse.cdt.core.IAddressFactory;
15	import org.eclipse.cdt.core.IBinaryParser;	18	import org.eclipse.cdt.core.IBinaryParser;
16	import org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable;	19	import org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable;
17	import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;	20	import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
Lines 35-40 Link Here
35	public String soname;	38	public String soname;
36	public String[] needed;	39	public String[] needed;
37	public String cpu;	40	public String cpu;
		41	public IAddressFactory addressFactory;
38		42
39	public BinaryObjectInfo() {	43	public BinaryObjectInfo() {
40	cpu = soname = ""; //$NON-NLS-1$	44	cpu = soname = ""; //$NON-NLS-1$
Lines 49-57 Link Here
49	/* (non-Javadoc)	53	/* (non-Javadoc)
50	* @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getSymbol(long)	54	* @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getSymbol(long)
51	*/	55	*/
52	public ISymbol getSymbol(long addr) {	56	public ISymbol getSymbol(IAddress addr) {
53	ISymbol[] syms = getSymbols();	57	ISymbol[] syms = getSymbols();
54	int insertion = Arrays.binarySearch(syms, new Long(addr));	58	int insertion = Arrays.binarySearch(syms, addr);
55	if (insertion >= 0) {	59	if (insertion >= 0) {
56	return syms[insertion];	60	return syms[insertion];
57	}	61	}
Lines 60-66 Link Here
60	}	64	}
61	insertion = -insertion - 1;	65	insertion = -insertion - 1;
62	ISymbol symbol = syms[insertion - 1];	66	ISymbol symbol = syms[insertion - 1];
63	if (addr < (symbol.getAddress() + symbol.getSize())) {	67	if (addr.compareTo(symbol.getAddress().add(BigInteger.valueOf(symbol.getSize()))) < 0) {
64	return syms[insertion - 1];	68	return syms[insertion - 1];
65	}	69	}
66	return null;	70	return null;
Lines 153-159 Link Here
153	}	157	}
154	return ""; //$NON-NLS-1$	158	return ""; //$NON-NLS-1$
155	}	159	}
156		160	public IAddressFactory getAddressFactory()
		161	{
		162	BinaryObjectInfo info = getBinaryObjectInfo();
		163	if (info != null) {
		164	return info.addressFactory;
		165	}
		166	return null; //$NON-NLS-1$
		167	}
157	/**	168	/**
158	* @see org.eclipse.cdt.core.model.IBinaryParser.IBinaryObject#getName()	169	* @see org.eclipse.cdt.core.model.IBinaryParser.IBinaryObject#getName()
159	*/	170	*/

Lines 15-20 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/coff/parser/ARMember.java (-1 / +2 lines)
15	import java.io.InputStream;	15	import java.io.InputStream;
16	import java.util.List;	16	import java.util.List;
17		17
		18	import org.eclipse.cdt.core.Addr32;
18	import org.eclipse.cdt.core.CCorePlugin;	19	import org.eclipse.cdt.core.CCorePlugin;
19	import org.eclipse.cdt.core.IBinaryParser;	20	import org.eclipse.cdt.core.IBinaryParser;
20	import org.eclipse.cdt.core.IBinaryParser.ISymbol;	21	import org.eclipse.cdt.core.IBinaryParser.ISymbol;
Lines 77-83 Link Here
77	continue;	78	continue;
78	}	79	}
79	int type = peSyms[i].isFunction() ? ISymbol.FUNCTION : ISymbol.VARIABLE;	80	int type = peSyms[i].isFunction() ? ISymbol.FUNCTION : ISymbol.VARIABLE;
80	list.add(new Symbol(this, name, type, peSyms[i].n_value, 1));	81	list.add(new Symbol(this, name, type, new Addr32(peSyms[i].n_value), 1));
81	}	82	}
82	}	83	}
83	}	84	}

Lines 11-18 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java (-2 / +5 lines)
11	import java.io.ByteArrayInputStream;	11	import java.io.ByteArrayInputStream;
12	import java.io.IOException;	12	import java.io.IOException;
13	import java.io.InputStream;	13	import java.io.InputStream;
		14	import java.math.BigInteger;
14	import java.util.List;	15	import java.util.List;
15		16
		17	import org.eclipse.cdt.core.Addr32;
		18	import org.eclipse.cdt.core.IAddress;
16	import org.eclipse.cdt.core.IBinaryParser.ISymbol;	19	import org.eclipse.cdt.core.IBinaryParser.ISymbol;
17	import org.eclipse.cdt.utils.Addr2line;	20	import org.eclipse.cdt.utils.Addr2line;
18	import org.eclipse.cdt.utils.CPPFilt;	21	import org.eclipse.cdt.utils.CPPFilt;
Lines 147-153 Link Here
147	continue;	150	continue;
148	}	151	}
149	int type = peSyms[i].isFunction() ? ISymbol.FUNCTION : ISymbol.VARIABLE;	152	int type = peSyms[i].isFunction() ? ISymbol.FUNCTION : ISymbol.VARIABLE;
150	int addr = peSyms[i].n_value;	153	IAddress addr = new Addr32(peSyms[i].n_value);
151	int size = 4;	154	int size = 4;
152	if (cppfilt != null) {	155	if (cppfilt != null) {
153	try {	156	try {
Lines 172-178 Link Here
172	}	175	}
173	IPath file = filename != null ? new Path(filename) : Path.EMPTY;	176	IPath file = filename != null ? new Path(filename) : Path.EMPTY;
174	int startLine = addr2line.getLineNumber(addr);	177	int startLine = addr2line.getLineNumber(addr);
175	int endLine = addr2line.getLineNumber(addr + size - 1);	178	int endLine = addr2line.getLineNumber(addr.add(BigInteger.valueOf(size - 1)));
176	list.add(new CygwinSymbol(this, name, type, addr, size, file, startLine, endLine));	179	list.add(new CygwinSymbol(this, name, type, addr, size, file, startLine, endLine));
177	} catch (IOException e) {	180	} catch (IOException e) {
178	addr2line = null;	181	addr2line = null;




package org.eclipse.cdt.utils.coff.parser;

import java.io.IOException;
import java.math.BigInteger;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.utils.Addr2line;
import org.eclipse.cdt.utils.Symbol;
import org.eclipse.core.runtime.IPath;

	 * @param startLine
	 * @param endLine
	 */
	public CygwinSymbol(CygwinPEBinaryObject binary, String name, int type, IAddress addr, long size, IPath sourceFile, int startLine,
			int endLine) {
		super(binary, name, type, addr, size, sourceFile, startLine, endLine);
	}

	 * @param addr
	 * @param size
	 */
	public CygwinSymbol(CygwinPEBinaryObject binary, String name, int type, IAddress addr, long size) {
		super(binary, name, type, addr, size);
	}


		Addr2line addr2line = ((CygwinPEBinaryObject)binary).getAddr2line(true);
		if (addr2line != null) {
			try {
				return addr2line.getLineNumber(getAddress().add(BigInteger.valueOf(offset)));
			} catch (IOException e) {
				// ignore
			}




import java.util.Arrays;
import java.util.List;

import org.eclipse.cdt.core.Addr32;
import org.eclipse.cdt.core.IBinaryParser;
import org.eclipse.cdt.core.IBinaryParser.IBinaryFile;
import org.eclipse.cdt.core.IBinaryParser.ISymbol;

		info.isLittleEndian = attribute.isLittleEndian();
		info.hasDebug = attribute.hasDebug();
		info.cpu = attribute.getCPU();
		info.addressFactory = attribute.getAddressFactory(); 
	}

	protected void loadSymbols(PE pe) throws IOException {

					continue;
				}
				int type = peSyms[i].isFunction() ? ISymbol.FUNCTION : ISymbol.VARIABLE;
				list.add(new Symbol(this, name, type, new Addr32(peSyms[i].n_value), 1));
			}
		}
	}

Lines 14-20 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/coff/PE.java (+10 lines)
14	import java.io.IOException;	14	import java.io.IOException;
15	import java.io.RandomAccessFile;	15	import java.io.RandomAccessFile;
16		16
		17	import org.eclipse.cdt.core.Addr32Factory;
17	import org.eclipse.cdt.core.CCorePlugin;	18	import org.eclipse.cdt.core.CCorePlugin;
		19	import org.eclipse.cdt.core.IAddressFactory;
18	import org.eclipse.cdt.utils.coff.Coff.FileHeader;	20	import org.eclipse.cdt.utils.coff.Coff.FileHeader;
19	import org.eclipse.cdt.utils.coff.Coff.OptionalHeader;	21	import org.eclipse.cdt.utils.coff.Coff.OptionalHeader;
20	import org.eclipse.cdt.utils.coff.Coff.SectionHeader;	22	import org.eclipse.cdt.utils.coff.Coff.SectionHeader;
Lines 84-89 Link Here
84	int word;	86	int word;
85	boolean bDebug;	87	boolean bDebug;
86	boolean isle;	88	boolean isle;
		89	IAddressFactory addrFactory;
87		90
88	public String getCPU() {	91	public String getCPU() {
89	return cpu;	92	return cpu;
Lines 104-109 Link Here
104	public int getWord() {	107	public int getWord() {
105	return word;	108	return word;
106	}	109	}
		110
		111	public IAddressFactory getAddressFactory(){
		112	return addrFactory;
		113	}
		114
107	}	115	}
108		116
109	/**	117	/**
Lines 462-467 Link Here
462	if ((filhdr.f_flags & PEConstants.IMAGE_FILE_32BIT_MACHINE) != 0) {	470	if ((filhdr.f_flags & PEConstants.IMAGE_FILE_32BIT_MACHINE) != 0) {
463	attrib.word = 32;	471	attrib.word = 32;
464	}	472	}
		473
		474	attrib.addrFactory = new Addr32Factory();
465	return attrib;	475	return attrib;
466	}	476	}
467		477

Lines 17-26 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/elf/Elf.java (-34 / +264 lines)
17	import java.util.Arrays;	17	import java.util.Arrays;
18	import java.util.Comparator;	18	import java.util.Comparator;
19		19
		20	import org.eclipse.cdt.core.Addr32;
		21	import org.eclipse.cdt.core.Addr32Factory;
		22	import org.eclipse.cdt.core.Addr64;
		23	import org.eclipse.cdt.core.Addr64Factory;
20	import org.eclipse.cdt.core.CCorePlugin;	24	import org.eclipse.cdt.core.CCorePlugin;
		25	import org.eclipse.cdt.core.IAddress;
		26	import org.eclipse.cdt.core.IAddressFactory;
21		27
22	// test checkin	28	// test checkin
23	public class Elf {	29	public class Elf {
		30	public final static int ELF32_ADDR_SIZE = 4;
		31	public final static int ELF32_OFF_SIZE = 4;
		32	public final static int ELF64_ADDR_SIZE = 8;
		33	public final static int ELF64_OFF_SIZE = 8;
		34
24	protected ERandomAccessFile efile;	35	protected ERandomAccessFile efile;
25		36
26	protected ELFhdr ehdr;	37	protected ELFhdr ehdr;
Lines 52-58 Link Here
52		63
53	/* e_ident[EI_CLASS] */	64	/* e_ident[EI_CLASS] */
54	public final static int ELFCLASSNONE = 0;	65	public final static int ELFCLASSNONE = 0;
55	public final static int ELCLASS32 = 1;	66	public final static int ELFCLASS32 = 1;
56	public final static int ELFCLASS64 = 2;	67	public final static int ELFCLASS64 = 2;
57		68
58	/* e_ident[EI_DATA] */	69	/* e_ident[EI_DATA] */
Lines 117-123 Link Here
117	public int e_type; /* file type (Elf32_Half) */	128	public int e_type; /* file type (Elf32_Half) */
118	public int e_machine; /* machine type (Elf32_Half) */	129	public int e_machine; /* machine type (Elf32_Half) */
119	public long e_version; /* version number (Elf32_Word) */	130	public long e_version; /* version number (Elf32_Word) */
120	public long e_entry; /* entry point (Elf32_Addr)*/	131	public IAddress e_entry; /* entry point (Elf32_Addr)*/
121	public long e_phoff; /* Program hdr offset (Elf32_Off)*/	132	public long e_phoff; /* Program hdr offset (Elf32_Off)*/
122	public long e_shoff; /* Section hdr offset (Elf32_Off)*/	133	public long e_shoff; /* Section hdr offset (Elf32_Off)*/
123	public long e_flags; /* Processor flags (Elf32_Word)*/	134	public long e_flags; /* Processor flags (Elf32_Word)*/
Lines 138-146 Link Here
138	e_type = efile.readShortE();	149	e_type = efile.readShortE();
139	e_machine = efile.readShortE();	150	e_machine = efile.readShortE();
140	e_version = efile.readIntE();	151	e_version = efile.readIntE();
141	e_entry = efile.readIntE();	152	switch (e_ident[ELFhdr.EI_CLASS])
		153	{
		154	case ELFhdr.ELFCLASS32:
		155	{
		156	byte[] addrArray = new byte[ELF32_ADDR_SIZE];
		157	efile.readFullyE(addrArray);
		158	e_entry = new Addr32(addrArray);
142	e_phoff = efile.readIntE();	159	e_phoff = efile.readIntE();
143	e_shoff = efile.readIntE();	160	e_shoff = efile.readIntE();
		161	}
		162	break;
		163	case ELFhdr.ELFCLASS64:
		164	{
		165	byte[] addrArray = new byte[ELF64_ADDR_SIZE];
		166	efile.readFullyE(addrArray);
		167	e_entry = new Addr64(addrArray);
		168	e_phoff = readUnsignedLong(efile);
		169	e_shoff = readUnsignedLong(efile);
		170	}
		171	break;
		172	case ELFhdr.ELFCLASSNONE:
		173	default:
		174	throw new IOException("Unknown ELF class " + e_ident[ELFhdr.EI_CLASS]);
		175	}
144	e_flags = efile.readIntE();	176	e_flags = efile.readIntE();
145	e_ehsize = efile.readShortE();	177	e_ehsize = efile.readShortE();
146	e_phentsize = efile.readShortE();	178	e_phentsize = efile.readShortE();
Lines 163-171 Link Here
163	e_type = makeShort(bytes, offset, isle); offset += 2;	195	e_type = makeShort(bytes, offset, isle); offset += 2;
164	e_machine = makeShort(bytes, offset, isle); offset += 2;	196	e_machine = makeShort(bytes, offset, isle); offset += 2;
165	e_version = makeInt(bytes, offset, isle); offset += 4;	197	e_version = makeInt(bytes, offset, isle); offset += 4;
166	e_entry = makeInt(bytes, offset, isle); offset += 4;	198	switch (e_ident[ELFhdr.EI_CLASS])
167	e_phoff = makeInt(bytes, offset, isle); offset += 4;	199	{
168	e_shoff = makeInt(bytes, offset, isle); offset += 4;	200	case ELFhdr.ELFCLASS32:
		201	{
		202	byte[] addrArray = new byte[ELF32_ADDR_SIZE];
		203	System.arraycopy(bytes, offset, addrArray, 0, ELF32_ADDR_SIZE); offset += ELF32_ADDR_SIZE;
		204	e_entry = new Addr32(addrArray);
		205	e_phoff = makeInt(bytes, offset, isle); offset += ELF32_OFF_SIZE;
		206	e_shoff = makeInt(bytes, offset, isle); offset += ELF32_OFF_SIZE;
		207	}
		208	break;
		209	case ELFhdr.ELFCLASS64:
		210	{
		211	byte[] addrArray = new byte[ELF64_ADDR_SIZE];
		212	System.arraycopy(bytes, offset, addrArray, 0, ELF64_ADDR_SIZE); offset += ELF64_ADDR_SIZE;
		213	e_entry = new Addr64(addrArray);
		214	e_phoff = makeUnsignedLong(bytes, offset, isle); offset += ELF64_OFF_SIZE;
		215	e_shoff = makeUnsignedLong(bytes, offset, isle); offset += ELF64_OFF_SIZE;
		216	}
		217	break;
		218	case ELFhdr.ELFCLASSNONE:
		219	default:
		220	throw new IOException("Unknown ELF class " + e_ident[ELFhdr.EI_CLASS]);
		221	}
169	e_flags = makeInt(bytes, offset, isle); offset += 4;	222	e_flags = makeInt(bytes, offset, isle); offset += 4;
170	e_ehsize = makeShort(bytes, offset, isle); offset += 2;	223	e_ehsize = makeShort(bytes, offset, isle); offset += 2;
171	e_phentsize = makeShort(bytes, offset, isle); offset += 2;	224	e_phentsize = makeShort(bytes, offset, isle); offset += 2;
Lines 194-199 Link Here
194	return ((val[offset + 0] << 24) + (val[offset + 1] << 16) + (val[offset + 2] << 8) + val[offset + 3]);	247	return ((val[offset + 0] << 24) + (val[offset + 1] << 16) + (val[offset + 2] << 8) + val[offset + 3]);
195	}	248	}
196		249
		250	private final long makeLong(byte [] val, int offset, boolean isle) throws IOException
		251	{
		252	long result = 0;
		253	int shift = 0;
		254	if ( isle )
		255	for(int i=7; i >= 0; i-- )
		256	{
		257	shift = i*8;
		258	result += ( ((long)val[offset + i]) << shift ) & ( 0xffL << shift );
		259	}
		260	else
		261	for(int i=0; i <= 7; i++ )
		262	{
		263	shift = (7-i)*8;
		264	result += ( ((long)val[offset + i]) << shift ) & ( 0xffL << shift );
		265	}
		266	return result;
		267	}
		268
		269	private final long makeUnsignedLong(byte [] val, int offset, boolean isle) throws IOException
		270	{
		271	long result = makeLong(val,offset,isle);
		272	if(result < 0)
		273	{
		274	throw new IOException( "Maximal file offset is " + Long.toHexString(Long.MAX_VALUE) +
		275	" given offset is " + Long.toHexString(result));
		276	}
		277	return result;
		278
		279	}
		280
		281
197		282
198	}	283	}
199		284
Lines 222-228 Link Here
222	public long sh_name;	307	public long sh_name;
223	public long sh_type;	308	public long sh_type;
224	public long sh_flags;	309	public long sh_flags;
225	public long sh_addr;	310	public IAddress sh_addr;
226	public long sh_offset;	311	public long sh_offset;
227	public long sh_size;	312	public long sh_size;
228	public long sh_link;	313	public long sh_link;
Lines 301-309 Link Here
301	public final static int SHN_XINDEX = 0xffffffff;	386	public final static int SHN_XINDEX = 0xffffffff;
302	public final static int SHN_HIRESERVE = 0xffffffff;	387	public final static int SHN_HIRESERVE = 0xffffffff;
303		388
304		389	/NOTE: 64 bit and 32 bit ELF sections has different order/
305	public long st_name;	390	public long st_name;
306	public long st_value;	391	public IAddress st_value;
307	public long st_size;	392	public long st_size;
308	public short st_info;	393	public short st_info;
309	public short st_other;	394	public short st_other;
Lines 326-331 Link Here
326	}	411	}
327		412
328	public int compareTo(Object obj) {	413	public int compareTo(Object obj) {
		414	/*
329	long thisVal = 0;	415	long thisVal = 0;
330	long anotherVal = 0;	416	long anotherVal = 0;
331	if ( obj instanceof Symbol ) {	417	if ( obj instanceof Symbol ) {
Lines 338-343 Link Here
338	thisVal = this.st_value;	424	thisVal = this.st_value;
339	}	425	}
340	return (thisVal<anotherVal ? -1 : (thisVal==anotherVal ? 0 : 1));	426	return (thisVal<anotherVal ? -1 : (thisVal==anotherVal ? 0 : 1));
		427	*/
		428	return this.st_value.compareTo(((Symbol)obj).st_value);
341	}	429	}
342		430
343	public String toString() {	431	public String toString() {
Lines 362-388 Link Here
362	* and the Long doesn't know how to compare against a Symbol so if	450	* and the Long doesn't know how to compare against a Symbol so if
363	* we compare Symbol vs Long it is ok, but not if we do Long vs Symbol.	451	* we compare Symbol vs Long it is ok, but not if we do Long vs Symbol.
364	*/	452	*/
		453
365	class SymbolComparator implements Comparator {	454	class SymbolComparator implements Comparator {
366	long val1, val2;	455	IAddress val1, val2;
367	public int compare(Object o1, Object o2) {	456	public int compare(Object o1, Object o2) {
368		457
369	if(o1 instanceof Long) {	458	if(o1 instanceof IAddress) {
370	val1 = ((Long)o1).longValue();	459	val1 = (IAddress)o1;
371	} else if(o1 instanceof Symbol) {	460	} else if(o1 instanceof Symbol) {
372	val1 = ((Symbol)o1).st_value;	461	val1 = ((Symbol)o1).st_value;
373	} else {	462	} else {
374	return -1;	463	return -1;
375	}	464	}
376		465
377	if(o2 instanceof Long) {	466	if(o2 instanceof IAddress) {
378	val2 = ((Long)o2).longValue();	467	val2 = (IAddress)o2;
379	} else if(o2 instanceof Symbol) {	468	} else if(o2 instanceof Symbol) {
380	val2 = ((Symbol)o2).st_value;	469	val2 = ((Symbol)o2).st_value;
381	} else {	470	} else {
382	return -1;	471	return -1;
383	}	472	}
384	return (val1 == val2) ? 0	473	return val1.compareTo(val2);
385	: ((val1 < val2) ? -1 : 1);
386	}	474	}
387	}	475	}
388		476
Lines 399-409 Link Here
399	public final static int PF_X = 1;	487	public final static int PF_X = 1;
400	public final static int PF_W = 2;	488	public final static int PF_W = 2;
401	public final static int PF_R = 4;	489	public final static int PF_R = 4;
402		490	/NOTE: 64 bit and 32 bit ELF have different order and size of elements /
403	public long p_type;	491	public long p_type;
404	public long p_offset;	492	public long p_offset;
405	public long p_vaddr;	493	public IAddress p_vaddr;
406	public long p_paddr;	494	public IAddress p_paddr;
407	public long p_filesz;	495	public long p_filesz;
408	public long p_memsz;	496	public long p_memsz;
409	public long p_flags;	497	public long p_flags;
Lines 418-437 Link Here
418	PHdr phdrs[] = new PHdr[ehdr.e_phnum];	506	PHdr phdrs[] = new PHdr[ehdr.e_phnum];
419	for( int i = 0; i < ehdr.e_phnum; i++ ) {	507	for( int i = 0; i < ehdr.e_phnum; i++ ) {
420	phdrs[i] = new PHdr();	508	phdrs[i] = new PHdr();
		509	switch (ehdr.e_ident[ELFhdr.EI_CLASS])
		510	{
		511	case ELFhdr.ELFCLASS32:
		512	{
		513	byte[] addrArray = new byte[ELF32_ADDR_SIZE];
		514
421	phdrs[i].p_type = efile.readIntE();	515	phdrs[i].p_type = efile.readIntE();
422	phdrs[i].p_offset = efile.readIntE();	516	phdrs[i].p_offset = efile.readIntE();
423	phdrs[i].p_vaddr = efile.readIntE();	517	efile.readFullyE(addrArray);
424	phdrs[i].p_paddr = efile.readIntE();	518	phdrs[i].p_vaddr = new Addr32(addrArray);
		519	efile.readFullyE(addrArray);
		520	phdrs[i].p_paddr = new Addr32(addrArray);
425	phdrs[i].p_filesz = efile.readIntE();	521	phdrs[i].p_filesz = efile.readIntE();
426	phdrs[i].p_memsz = efile.readIntE();	522	phdrs[i].p_memsz = efile.readIntE();
427	phdrs[i].p_flags = efile.readIntE();	523	phdrs[i].p_flags = efile.readIntE();
428	phdrs[i].p_align = efile.readIntE();	524	phdrs[i].p_align = efile.readIntE();
429	}	525	}
		526	break;
		527	case ELFhdr.ELFCLASS64:
		528	{
		529	byte[] addrArray = new byte[ELF64_ADDR_SIZE];
		530
		531	phdrs[i].p_type = efile.readIntE();
		532	phdrs[i].p_flags = efile.readIntE();
		533	phdrs[i].p_offset = readUnsignedLong(efile);
		534	efile.readFullyE(addrArray);
		535	phdrs[i].p_vaddr = new Addr64(addrArray);
		536	efile.readFullyE(addrArray);
		537	phdrs[i].p_paddr = new Addr64(addrArray);
		538	phdrs[i].p_filesz = readUnsignedLong(efile);
		539	phdrs[i].p_memsz = readUnsignedLong(efile);
		540	phdrs[i].p_align = readUnsignedLong(efile);
		541	}
		542	break;
		543	case ELFhdr.ELFCLASSNONE:
		544	default:
		545	throw new IOException("Unknown ELF class " + ehdr.e_ident[ELFhdr.EI_CLASS]);
		546	}
		547
		548	}
430	return phdrs;	549	return phdrs;
431	}	550	}
432		551
433	public class Dynamic {	552	public class Dynamic {
434	public final static int DYN_ENT_SIZE = 8;	553	public final static int DYN_ENT_SIZE_32 = 8;
		554	public final static int DYN_ENT_SIZE_64 = 16;
435		555
436	public final static int DT_NULL = 0;	556	public final static int DT_NULL = 0;
437	public final static int DT_NEEDED = 1;	557	public final static int DT_NEEDED = 1;
Lines 454-463 Link Here
454	private Section section;	574	private Section section;
455	private String name;	575	private String name;
456		576
457	protected Dynamic(Section section, long tag, long val) {	577	protected Dynamic(Section section) {
458	this.section = section;	578	this.section = section;
459	d_tag = tag;
460	d_val = val;
461	}	579	}
462		580
463	public String toString() {	581	public String toString() {
Lines 491-501 Link Here
491	// We must assume the section is a table ignoring the sh_entsize as it is not	609	// We must assume the section is a table ignoring the sh_entsize as it is not
492	// set for MIPS.	610	// set for MIPS.
493	while( off < section.sh_size ) {	611	while( off < section.sh_size ) {
494	Dynamic dynEnt = new Dynamic(section, efile.readIntE(), efile.readIntE());	612	Dynamic dynEnt = new Dynamic(section);
495	if ( dynEnt.d_tag == Dynamic.DT_NULL )	613	switch (ehdr.e_ident[ELFhdr.EI_CLASS])
		614	{
		615	case ELFhdr.ELFCLASS32:
		616	{
		617	dynEnt.d_tag = efile.readIntE();
		618	dynEnt.d_val = efile.readIntE();
		619	off+= Dynamic.DYN_ENT_SIZE_32;
		620	}
496	break;	621	break;
		622	case ELFhdr.ELFCLASS64:
		623	{
		624	dynEnt.d_tag = efile.readLongE();
		625	dynEnt.d_val = efile.readLongE();
		626	off+= Dynamic.DYN_ENT_SIZE_64;
		627	}
		628	break;
		629	case ELFhdr.ELFCLASSNONE:
		630	default:
		631	throw new IOException("Unknown ELF class " + ehdr.e_ident[ELFhdr.EI_CLASS]);
		632	}
		633
		634	if ( dynEnt.d_tag != Dynamic.DT_NULL )
497	dynList.add(dynEnt);	635	dynList.add(dynEnt);
498	off+= Dynamic.DYN_ENT_SIZE;
499	}	636	}
500	return (Dynamic[])dynList.toArray(new Dynamic[0]);	637	return (Dynamic[])dynList.toArray(new Dynamic[0]);
501	}	638	}
Lines 546-551 Link Here
546	int debugType;	683	int debugType;
547	boolean bDebug;	684	boolean bDebug;
548	boolean isle;	685	boolean isle;
		686	IAddressFactory addressFactory;
549		687
550	public String getCPU() {	688	public String getCPU() {
551	return cpu;	689	return cpu;
Lines 566-571 Link Here
566	public boolean isLittleEndian() {	704	public boolean isLittleEndian() {
567	return isle;	705	return isle;
568	}	706	}
		707
		708	public IAddressFactory getAddressFactory() {
		709	return addressFactory;
		710	}
569	}	711	}
570		712
571	public Attribute getAttributes() throws IOException {	713	public Attribute getAttributes() throws IOException {
Lines 679-684 Link Here
679	attrib.isle = false;	821	attrib.isle = false;
680	break;	822	break;
681	}	823	}
		824	switch (ehdr.e_ident[ELFhdr.EI_CLASS])
		825	{
		826	case ELFhdr.ELFCLASS32:
		827	attrib.addressFactory = new Addr32Factory();
		828	break;
		829	case ELFhdr.ELFCLASS64:
		830	attrib.addressFactory = new Addr64Factory();
		831	break;
		832	case ELFhdr.ELFCLASSNONE:
		833	default:
		834	attrib.addressFactory = null;
		835	}
682	// getSections	836	// getSections
683	// find .debug using toString	837	// find .debug using toString
684	Section [] sec = getSections();	838	Section [] sec = getSections();
Lines 777-790 Link Here
777	sections[i] = new Section();	931	sections[i] = new Section();
778	sections[i].sh_name = efile.readIntE();	932	sections[i].sh_name = efile.readIntE();
779	sections[i].sh_type = efile.readIntE();	933	sections[i].sh_type = efile.readIntE();
		934	switch (ehdr.e_ident[ELFhdr.EI_CLASS])
		935	{
		936	case ELFhdr.ELFCLASS32:
		937	{
		938	byte[] addrArray = new byte[ELF32_ADDR_SIZE];
780	sections[i].sh_flags = efile.readIntE();	939	sections[i].sh_flags = efile.readIntE();
781	sections[i].sh_addr = efile.readIntE();	940	efile.readFullyE(addrArray);
		941	sections[i].sh_addr = new Addr32(addrArray);
782	sections[i].sh_offset = efile.readIntE();	942	sections[i].sh_offset = efile.readIntE();
783	sections[i].sh_size = efile.readIntE();	943	sections[i].sh_size = efile.readIntE();
		944	}
		945	break;
		946	case ELFhdr.ELFCLASS64:
		947	{
		948	byte[] addrArray = new byte[ELF64_ADDR_SIZE];
		949	sections[i].sh_flags = efile.readLongE();
		950	efile.readFullyE(addrArray);
		951	sections[i].sh_addr = new Addr64(addrArray);
		952	sections[i].sh_offset = readUnsignedLong(efile);
		953	sections[i].sh_size = readUnsignedLong(efile);
		954	}
		955	break;
		956	case ELFhdr.ELFCLASSNONE:
		957	default:
		958	throw new IOException("Unknown ELF class " + ehdr.e_ident[ELFhdr.EI_CLASS]);
		959	}
		960
784	sections[i].sh_link = efile.readIntE();	961	sections[i].sh_link = efile.readIntE();
785	sections[i].sh_info = efile.readIntE();	962	sections[i].sh_info = efile.readIntE();
		963	switch (ehdr.e_ident[ELFhdr.EI_CLASS])
		964	{
		965	case ELFhdr.ELFCLASS32:
		966	{
786	sections[i].sh_addralign = efile.readIntE();	967	sections[i].sh_addralign = efile.readIntE();
787	sections[i].sh_entsize = efile.readIntE();	968	sections[i].sh_entsize = efile.readIntE();
		969	}
		970	break;
		971	case ELFhdr.ELFCLASS64:
		972	{
		973	sections[i].sh_addralign = efile.readLongE();
		974	sections[i].sh_entsize = readUnsignedLong(efile);
		975	}
		976	break;
		977	case ELFhdr.ELFCLASSNONE:
		978	default:
		979	throw new IOException("Unknown ELF class " + ehdr.e_ident[ELFhdr.EI_CLASS]);
		980	}
788	if ( sections[i].sh_type == Section.SHT_SYMTAB )	981	if ( sections[i].sh_type == Section.SHT_SYMTAB )
789	syms = i;	982	syms = i;
790	if ( syms == 0 && sections[i].sh_type == Section.SHT_DYNSYM )	983	if ( syms == 0 && sections[i].sh_type == Section.SHT_DYNSYM )
Lines 804-815 Link Here
804	for( int c = 0; c < numSyms; c++) {	997	for( int c = 0; c < numSyms; c++) {
805	efile.seek(section.sh_offset + (section.sh_entsize * c));	998	efile.seek(section.sh_offset + (section.sh_entsize * c));
806	Symbol symbol = new Symbol( section );	999	Symbol symbol = new Symbol( section );
		1000	switch (ehdr.e_ident[ELFhdr.EI_CLASS])
		1001	{
		1002	case ELFhdr.ELFCLASS32:
		1003	{
		1004	byte[] addrArray = new byte[ELF32_ADDR_SIZE];
		1005
807	symbol.st_name = efile.readIntE();	1006	symbol.st_name = efile.readIntE();
808	symbol.st_value = efile.readIntE();	1007	efile.readFullyE(addrArray);
		1008	symbol.st_value = new Addr32(addrArray);
809	symbol.st_size = efile.readIntE();	1009	symbol.st_size = efile.readIntE();
810	symbol.st_info = efile.readByte();	1010	symbol.st_info = efile.readByte();
811	symbol.st_other = efile.readByte();	1011	symbol.st_other = efile.readByte();
812	symbol.st_shndx = efile.readShortE();	1012	symbol.st_shndx = efile.readShortE();
		1013	}
		1014	break;
		1015	case ELFhdr.ELFCLASS64:
		1016	{
		1017	byte[] addrArray = new byte[ELF64_ADDR_SIZE];
		1018
		1019	symbol.st_name = efile.readIntE();
		1020	symbol.st_info = efile.readByte();
		1021	symbol.st_other = efile.readByte();
		1022	symbol.st_shndx = efile.readShortE();
		1023	efile.readFullyE(addrArray);
		1024	symbol.st_value = new Addr64(addrArray);
		1025	symbol.st_size = readUnsignedLong(efile);
		1026	}
		1027	break;
		1028	case ELFhdr.ELFCLASSNONE:
		1029	default:
		1030	throw new IOException("Unknown ELF class " + ehdr.e_ident[ELFhdr.EI_CLASS]);
		1031	}
813	if ( symbol.st_info == 0 )	1032	if ( symbol.st_info == 0 )
814	continue;	1033	continue;
815	symList.add(symbol);	1034	symList.add(symbol);
Lines 865-871 Link Here
865		1084
866		1085
867	/* return the address of the function that address is in */	1086	/* return the address of the function that address is in */
868	public Symbol getSymbol( long vma ) {	1087	public Symbol getSymbol( IAddress vma ) {
869	if ( symbols == null ) {	1088	if ( symbols == null ) {
870	return null;	1089	return null;
871	}	1090	}
Lines 873-879 Link Here
873	//@@@ If this works, move it to a single instance in this class.	1092	//@@@ If this works, move it to a single instance in this class.
874	SymbolComparator symbol_comparator = new SymbolComparator();	1093	SymbolComparator symbol_comparator = new SymbolComparator();
875		1094
876	int ndx = Arrays.binarySearch(symbols, new Long(vma), symbol_comparator);	1095	int ndx = Arrays.binarySearch(symbols, vma, symbol_comparator);
877	if ( ndx > 0 )	1096	if ( ndx > 0 )
878	return symbols[ndx];	1097	return symbols[ndx];
879	if ( ndx == -1 ) {	1098	if ( ndx == -1 ) {
Lines 882-888 Link Here
882	ndx = -ndx - 1;	1101	ndx = -ndx - 1;
883	return symbols[ndx-1];	1102	return symbols[ndx-1];
884	}	1103	}
885		1104	/*
886	public long swapInt( long val ) {	1105	public long swapInt( long val ) {
887	if ( ehdr.e_ident[ELFhdr.EI_DATA] == ELFhdr.ELFDATA2LSB ) {	1106	if ( ehdr.e_ident[ELFhdr.EI_DATA] == ELFhdr.ELFDATA2LSB ) {
888	short tmp[] = new short[4];	1107	short tmp[] = new short[4];
Lines 904-911 Link Here
904	}	1123	}
905	return val;	1124	return val;
906	}	1125	}
907		1126	*/
908	public String getFilename() {	1127	public String getFilename() {
909	return file;	1128	return file;
910	}	1129	}
		1130
		1131	private final long readUnsignedLong(ERandomAccessFile file) throws IOException
		1132	{
		1133	long result = file.readLongE();
		1134	if(result < 0)
		1135	{
		1136	throw new IOException( "Maximal file offset is " + Long.toHexString(Long.MAX_VALUE) +
		1137	" given offset is " + Long.toHexString(result));
		1138	}
		1139	return result;
		1140	}
911	}	1141	}




		return ((val[0] << 24) + (val[1] << 16) + (val[2] << 8) + val[3]);
	}

	public final long readLongE() throws IOException
	{
		byte [] bytes = new byte[8];
		long result = 0;
		super.readFully(bytes);
		int shift = 0;		
		if ( isle ) 
			for(int i=7; i >= 0; i-- )
			{
				shift = i*8;
				result += ( ((long)bytes[i]) << shift ) & ( 0xffL << shift );
			}
	    else
			for(int i=0; i <= 7; i++ )
			{
				shift = (7-i)*8;
				result += ( ((long)bytes[i]) << shift ) & ( 0xffL << shift );
			}
		return result;
	}
	
	public final void readFullyE(byte [] bytes) throws IOException
	{
		super.readFully(bytes);
		byte tmp = 0;
		if( isle )
			for(int i=0; i <= bytes.length / 2; i++)
			{
				tmp = bytes[i];
				bytes[i] = bytes[bytes.length - i -1];
				bytes[bytes.length - i -1] = tmp; 
			}
	}

    public void setFileOffset( long offset ) throws IOException {
        ptr_offset = offset;
        super.seek( offset );

Lines 120-125 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java (+1 lines)
120	info.isLittleEndian = attribute.isLittleEndian();	120	info.isLittleEndian = attribute.isLittleEndian();
121	info.hasDebug = attribute.hasDebug();	121	info.hasDebug = attribute.hasDebug();
122	info.cpu = attribute.getCPU();	122	info.cpu = attribute.getCPU();
		123	info.addressFactory = attribute.getAddressFactory();
123	}	124	}
124		125
125	protected void loadSymbols(ElfHelper helper) throws IOException {	126	protected void loadSymbols(ElfHelper helper) throws IOException {




import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigInteger;
import java.util.List;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.utils.Addr2line;
import org.eclipse.cdt.utils.CPPFilt;
import org.eclipse.cdt.utils.Objdump;

					cppfilt = null;
				}
			}
			IAddress addr = array[i].st_value;
			long size = array[i].st_size;
			if (addr2line != null) {
				try {

					// the file.
					IPath file = (filename != null && !filename.equals("??")) ? new Path(filename) : Path.EMPTY; //$NON-NLS-1$
					int startLine = addr2line.getLineNumber(addr);
					int endLine = addr2line.getLineNumber(addr.add(BigInteger.valueOf(size - 1)));
					list.add(new GNUSymbol(this, name, type, addr, size, file, startLine, endLine));
				} catch (IOException e) {
					addr2line = null;




package org.eclipse.cdt.utils.elf.parser;

import java.io.IOException;
import java.math.BigInteger;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.utils.Addr2line;
import org.eclipse.cdt.utils.Symbol;
import org.eclipse.core.runtime.IPath;

public class GNUSymbol extends Symbol {

	public GNUSymbol(GNUElfBinaryObject binary, String name, int type, IAddress addr, long size, IPath sourceFile, int startLine, int endLine) {
		super(binary, name, type, addr, size, sourceFile, startLine, endLine);
		// TODO Auto-generated constructor stub
	}

	public GNUSymbol(GNUElfBinaryObject binary, String name, int type, IAddress addr, long size) {
		super(binary, name, type, addr, size);
	}
		

		Addr2line addr2line = ((GNUElfBinaryObject)binary).getAddr2line(true);
		if (addr2line != null) {
			try {
				return addr2line.getLineNumber(getAddress().add(BigInteger.valueOf(offset)));
			} catch (IOException e) {
				// ignore
			}

Lines 15-20 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/macho/parser/ARMember.java (-1 / +2 lines)
15	import java.io.InputStream;	15	import java.io.InputStream;
16	import java.util.List;	16	import java.util.List;
17		17
		18	import org.eclipse.cdt.core.Addr32;
18	import org.eclipse.cdt.core.CCorePlugin;	19	import org.eclipse.cdt.core.CCorePlugin;
19	import org.eclipse.cdt.core.IBinaryParser;	20	import org.eclipse.cdt.core.IBinaryParser;
20	import org.eclipse.cdt.utils.Addr2line;	21	import org.eclipse.cdt.utils.Addr2line;
Lines 72-78 Link Here
72		73
73	protected void addSymbols(MachO.Symbol[] array, int type, Addr2line addr2line, CPPFilt cppfilt, List list) {	74	protected void addSymbols(MachO.Symbol[] array, int type, Addr2line addr2line, CPPFilt cppfilt, List list) {
74	for (int i = 0; i < array.length; i++) {	75	for (int i = 0; i < array.length; i++) {
75	list.add(new Symbol(this, array[i].toString(), type, array[i].n_value, 4));	76	list.add(new Symbol(this, array[i].toString(), type, new Addr32(array[i].n_value), 4));
76	}	77	}
77	}	78	}
78		79

Lines 15-20 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java (-1 / +2 lines)
15	import java.util.Arrays;	15	import java.util.Arrays;
16	import java.util.List;	16	import java.util.List;
17		17
		18	import org.eclipse.cdt.core.Addr32;
18	import org.eclipse.cdt.core.IBinaryParser;	19	import org.eclipse.cdt.core.IBinaryParser;
19	import org.eclipse.cdt.core.IBinaryParser.IBinaryFile;	20	import org.eclipse.cdt.core.IBinaryParser.IBinaryFile;
20	import org.eclipse.cdt.core.IBinaryParser.ISymbol;	21	import org.eclipse.cdt.core.IBinaryParser.ISymbol;
Lines 161-167 Link Here
161	int size = 0;	162	int size = 0;
162	String filename = array[i].getFilename();	163	String filename = array[i].getFilename();
163	IPath filePath = (filename != null) ? new Path(filename) : null; //$NON-NLS-1$	164	IPath filePath = (filename != null) ? new Path(filename) : null; //$NON-NLS-1$
164	list.add(new Symbol(this, name, type, array[i].n_value, size, filePath, array[i].getLineNumber(addr), array[i].getLineNumber(addr + size - 1)));	165	list.add(new Symbol(this, name, type, new Addr32(array[i].n_value), size, filePath, array[i].getLineNumber(addr), array[i].getLineNumber(addr + size - 1)));
165	}	166	}
166	}	167	}
167		168




import java.io.InputStream;
import java.util.List;

import org.eclipse.cdt.core.Addr32;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.IBinaryParser;
import org.eclipse.cdt.core.IBinaryParser.ISymbol;
import org.eclipse.core.runtime.IPath;

import org.eclipse.cdt.utils.CPPFilt;
import org.eclipse.cdt.utils.Symbol;
import org.eclipse.cdt.utils.som.AR;
import org.eclipse.cdt.utils.som.SOM;
import org.eclipse.core.runtime.IPath;

/**
 * A member of a SOM archive

						cppfilt = null;
					}
				}
				Symbol sym = new Symbol(this, name, peSyms[i].isFunction() ? ISymbol.FUNCTION : ISymbol.VARIABLE, new Addr32(peSyms[i].symbol_value), 1);

				list.add(sym);
			}

Lines 13-22 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java (-3 / +5 lines)
13	import java.io.ByteArrayInputStream;	13	import java.io.ByteArrayInputStream;
14	import java.io.IOException;	14	import java.io.IOException;
15	import java.io.InputStream;	15	import java.io.InputStream;
		16	import java.math.BigInteger;
16	import java.util.ArrayList;	17	import java.util.ArrayList;
17	import java.util.Arrays;	18	import java.util.Arrays;
18	import java.util.List;	19	import java.util.List;
19		20
		21	import org.eclipse.cdt.core.Addr32;
		22	import org.eclipse.cdt.core.IAddress;
20	import org.eclipse.cdt.core.IBinaryParser;	23	import org.eclipse.cdt.core.IBinaryParser;
21	import org.eclipse.cdt.core.IBinaryParser.IBinaryFile;	24	import org.eclipse.cdt.core.IBinaryParser.IBinaryFile;
22	import org.eclipse.cdt.core.IBinaryParser.ISymbol;	25	import org.eclipse.cdt.core.IBinaryParser.ISymbol;
Lines 25-31 Link Here
25	import org.eclipse.cdt.utils.CPPFilt;	28	import org.eclipse.cdt.utils.CPPFilt;
26	import org.eclipse.cdt.utils.Objdump;	29	import org.eclipse.cdt.utils.Objdump;
27	import org.eclipse.cdt.utils.som.SOM;	30	import org.eclipse.cdt.utils.som.SOM;
28	import org.eclipse.cdt.utils.som.parser.SOMParser;
29	import org.eclipse.core.runtime.IPath;	31	import org.eclipse.core.runtime.IPath;
30	import org.eclipse.core.runtime.Path;	32	import org.eclipse.core.runtime.Path;
31		33
Lines 162-168 Link Here
162	continue;	164	continue;
163	}	165	}
164	int type = peSyms[i].isFunction() ? ISymbol.FUNCTION : ISymbol.VARIABLE;	166	int type = peSyms[i].isFunction() ? ISymbol.FUNCTION : ISymbol.VARIABLE;
165	int addr = peSyms[i].symbol_value;	167	IAddress addr = new Addr32(peSyms[i].symbol_value);
166	int size = 4;	168	int size = 4;
167	if (cppfilt != null) {	169	if (cppfilt != null) {
168	try {	170	try {
Lines 181-187 Link Here
181		183
182	IPath file = filename != null ? new Path(filename) : Path.EMPTY;	184	IPath file = filename != null ? new Path(filename) : Path.EMPTY;
183	int startLine = addr2line.getLineNumber(addr);	185	int startLine = addr2line.getLineNumber(addr);
184	int endLine = addr2line.getLineNumber(addr + size - 1);	186	int endLine = addr2line.getLineNumber(addr.add(BigInteger.valueOf(size - 1)));
185	list.add(new SomSymbol(this, name, type, addr, size, file, startLine, endLine));	187	list.add(new SomSymbol(this, name, type, addr, size, file, startLine, endLine));
186	} catch (IOException e) {	188	} catch (IOException e) {
187	addr2line = null;	189	addr2line = null;




package org.eclipse.cdt.utils.som.parser;

import java.io.IOException;
import java.math.BigInteger;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.utils.Addr2line;
import org.eclipse.cdt.utils.BinaryObjectAdapter;
import org.eclipse.cdt.utils.Symbol;

	 * @param startLine
	 * @param endLine
	 */
	public SomSymbol(BinaryObjectAdapter binary, String name, int type, IAddress addr, long size, IPath sourceFile, int startLine, int endLine) {
		super(binary, name, type, addr, size, sourceFile, startLine, endLine);
		// TODO Auto-generated constructor stub
	}

	 * @param addr
	 * @param size
	 */
	public SomSymbol(BinaryObjectAdapter binary, String name, int type, IAddress addr, long size) {
		super(binary, name, type, addr, size);
		// TODO Auto-generated constructor stub
	}

		Addr2line addr2line = ((SOMBinaryObject)binary).getAddr2line(true);
		if (addr2line != null) {
			try {
				return addr2line.getLineNumber(getAddress().add(BigInteger.valueOf(offset)));
			} catch (IOException e) {
				// ignore
			}




 *******************************************************************************/
package org.eclipse.cdt.utils;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
import org.eclipse.cdt.core.IBinaryParser.ISymbol;
import org.eclipse.core.runtime.IPath;

	protected final BinaryObjectAdapter binary;
	private final String name;

	private final IAddress addr;
	private final int type;
	private final long size;
	private final int startLine;
	private final int endLine;
	private final IPath sourceFile;

	public Symbol(BinaryObjectAdapter binary, String name, int type, IAddress addr, long size, IPath sourceFile, int startLine, int endLine) {
		this.binary = binary;
		this.name = name;
		this.type = type;

		this.sourceFile = sourceFile;
	}

	public Symbol(BinaryObjectAdapter binary, String name, int type, IAddress addr, long size) {
		this.binary = binary;
		this.name = name;
		this.type = type;

	 * 
	 * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getAdress()
	 */
	public IAddress getAddress() {
		return addr;
	}


	}

	public int compareTo(Object obj) {
		IAddress thisVal = this.addr;
		IAddress anotherVal = null;
		if (obj instanceof Symbol) {
			anotherVal = ((Symbol) obj).addr;
		} else if (obj instanceof IAddress) {
			anotherVal  = (IAddress) obj;
		} else if (obj instanceof Long) {
			Long val = (Long) obj;
			anotherVal = val.longValue();
			thisVal = this.addr;
		}
		return thisVal.compareTo(anotherVal);
	}
}

Lines 15-20 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/xcoff/parser/ARMember.java (-1 / +2 lines)
15	import java.io.InputStream;	15	import java.io.InputStream;
16	import java.util.List;	16	import java.util.List;
17		17
		18	import org.eclipse.cdt.core.Addr32;
18	import org.eclipse.cdt.core.CCorePlugin;	19	import org.eclipse.cdt.core.CCorePlugin;
19	import org.eclipse.cdt.core.IBinaryParser;	20	import org.eclipse.cdt.core.IBinaryParser;
20	import org.eclipse.cdt.core.IBinaryParser.ISymbol;	21	import org.eclipse.cdt.core.IBinaryParser.ISymbol;
Lines 87-93 Link Here
87	cppfilt = null;	88	cppfilt = null;
88	}	89	}
89	}	90	}
90	Symbol sym = new Symbol(this, name, peSyms[i].isFunction() ? ISymbol.FUNCTION : ISymbol.VARIABLE, peSyms[i].n_value, 1);	91	Symbol sym = new Symbol(this, name, peSyms[i].isFunction() ? ISymbol.FUNCTION : ISymbol.VARIABLE, new Addr32(peSyms[i].n_value), 1);
91		92
92	list.add(sym);	93	list.add(sym);
93	}	94	}

Lines 11-20 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java (-2 / +5 lines)
11	import java.io.ByteArrayInputStream;	11	import java.io.ByteArrayInputStream;
12	import java.io.IOException;	12	import java.io.IOException;
13	import java.io.InputStream;	13	import java.io.InputStream;
		14	import java.math.BigInteger;
14	import java.util.ArrayList;	15	import java.util.ArrayList;
15	import java.util.Arrays;	16	import java.util.Arrays;
16	import java.util.List;	17	import java.util.List;
17		18
		19	import org.eclipse.cdt.core.Addr32;
		20	import org.eclipse.cdt.core.IAddress;
18	import org.eclipse.cdt.core.IBinaryParser;	21	import org.eclipse.cdt.core.IBinaryParser;
19	import org.eclipse.cdt.core.IBinaryParser.IBinaryFile;	22	import org.eclipse.cdt.core.IBinaryParser.IBinaryFile;
20	import org.eclipse.cdt.core.IBinaryParser.ISymbol;	23	import org.eclipse.cdt.core.IBinaryParser.ISymbol;
Lines 164-170 Link Here
164	continue;	167	continue;
165	}	168	}
166	int type = peSyms[i].isFunction() ? ISymbol.FUNCTION : ISymbol.VARIABLE;	169	int type = peSyms[i].isFunction() ? ISymbol.FUNCTION : ISymbol.VARIABLE;
167	int addr = peSyms[i].n_value;	170	IAddress addr = new Addr32(peSyms[i].n_value);
168	int size = 4;	171	int size = 4;
169	if (cppfilt != null) {	172	if (cppfilt != null) {
170	try {	173	try {
Lines 184-190 Link Here
184		187
185	IPath file = filename != null ? new Path(filename) : Path.EMPTY;	188	IPath file = filename != null ? new Path(filename) : Path.EMPTY;
186	int startLine = addr2line.getLineNumber(addr);	189	int startLine = addr2line.getLineNumber(addr);
187	int endLine = addr2line.getLineNumber(addr + size - 1);	190	int endLine = addr2line.getLineNumber(addr.add(BigInteger.valueOf(size - 1)));
188	list.add(new XCoffSymbol(this, name, type, addr, size, file, startLine, endLine));	191	list.add(new XCoffSymbol(this, name, type, addr, size, file, startLine, endLine));
189	} catch (IOException e) {	192	} catch (IOException e) {
190	addr2line = null;	193	addr2line = null;




package org.eclipse.cdt.utils.xcoff.parser;

import java.io.IOException;
import java.math.BigInteger;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.utils.Addr2line;
import org.eclipse.cdt.utils.BinaryObjectAdapter;
import org.eclipse.cdt.utils.Symbol;

	 * @param startLine
	 * @param endLine
	 */
	public XCoffSymbol(BinaryObjectAdapter binary, String name, int type, IAddress addr, long size, IPath sourceFile, int startLine,
			int endLine) {
		super(binary, name, type, addr, size, sourceFile, startLine, endLine);
		// TODO Auto-generated constructor stub

	 * @param addr
	 * @param size
	 */
	public XCoffSymbol(BinaryObjectAdapter binary, String name, int type, IAddress addr, long size) {
		super(binary, name, type, addr, size);
		// TODO Auto-generated constructor stub
	}

		Addr2line addr2line = ((XCOFFBinaryObject)binary).getAddr2line(true);
		if (addr2line != null) {
			try {
				return addr2line.getLineNumber(getAddress().add(BigInteger.valueOf(offset)));
			} catch (IOException e) {
				// ignore
			}




		}
	}
	
	public static String toHexAddressString( long address )
	{
		String addressString = Long.toHexString( address );
		StringBuffer sb = new StringBuffer( 10 );
		sb.append( "0x" ); //$NON-NLS-1$
		for ( int i = 0; i < 8 - addressString.length(); ++i )
		{
			sb.append( '0' );
		}
		sb.append( addressString );
		return sb.toString();
	}

	public static char[] getByteText( byte b )
	{
		return new char[]{ charFromByte( (byte)((b >>> 4) & 0x0f) ), 

		return Long.parseLong( bytesToString( bytes, le, false ), 16 );
	}  
	
	public static long toLongLong( char[] bytes, boolean le )
	{
		if ( bytes.length != 16 )
			return 0;
		return Long.parseLong( bytesToString( bytes, le, false ), 16 );
	}
	
	public static long toUnsignedLongLong( char[] bytes, boolean le )
	{
		return 0;
	}
	
	private static String bytesToString( char[] bytes, boolean le, boolean signed )
	{
		char[] copy = new char[bytes.length];

Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/cdi/event/ICDIMemoryChangedEvent.java (-1 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.cdt.debug.core.cdi.event;	11	package org.eclipse.cdt.debug.core.cdi.event;
12		12
		13	import org.eclipse.cdt.core.IAddress;
		14
13	/**	15	/**
14	*	16	*
15	* Notifies that the originator has changed.	17	* Notifies that the originator has changed.
Lines 19-23 Link Here
19	/**	21	/**
20	* @return the modified addresses.	22	* @return the modified addresses.
21	*/	23	*/
22	Long[] getAddresses();	24	IAddress[] getAddresses();
23	}	25	}

Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/cdi/ICDILocation.java (-1 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.cdt.debug.core.cdi;	11	package org.eclipse.cdt.debug.core.cdi;
12		12
		13	import org.eclipse.cdt.core.IAddress;
		14
13		15
14	/**	16	/**
15	*	17	*
Lines 24-30 Link Here
24	*	26	*
25	* @return the address of this location	27	* @return the address of this location
26	*/	28	*/
27	long getAddress();	29	IAddress getAddress();
28		30
29	/**	31	/**
30	* Returns the source file of this location or <code>null</code>	32	* Returns the source file of this location or <code>null</code>

Lines 11-16 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java (-1 / +2 lines)
11		11
12	package org.eclipse.cdt.debug.core.cdi;	12	package org.eclipse.cdt.debug.core.cdi;
13		13
		14	import org.eclipse.cdt.core.IAddress;
14	import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock;	15	import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock;
15		16
16	/**	17	/**
Lines 41-47 Link Here
41	* @return a memory block with the specified identifier	42	* @return a memory block with the specified identifier
42	* @throws CDIException on failure. Reasons include:	43	* @throws CDIException on failure. Reasons include:
43	*/	44	*/
44	ICDIMemoryBlock createMemoryBlock(long address, int length)	45	ICDIMemoryBlock createMemoryBlock(IAddress address, int length)
45	throws CDIException;	46	throws CDIException;
46		47
47	/**	48	/**





package org.eclipse.cdt.debug.core.cdi;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction;
import org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction;


	 *  @param endAddress is the end address
	 *  @throws CDIException on failure.
	 */
	ICDIInstruction[] getInstructions(IAddress startAddress, IAddress endAddress)
		throws CDIException;

	/**

	 *  @throws CDIException on failure.
	 */
	ICDIMixedInstruction[] getMixedInstructions(
		IAddress startAddress,
	    IAddress endAddress)
		throws CDIException;

	/**

Lines 11-16 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/cdi/ICDITraceManager.java (-1 / +2 lines)
11		11
12	package org.eclipse.cdt.debug.core.cdi;	12	package org.eclipse.cdt.debug.core.cdi;
13		13
		14	import org.eclipse.cdt.core.IAddress;
14	import org.eclipse.cdt.debug.core.cdi.model.ICDITracepoint;	15	import org.eclipse.cdt.debug.core.cdi.model.ICDITracepoint;
15		16
16	/**	17	/**
Lines 155-159 Link Here
155	* @param address - an address	156	* @param address - an address
156	* @return an ICDILocation object	157	* @return an ICDILocation object
157	*/	158	*/
158	ICDILocation createLocation( long address );	159	ICDILocation createLocation( IAddress address );
159	}	160	}

Lines 11-16 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java (-1 / +3 lines)
11		11
12	package org.eclipse.cdt.debug.core.cdi.model;	12	package org.eclipse.cdt.debug.core.cdi.model;
13		13
		14	import org.eclipse.cdt.core.IAddress;
		15
14	/**	16	/**
15	*	17	*
16	* Represents a machine instruction.	18	* Represents a machine instruction.
Lines 22-28 Link Here
22	* Returns the Address.	24	* Returns the Address.
23	* @return the address.	25	* @return the address.
24	*/	26	*/
25	long getAdress();	27	IAddress getAdress();
26		28
27	/**	29	/**
28	* @return the function name.	30	* @return the function name.

Lines 11-16 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java (-1 / +2 lines)
11		11
12	package org.eclipse.cdt.debug.core.cdi.model;	12	package org.eclipse.cdt.debug.core.cdi.model;
13		13
		14	import org.eclipse.cdt.core.IAddress;
14	import org.eclipse.cdt.debug.core.cdi.CDIException;	15	import org.eclipse.cdt.debug.core.cdi.CDIException;
15		16
16	/**	17	/**
Lines 26-32 Link Here
26	*	27	*
27	* @return the start address of this memory block	28	* @return the start address of this memory block
28	*/	29	*/
29	long getStartAddress();	30	IAddress getStartAddress();
30		31
31	/**	32	/**
32	* Returns the length of this memory block in bytes.	33	* Returns the length of this memory block in bytes.




 *******************************************************************************/
package org.eclipse.cdt.debug.core.cdi.model;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.CDIException;

/**

	 * 
	 * @return the start address of this library
	 */
	IAddress getStartAddress();

	/**
	 * Returns the end address of this library.
	 * 
	 * @return the end address of this library
	 */
	IAddress getEndAddress();

	/**
	 * Returns whether the symbols of this library are read.

Lines 11-16 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java (-1 / +2 lines)
11		11
12	package org.eclipse.cdt.debug.core.cdi.model;	12	package org.eclipse.cdt.debug.core.cdi.model;
13		13
		14	import org.eclipse.cdt.core.IAddress;
14	import org.eclipse.cdt.debug.core.cdi.CDIException;	15	import org.eclipse.cdt.debug.core.cdi.CDIException;
15	import org.eclipse.cdt.debug.core.cdi.ICDICondition;	16	import org.eclipse.cdt.debug.core.cdi.ICDICondition;
16	import org.eclipse.cdt.debug.core.cdi.ICDILocation;	17	import org.eclipse.cdt.debug.core.cdi.ICDILocation;
Lines 182-187 Link Here
182	/**	183	/**
183	* Returns a ICDILocation	184	* Returns a ICDILocation
184	*/	185	*/
185	ICDILocation createLocation(long address);	186	ICDILocation createLocation(IAddress address);
186		187
187	}	188	}

Lines 11-16 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/cdi/model/type/ICDIPointerValue.java (-1 / +2 lines)
11		11
12	package org.eclipse.cdt.debug.core.cdi.model.type;	12	package org.eclipse.cdt.debug.core.cdi.model.type;
13		13
		14	import org.eclipse.cdt.core.IAddress;
14	import org.eclipse.cdt.debug.core.cdi.CDIException;	15	import org.eclipse.cdt.debug.core.cdi.CDIException;
15		16
16		17
Lines 22-26 Link Here
22	*/	23	*/
23	public interface ICDIPointerValue extends ICDIDerivedValue {	24	public interface ICDIPointerValue extends ICDIDerivedValue {
24		25
25	long pointerValue() throws CDIException;	26	IAddress pointerValue() throws CDIException;
26	}	27	}




 *******************************************************************************/
package org.eclipse.cdt.debug.core.cdi.model.type;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.CDIException;

/**
 */
public interface ICDIReferenceValue extends ICDIDerivedValue {

	IAddress referenceValue() throws CDIException;
}

Lines 12-17 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/CDIDebugModel.java (-2 / +4 lines)
12		12
13	import java.text.MessageFormat;	13	import java.text.MessageFormat;
14	import java.util.HashMap;	14	import java.util.HashMap;
		15
		16	import org.eclipse.cdt.core.IAddress;
15	import org.eclipse.cdt.debug.core.cdi.CDIException;	17	import org.eclipse.cdt.debug.core.cdi.CDIException;
16	import org.eclipse.cdt.debug.core.cdi.ICDIConfiguration;	18	import org.eclipse.cdt.debug.core.cdi.ICDIConfiguration;
17	import org.eclipse.cdt.debug.core.cdi.ICDILocation;	19	import org.eclipse.cdt.debug.core.cdi.ICDILocation;
Lines 255-261 Link Here
255	*/	257	*/
256	public static ICAddressBreakpoint createAddressBreakpoint( String sourceHandle,	258	public static ICAddressBreakpoint createAddressBreakpoint( String sourceHandle,
257	IResource resource,	259	IResource resource,
258	long address,	260	IAddress address,
259	boolean enabled,	261	boolean enabled,
260	int ignoreCount,	262	int ignoreCount,
261	String condition,	263	String condition,
Lines 266-272 Link Here
266	attributes.put( IMarker.CHAR_END, new Integer( 0 ) );	268	attributes.put( IMarker.CHAR_END, new Integer( 0 ) );
267	attributes.put( IMarker.LINE_NUMBER, new Integer( -1 ) );	269	attributes.put( IMarker.LINE_NUMBER, new Integer( -1 ) );
268	attributes.put( IMarker.LINE_NUMBER, new Integer( -1 ) );	270	attributes.put( IMarker.LINE_NUMBER, new Integer( -1 ) );
269	attributes.put( ICLineBreakpoint.ADDRESS, Long.toString( address ) );	271	attributes.put( ICLineBreakpoint.ADDRESS, address.toHexAddressString() );
270	attributes.put( IBreakpoint.ENABLED, new Boolean( enabled ) );	272	attributes.put( IBreakpoint.ENABLED, new Boolean( enabled ) );
271	attributes.put( ICBreakpoint.IGNORE_COUNT, new Integer( ignoreCount ) );	273	attributes.put( ICBreakpoint.IGNORE_COUNT, new Integer( ignoreCount ) );
272	attributes.put( ICBreakpoint.CONDITION, condition );	274	attributes.put( ICBreakpoint.CONDITION, condition );

Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/model/IAsmInstruction.java (-1 / +3 lines)
10	***********************************************************************/	10	***********************************************************************/
11	package org.eclipse.cdt.debug.core.model;	11	package org.eclipse.cdt.debug.core.model;
12		12
		13	import org.eclipse.cdt.core.IAddress;
		14
13	/**	15	/**
14	* An instruction of disassemby.	16	* An instruction of disassemby.
15	*/	17	*/
Lines 20-26 Link Here
20	*	22	*
21	* @return the address of this instruction	23	* @return the address of this instruction
22	*/	24	*/
23	long getAdress();	25	IAddress getAdress();
24		26
25	/**	27	/**
26	* Returns the function name of this instruction,	28	* Returns the function name of this instruction,

Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/model/IBreakpointTarget.java (-1 / +2 lines)
10	***********************************************************************/	10	***********************************************************************/
11	package org.eclipse.cdt.debug.core.model;	11	package org.eclipse.cdt.debug.core.model;
12		12
		13	import org.eclipse.cdt.core.IAddress;
13	import org.eclipse.debug.core.DebugException;	14	import org.eclipse.debug.core.DebugException;
14		15
15	/**	16	/**
Lines 30-34 Link Here
30	* @return the target address of the given breakpoint	31	* @return the target address of the given breakpoint
31	* @throws DebugException if the address is not available	32	* @throws DebugException if the address is not available
32	*/	33	*/
33	long getBreakpointAddress( ICLineBreakpoint breakpoint ) throws DebugException;	34	IAddress getBreakpointAddress( ICLineBreakpoint breakpoint ) throws DebugException;
34	}	35	}




***********************************************************************/
package org.eclipse.cdt.debug.core.model;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IDebugElement;


	 * 
	 * @return the start address of this library
	 */
	IAddress getStartAddress();

	/**
	 * Returns the end address of this library.
	 * 
	 * @return the end address of this library
	 */
	IAddress getEndAddress();

	/**
	 * Returns whether the symbols of this library are read.

Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/model/ICStackFrame.java (-1 / +2 lines)
10	***********************************************************************/	10	***********************************************************************/
11	package org.eclipse.cdt.debug.core.model;	11	package org.eclipse.cdt.debug.core.model;
12		12
		13	import org.eclipse.cdt.core.IAddress;
13	import org.eclipse.debug.core.DebugException;	14	import org.eclipse.debug.core.DebugException;
14	import org.eclipse.debug.core.model.IStackFrame;	15	import org.eclipse.debug.core.model.IStackFrame;
15	import org.eclipse.debug.core.model.IValue;	16	import org.eclipse.debug.core.model.IValue;
Lines 24-30 Link Here
24	*	25	*
25	* @return the address of this stack frame	26	* @return the address of this stack frame
26	*/	27	*/
27	public long getAddress();	28	public IAddress getAddress();
28		29
29	/**	30	/**
30	* Returns the source file of this stack frame or <code>null</code>	31	* Returns the source file of this stack frame or <code>null</code>

Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/model/IFormattedMemoryBlock.java (-5 / +8 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.cdt.debug.core.model;	11	package org.eclipse.cdt.debug.core.model;
12		12
		13	import org.eclipse.cdt.core.IAddress;
13	import org.eclipse.debug.core.DebugException;	14	import org.eclipse.debug.core.DebugException;
14	import org.eclipse.debug.core.model.IMemoryBlock;	15	import org.eclipse.debug.core.model.IMemoryBlock;
15		16
Lines 104-116 Link Here
104		105
105	char getPaddingCharacter();	106	char getPaddingCharacter();
106		107
107	long nextRowAddress();	108	public IAddress getRealStartAddress();
108		109
109	long previousRowAddress();	110	IAddress nextRowAddress();
110		111
111	long nextPageAddress();	112	IAddress previousRowAddress();
112		113
113	long previousPageAddress();	114	IAddress nextPageAddress();
		115
		116	IAddress previousPageAddress();
114		117
115	void reformat( int format,	118	void reformat( int format,
116	int wordSize,	119	int wordSize,
Lines 124-130 Link Here
124	char paddingChar ) throws DebugException;	127	char paddingChar ) throws DebugException;
125	void dispose();	128	void dispose();
126		129
127	Long[] getChangedAddresses();	130	IAddress[] getChangedAddresses();
128		131
129	boolean isFrozen();	132	boolean isFrozen();
130		133

Lines 11-16 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/model/IFormattedMemoryBlockRow.java (-1 / +3 lines)
11		11
12	package org.eclipse.cdt.debug.core.model;	12	package org.eclipse.cdt.debug.core.model;
13		13
		14	import org.eclipse.cdt.core.IAddress;
		15
14	/**	16	/**
15	*	17	*
16	* Represents a row in the output table of formatted memory block.	18	* Represents a row in the output table of formatted memory block.
Lines 24-30 Link Here
24	*	26	*
25	* @return the address of this row	27	* @return the address of this row
26	*/	28	*/
27	long getAddress();	29	IAddress getAddress();
28		30
29	/**	31	/**
30	* Returns the array of memory words.	32	* Returns the array of memory words.




 ***********************************************************************/
package org.eclipse.cdt.debug.core.model;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.debug.core.DebugException;

/**

	 * 
	 * @return whether this operation is currently available
	 */
	public boolean canJumpToAddress( IAddress address );

	/**
	 * Causes this element to resume the execution at the specified address.
	 * 
	 * @exception DebugException on failure. Reasons include:
	 */
	public void jumpToAddress( IAddress address ) throws DebugException;
}




 ***********************************************************************/
package org.eclipse.cdt.debug.core.model;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.debug.core.DebugException;

/**

	 * 
	 * @return whether this operation is currently available
	 */
	public boolean canRunToAddress( IAddress address );

	/**
	 * Causes this element to run to specified address.
	 * 
	 * @exception DebugException on failure. Reasons include:
	 */
	public void runToAddress( IAddress address, boolean skipBreakpoints ) throws DebugException;
}




 ***********************************************************************/
package org.eclipse.cdt.debug.internal.core.breakpoints;

import java.text.MessageFormat;
import java.util.Map;

import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
import org.eclipse.cdt.debug.internal.core.CDebugUtils;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.osgi.framework.msg.MessageFormat;

/**
 * A breakpoint that suspend the execution when a particular address is reached.

			sb.append( name );
		}
		try {
			sb.append( MessageFormat.format( BreakpointMessages.getString( "CAddressBreakpoint.2" ), new String[] { getAddress() } ) ); //$NON-NLS-1$
			sb.append( MessageFormat.format( BreakpointMessages.getString( "CAddressBreakpoint.2" ), new String[] { CDebugUtils.toHexAddressString( address ) } ) ); //$NON-NLS-1$
		}
		catch( NumberFormatException e ) {
		}

Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/internal/core/model/AsmInstruction.java (-1 / +2 lines)
10	***********************************************************************/	10	***********************************************************************/
11	package org.eclipse.cdt.debug.internal.core.model;	11	package org.eclipse.cdt.debug.internal.core.model;
12		12
		13	import org.eclipse.cdt.core.IAddress;
13	import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction;	14	import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction;
14	import org.eclipse.cdt.debug.core.model.IAsmInstruction;	15	import org.eclipse.cdt.debug.core.model.IAsmInstruction;
15		16
Lines 30-36 Link Here
30	/* (non-Javadoc)	31	/* (non-Javadoc)
31	* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getAdress()	32	* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getAdress()
32	*/	33	*/
33	public long getAdress() {	34	public IAddress getAdress() {
34	return fCDIInstruction.getAdress();	35	return fCDIInstruction.getAdress();
35	}	36	}
36		37

Lines 15-21 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java (-7 / +28 lines)
15	import java.util.Iterator;	15	import java.util.Iterator;
16	import java.util.List;	16	import java.util.List;
17	import java.util.StringTokenizer;	17	import java.util.StringTokenizer;
		18
18	import org.eclipse.cdt.core.CCorePlugin;	19	import org.eclipse.cdt.core.CCorePlugin;
		20	import org.eclipse.cdt.core.IAddress;
		21	import org.eclipse.cdt.core.IAddressFactory;
19	import org.eclipse.cdt.core.model.CModelException;	22	import org.eclipse.cdt.core.model.CModelException;
20	import org.eclipse.cdt.core.model.CoreModel;	23	import org.eclipse.cdt.core.model.CoreModel;
21	import org.eclipse.cdt.core.model.IBinary;	24	import org.eclipse.cdt.core.model.IBinary;
Lines 205-210 Link Here
205	*/	208	*/
206	private Preferences fPreferences = null;	209	private Preferences fPreferences = null;
207		210
		211	private IAddressFactory fAddressFactory;
		212
208	/**	213	/**
209	* Constructor for CDebugTarget.	214	* Constructor for CDebugTarget.
210	*/	215	*/
Lines 754-760 Link Here
754	* @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#getMemoryBlock(long, long)	759	* @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#getMemoryBlock(long, long)
755	*/	760	*/
756	public IMemoryBlock getMemoryBlock( long startAddress, long length ) throws DebugException {	761	public IMemoryBlock getMemoryBlock( long startAddress, long length ) throws DebugException {
757	return null;	762	//IPF_TODO look into implementation
		763	throw new RuntimeException("Method getMemoryBlock should not be called from CDT");
758	}	764	}
759		765
760	/* (non-Javadoc)	766	/* (non-Javadoc)
Lines 1521-1527 Link Here
1521	/* (non-Javadoc)	1527	/* (non-Javadoc)
1522	* @see org.eclipse.cdt.debug.core.model.IRunToAddress#canRunToAddress(long)	1528	* @see org.eclipse.cdt.debug.core.model.IRunToAddress#canRunToAddress(long)
1523	*/	1529	*/
1524	public boolean canRunToAddress( long address ) {	1530	public boolean canRunToAddress( IAddress address ) {
1525	// for now	1531	// for now
1526	return canResume();	1532	return canResume();
1527	}	1533	}
Lines 1529-1535 Link Here
1529	/* (non-Javadoc)	1535	/* (non-Javadoc)
1530	* @see org.eclipse.cdt.debug.core.model.IRunToAddress#runToAddress(long, boolean)	1536	* @see org.eclipse.cdt.debug.core.model.IRunToAddress#runToAddress(long, boolean)
1531	*/	1537	*/
1532	public void runToAddress( long address, boolean skipBreakpoints ) throws DebugException {	1538	public void runToAddress( IAddress address, boolean skipBreakpoints ) throws DebugException {
1533	if ( !canRunToAddress( address ) )	1539	if ( !canRunToAddress( address ) )
1534	return;	1540	return;
1535	if ( skipBreakpoints ) {	1541	if ( skipBreakpoints ) {
Lines 1625-1631 Link Here
1625	/* (non-Javadoc)	1631	/* (non-Javadoc)
1626	* @see org.eclipse.cdt.debug.core.model.IJumpToAddress#canJumpToAddress(long)	1632	* @see org.eclipse.cdt.debug.core.model.IJumpToAddress#canJumpToAddress(long)
1627	*/	1633	*/
1628	public boolean canJumpToAddress( long address ) {	1634	public boolean canJumpToAddress( IAddress address ) {
1629	// check if supports jump to address	1635	// check if supports jump to address
1630	return canResume();	1636	return canResume();
1631	}	1637	}
Lines 1633-1639 Link Here
1633	/* (non-Javadoc)	1639	/* (non-Javadoc)
1634	* @see org.eclipse.cdt.debug.core.model.IJumpToAddress#jumpToAddress(long)	1640	* @see org.eclipse.cdt.debug.core.model.IJumpToAddress#jumpToAddress(long)
1635	*/	1641	*/
1636	public void jumpToAddress( long address ) throws DebugException {	1642	public void jumpToAddress( IAddress address ) throws DebugException {
1637	if ( !canJumpToAddress( address ) )	1643	if ( !canJumpToAddress( address ) )
1638	return;	1644	return;
1639	ICDILocation location = getCDITarget().createLocation( address );	1645	ICDILocation location = getCDITarget().createLocation( address );
Lines 1783-1790 Link Here
1783	/* (non-Javadoc)	1789	/* (non-Javadoc)
1784	* @see org.eclipse.cdt.debug.core.model.IBreakpointTarget#getBreakpointAddress(org.eclipse.cdt.debug.core.model.ICLineBreakpoint)	1790	* @see org.eclipse.cdt.debug.core.model.IBreakpointTarget#getBreakpointAddress(org.eclipse.cdt.debug.core.model.ICLineBreakpoint)
1785	*/	1791	*/
1786	public long getBreakpointAddress( ICLineBreakpoint breakpoint ) throws DebugException {	1792	public IAddress getBreakpointAddress( ICLineBreakpoint breakpoint ) throws DebugException {
1787	return (getBreakpointManager() != null) ? getBreakpointManager().getBreakpointAddress( breakpoint ) : 0;	1793	return (getBreakpointManager() != null) ? getBreakpointManager().getBreakpointAddress( breakpoint ) : getAddressFactory().getZero();
1788	}	1794	}
1789		1795
1790	/* (non-Javadoc)	1796	/* (non-Javadoc)
Lines 1861-1864 Link Here
1861	public boolean isPostMortem() {	1867	public boolean isPostMortem() {
1862	return false;	1868	return false;
1863	}	1869	}
		1870	public IAddressFactory getAddressFactory()
		1871	{
		1872	if ( fAddressFactory == null )
		1873	{
		1874	if ( getExecFile() != null && CoreModel.getDefault().isBinary( getExecFile() ) )
		1875	{
		1876	ICElement cFile = CCorePlugin.getDefault().getCoreModel().create( getExecFile() );
		1877	if ( cFile instanceof IBinary )
		1878	{
		1879	fAddressFactory = ((IBinary)cFile).getAddressFactory();
		1880	}
		1881	}
		1882	}
		1883	return fAddressFactory;
		1884	}
1864	}	1885	}




 *******************************************************************************/
package org.eclipse.cdt.debug.internal.core.model;

import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.cdi.CDIException;

{
	class CFormattedMemoryBlockRow implements IFormattedMemoryBlockRow
	{
		private IAddress fAddress;
		private String[] fData;
		private String fAscii;

		/**
		 * Constructor for CFormattedMemoryBlockRow.
		 */
		public CFormattedMemoryBlockRow( IAddress address, String[] data, String ascii )
		{
			fAddress = address;
			fData = data;

		/* (non-Javadoc)
		 * @see org.eclipse.cdt.debug.core.IFormattedMemoryBlockRow#getAddress()
		 */
		public IAddress getAddress()
		{
			return fAddress;
		}

	private boolean fDisplayAscii = true;
	private char fPaddingChar = '.';
	private List fRows = null;
	private IAddress[] fChangedAddresses = new IAddress[0];
	private boolean fStartAddressChanged = false;

	/**

	/* (non-Javadoc)
	 * @see org.eclipse.cdt.debug.core.IFormattedMemoryBlock#nextRowAddress()
	 */
	public IAddress nextRowAddress()
	{
		return ((CDebugTarget)getDebugTarget()).getAddressFactory().getZero();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.cdt.debug.core.IFormattedMemoryBlock#previousRowAddress()
	 */
	public IAddress previousRowAddress()
	{
		return ((CDebugTarget)getDebugTarget()).getAddressFactory().getZero();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.cdt.debug.core.IFormattedMemoryBlock#nextPageAddress()
	 */
	public IAddress nextPageAddress()
	{
		return ((CDebugTarget)getDebugTarget()).getAddressFactory().getZero();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.cdt.debug.core.IFormattedMemoryBlock#previousPageAddress()
	 */
	public IAddress previousPageAddress()
	{
		return ((CDebugTarget)getDebugTarget()).getAddressFactory().getZero();
	}

	/* (non-Javadoc)

	 */
	public long getStartAddress()
	{
		//IPF_TODO look into implementation
		throw new RuntimeException("Method IMemoryBlock.getStartAddress shoud not be called in CDT debug");
	}

	public IAddress getRealStartAddress()
	{
		if ( fCDIMemoryBlock != null )
		{
			return fCDIMemoryBlock.getStartAddress();
		}
		return ((CDebugTarget)getDebugTarget()).getAddressFactory().getZero();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.debug.core.model.IMemoryBlock#getLength()
	 */

		fireTerminateEvent();
	}
	
	public IAddress[] getChangedAddresses()
	{
		return fChangedAddresses;
	}

	protected void setChangedAddresses( IAddress[] changedAddresses )
	{
		fChangedAddresses = changedAddresses;
	}
	
	protected void resetChangedAddresses()
	{
		fChangedAddresses = new IAddress[0];
	}

	/**

		return fStartAddressChanged;
	}
	
	private IAddress getRowAddress(int offset )
	{
		IAddress result = getRealStartAddress().add(BigInteger.valueOf(offset));
		IAddress max = ((CDebugTarget)getDebugTarget()).getAddressFactory().getMax();
		if ( result.compareTo(max) > 0 )
		{
			result = result.add(result.getMaxOffset().negate());
		}
		return result;
	}




 *******************************************************************************/
package org.eclipse.cdt.debug.internal.core.model;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent;
import org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener;

	/* (non-Javadoc)
	 * @see org.eclipse.cdt.debug.core.model.ICSharedLibrary#getStartAddress()
	 */
	public IAddress getStartAddress()
	{
		if ( getCDISharedLibrary() != null )
			return getCDISharedLibrary().getStartAddress();
		return ((CDebugTarget)getDebugTarget()).getAddressFactory().getZero();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.cdt.debug.core.model.ICSharedLibrary#getEndAddress()
	 */
	public IAddress getEndAddress()
	{
		if ( getCDISharedLibrary() != null )
			return getCDISharedLibrary().getEndAddress();
		return ((CDebugTarget)getDebugTarget()).getAddressFactory().getZero();
	}

	/* (non-Javadoc)

Lines 16-21 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java (-1 / +3 lines)
16	import java.util.Arrays;	16	import java.util.Arrays;
17	import java.util.Iterator;	17	import java.util.Iterator;
18	import java.util.List;	18	import java.util.List;
		19
		20	import org.eclipse.cdt.core.IAddress;
19	import org.eclipse.cdt.debug.core.cdi.CDIException;	21	import org.eclipse.cdt.debug.core.cdi.CDIException;
20	import org.eclipse.cdt.debug.core.cdi.ICDILocation;	22	import org.eclipse.cdt.debug.core.cdi.ICDILocation;
21	import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent;	23	import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent;
Lines 530-536 Link Here
530	/* (non-Javadoc)	532	/* (non-Javadoc)
531	* @see org.eclipse.cdt.debug.core.model.ICStackFrame#getAddress()	533	* @see org.eclipse.cdt.debug.core.model.ICStackFrame#getAddress()
532	*/	534	*/
533	public long getAddress() {	535	public IAddress getAddress() {
534	return getCDIStackFrame().getLocation().getAddress();	536	return getCDIStackFrame().getLocation().getAddress();
535	}	537	}
536		538

Lines 16-21 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/internal/core/model/CValue.java (-27 / +36 lines)
16	import java.util.Collections;	16	import java.util.Collections;
17	import java.util.Iterator;	17	import java.util.Iterator;
18	import java.util.List;	18	import java.util.List;
		19
		20	import org.eclipse.cdt.core.IAddress;
19	import org.eclipse.cdt.debug.core.cdi.CDIException;	21	import org.eclipse.cdt.debug.core.cdi.CDIException;
20	import org.eclipse.cdt.debug.core.cdi.model.ICDIValue;	22	import org.eclipse.cdt.debug.core.cdi.model.ICDIValue;
21	import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable;	23	import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable;
Lines 274-285 Link Here
274	private String getLongValueString( ICDILongValue value ) throws CDIException {	276	private String getLongValueString( ICDILongValue value ) throws CDIException {
275	CVariableFormat format = getParentVariable().getFormat();	277	CVariableFormat format = getParentVariable().getFormat();
276	if ( CVariableFormat.NATURAL.equals( format ) \|\| CVariableFormat.DECIMAL.equals( format ) ) {	278	if ( CVariableFormat.NATURAL.equals( format ) \|\| CVariableFormat.DECIMAL.equals( format ) ) {
277	return (isUnsigned()) ? Long.toString( value.longValue() ) : Integer.toString( value.intValue() );	279	if ( isUnsigned() ) {
		280	BigInteger bigValue = new BigInteger( value.getValueString() );
		281	return bigValue.toString();
		282	}
		283	return Long.toString( value.longValue() );
278	}	284	}
279	else if ( CVariableFormat.HEXADECIMAL.equals( format ) ) {	285	else if ( CVariableFormat.HEXADECIMAL.equals( format ) ) {
280	StringBuffer sb = new StringBuffer( "0x" ); //$NON-NLS-1$	286	StringBuffer sb = new StringBuffer( "0x" ); //$NON-NLS-1$
281	String stringValue = Long.toHexString( (isUnsigned()) ? value.longValue() : value.intValue() );	287	if ( isUnsigned() ) {
282	sb.append( (stringValue.length() > 8) ? stringValue.substring( stringValue.length() - 8 ) : stringValue );	288	BigInteger bigValue = new BigInteger( value.getValueString() );
		289	sb.append( bigValue.toString( 16 ) );
		290	}
		291	else
		292	sb.append( Long.toHexString( value.longValue() ) );
283	return sb.toString();	293	return sb.toString();
284	}	294	}
285	return null;	295	return null;
Lines 351-383 Link Here
351	return null;	361	return null;
352	}	362	}
353		363
354	private String getPointerValueString( ICDIPointerValue value ) throws CDIException {	364	private String getPointerValueString( ICDIPointerValue value ) throws CDIException
355	long longValue = value.pointerValue();	365	{
356	CVariableFormat format = getParentVariable().getFormat();	366	//IPF_TODO Workaround to solve incoorect handling of structures referenced by pointers or references
357	if ( CVariableFormat.DECIMAL.equals( format ) ) {	367	IAddress address = value.pointerValue();
358	return Long.toString( longValue );	368	if(address == null) return "";
359	}	369	CVariableFormat format = getParentVariable().getFormat();
360	else if ( CVariableFormat.NATURAL.equals( format ) \|\| CVariableFormat.HEXADECIMAL.equals( format ) ) {	370	if( CVariableFormat.NATURAL.equals( format ) \|\|
361	StringBuffer sb = new StringBuffer( "0x" ); //$NON-NLS-1$	371	CVariableFormat.HEXADECIMAL.equals( format ) )
362	String stringValue = Long.toHexString( longValue );	372	return address.toHexAddressString();
363	sb.append( (stringValue.length() > 8) ? stringValue.substring( stringValue.length() - 8 ) : stringValue );	373	if( CVariableFormat.DECIMAL.equals( format ))
364	return sb.toString();	374	return address.toString();
365	}
366	return null;	375	return null;
367	}	376	}
368		377
369	private String getReferenceValueString( ICDIReferenceValue value ) throws CDIException {	378	private String getReferenceValueString( ICDIReferenceValue value ) throws CDIException
370	long longValue = value.referenceValue();	379	{
371	CVariableFormat format = getParentVariable().getFormat();	380	//NOTE: Reference should be displayed identically to address
372	if ( CVariableFormat.DECIMAL.equals( format ) ) {	381	//IPF_TODO Workaround to solve incoorect handling of structures referenced by pointers or references
373	return Long.toString( longValue );	382	IAddress address = value.referenceValue();
374	}	383	if(address == null) return "";
375	else if ( CVariableFormat.NATURAL.equals( format ) \|\| CVariableFormat.HEXADECIMAL.equals( format ) ) {	384	CVariableFormat format = getParentVariable().getFormat();
376	StringBuffer sb = new StringBuffer( "0x" ); //$NON-NLS-1$	385	if( CVariableFormat.NATURAL.equals( format ) \|\|
377	String stringValue = Long.toHexString( longValue );	386	CVariableFormat.HEXADECIMAL.equals( format ) )
378	sb.append( (stringValue.length() > 8) ? stringValue.substring( stringValue.length() - 8 ) : stringValue );	387	return address.toHexAddressString();
379	return sb.toString();	388	if( CVariableFormat.DECIMAL.equals( format ))
380	}	389	return address.toString();
381	return null;	390	return null;
382	}	391	}
383		392




import java.io.IOException;
import java.io.LineNumberReader;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction;
import org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction;
import org.eclipse.cdt.debug.core.model.IAsmInstruction;

	
	private IAsmSourceLine[] fSourceLines;

	private IAddress fStartAddress;

	private IAddress fEndAddress;
	
	private boolean fMixedMode = false;


	public boolean contains( ICStackFrame frame ) {
		if ( !getDisassembly().getDebugTarget().equals( frame.getDebugTarget() ) )
			return false;
		IAddress address = frame.getAddress();
		return ( address.compareTo(fStartAddress) >= 0 && 
				 address.compareTo(fEndAddress)   <= 0    );
	}

	/* (non-Javadoc)




***********************************************************************/
package org.eclipse.cdt.debug.internal.core.model;

import java.math.BigInteger;
import java.util.ArrayList;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.ICDebugConstants;
import org.eclipse.cdt.debug.core.cdi.CDIException;

				String fileName = frame.getFile();
				int lineNumber = frame.getLineNumber();
				ICDIMixedInstruction[] mixedInstrs = new ICDIMixedInstruction[0];
				IAddress address = frame.getAddress();				
				if ( fileName != null && fileName.length() > 0 ) {
					try {
						mixedInstrs = sm.getMixedInstructions( fileName, 

						targetRequestFailed( e.getMessage(), e );
					}
				}
				if ( mixedInstrs.length == 0 ||
				// Double check if debugger returns correct address range.
				if ( mixedInstrs.length == 0 ||
						!containsAddress( mixedInstrs, address ) ) {
					if ( address >= 0 ) {
						try {
							ICDIInstruction[] instructions = getFunctionInstructions( sm.getInstructions( address, address.add(BigInteger.valueOf(DISASSEMBLY_BLOCK_SIZE)) ) );
							return DisassemblyBlock.create( this, instructions );
						}
						catch( CDIException e ) {
							targetRequestFailed( e.getMessage(), e );
						}
					}
				}
				else {
					return DisassemblyBlock.create( this, mixedInstrs );
				}

		return null;
	}

	private boolean containsAddress( ICDIMixedInstruction[] mi, IAddress address ) {
		for( int i = 0; i < mi.length; ++i ) {
			ICDIInstruction[] instructions = mi[i].getInstructions();
			for ( int j = 0; j < instructions.length; ++j )
				if ( address.equals(instructions[j].getAdress()))
					return true;
		}
		return false;

Lines 16-21 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java (-1 / +2 lines)
16	import java.util.List;	16	import java.util.List;
17	import java.util.Map;	17	import java.util.Map;
18		18
		19	import org.eclipse.cdt.core.IAddress;
19	import org.eclipse.cdt.debug.core.cdi.CDIException;	20	import org.eclipse.cdt.debug.core.cdi.CDIException;
20	import org.eclipse.cdt.debug.core.cdi.ICDICondition;	21	import org.eclipse.cdt.debug.core.cdi.ICDICondition;
21	import org.eclipse.cdt.debug.core.cdi.ICDILocation;	22	import org.eclipse.cdt.debug.core.cdi.ICDILocation;
Lines 649-655 Link Here
649	/**	650	/**
650	* @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager#createLocation(long)	651	* @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager#createLocation(long)
651	*/	652	*/
652	public ICDILocation createLocation(long address) {	653	public ICDILocation createLocation(IAddress address) {
653	return new Location(address);	654	return new Location(address);
654	}	655	}
655		656

Lines 95-101 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java (-1 / +1 lines)
95	MISession miSession = mblock.getMISession();	95	MISession miSession = mblock.getMISession();
96	ICDIMemoryBlock[] blocks = mgr.getMemoryBlocks(miSession);	96	ICDIMemoryBlock[] blocks = mgr.getMemoryBlocks(miSession);
97	for (int i = 0; i < blocks.length; i++) {	97	for (int i = 0; i < blocks.length; i++) {
98	if (blocks[i].getStartAddress() == mblock.getAddress() &&	98	if (blocks[i].getStartAddress().equals(mblock.getAddress()) &&
99	blocks[i].getLength() == mblock.getLength()) {	99	blocks[i].getLength() == mblock.getLength()) {
100	source = blocks[i];	100	source = blocks[i];
101	break;	101	break;




import java.util.ArrayList;
import java.util.List;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.event.ICDIMemoryChangedEvent;
import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
import org.eclipse.cdt.debug.mi.core.cdi.Session;

	/**
	 * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getAddresses()
	 */
	public IAddress[] getAddresses() {
	 	/* But only returns the address that are in the block.  */
		IAddress[] mi_addresses = miMem.getAddresses();
		List aList = new ArrayList(mi_addresses.length);
		for (int i = 0; i < mi_addresses.length; i++) {
			if (source.contains(mi_addresses[i])) {
				aList.add(mi_addresses[i]);
			}
		}
		return (IAddress[])aList.toArray(new IAddress[0]);
	}

	/**




 *******************************************************************************/
package org.eclipse.cdt.debug.mi.core.cdi;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.ICDILocation;

/**
 */
public class Location implements ICDILocation {

	IAddress addr;
	String file = ""; //$NON-NLS-1$
	String function = ""; //$NON-NLS-1$
	int line;

	public Location(String f, String fnct, int l) {
		this(f, fnct, l, null);
	}

	public Location(String f, String fnct, int l, IAddress a) {
		if (f != null)
			file = f;
		if (fnct != null)

		addr = a;  
	}

	public Location(IAddress address) {
		addr = address;
	}

	/**
	 * @see org.eclipse.cdt.debug.core.cdi.ICDILocation#getAddress()
	 */
	public IAddress getAddress() {
		return addr;
	}


				}
			}
		}
		IAddress oaddr = location.getAddress();
		if (addr != null && oaddr != null) { //IPF_TODO: check ZERO addresses
			if (addr.equals(oaddr)) {
				return true;
			}
		}




 *******************************************************************************/
package org.eclipse.cdt.debug.mi.core.cdi;

import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;

import java.util.List;
import java.util.Map;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager;
import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock;

	/**
	 * update one Block.
	 */
	public IAddress[] update(MemoryBlock block, List aList) throws CDIException {
		Target target = (Target)block.getTarget();
		MISession miSession = target.getMISession();
		MemoryBlock newBlock = cloneBlock(block);
		boolean newAddress = ( newBlock.getStartAddress() != block.getStartAddress() );
		IAddress[] array = compareBlocks(block, newBlock);
		// Update the block MIDataReadMemoryInfo.
		block.setMIDataReadMemoryInfo(newBlock.getMIDataReadMemoryInfo());
		if (array.length > 0 || newAddress) {

	 * oldBlock.getLength() == newBlock.getLength();
	 * @return Long[] array of modified addresses.
	 */
	IAddress[] compareBlocks (MemoryBlock oldBlock, MemoryBlock newBlock) throws CDIException {
		byte[] oldBytes = oldBlock.getBytes();
		byte[] newBytes = newBlock.getBytes();
		List aList = new ArrayList(newBytes.length);
		BigInteger distance = newBlock.getStartAddress().distance(oldBlock.getStartAddress());
		//IPF_TODO enshure it is OK here
		int diff = distance.intValue();
		if ( Math.abs(diff) <  newBytes.length) {
			for (int i = 0; i < newBytes.length; i++) {
				if (i + diff < oldBytes.length && i + diff >= 0) {
					if (oldBytes[i + diff] != newBytes[i]) {
						aList.add(newBlock.getStartAddress().add(BigInteger.valueOf(i)));
					}
				}
			}
		}
		return (IAddress[])aList.toArray(new IAddress[0]);
	}

	/**

	/**
	 * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#createMemoryBlock(long, int)
	 */
	public ICDIMemoryBlock createMemoryBlock(IAddress address, int length)
		throws CDIException {
		return createMemoryBlock(address.toHexAddressString(), length);
		return createMemoryBlock(addr, length);
	}
		
	/**

Lines 153-159 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java (-1 / +1 lines)
153	fLocation = new Location (miBreakpoint.getFile(),	153	fLocation = new Location (miBreakpoint.getFile(),
154	miBreakpoint.getFunction(),	154	miBreakpoint.getFunction(),
155	miBreakpoint.getLine(),	155	miBreakpoint.getLine(),
156	miBreakpoint.getAddress());	156	((Target)getTarget()).getAddressFactory().createAddress(miBreakpoint.getAddress()));
157	}	157	}
158	}	158	}
159	return fLocation;	159	return fLocation;

Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/cdi/model/Instruction.java (-2 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.cdt.debug.mi.core.cdi.model;	11	package org.eclipse.cdt.debug.mi.core.cdi.model;
12		12
		13	import org.eclipse.cdt.core.IAddress;
13	import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction;	14	import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction;
14	import org.eclipse.cdt.debug.mi.core.output.MIAsm;	15	import org.eclipse.cdt.debug.mi.core.output.MIAsm;
15		16
Lines 26-33 Link Here
26	/**	27	/**
27	* @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getAdress()	28	* @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getAdress()
28	*/	29	*/
29	public long getAdress() {	30	public IAddress getAdress() {
30	return asm.getAddress();	31	return ((Target)getTarget()).getAddressFactory().createAddress(asm.getAddress());
31	}	32	}
32		33
33	/**	34	/**





package org.eclipse.cdt.debug.mi.core.cdi.model;

import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock;
import org.eclipse.cdt.debug.mi.core.MIException;

	/**
	 * @return true if any address in the array is within the block.
	 */
	public boolean contains(IAddress[] adds) {
		for (int i = 0; i < adds.length; i++) {
			if (contains(adds[i])) {
				return true;

	/**
	 * @return true if the address is within the block.
	 */
	public boolean contains(IAddress addr) {
		IAddress start = getStartAddress();
		long length = getLength();
		if ( start.compareTo(addr) <= 0 && 
		     addr.compareTo(start.add(BigInteger.valueOf(length))) <= 0 ) 
		{
			return true;
		}
		return false;

		Target target = (Target)getTarget();
		MemoryManager mgr = (MemoryManager)target.getSession().getMemoryManager();
		setDirty(true);
		IAddress[] addresses = mgr.update(this, null);
		// Check if this affects other blocks.
		if (addresses.length > 0) {
			MemoryBlock[] blocks = mgr.getMemoryBlocks(target.getMISession());

	/**
	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#getStartAddress()
	 */
	public IAddress getStartAddress() {
		return ((Target)getTarget()).getAddressFactory().createAddress(mem.getAddress());
	}

	/**





package org.eclipse.cdt.debug.mi.core.cdi.model;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary;
import org.eclipse.cdt.debug.mi.core.cdi.Session;

	/**
	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary#getStartAddress()
	 */
	public IAddress getStartAddress() {
		return ((Target)getTarget()).getAddressFactory().createAddress(miShared.getFrom());
	}

	/**
	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary#getEndAddress()
	 */
	public IAddress getEndAddress() {
		return ((Target)getTarget()).getAddressFactory().createAddress(miShared.getTo());
	}

	/**

Lines 130-139 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java (-3 / +5 lines)
130	*/	130	*/
131	public ICDILocation getLocation() {	131	public ICDILocation getLocation() {
132	if (frame != null) {	132	if (frame != null) {
133	return new Location(frame.getFile(), frame.getFunction(),	133	return new Location(frame.getFile(),
134	frame.getLine(), frame.getAddress());	134	frame.getFunction(),
		135	frame.getLine(),
		136	((Target)getTarget()).getAddressFactory().createAddress(frame.getAddress()));
135	}	137	}
136	return new Location("", "", 0, 0); //$NON-NLS-1$ //$NON-NLS-2$	138	return new Location("", "", 0, ((Target)getTarget()).getAddressFactory().getZero()); //$NON-NLS-1$ //$NON-NLS-2$
137	}	139	}
138		140
139	/**	141	/**

Lines 13-18 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java (-7 / +45 lines)
13	import java.util.ArrayList;	13	import java.util.ArrayList;
14	import java.util.List;	14	import java.util.List;
15		15
		16	import org.eclipse.cdt.core.IAddress;
		17	import org.eclipse.cdt.core.IAddressFactory;
16	import org.eclipse.cdt.debug.core.cdi.CDIException;	18	import org.eclipse.cdt.debug.core.cdi.CDIException;
17	import org.eclipse.cdt.debug.core.cdi.ICDICondition;	19	import org.eclipse.cdt.debug.core.cdi.ICDICondition;
18	import org.eclipse.cdt.debug.core.cdi.ICDILocation;	20	import org.eclipse.cdt.debug.core.cdi.ICDILocation;
Lines 26-31 Link Here
26	import org.eclipse.cdt.debug.mi.core.MIException;	28	import org.eclipse.cdt.debug.mi.core.MIException;
27	import org.eclipse.cdt.debug.mi.core.MISession;	29	import org.eclipse.cdt.debug.mi.core.MISession;
28	import org.eclipse.cdt.debug.mi.core.cdi.BreakpointManager;	30	import org.eclipse.cdt.debug.mi.core.cdi.BreakpointManager;
		31	import org.eclipse.cdt.debug.mi.core.cdi.CdiResources;
29	import org.eclipse.cdt.debug.mi.core.cdi.MI2CDIException;	32	import org.eclipse.cdt.debug.mi.core.cdi.MI2CDIException;
30	import org.eclipse.cdt.debug.mi.core.cdi.RegisterManager;	33	import org.eclipse.cdt.debug.mi.core.cdi.RegisterManager;
31	import org.eclipse.cdt.debug.mi.core.cdi.Session;	34	import org.eclipse.cdt.debug.mi.core.cdi.Session;
Lines 52-58 Link Here
52	import org.eclipse.cdt.debug.mi.core.output.MIInfo;	55	import org.eclipse.cdt.debug.mi.core.output.MIInfo;
53	import org.eclipse.cdt.debug.mi.core.output.MIInfoThreadsInfo;	56	import org.eclipse.cdt.debug.mi.core.output.MIInfoThreadsInfo;
54	import org.eclipse.cdt.debug.mi.core.output.MIThreadSelectInfo;	57	import org.eclipse.cdt.debug.mi.core.output.MIThreadSelectInfo;
55	import org.eclipse.cdt.debug.mi.core.cdi.CdiResources;
56		58
57	/**	59	/**
58	*/	60	*/
Lines 63-73 Link Here
63	Thread[] noThreads = new Thread[0];	65	Thread[] noThreads = new Thread[0];
64	Thread[] currentThreads;	66	Thread[] currentThreads;
65	int currentThreadId;	67	int currentThreadId;
		68	IAddressFactory addressFactory;
66		69
67	public Target(Session s, MISession mi) {	70	public Target(Session s, MISession mi, IAddressFactory addrFactory) {
68	session = s;	71	session = s;
69	miSession = mi;	72	miSession = mi;
70	currentThreads = noThreads;	73	currentThreads = noThreads;
		74	addressFactory = addrFactory;
71	}	75	}
72		76
73	public MISession getMISession() {	77	public MISession getMISession() {
Lines 464-471 Link Here
464	loc = location.getFile() + ":" + location.getLineNumber(); //$NON-NLS-1$	468	loc = location.getFile() + ":" + location.getLineNumber(); //$NON-NLS-1$
465	} else if (location.getFunction() != null && location.getFunction().length() > 0) {	469	} else if (location.getFunction() != null && location.getFunction().length() > 0) {
466	loc = location.getFunction();	470	loc = location.getFunction();
467	} else if (location.getAddress() != 0) {	471	} else if ( ! location.getAddress().isZero() ) {
468	loc = "*" + location.getAddress(); //$NON-NLS-1$	472	loc = "*" + location.getAddress().toString(); //$NON-NLS-1$
469	}	473	}
470	MIExecUntil until = factory.createMIExecUntil(loc);	474	MIExecUntil until = factory.createMIExecUntil(loc);
471	try {	475	try {
Lines 575-582 Link Here
575	loc = location.getFile() + ":" + location.getLineNumber(); //$NON-NLS-1$	579	loc = location.getFile() + ":" + location.getLineNumber(); //$NON-NLS-1$
576	} else if (location.getFunction() != null && location.getFunction().length() > 0) {	580	} else if (location.getFunction() != null && location.getFunction().length() > 0) {
577	loc = location.getFunction();	581	loc = location.getFunction();
578	} else if (location.getAddress() != 0) {	582	} else if (! location.getAddress().isZero()) {
579	loc = "*" + location.getAddress(); //$NON-NLS-1$	583	loc = "*" + location.getAddress().toString(); //$NON-NLS-1$
580	}	584	}
581	MIJump jump = factory.createMIJump(loc);	585	MIJump jump = factory.createMIJump(loc);
582	try {	586	try {
Lines 742-751 Link Here
742	/* (non-Javadoc)	746	/* (non-Javadoc)
743	* @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createLocation(long)	747	* @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createLocation(long)
744	*/	748	*/
745	public ICDILocation createLocation(long address) {	749	public ICDILocation createLocation(IAddress address) {
746	BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager();	750	BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager();
747	return bMgr.createLocation(address);	751	return bMgr.createLocation(address);
748	}	752	}
		753	/*
		754	private IAddressFactory createAddressFactory() throws CDIException
		755	{
		756	MISession mi = ((Session)getSession()).getMISession();
		757	CommandFactory cf = mi.getCommandFactory();
		758	MIGDBShowAddressSize as = cf.createMIGDBShowAddressSize();
		759	try
		760	{
		761	mi.postCommand(as );
		762	MIGDBShowAddressSizeInfo info = (MIGDBShowAddressSizeInfo)as.getMIInfo();
		763	if (info == null)
		764	{
		765	throw new CDIException("Target is not responding");
		766	}
		767	switch ( info.getAddressSize() )
		768	{
		769	case 32:
		770	return new Addr32Factory();
		771	case 64:
		772	return new Addr64Factory();
		773	default:
		774	throw new CDIException("Undefined address size");
		775	}
		776	}
		777	catch (MIException e)
		778	{
		779	throw new MI2CDIException(e);
		780	}
		781	}
		782	*/
		783	public IAddressFactory getAddressFactory()
		784	{
		785	return addressFactory;
		786	}
749		787
750		788
751	}	789	}





package org.eclipse.cdt.debug.mi.core.cdi.model.type;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.model.type.ICDIPointerValue;
import org.eclipse.cdt.debug.mi.core.cdi.model.Target;
import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;

/**

	/* (non-Javadoc)
	 * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIPointerValue#pointerValue()
	 */
	public IAddress pointerValue() throws CDIException {
		String valueString = getValueString().trim();
		String valueString = getValueString();
		int space = valueString.indexOf(' ');
		if (space != -1) {
			valueString = valueString.substring(0, space).trim();
		}
		try{
			
			return ((Target)getTarget()).getAddressFactory().createAddress(valueString);
		}
		catch(Exception e)
		{
			return null;
		}
		return value;
	}
}





package org.eclipse.cdt.debug.mi.core.cdi.model.type;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.model.type.ICDIReferenceValue;
import org.eclipse.cdt.debug.mi.core.cdi.model.Target;
import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;

/**

	/* (non-Javadoc)
	 * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIReferenceValue#referenceValue()
	 */
	public IAddress referenceValue() throws CDIException {
		long value = 0;
		String valueString = getValueString().trim();
		if ( valueString.startsWith("@") ) //$NON-NLS-1$
			valueString = valueString.substring( 1 );

		if (space != -1) {
			valueString = valueString.substring(0, space).trim();
		}
		try{
			
			return ((Target)getTarget()).getAddressFactory().createAddress(valueString);
		}
		catch(Exception e)
		{
			return null;
		}
		
	}
}





import java.util.Properties;

import org.eclipse.cdt.core.IAddressFactory;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDIConfiguration;
import org.eclipse.cdt.debug.core.cdi.ICDIEventManager;

	SourceManager sourceManager;
	ICDIConfiguration configuration;

	public Session(MISession miSession, IAddressFactory addrFactory, boolean attach) {
		commonSetup();
		setConfiguration(new Configuration(miSession, attach));

		Target target = new Target(this, miSession, addrFactory);
		addTargets(new Target[] { target }, target);
	}

	public Session(MISession miSession, IAddressFactory addrFactory) {
		commonSetup();
		setConfiguration(new CoreFileConfiguration());

		Target target = new Target(this, miSession, addrFactory);
		addTargets(new Target[] { target }, target);
	}





import java.util.List;
import java.util.Map;

import org.eclipse.cdt.core.IAddressFactory;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDIConfiguration;
import org.eclipse.cdt.debug.core.cdi.ICDISharedLibraryManager;

	}

	public boolean hasSharedLibChanged(ICDISharedLibrary lib, MIShared miLib) {
		IAddressFactory af = ((Target)getSession().getCurrentTarget()).getAddressFactory();
		return !miLib.getName().equals(lib.getFileName()) ||
			!af.createAddress(miLib.getFrom()).equals(lib.getStartAddress())   ||
		    !af.createAddress(miLib.getTo()).equals(lib.getEndAddress()) ||
			miLib.isRead() != lib.areSymbolsLoaded();
	}






import java.util.StringTokenizer;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDISourceManager;
import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction;

	/**
	 * @see org.eclipse.cdt.debug.core.cdi.ICDISourceManager#getInstructions(long, long)
	 */
	public ICDIInstruction[] getInstructions(IAddress start, IAddress end) throws CDIException {
		Target target = (Target)getSession().getCurrentTarget();
		return getInstructions(target, start, end);
	}
	public ICDIInstruction[] getInstructions(Target target, IAddress start, IAddress end) throws CDIException {
		MISession mi = target.getMISession();
		CommandFactory factory = mi.getCommandFactory();
		String hex = "0x"; //$NON-NLS-1$
		String sa = start.toHexAddressString();
		String ea = end.toHexAddressString();
		MIDataDisassemble dis = factory.createMIDataDisassemble(sa, ea, false);
		try {
			mi.postCommand(dis);

	/**
	 * @see org.eclipse.cdt.debug.core.cdi.ICDISourceManager#getMixedInstructions(long, long)
	 */
	public ICDIMixedInstruction[] getMixedInstructions(IAddress start, IAddress end) throws CDIException {	
		Target target = (Target)getSession().getCurrentTarget();
		return getMixedInstructions(target, start, end);
	}
	public ICDIMixedInstruction[] getMixedInstructions(Target target, IAddress start, IAddress end) throws CDIException {
		MISession mi = target.getMISession();
		CommandFactory factory = mi.getCommandFactory();
		String sa = start.toHexAddressString();
		String ea = end.toHexAddressString();
		String ea = hex + Long.toHexString(end);
		MIDataDisassemble dis = factory.createMIDataDisassemble(sa, ea, true);
		try {
			mi.postCommand(dis);

Lines 222-227 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java (+4 lines)
222	return new MIGDBShowSolibSearchPath();	222	return new MIGDBShowSolibSearchPath();
223	}	223	}
224		224
		225	public MIGDBShowAddressSize createMIGDBShowAddressSize() {
		226	return new MIGDBShowAddressSize();
		227	}
		228
225	public MIStackInfoDepth createMIStackInfoDepth() {	229	public MIStackInfoDepth createMIStackInfoDepth() {
226	return new MIStackInfoDepth();	230	return new MIStackInfoDepth();
227	}	231	}




/*
 * Created on Jun 4, 2004
 *
 * To change the template for this generated file go to
 * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
 */
package org.eclipse.cdt.debug.mi.core.command;

import org.eclipse.cdt.debug.mi.core.MIException;
import org.eclipse.cdt.debug.mi.core.output.MIGDBShowAddressSizeInfo;
import org.eclipse.cdt.debug.mi.core.output.MIInfo;
import org.eclipse.cdt.debug.mi.core.output.MIOutput;

/**
 * @author root
 *
 * To change the template for this generated type comment go to
 * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
 */
public class MIGDBShowAddressSize extends MIGDBShow {
	
	public MIGDBShowAddressSize () {
		super(new String[] { "remoteaddresssize" });
	}
	
	public MIInfo getMIInfo() throws MIException {
		MIGDBShowAddressSizeInfo info = null;
		MIOutput out = getMIOutput();
		if (out != null) {
			info = new MIGDBShowAddressSizeInfo(out);
			if (info.isError()) {
				throwMIException(info, out);
			}
		}
		return info;
	}

}





import org.eclipse.cdt.debug.mi.core.MISession;

import org.eclipse.cdt.core.IAddress;

/**
 * This can not be detected yet by gdb/mi.

 */
public class MIMemoryChangedEvent extends MIChangedEvent {

	IAddress[] addresses;

	public MIMemoryChangedEvent(MISession source, IAddress[] addrs) {
		this(source, 0, addrs);
	}

	public MIMemoryChangedEvent(MISession source, int token, IAddress[] addrs) {
		super(source, token);
		addresses = addrs;
	}

	public IAddress[] getAddresses() {
		return addresses;
	}
}




 *******************************************************************************/
package org.eclipse.cdt.debug.mi.core.event;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.mi.core.MISession;



 */
public class MIMemoryCreatedEvent extends MICreatedEvent {

	IAddress address;
	long totalBytes;

	public MIMemoryCreatedEvent(MISession source, IAddress addr, long total) {
		this(source, 0, addr, total);
	}

	public MIMemoryCreatedEvent(MISession source, int token, IAddress addr, long total) {
		super(source, token);
		address = addr;
		totalBytes = total;
	}

	public IAddress getAddress() {
		return address;
	}





			String gdb = config.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb"); //$NON-NLS-1$
			File cwd = exe.getProject().getLocation().toFile();
			String gdbinit = config.getAttribute(IMILaunchConfigurationConstants.ATTR_GDB_INIT, ".gdbinit"); //$NON-NLS-1$
			session = (Session)MIPlugin.getDefault().createCSession(gdb, exe, cwd, gdbinit);
			initializeLibraries(config, session);
			return session;
		} catch (IOException e) {

			String gdb = config.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb"); //$NON-NLS-1$
			File cwd = exe.getProject().getLocation().toFile();
			String gdbinit = config.getAttribute(IMILaunchConfigurationConstants.ATTR_GDB_INIT, ".gdbinit"); //$NON-NLS-1$
			session = (Session)MIPlugin.getDefault().createCSession(gdb, exe, pid, null, cwd, gdbinit);
			initializeLibraries(config, session);
			return session;
		} catch (IOException e) {

			String gdb = config.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb"); //$NON-NLS-1$
			File cwd = exe.getProject().getLocation().toFile();
			String gdbinit = config.getAttribute(IMILaunchConfigurationConstants.ATTR_GDB_INIT, ".gdbinit"); //$NON-NLS-1$
			session = (Session)MIPlugin.getDefault().createCSession(gdb, exe, corefile.toFile(), cwd, gdbinit);
			initializeLibraries(config, session);
			return session;
		} catch (IOException e) {

Lines 21-26 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/MIPlugin.java (-11 / +27 lines)
21	import java.util.MissingResourceException;	21	import java.util.MissingResourceException;
22	import java.util.ResourceBundle;	22	import java.util.ResourceBundle;
23		23
		24	import org.eclipse.cdt.core.CCorePlugin;
		25	import org.eclipse.cdt.core.IAddressFactory;
		26	import org.eclipse.cdt.core.model.IBinary;
		27	import org.eclipse.cdt.core.model.ICElement;
24	import org.eclipse.cdt.debug.core.cdi.ICDISession;	28	import org.eclipse.cdt.debug.core.cdi.ICDISession;
25	import org.eclipse.cdt.debug.mi.core.cdi.Session;	29	import org.eclipse.cdt.debug.mi.core.cdi.Session;
26	import org.eclipse.cdt.debug.mi.core.command.CLICommand;	30	import org.eclipse.cdt.debug.mi.core.command.CLICommand;
Lines 30-35 Link Here
30	import org.eclipse.cdt.debug.mi.core.output.MIInfo;	34	import org.eclipse.cdt.debug.mi.core.output.MIInfo;
31	import org.eclipse.cdt.utils.pty.PTY;	35	import org.eclipse.cdt.utils.pty.PTY;
32	import org.eclipse.cdt.utils.spawner.ProcessFactory;	36	import org.eclipse.cdt.utils.spawner.ProcessFactory;
		37	import org.eclipse.core.resources.IFile;
		38	import org.eclipse.core.runtime.IPluginDescriptor;
33	import org.eclipse.core.runtime.Plugin;	39	import org.eclipse.core.runtime.Plugin;
34	import org.eclipse.core.runtime.Preferences;	40	import org.eclipse.core.runtime.Preferences;
35	import org.osgi.framework.BundleContext;	41	import org.osgi.framework.BundleContext;
Lines 113-119 Link Here
113	* @return ICDISession	119	* @return ICDISession
114	* @throws MIException	120	* @throws MIException
115	*/	121	*/
116	public ICDISession createCSession(String gdb, File program, File cwd, String gdbinit) throws IOException, MIException {	122	public ICDISession createCSession(String gdb, IFile program, File cwd, String gdbinit) throws IOException, MIException {
117	PTY pty = null;	123	PTY pty = null;
118	boolean failed = false;	124	boolean failed = false;
119		125
Lines 156-162 Link Here
156	* @return ICDISession	162	* @return ICDISession
157	* @throws IOException	163	* @throws IOException
158	*/	164	*/
159	public ICDISession createCSession(String gdb, File program, File cwd, String gdbinit, PTY pty) throws IOException, MIException {	165	public ICDISession createCSession(String gdb, IFile program, File cwd, String gdbinit, PTY pty) throws IOException, MIException {
160	if (gdb == null \|\| gdb.length() == 0) {	166	if (gdb == null \|\| gdb.length() == 0) {
161	gdb = GDB;	167	gdb = GDB;
162	}	168	}
Lines 170-182 Link Here
170	if (program == null) {	176	if (program == null) {
171	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "-q", "-nw", "-tty", pty.getSlaveName(), "-i", "mi1"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$	177	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "-q", "-nw", "-tty", pty.getSlaveName(), "-i", "mi1"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
172	} else {	178	} else {
173	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "-q", "-nw", "-tty", pty.getSlaveName(), "-i", "mi1", program.getAbsolutePath()}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$	179	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "-q", "-nw", "-tty", pty.getSlaveName(), "-i", "mi1", program.getLocation().toFile().getAbsolutePath()}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
174	}	180	}
175	} else {	181	} else {
176	if (program == null) {	182	if (program == null) {
177	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "-q", "-nw", "-i", "mi1"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$	183	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "-q", "-nw", "-i", "mi1"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
178	} else {	184	} else {
179	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "-q", "-nw", "-i", "mi1", program.getAbsolutePath()}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$	185	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "-q", "-nw", "-i", "mi1", program.getLocation().toFile().getAbsolutePath()}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
180	}	186	}
181	}	187	}
182		188
Lines 206-212 Link Here
206	// If an exception is thrown that means ok	212	// If an exception is thrown that means ok
207	// we did not attach to any target.	213	// we did not attach to any target.
208	}	214	}
209	return new Session(session, false);	215	return new Session(session, getAddressFactory(program), false);
210	}	216	}
211		217
212	/**	218	/**
Lines 216-222 Link Here
216	* @return ICDISession	222	* @return ICDISession
217	* @throws IOException	223	* @throws IOException
218	*/	224	*/
219	public ICDISession createCSession(String gdb, File program, File core, File cwd, String gdbinit) throws IOException, MIException {	225	public ICDISession createCSession(String gdb, IFile program, File core, File cwd, String gdbinit) throws IOException, MIException {
220	if (gdb == null \|\| gdb.length() == 0) {	226	if (gdb == null \|\| gdb.length() == 0) {
221	gdb = GDB;	227	gdb = GDB;
222	}	228	}
Lines 229-235 Link Here
229	if (program == null) {	235	if (program == null) {
230	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "--quiet", "-nw", "-i", "mi1", "-c", core.getAbsolutePath()}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$	236	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "--quiet", "-nw", "-i", "mi1", "-c", core.getAbsolutePath()}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
231	} else {	237	} else {
232	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "--quiet", "-nw", "-i", "mi1", "-c", core.getAbsolutePath(), program.getAbsolutePath()}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$	238	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "--quiet", "-nw", "-i", "mi1", "-c", core.getAbsolutePath(), program.getLocation().toFile().getAbsolutePath()}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
233	}	239	}
234	Process pgdb = getGDBProcess(args);	240	Process pgdb = getGDBProcess(args);
235	MISession session;	241	MISession session;
Lines 239-245 Link Here
239	pgdb.destroy();	245	pgdb.destroy();
240	throw e;	246	throw e;
241	}	247	}
242	return new Session(session);	248	return new Session(session, getAddressFactory(program));
243	}	249	}
244		250
245	/**	251	/**
Lines 249-255 Link Here
249	* @return ICDISession	255	* @return ICDISession
250	* @throws IOException	256	* @throws IOException
251	*/	257	*/
252	public ICDISession createCSession(String gdb, File program, int pid, String[] targetParams, File cwd, String gdbinit) throws IOException, MIException {	258	public ICDISession createCSession(String gdb, IFile program, int pid, String[] targetParams, File cwd, String gdbinit) throws IOException, MIException {
253	if (gdb == null \|\| gdb.length() == 0) {	259	if (gdb == null \|\| gdb.length() == 0) {
254	gdb = GDB;	260	gdb = GDB;
255	}	261	}
Lines 262-268 Link Here
262	if (program == null) {	268	if (program == null) {
263	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "--quiet", "-nw", "-i", "mi1"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$	269	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "--quiet", "-nw", "-i", "mi1"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
264	} else {	270	} else {
265	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "--quiet", "-nw", "-i", "mi1", program.getAbsolutePath()}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$	271	args = new String[] {gdb, "--cd="+cwd.getAbsolutePath(), "--command="+gdbinit, "--quiet", "-nw", "-i", "mi1", program.getLocation().toFile().getAbsolutePath()}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
266	}	272	}
267	Process pgdb = getGDBProcess(args);	273	Process pgdb = getGDBProcess(args);
268	MISession session;	274	MISession session;
Lines 298-304 Link Here
298	//@@@ We have to manually set the suspended state when we attach	304	//@@@ We have to manually set the suspended state when we attach
299	session.getMIInferior().setSuspended();	305	session.getMIInferior().setSuspended();
300	session.getMIInferior().update();	306	session.getMIInferior().update();
301	return new Session(session, true);	307	return new Session(session, getAddressFactory(program), true);
302	}	308	}
303		309
304	/**	310	/**
Lines 423-428 Link Here
423	getPluginPreferences().setDefault(IMIConstants.PREF_REQUEST_LAUNCH_TIMEOUT, IMIConstants.DEF_REQUEST_LAUNCH_TIMEOUT);	429	getPluginPreferences().setDefault(IMIConstants.PREF_REQUEST_LAUNCH_TIMEOUT, IMIConstants.DEF_REQUEST_LAUNCH_TIMEOUT);
424	}	430	}
425		431
		432	protected IAddressFactory getAddressFactory(IFile exe)
		433	{
		434	ICElement cFile = CCorePlugin.getDefault().getCoreModel().create( exe );
		435	if ( cFile instanceof IBinary )
		436	{
		437	return ((IBinary)cFile).getAddressFactory();
		438	}
		439	return null;
		440	}
		441
426	/* (non-Javadoc)	442	/* (non-Javadoc)
427	* @see org.eclipse.core.runtime.Plugin#shutdown()	443	* @see org.eclipse.core.runtime.Plugin#shutdown()
428	*/	444	*/




 * Represent a GDB Tuple MI assembly response.
 */
public class MIAsm {
	String address;
	String function = ""; //$NON-NLS-1$
	String opcode = ""; //$NON-NLS-1$
	String args = ""; //$NON-NLS-1$

		parse(tuple);
	}

	public String getAddress() {
		return address;
	}


	public String toString() {
		StringBuffer buffer = new StringBuffer();
		buffer.append('{');
		buffer.append("address=\"" + address +"\"");  //$NON-NLS-1$//$NON-NLS-2$
		buffer.append(",func-name=\"" + function + "\"");  //$NON-NLS-1$//$NON-NLS-2$
		buffer.append(",offset=\"").append(offset).append('"'); //$NON-NLS-1$
		buffer.append(",inst=\"" + getInstruction() + "\"");  //$NON-NLS-1$//$NON-NLS-2$


			if (var.equals("address")) { //$NON-NLS-1$
				try {
					address = str.trim();
				} catch (NumberFormatException e) {
				}
			} else if (var.equals("func-name")) { //$NON-NLS-1$




	String type = ""; //$NON-NLS-1$
	String disp = ""; //$NON-NLS-1$
	boolean enabled;
	String address;
	String func = "";  //$NON-NLS-1$
	String file = ""; //$NON-NLS-1$
	int line;

		enabled = e;
	}

	public String getAddress() {
		return address;
	}


				enabled = str.equals("y"); //$NON-NLS-1$
			} else if (var.equals("addr")) { //$NON-NLS-1$
				try {
					address = str.trim();
				} catch (NumberFormatException e) {
				}
			} else if (var.equals("func")) { //$NON-NLS-1$




 */
public class MIDataReadMemoryInfo extends MIInfo {

	String addr;
	long nextRow;
	long prevRow;
	long nextPage;

		parse();
	}

	public String getAddress() {
		return addr;
	}



					if (var.equals("addr")) { //$NON-NLS-1$
						try {
							addr = str.trim();
						} catch (NumberFormatException e) {
						}
					} else if (var.equals("nr-bytes")) { //$NON-NLS-1$




public class MIFrame {

	int level;
	String addr;
	String func = ""; //$NON-NLS-1$
	String file = ""; //$NON-NLS-1$
	int line;

		return line;
	}

	public String getAddress() {
		return addr;
	}


	public String toString() {
		StringBuffer buffer = new StringBuffer();
		buffer.append("level=\"" + level + "\"");  //$NON-NLS-1$//$NON-NLS-2$
		buffer.append(",addr=\"" + addr + "\"");  //$NON-NLS-1$//$NON-NLS-2$
		buffer.append(",func=\"" + func + "\"");  //$NON-NLS-1$//$NON-NLS-2$
		buffer.append(",file=\"" + file + "\"");  //$NON-NLS-1$//$NON-NLS-2$
		buffer.append(",line=\"").append(line).append('"'); //$NON-NLS-1$

				}
			} else if (var.equals("addr")) { //$NON-NLS-1$
				try {
					addr = str.trim();
				} catch (NumberFormatException e) {
				}
			} else if (var.equals("func")) { //$NON-NLS-1$




/*
 * Created on Jun 7, 2004
 *
 * To change the template for this generated file go to
 * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
 */
package org.eclipse.cdt.debug.mi.core.output;

/**
 * @author root
 *
 * To change the template for this generated type comment go to
 * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
 */
public class MIGDBShowAddressSizeInfo extends MIGDBShowInfo {

	public MIGDBShowAddressSizeInfo(MIOutput o) {
		super(o);
	}

	public int getAddressSize()
	{
		return Integer.parseInt(getValue()); 
	}
}




		if (str.length() > 0) {
			// Pass the header
			int index = -1;
			String from = "";
			String to = "";
			boolean syms = false;
			String name = ""; //$NON-NLS-1$


						}
						break;
					case 2 : // second column is "To"
							to = sub;
							to = Long.decode(sub).longValue();
						} catch (NumberFormatException e) {
						}
						break;
					case 3 : // first column is "From"
							from = sub;
							from = Long.decode(sub).longValue();
						} catch (NumberFormatException e) {
						}
						break;
				}
			}

	}

	void parseWinShared(String str, List aList) {
		String from = "";
		String to = "";
		boolean syms = true;

		int index = str.lastIndexOf(' ');

			if (!sub.startsWith("0x")) { //$NON-NLS-1$
				sub = "0x" + sub; //$NON-NLS-1$
			}
			from = sub;
				from = Long.decode(sub).longValue();
			} catch (NumberFormatException e) {
			}
			str = str.substring(0, index).trim();
		}
		MIShared s = new MIShared(from, to, syms, str.trim());




 * GDB/MI memory parsing.
 */
public class MIMemory {
	String addr;
	long [] data = new long[0];
	String ascii = ""; //$NON-NLS-1$


		parse(tuple);
	}

	public String getAddress() {
		return addr;
	}



	public String toSting() {
		StringBuffer buffer = new StringBuffer();
		buffer.append("addr=\"" + addr + "\""); //$NON-NLS-1$ //$NON-NLS-2$
		buffer.append("data=[");  //$NON-NLS-1$
		for (int i = 0 ; i < data.length; i++) {
			if (i != 0) {


			if (var.equals("addr")) { //$NON-NLS-1$
				try {
					addr = str.trim();
				} catch (NumberFormatException e) {
				}
			} else if (var.equals("data")) { //$NON-NLS-1$




 */
public class MIShared {

	String from;
	String to;
	boolean isread;
	String name;

	public MIShared (String start, String end, boolean read, String location) {
		from = start;
		to = end;
		isread = read;
		name = location;
	}

	public String getFrom() {
		return from;
	}

	public String getTo() {
		return to;
	}


Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.debug.ui/src-cdtdebugui/org/eclipse/cdt/debug/internal/ui/actions/JumpToLineActionDelegate.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.cdt.debug.internal.ui.actions;	11	package org.eclipse.cdt.debug.internal.ui.actions;
12		12
		13	import org.eclipse.cdt.core.IAddress;
13	import org.eclipse.cdt.core.resources.FileStorage;	14	import org.eclipse.cdt.core.resources.FileStorage;
14	import org.eclipse.cdt.debug.core.model.IJumpToAddress;	15	import org.eclipse.cdt.debug.core.model.IJumpToAddress;
15	import org.eclipse.cdt.debug.core.model.IJumpToLine;	16	import org.eclipse.cdt.debug.core.model.IJumpToLine;
Lines 176-182 Link Here
176	}	177	}
177	}	178	}
178		179
179	protected void jumpToAddress( long address )	180	protected void jumpToAddress( IAddress address )
180	{	181	{
181	IJumpToAddress target = (IJumpToAddress)getDebugTarget().getAdapter( IJumpToAddress.class );	182	IJumpToAddress target = (IJumpToAddress)getDebugTarget().getAdapter( IJumpToAddress.class );
182	if ( target != null )	183	if ( target != null )




***********************************************************************/
package org.eclipse.cdt.debug.internal.ui.actions;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.CDIDebugModel;
import org.eclipse.cdt.debug.core.model.IJumpToAddress;
import org.eclipse.cdt.debug.core.model.IJumpToLine;

			}
			ITextSelection textSelection = (ITextSelection)selection;
			int lineNumber = textSelection.getStartLine() + 1;
			IAddress address = ((DisassemblyEditorInput)input).getAddress( lineNumber );
			return jumpToAddress.canJumpToAddress( address );
		}
		return false;

			else {
				ITextSelection textSelection = (ITextSelection)selection;
				int lineNumber = textSelection.getStartLine() + 1;
				IAddress address = ((DisassemblyEditorInput)input).getAddress( lineNumber );
				IJumpToAddress jumpToAddress = (IJumpToAddress)((IAdaptable)debugTarget).getAdapter( IJumpToAddress.class );
				if ( jumpToAddress != null )
					jumpToAddress.jumpToAddress( address );

Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.debug.ui/src-cdtdebugui/org/eclipse/cdt/debug/internal/ui/actions/ToggleBreakpointAdapter.java (-2 / +3 lines)
10	***********************************************************************/	10	***********************************************************************/
11	package org.eclipse.cdt.debug.internal.ui.actions;	11	package org.eclipse.cdt.debug.internal.ui.actions;
12		12
		13	import org.eclipse.cdt.core.IAddress;
13	import org.eclipse.cdt.core.model.CModelException;	14	import org.eclipse.cdt.core.model.CModelException;
14	import org.eclipse.cdt.core.model.IDeclaration;	15	import org.eclipse.cdt.core.model.IDeclaration;
15	import org.eclipse.cdt.core.model.IFunction;	16	import org.eclipse.cdt.core.model.IFunction;
Lines 110-117 Link Here
110	errorMessage = ActionMessages.getString( "ToggleBreakpointAdapter.Invalid_line_1" ); //$NON-NLS-1$	111	errorMessage = ActionMessages.getString( "ToggleBreakpointAdapter.Invalid_line_1" ); //$NON-NLS-1$
111	}	112	}
112	else {	113	else {
113	long address = ((DisassemblyEditorInput)input).getAddress( lineNumber );	114	IAddress address = ((DisassemblyEditorInput)input).getAddress( lineNumber );
114	if ( address == 0 ) {	115	if ( address == null ) {
115	errorMessage = ActionMessages.getString( "ToggleBreakpointAdapter.Invalid_line_1" ); //$NON-NLS-1$	116	errorMessage = ActionMessages.getString( "ToggleBreakpointAdapter.Invalid_line_1" ); //$NON-NLS-1$
116	}	117	}
117	else {	118	else {




 */
public class CDebugUIUtils
{

	{
		String tmp = Long.toHexString( address );
		char[] prefix = new char[10 - tmp.length()];
		prefix[0] = '0';
		prefix[1] = 'x';
		for ( int i = 2; i < prefix.length; ++i )
			prefix[i] = '0';
		return new String( prefix ) + tmp;
	} 

	static public IRegion findWord( IDocument document, int offset ) 
	{

Lines 703-711 Link Here

(-)workspace-old/org.eclipse.cdt.debug.ui/src-cdtdebugui/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java (-2 / +1 lines)
703		703
704	protected StringBuffer appendAddress( ICAddressBreakpoint breakpoint, StringBuffer label ) throws CoreException {	704	protected StringBuffer appendAddress( ICAddressBreakpoint breakpoint, StringBuffer label ) throws CoreException {
705	try {	705	try {
706	long address = Long.parseLong( breakpoint.getAddress() );
707	label.append( ' ' );	706	label.append( ' ' );
708	label.append( MessageFormat.format( CDebugUIMessages.getString( "CDTDebugModelPresentation.27" ), new String[]{ CDebugUtils.toHexAddressString( address ) } ) ); //$NON-NLS-1$	707	label.append( MessageFormat.format( CDebugUIMessages.getString( "CDTDebugModelPresentation.27" ), new String[]{ breakpoint.getAddress() } ) ); //$NON-NLS-1$
709	}	708	}
710	catch( NumberFormatException e ) {	709	catch( NumberFormatException e ) {
711	}	710	}




import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint;

			ICAddressBreakpoint abrkpt = (ICAddressBreakpoint)breakpoint;
			addField( createLabelEditor( getFieldEditorParent(), PropertyPageMessages.getString( "CBreakpointPropertyPage.18" ), PropertyPageMessages.getString( "CBreakpointPropertyPage.6" ) ) );  //$NON-NLS-1$//$NON-NLS-2$
			String address = PropertyPageMessages.getString( "CBreakpointPropertyPage.4" ); //$NON-NLS-1$
			try {
				address = CDebugUtils.toHexAddressString( Long.parseLong( abrkpt.getAddress() ) );
			}
			catch( CoreException e ) {
			}
			catch( NumberFormatException e ) {
			}
			if ( address != null ) {
				addField( createLabelEditor( getFieldEditorParent(), PropertyPageMessages.getString( "CBreakpointPropertyPage.5" ), address ) ); //$NON-NLS-1$
			}

Lines 11-16 Link Here

(-)workspace-old/org.eclipse.cdt.debug.ui/src-cdtdebugui/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyEditorInput.java (-19 / +23 lines)
11	package org.eclipse.cdt.debug.internal.ui.views.disassembly;	11	package org.eclipse.cdt.debug.internal.ui.views.disassembly;
12		12
13	import java.util.Arrays;	13	import java.util.Arrays;
		14
		15	import org.eclipse.cdt.core.IAddress;
14	import org.eclipse.cdt.debug.core.CDIDebugModel;	16	import org.eclipse.cdt.debug.core.CDIDebugModel;
15	import org.eclipse.cdt.debug.core.model.IAsmInstruction;	17	import org.eclipse.cdt.debug.core.model.IAsmInstruction;
16	import org.eclipse.cdt.debug.core.model.IAsmSourceLine;	18	import org.eclipse.cdt.debug.core.model.IAsmSourceLine;
Lines 20-26 Link Here
20	import org.eclipse.cdt.debug.core.model.ICStackFrame;	22	import org.eclipse.cdt.debug.core.model.ICStackFrame;
21	import org.eclipse.cdt.debug.core.model.IDisassembly;	23	import org.eclipse.cdt.debug.core.model.IDisassembly;
22	import org.eclipse.cdt.debug.core.model.IDisassemblyBlock;	24	import org.eclipse.cdt.debug.core.model.IDisassemblyBlock;
23	import org.eclipse.cdt.debug.internal.ui.CDebugUIUtils;
24	import org.eclipse.core.runtime.CoreException;	25	import org.eclipse.core.runtime.CoreException;
25	import org.eclipse.debug.core.DebugException;	26	import org.eclipse.debug.core.DebugException;
26	import org.eclipse.debug.core.DebugPlugin;	27	import org.eclipse.debug.core.DebugPlugin;
Lines 67-73 Link Here
67	* @param disassembly	68	* @param disassembly
68	* @param instructions	69	* @param instructions
69	*/	70	*/
70	private DisassemblyEditorInput( IDisassemblyBlock block ) {	71	private DisassemblyEditorInput( IDisassemblyBlock block) {
71	fBlock = block;	72	fBlock = block;
72	createContents();	73	createContents();
73	}	74	}
Lines 125-131 Link Here
125	return fContents;	126	return fContents;
126	}	127	}
127		128
128	public int getInstructionLine( long address ) {	129	public int getInstructionLine( IAddress address ) {
129	if ( fBlock != null ) {	130	if ( fBlock != null ) {
130	IAsmSourceLine[] lines = fBlock.getSourceLines();	131	IAsmSourceLine[] lines = fBlock.getSourceLines();
131	int result = 0;	132	int result = 0;
Lines 134-146 Link Here
134	++result;	135	++result;
135	for ( int j = 0; j < instructions.length; ++j ) {	136	for ( int j = 0; j < instructions.length; ++j ) {
136	++result;	137	++result;
137	if ( instructions[j].getAdress() == address ) {	138	if ( address.compareTo(instructions[j].getAdress()) == 0) {
138	return result;	139	return result;
139	}	140	}
140	}	141	}
141	}	142	}
142	}	143	}
143	return 0;	144	return -1;
144	}	145	}
145		146
146	public int getInstructionLine( ICLineBreakpoint breakpoint ) {	147	public int getInstructionLine( ICLineBreakpoint breakpoint ) {
Lines 150-157 Link Here
150	IBreakpointTarget bt = (IBreakpointTarget)dis.getDebugTarget().getAdapter( IBreakpointTarget.class );	151	IBreakpointTarget bt = (IBreakpointTarget)dis.getDebugTarget().getAdapter( IBreakpointTarget.class );
151	if ( bt != null ) {	152	if ( bt != null ) {
152	try {	153	try {
153	long address = bt.getBreakpointAddress( breakpoint );	154	IAddress address = bt.getBreakpointAddress( breakpoint );
154	if ( address != 0 )	155	if ( ! address.isZero() )
155	return getInstructionLine( address );	156	return getInstructionLine( address );
156	}	157	}
157	catch( DebugException e ) {	158	catch( DebugException e ) {
Lines 159-168 Link Here
159	}	160	}
160	}	161	}
161	}	162	}
162	return 0;	163	return -1;
163	}	164	}
164		165
165	public long getAddress( int lineNumber ) {	166	public IAddress getAddress( int lineNumber ) {
166	if ( fBlock != null ) {	167	if ( fBlock != null ) {
167	IAsmSourceLine[] lines = fBlock.getSourceLines();	168	IAsmSourceLine[] lines = fBlock.getSourceLines();
168	int current = 0;	169	int current = 0;
Lines 176-182 Link Here
176	current += instructions.length;	177	current += instructions.length;
177	}	178	}
178	}	179	}
179	return 0;	180	return null;
180	}	181	}
181		182
182	public String getModuleFile() {	183	public String getModuleFile() {
Lines 185-194 Link Here
185		186
186	public static DisassemblyEditorInput create( ICStackFrame frame ) throws DebugException {	187	public static DisassemblyEditorInput create( ICStackFrame frame ) throws DebugException {
187	DisassemblyEditorInput input = null;	188	DisassemblyEditorInput input = null;
188	IDisassembly disassembly = ((ICDebugTarget)frame.getDebugTarget()).getDisassembly();	189	ICDebugTarget target = ((ICDebugTarget)frame.getDebugTarget());
		190	IDisassembly disassembly = target.getDisassembly();
189	if ( disassembly != null ) {	191	if ( disassembly != null ) {
190	IDisassemblyBlock block = disassembly.getDisassemblyBlock( frame );	192	IDisassemblyBlock block = disassembly.getDisassemblyBlock( frame );
191	input = new DisassemblyEditorInput( block );	193	input = new DisassemblyEditorInput( block);
192	}	194	}
193	return input;	195	return input;
194	}	196	}
Lines 216-222 Link Here
216	}	218	}
217	}	219	}
218	}	220	}
219	int instrPos = calculateInstructionPosition( maxFunctionName, maxOffset );	221	int instrPos = calculateInstructionPosition( maxFunctionName, maxOffset,
		222	fBlock.getSourceLines()[0].getInstructions()[0].getAdress().getCharsNum());
220	int argPosition = instrPos + maxOpcodeLength + 1;	223	int argPosition = instrPos + maxOpcodeLength + 1;
221	if ( fBlock.isMixedMode() )	224	if ( fBlock.isMixedMode() )
222	fSourceRegions = new IRegion[mi.length];	225	fSourceRegions = new IRegion[mi.length];
Lines 241-247 Link Here
241	Arrays.fill( spaces, ' ' );	244	Arrays.fill( spaces, ' ' );
242	StringBuffer sb = new StringBuffer();	245	StringBuffer sb = new StringBuffer();
243	if ( instruction != null ) {	246	if ( instruction != null ) {
244	sb.append( CDebugUIUtils.toHexAddressString( instruction.getAdress() ) );	247	sb.append( instruction.getAdress().toHexAddressString() );
245	sb.append( ' ' );	248	sb.append( ' ' );
246	String functionName = instruction.getFunctionName();	249	String functionName = instruction.getFunctionName();
247	if ( functionName != null && functionName.length() > 0 ) {	250	if ( functionName != null && functionName.length() > 0 ) {
Lines 262-269 Link Here
262	return sb.toString();	265	return sb.toString();
263	}	266	}
264		267
265	private int calculateInstructionPosition( int maxFunctionName, long maxOffset ) {	268	private int calculateInstructionPosition( int maxFunctionName, long maxOffset, int addressLength ) {
266	return (16 + maxFunctionName + Long.toString( maxOffset ).length());	269	//(Address prefix address representation in chars) + (space) + (<) + (+) + (>) + (:) + (space)
		270	return ( addressLength + 6 + maxFunctionName + Long.toString( maxOffset ).length() );
267	}	271	}
268		272
269	private String getSourceLineString( IAsmSourceLine line ) {	273	private String getSourceLineString( IAsmSourceLine line ) {
Lines 282-289 Link Here
282	return ( fBlock != null ) ? fBlock.getDisassembly() : null;	286	return ( fBlock != null ) ? fBlock.getDisassembly() : null;
283	}	287	}
284		288
285	public ICLineBreakpoint breakpointExists( long address ) throws CoreException {	289	public ICLineBreakpoint breakpointExists( IAddress address ) throws CoreException {
286	Assert.isTrue( address != 0 );	290	Assert.isTrue( address != null );
287	IDisassembly dis = getDisassembly();	291	IDisassembly dis = getDisassembly();
288	if ( dis != null ) {	292	if ( dis != null ) {
289	IBreakpointTarget bt = (IBreakpointTarget)dis.getDebugTarget().getAdapter( IBreakpointTarget.class );	293	IBreakpointTarget bt = (IBreakpointTarget)dis.getDebugTarget().getAdapter( IBreakpointTarget.class );
Lines 294-300 Link Here
294	if ( bps[i] instanceof ICLineBreakpoint ) {	298	if ( bps[i] instanceof ICLineBreakpoint ) {
295	ICLineBreakpoint b = (ICLineBreakpoint)bps[i];	299	ICLineBreakpoint b = (ICLineBreakpoint)bps[i];
296	try {	300	try {
297	if ( address == bt.getBreakpointAddress( b ) )	301	if ( address.compareTo(bt.getBreakpointAddress( b )) == 0)
298	return b;	302	return b;
299	}	303	}
300	catch( NumberFormatException e ) {	304	catch( NumberFormatException e ) {

Lines 10-15 Link Here

(-)workspace-old/org.eclipse.cdt.debug.ui/src-cdtdebugui/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyInstructionPointerAnnotation.java (-2 / +3 lines)
10	***********************************************************************/	10	***********************************************************************/
11	package org.eclipse.cdt.debug.internal.ui.views.disassembly;	11	package org.eclipse.cdt.debug.internal.ui.views.disassembly;
12		12
		13	import org.eclipse.cdt.core.IAddress;
13	import org.eclipse.cdt.debug.core.model.ICDebugTarget;	14	import org.eclipse.cdt.debug.core.model.ICDebugTarget;
14	import org.eclipse.cdt.debug.core.model.ICStackFrame;	15	import org.eclipse.cdt.debug.core.model.ICStackFrame;
15	import org.eclipse.cdt.debug.core.model.IDisassembly;	16	import org.eclipse.cdt.debug.core.model.IDisassembly;
Lines 63-70 Link Here
63	IDisassembly disassembly = getDisassembly( frame );	64	IDisassembly disassembly = getDisassembly( frame );
64	hashCode = 37*hashCode + (( disassembly != null ) ? disassembly.hashCode() : 0);	65	hashCode = 37*hashCode + (( disassembly != null ) ? disassembly.hashCode() : 0);
65	if ( frame != null ) {	66	if ( frame != null ) {
66	long address = frame.getAddress();	67	IAddress address = frame.getAddress();
67	hashCode = 37*hashCode + (int)(address^(address>>>32));	68	hashCode = 37*hashCode + address.hashCode();
68	}	69	}
69	return hashCode;	70	return hashCode;
70	}	71	}

Lines 13-19 Link Here

(-)workspace-old/org.eclipse.cdt.debug.ui/src-cdtdebugui/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java (-2 / +1 lines)
13	import org.eclipse.cdt.debug.core.CDebugModel;	13	import org.eclipse.cdt.debug.core.CDebugModel;
14	import org.eclipse.cdt.debug.core.ICMemoryManager;	14	import org.eclipse.cdt.debug.core.ICMemoryManager;
15	import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock;	15	import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock;
16	import org.eclipse.cdt.debug.internal.ui.CDebugUIUtils;
17	import org.eclipse.cdt.debug.internal.ui.preferences.ICDebugPreferenceConstants;	16	import org.eclipse.cdt.debug.internal.ui.preferences.ICDebugPreferenceConstants;
18	import org.eclipse.cdt.debug.ui.CDebugUIPlugin;	17	import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
19	import org.eclipse.debug.core.DebugException;	18	import org.eclipse.debug.core.DebugException;
Lines 430-436 Link Here
430	}	429	}
431	}	430	}
432	if ( getMemoryBlock() != null ) {	431	if ( getMemoryBlock() != null ) {
433	fAddressText.setText( CDebugUIUtils.toHexAddressString( getMemoryBlock().getStartAddress() ) );	432	fAddressText.setText( getMemoryBlock().getRealStartAddress().toHexAddressString() );
434	handleAddressEnter();	433	handleAddressEnter();
435	}	434	}
436	}	435	}





package org.eclipse.cdt.debug.internal.ui.views.memory;

import java.math.BigInteger;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;

import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.ICMemoryManager;
import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock;
import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlockRow;
import org.eclipse.cdt.debug.internal.ui.CDebugUIUtils;
import org.eclipse.debug.core.DebugException;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Display;

		{
			int offset = sb.length();
			sb.append( getRowText( rows[i] ) );
			fAddressZones.add( new Point( offset, offset + rows[i].getAddress().getCharsNum()  ) );
		}
		return sb.toString();
	}

	public Point[] getChangedZones()
	{
		fChangedZones.clear();
		IAddress[] changedAddresses = getChangedAddresses();
		for ( int i = 0; i < changedAddresses.length; ++i )
		{
			int dataOffset = getDataItemOffsetByAddress( changedAddresses[i] );

	
	public String getStartAddress()
	{
		return ( fBlock != null ) ? fBlock.getRealStartAddress().toHexAddressString() : "";  //$NON-NLS-1$
	}

	public String getAddressExpression()

		return new String( chars );
	}

	private String getAddressString( long address )
	{
		return CDebugUIUtils.toHexAddressString( address );
	}

	private String getRowText( IFormattedMemoryBlockRow row )
	{
		StringBuffer result = new StringBuffer( getRowLength( ) ); 
		result.append(  row.getAddress().toHexAddressString() ); 
		result.append( getInterval( INTERVAL_BETWEEN_ADDRESS_AND_DATA ) );
		String[] items = row.getData();
		for ( int i = 0; i < items.length; ++i )

			   getDataBytesPerRow() : 0 ) + 1;
	}


   private int getAddressLength() {
   		return fBlock.getRealStartAddress().getCharsNum();
	}
	
	private boolean isInAsciiArea( int offset )

		return IFormattedMemoryBlock.MEMORY_FORMAT_HEX;
	}
	
	private IAddress[] getChangedAddresses()
	{
		return ( getMemoryBlock() != null ) ? getMemoryBlock().getChangedAddresses() : new IAddress[0];
	}
	
	private int getDataItemOffsetByAddress( IAddress address )
	{
		if ( getMemoryBlock() != null )
		{

			{
				int wordSize = getMemoryBlock().getWordSize();
				int numberOfColumns = getMemoryBlock().getNumberOfColumns();

				if(  address.compareTo( rows[i].getAddress())  >=0 && 
					 address.compareTo( rows[i].getAddress().add(BigInteger.valueOf(wordSize * numberOfColumns)))  <0)
				{
					for ( int j = 1; j <= numberOfColumns; ++j )
					{
						if(  address.compareTo( rows[i].getAddress().add(BigInteger.valueOf( (j - 1) * wordSize)))    >=0 && 
							 address.compareTo( rows[i].getAddress().add(BigInteger.valueOf(    j      * wordSize)))      <0)
						{
							return (i * getRowLength()) + ((j - 1) * (getDataItemLength() + INTERVAL_BETWEEN_DATA_ITEMS)) + address.getCharsNum()  + INTERVAL_BETWEEN_ADDRESS_AND_DATA;
						}
					}
				}

		return -1;
	}
	
	private int getAsciiOffsetByAddress( IAddress address )
	{
		if ( getMemoryBlock() != null )
		{

			{
				IFormattedMemoryBlockRow firstRow = rows[0];
				IFormattedMemoryBlockRow lastRow = rows[rows.length - 1];
				
				if (address.compareTo( firstRow.getAddress()) >=0 && address.compareTo( lastRow.getAddress()) <=0)
				
				{
					BigInteger asciiOffset = address.distance( firstRow.getAddress());
					int asciiRowlength = getMemoryBlock().getWordSize() * getMemoryBlock().getNumberOfColumns();
					int numberOfRows = asciiOffset.intValue()  / asciiRowlength;
					int offsetInRow = asciiOffset.intValue()  % asciiRowlength;
					return (numberOfRows * getRowLength()) + 
						   address.getCharsNum() + INTERVAL_BETWEEN_ADDRESS_AND_DATA +
						   (getDataItemLength() + INTERVAL_BETWEEN_DATA_ITEMS) * getMemoryBlock().getNumberOfColumns() +
						   INTERVAL_BETWEEN_DATA_AND_ASCII + offsetInRow;
				}

	{
		if ( getMemoryBlock() != null )
		{
			int index = getDataItemIndex(offset );
			if ( index != -1 )
			{
				char[] chars = getDataItemChars( index );
				if ( isInDataArea( offset ) )
				{
					int charIndex = getOffsetInDataItem(offset, index );
					chars[charIndex] = newChar;
				}
				if ( isInAsciiArea( offset ) )

			int index = getDataItemIndex( offset );
			if ( index != -1 )
			{
				String newValue = getNewItemValue(offset, ch );
				if ( newValue != null )
				{
					try




import org.eclipse.cdt.debug.core.model.ICDebugTarget;
import org.eclipse.cdt.debug.core.model.ICSharedLibrary;
import org.eclipse.cdt.debug.internal.ui.CDebugModelPresentation;
import org.eclipse.cdt.debug.internal.ui.CDebugUIUtils;
import org.eclipse.cdt.debug.internal.ui.ICDebugHelpContextIds;
import org.eclipse.cdt.debug.internal.ui.PixelConverter;
import org.eclipse.cdt.debug.internal.ui.views.AbstractDebugEventHandler;

					case 2:
						return ( library.areSymbolsLoaded() ) ? SharedLibrariesMessages.getString( "SharedLibrariesView.Loaded_1" ) : SharedLibrariesMessages.getString( "SharedLibrariesView.Not_loaded_1" ); //$NON-NLS-1$ //$NON-NLS-2$
					case 3:
						return library.getStartAddress().toHexAddressString(); //$NON-NLS-1$
									CDebugUIUtils.toHexAddressString( library.getStartAddress() ) : ""; //$NON-NLS-1$
					case 4:
						return library.getEndAddress().toHexAddressString(); //$NON-NLS-1$
									CDebugUIUtils.toHexAddressString( library.getEndAddress() ) : ""; //$NON-NLS-1$
				}
			}
			return null;

Return to bug 69908

Line 0 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/core/Addr32Factory.java (+41 lines)
	1	/*******************************************************************************
	2	* Copyright (c) 2004 Intel Corporation and others.
	3	* All rights reserved. This program and the accompanying materials
	4	* are made available under the terms of the Common Public License v1.0
	5	* which accompanies this distribution, and is available at
	6	* http://www.eclipse.org/legal/cpl-v10.html
	7	*
	8	* Contributors:
	9	* Intel Corporation - Initial API and implementation
	10	*******************************************************************************/
	11	package org.eclipse.cdt.core;
	12
	13
	14	/*
	15	*/
	16	final public class Addr32Factory implements IAddressFactory
	17	{
	18
	19	final public IAddress getZero()
	20	{
	21	return Addr32.ZERO;
	22	}
	23
	24	final public IAddress getMax()
	25	{
	26	return Addr32.MAX;
	27	}
	28
	29	final public IAddress createAddress(String addr)
	30	{
	31	IAddress address=new Addr32(addr);
	32	return address;
	33	}
	34
	35	final public IAddress createAddress(String addr, int radix)
	36	{
	37	IAddress address=new Addr32(addr, radix);
	38	return address;
	39	}
	40
	41	}

Lines 121-127 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/core/IBinaryParser.java (-2 / +3 lines)
121	* @param addr	121	* @param addr
122	* @return ISymbol	122	* @return ISymbol
123	*/	123	*/
124	ISymbol getSymbol(long addr);	124	ISymbol getSymbol(IAddress addr);
125		125
126	/**	126	/**
127	* The name of the object	127	* The name of the object
Lines 129-134 Link Here
129	*/	129	*/
130	String getName();	130	String getName();
131		131
		132	IAddressFactory getAddressFactory();
132	}	133	}
133		134
134	/**	135	/**
Lines 176-182 Link Here
176	* Address of the symbol	177	* Address of the symbol
177	* @return	178	* @return
178	*/	179	*/
179	long getAddress();	180	IAddress getAddress();
180		181
181	/**	182	/**
182	* Size of the symbol.	183	* Size of the symbol.

Lines 7-13 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/coff/parser/CygwinSymbol.java (-3 / +5 lines)
7	package org.eclipse.cdt.utils.coff.parser;	7	package org.eclipse.cdt.utils.coff.parser;
8		8
9	import java.io.IOException;	9	import java.io.IOException;
		10	import java.math.BigInteger;
10		11
		12	import org.eclipse.cdt.core.IAddress;
11	import org.eclipse.cdt.utils.Addr2line;	13	import org.eclipse.cdt.utils.Addr2line;
12	import org.eclipse.cdt.utils.Symbol;	14	import org.eclipse.cdt.utils.Symbol;
13	import org.eclipse.core.runtime.IPath;	15	import org.eclipse.core.runtime.IPath;
Lines 31-37 Link Here
31	* @param startLine	33	* @param startLine
32	* @param endLine	34	* @param endLine
33	*/	35	*/
34	public CygwinSymbol(CygwinPEBinaryObject binary, String name, int type, long addr, long size, IPath sourceFile, int startLine,	36	public CygwinSymbol(CygwinPEBinaryObject binary, String name, int type, IAddress addr, long size, IPath sourceFile, int startLine,
35	int endLine) {	37	int endLine) {
36	super(binary, name, type, addr, size, sourceFile, startLine, endLine);	38	super(binary, name, type, addr, size, sourceFile, startLine, endLine);
37	}	39	}
Lines 43-49 Link Here
43	* @param addr	45	* @param addr
44	* @param size	46	* @param size
45	*/	47	*/
46	public CygwinSymbol(CygwinPEBinaryObject binary, String name, int type, long addr, long size) {	48	public CygwinSymbol(CygwinPEBinaryObject binary, String name, int type, IAddress addr, long size) {
47	super(binary, name, type, addr, size);	49	super(binary, name, type, addr, size);
48	}	50	}
49		51
Lines 55-61 Link Here
55	Addr2line addr2line = ((CygwinPEBinaryObject)binary).getAddr2line(true);	57	Addr2line addr2line = ((CygwinPEBinaryObject)binary).getAddr2line(true);
56	if (addr2line != null) {	58	if (addr2line != null) {
57	try {	59	try {
58	return addr2line.getLineNumber(getAddress() + offset);	60	return addr2line.getLineNumber(getAddress().add(BigInteger.valueOf(offset)));
59	} catch (IOException e) {	61	} catch (IOException e) {
60	// ignore	62	// ignore
61	}	63	}

Lines 59-64 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/elf/ERandomAccessFile.java (+34 lines)
59	return ((val[0] << 24) + (val[1] << 16) + (val[2] << 8) + val[3]);	59	return ((val[0] << 24) + (val[1] << 16) + (val[2] << 8) + val[3]);
60	}	60	}
61		61
		62	public final long readLongE() throws IOException
		63	{
		64	byte [] bytes = new byte[8];
		65	long result = 0;
		66	super.readFully(bytes);
		67	int shift = 0;
		68	if ( isle )
		69	for(int i=7; i >= 0; i-- )
		70	{
		71	shift = i*8;
		72	result += ( ((long)bytes[i]) << shift ) & ( 0xffL << shift );
		73	}
		74	else
		75	for(int i=0; i <= 7; i++ )
		76	{
		77	shift = (7-i)*8;
		78	result += ( ((long)bytes[i]) << shift ) & ( 0xffL << shift );
		79	}
		80	return result;
		81	}
		82
		83	public final void readFullyE(byte [] bytes) throws IOException
		84	{
		85	super.readFully(bytes);
		86	byte tmp = 0;
		87	if( isle )
		88	for(int i=0; i <= bytes.length / 2; i++)
		89	{
		90	tmp = bytes[i];
		91	bytes[i] = bytes[bytes.length - i -1];
		92	bytes[bytes.length - i -1] = tmp;
		93	}
		94	}
		95
62	public void setFileOffset( long offset ) throws IOException {	96	public void setFileOffset( long offset ) throws IOException {
63	ptr_offset = offset;	97	ptr_offset = offset;
64	super.seek( offset );	98	super.seek( offset );

Lines 11-29 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/elf/parser/GNUSymbol.java (-3 / +5 lines)
11	package org.eclipse.cdt.utils.elf.parser;	11	package org.eclipse.cdt.utils.elf.parser;
12		12
13	import java.io.IOException;	13	import java.io.IOException;
		14	import java.math.BigInteger;
14		15
		16	import org.eclipse.cdt.core.IAddress;
15	import org.eclipse.cdt.utils.Addr2line;	17	import org.eclipse.cdt.utils.Addr2line;
16	import org.eclipse.cdt.utils.Symbol;	18	import org.eclipse.cdt.utils.Symbol;
17	import org.eclipse.core.runtime.IPath;	19	import org.eclipse.core.runtime.IPath;
18		20
19	public class GNUSymbol extends Symbol {	21	public class GNUSymbol extends Symbol {
20		22
21	public GNUSymbol(GNUElfBinaryObject binary, String name, int type, long addr, long size, IPath sourceFile, int startLine, int endLine) {	23	public GNUSymbol(GNUElfBinaryObject binary, String name, int type, IAddress addr, long size, IPath sourceFile, int startLine, int endLine) {
22	super(binary, name, type, addr, size, sourceFile, startLine, endLine);	24	super(binary, name, type, addr, size, sourceFile, startLine, endLine);
23	// TODO Auto-generated constructor stub	25	// TODO Auto-generated constructor stub
24	}	26	}
25		27
26	public GNUSymbol(GNUElfBinaryObject binary, String name, int type, long addr, long size) {	28	public GNUSymbol(GNUElfBinaryObject binary, String name, int type, IAddress addr, long size) {
27	super(binary, name, type, addr, size);	29	super(binary, name, type, addr, size);
28	}	30	}
29		31
Lines 35-41 Link Here
35	Addr2line addr2line = ((GNUElfBinaryObject)binary).getAddr2line(true);	37	Addr2line addr2line = ((GNUElfBinaryObject)binary).getAddr2line(true);
36	if (addr2line != null) {	38	if (addr2line != null) {
37	try {	39	try {
38	return addr2line.getLineNumber(getAddress() + offset);	40	return addr2line.getLineNumber(getAddress().add(BigInteger.valueOf(offset)));
39	} catch (IOException e) {	41	} catch (IOException e) {
40	// ignore	42	// ignore
41	}	43	}

Lines 11-17 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/som/parser/SomSymbol.java (-3 / +5 lines)
11	package org.eclipse.cdt.utils.som.parser;	11	package org.eclipse.cdt.utils.som.parser;
12		12
13	import java.io.IOException;	13	import java.io.IOException;
		14	import java.math.BigInteger;
14		15
		16	import org.eclipse.cdt.core.IAddress;
15	import org.eclipse.cdt.utils.Addr2line;	17	import org.eclipse.cdt.utils.Addr2line;
16	import org.eclipse.cdt.utils.BinaryObjectAdapter;	18	import org.eclipse.cdt.utils.BinaryObjectAdapter;
17	import org.eclipse.cdt.utils.Symbol;	19	import org.eclipse.cdt.utils.Symbol;
Lines 34-40 Link Here
34	* @param startLine	36	* @param startLine
35	* @param endLine	37	* @param endLine
36	*/	38	*/
37	public SomSymbol(BinaryObjectAdapter binary, String name, int type, long addr, long size, IPath sourceFile, int startLine, int endLine) {	39	public SomSymbol(BinaryObjectAdapter binary, String name, int type, IAddress addr, long size, IPath sourceFile, int startLine, int endLine) {
38	super(binary, name, type, addr, size, sourceFile, startLine, endLine);	40	super(binary, name, type, addr, size, sourceFile, startLine, endLine);
39	// TODO Auto-generated constructor stub	41	// TODO Auto-generated constructor stub
40	}	42	}
Lines 46-52 Link Here
46	* @param addr	48	* @param addr
47	* @param size	49	* @param size
48	*/	50	*/
49	public SomSymbol(BinaryObjectAdapter binary, String name, int type, long addr, long size) {	51	public SomSymbol(BinaryObjectAdapter binary, String name, int type, IAddress addr, long size) {
50	super(binary, name, type, addr, size);	52	super(binary, name, type, addr, size);
51	// TODO Auto-generated constructor stub	53	// TODO Auto-generated constructor stub
52	}	54	}
Lines 59-65 Link Here
59	Addr2line addr2line = ((SOMBinaryObject)binary).getAddr2line(true);	61	Addr2line addr2line = ((SOMBinaryObject)binary).getAddr2line(true);
60	if (addr2line != null) {	62	if (addr2line != null) {
61	try {	63	try {
62	return addr2line.getLineNumber(getAddress() + offset);	64	return addr2line.getLineNumber(getAddress().add(BigInteger.valueOf(offset)));
63	} catch (IOException e) {	65	} catch (IOException e) {
64	// ignore	66	// ignore
65	}	67	}

Lines 7-13 Link Here

(-)workspace-old/org.eclipse.cdt.core/src-cdtcore/org/eclipse/cdt/utils/xcoff/parser/XCoffSymbol.java (-3 / +5 lines)
7	package org.eclipse.cdt.utils.xcoff.parser;	7	package org.eclipse.cdt.utils.xcoff.parser;
8		8
9	import java.io.IOException;	9	import java.io.IOException;
		10	import java.math.BigInteger;
10		11
		12	import org.eclipse.cdt.core.IAddress;
11	import org.eclipse.cdt.utils.Addr2line;	13	import org.eclipse.cdt.utils.Addr2line;
12	import org.eclipse.cdt.utils.BinaryObjectAdapter;	14	import org.eclipse.cdt.utils.BinaryObjectAdapter;
13	import org.eclipse.cdt.utils.Symbol;	15	import org.eclipse.cdt.utils.Symbol;
Lines 32-38 Link Here
32	* @param startLine	34	* @param startLine
33	* @param endLine	35	* @param endLine
34	*/	36	*/
35	public XCoffSymbol(BinaryObjectAdapter binary, String name, int type, long addr, long size, IPath sourceFile, int startLine,	37	public XCoffSymbol(BinaryObjectAdapter binary, String name, int type, IAddress addr, long size, IPath sourceFile, int startLine,
36	int endLine) {	38	int endLine) {
37	super(binary, name, type, addr, size, sourceFile, startLine, endLine);	39	super(binary, name, type, addr, size, sourceFile, startLine, endLine);
38	// TODO Auto-generated constructor stub	40	// TODO Auto-generated constructor stub
Lines 45-51 Link Here
45	* @param addr	47	* @param addr
46	* @param size	48	* @param size
47	*/	49	*/
48	public XCoffSymbol(BinaryObjectAdapter binary, String name, int type, long addr, long size) {	50	public XCoffSymbol(BinaryObjectAdapter binary, String name, int type, IAddress addr, long size) {
49	super(binary, name, type, addr, size);	51	super(binary, name, type, addr, size);
50	// TODO Auto-generated constructor stub	52	// TODO Auto-generated constructor stub
51	}	53	}
Lines 58-64 Link Here
58	Addr2line addr2line = ((XCOFFBinaryObject)binary).getAddr2line(true);	60	Addr2line addr2line = ((XCOFFBinaryObject)binary).getAddr2line(true);
59	if (addr2line != null) {	61	if (addr2line != null) {
60	try {	62	try {
61	return addr2line.getLineNumber(getAddress() + offset);	63	return addr2line.getLineNumber(getAddress().add(BigInteger.valueOf(offset)));
62	} catch (IOException e) {	64	} catch (IOException e) {
63	// ignore	65	// ignore
64	}	66	}

Lines 91-109 Link Here

(-)workspace-old/org.eclipse.cdt.debug.core/src-cdtdebugcore/org/eclipse/cdt/debug/core/CDebugUtils.java (-25 lines)
91	}	91	}
92	}	92	}
93		93
94	public static String toHexAddressString( long address )
95	{
96	String addressString = Long.toHexString( address );
97	StringBuffer sb = new StringBuffer( 10 );
98	sb.append( "0x" ); //$NON-NLS-1$
99	for ( int i = 0; i < 8 - addressString.length(); ++i )
100	{
101	sb.append( '0' );
102	}
103	sb.append( addressString );
104	return sb.toString();
105	}
106
107	public static char[] getByteText( byte b )	94	public static char[] getByteText( byte b )
108	{	95	{
109	return new char[]{ charFromByte( (byte)((b >>> 4) & 0x0f) ),	96	return new char[]{ charFromByte( (byte)((b >>> 4) & 0x0f) ),
Lines 201-218 Link Here
201	return Long.parseLong( bytesToString( bytes, le, false ), 16 );	188	return Long.parseLong( bytesToString( bytes, le, false ), 16 );
202	}	189	}
203		190
204	public static long toLongLong( char[] bytes, boolean le )
205	{
206	if ( bytes.length != 16 )
207	return 0;
208	return Long.parseLong( bytesToString( bytes, le, false ), 16 );
209	}
210
211	public static long toUnsignedLongLong( char[] bytes, boolean le )
212	{
213	return 0;
214	}
215
216	private static String bytesToString( char[] bytes, boolean le, boolean signed )	191	private static String bytesToString( char[] bytes, boolean le, boolean signed )
217	{	192	{
218	char[] copy = new char[bytes.length];	193	char[] copy = new char[bytes.length];

Lines 16-21 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java (-1 / +2 lines)
16	import java.util.Observable;	16	import java.util.Observable;
17	import java.util.Observer;	17	import java.util.Observer;
18		18
		19	import org.eclipse.cdt.core.IAddress;
19	import org.eclipse.cdt.debug.core.cdi.CDIException;	20	import org.eclipse.cdt.debug.core.cdi.CDIException;
20	import org.eclipse.cdt.debug.core.cdi.ICDIEventManager;	21	import org.eclipse.cdt.debug.core.cdi.ICDIEventManager;
21	import org.eclipse.cdt.debug.core.cdi.ICDISharedLibraryManager;	22	import org.eclipse.cdt.debug.core.cdi.ICDISharedLibraryManager;
Lines 119-125 Link Here
119	MemoryManager mgr = (MemoryManager)session.getMemoryManager();	120	MemoryManager mgr = (MemoryManager)session.getMemoryManager();
120	MemoryBlock[] blocks = mgr.getMemoryBlocks(miEvent.getMISession());	121	MemoryBlock[] blocks = mgr.getMemoryBlocks(miEvent.getMISession());
121	MIMemoryChangedEvent miMem = (MIMemoryChangedEvent)miEvent;	122	MIMemoryChangedEvent miMem = (MIMemoryChangedEvent)miEvent;
122	Long[] addresses = miMem.getAddresses();	123	IAddress[] addresses = miMem.getAddresses();
123	for (int i = 0; i < blocks.length; i++) {	124	for (int i = 0; i < blocks.length; i++) {
124	if (blocks[i].contains(addresses) &&	125	if (blocks[i].contains(addresses) &&
125	(! blocks[i].isFrozen() \|\| blocks[i].isDirty())) {	126	(! blocks[i].isFrozen() \|\| blocks[i].isDirty())) {

Lines 13-18 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/cdi/Session.java (-4 / +5 lines)
13		13
14	import java.util.Properties;	14	import java.util.Properties;
15		15
		16	import org.eclipse.cdt.core.IAddressFactory;
16	import org.eclipse.cdt.debug.core.cdi.CDIException;	17	import org.eclipse.cdt.debug.core.cdi.CDIException;
17	import org.eclipse.cdt.debug.core.cdi.ICDIConfiguration;	18	import org.eclipse.cdt.debug.core.cdi.ICDIConfiguration;
18	import org.eclipse.cdt.debug.core.cdi.ICDIEventManager;	19	import org.eclipse.cdt.debug.core.cdi.ICDIEventManager;
Lines 54-72 Link Here
54	SourceManager sourceManager;	55	SourceManager sourceManager;
55	ICDIConfiguration configuration;	56	ICDIConfiguration configuration;
56		57
57	public Session(MISession miSession, boolean attach) {	58	public Session(MISession miSession, IAddressFactory addrFactory, boolean attach) {
58	commonSetup();	59	commonSetup();
59	setConfiguration(new Configuration(miSession, attach));	60	setConfiguration(new Configuration(miSession, attach));
60		61
61	Target target = new Target(this, miSession);	62	Target target = new Target(this, miSession, addrFactory);
62	addTargets(new Target[] { target }, target);	63	addTargets(new Target[] { target }, target);
63	}	64	}
64		65
65	public Session(MISession miSession) {	66	public Session(MISession miSession, IAddressFactory addrFactory) {
66	commonSetup();	67	commonSetup();
67	setConfiguration(new CoreFileConfiguration());	68	setConfiguration(new CoreFileConfiguration());
68		69
69	Target target = new Target(this, miSession);	70	Target target = new Target(this, miSession, addrFactory);
70	addTargets(new Target[] { target }, target);	71	addTargets(new Target[] { target }, target);
71	}	72	}
72		73

Line 0 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/command/MIGDBShowAddressSize.java (+38 lines)
	1	/*
	2	* Created on Jun 4, 2004
	3	*
	4	* To change the template for this generated file go to
	5	* Window>Preferences>Java>Code Generation>Code and Comments
	6	*/
	7	package org.eclipse.cdt.debug.mi.core.command;
	8
	9	import org.eclipse.cdt.debug.mi.core.MIException;
	10	import org.eclipse.cdt.debug.mi.core.output.MIGDBShowAddressSizeInfo;
	11	import org.eclipse.cdt.debug.mi.core.output.MIInfo;
	12	import org.eclipse.cdt.debug.mi.core.output.MIOutput;
	13
	14	/**
	15	* @author root
	16	*
	17	* To change the template for this generated type comment go to
	18	* Window>Preferences>Java>Code Generation>Code and Comments
	19	*/
	20	public class MIGDBShowAddressSize extends MIGDBShow {
	21
	22	public MIGDBShowAddressSize () {
	23	super(new String[] { "remoteaddresssize" });
	24	}
	25
	26	public MIInfo getMIInfo() throws MIException {
	27	MIGDBShowAddressSizeInfo info = null;
	28	MIOutput out = getMIOutput();
	29	if (out != null) {
	30	info = new MIGDBShowAddressSizeInfo(out);
	31	if (info.isError()) {
	32	throwMIException(info, out);
	33	}
	34	}
	35	return info;
	36	}
	37
	38	}

Lines 73-79 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/GDBDebugger.java (-3 / +3 lines)
73	String gdb = config.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb"); //$NON-NLS-1$	73	String gdb = config.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb"); //$NON-NLS-1$
74	File cwd = exe.getProject().getLocation().toFile();	74	File cwd = exe.getProject().getLocation().toFile();
75	String gdbinit = config.getAttribute(IMILaunchConfigurationConstants.ATTR_GDB_INIT, ".gdbinit"); //$NON-NLS-1$	75	String gdbinit = config.getAttribute(IMILaunchConfigurationConstants.ATTR_GDB_INIT, ".gdbinit"); //$NON-NLS-1$
76	session = (Session)MIPlugin.getDefault().createCSession(gdb, exe.getLocation().toFile(), cwd, gdbinit);	76	session = (Session)MIPlugin.getDefault().createCSession(gdb, exe, cwd, gdbinit);
77	initializeLibraries(config, session);	77	initializeLibraries(config, session);
78	return session;	78	return session;
79	} catch (IOException e) {	79	} catch (IOException e) {
Lines 105-111 Link Here
105	String gdb = config.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb"); //$NON-NLS-1$	105	String gdb = config.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb"); //$NON-NLS-1$
106	File cwd = exe.getProject().getLocation().toFile();	106	File cwd = exe.getProject().getLocation().toFile();
107	String gdbinit = config.getAttribute(IMILaunchConfigurationConstants.ATTR_GDB_INIT, ".gdbinit"); //$NON-NLS-1$	107	String gdbinit = config.getAttribute(IMILaunchConfigurationConstants.ATTR_GDB_INIT, ".gdbinit"); //$NON-NLS-1$
108	session = (Session)MIPlugin.getDefault().createCSession(gdb, exe.getLocation().toFile(), pid, null, cwd, gdbinit);	108	session = (Session)MIPlugin.getDefault().createCSession(gdb, exe, pid, null, cwd, gdbinit);
109	initializeLibraries(config, session);	109	initializeLibraries(config, session);
110	return session;	110	return session;
111	} catch (IOException e) {	111	} catch (IOException e) {
Lines 137-143 Link Here
137	String gdb = config.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb"); //$NON-NLS-1$	137	String gdb = config.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb"); //$NON-NLS-1$
138	File cwd = exe.getProject().getLocation().toFile();	138	File cwd = exe.getProject().getLocation().toFile();
139	String gdbinit = config.getAttribute(IMILaunchConfigurationConstants.ATTR_GDB_INIT, ".gdbinit"); //$NON-NLS-1$	139	String gdbinit = config.getAttribute(IMILaunchConfigurationConstants.ATTR_GDB_INIT, ".gdbinit"); //$NON-NLS-1$
140	session = (Session)MIPlugin.getDefault().createCSession(gdb, exe.getLocation().toFile(), corefile.toFile(), cwd, gdbinit);	140	session = (Session)MIPlugin.getDefault().createCSession(gdb, exe, corefile.toFile(), cwd, gdbinit);
141	initializeLibraries(config, session);	141	initializeLibraries(config, session);
142	return session;	142	return session;
143	} catch (IOException e) {	143	} catch (IOException e) {

Lines 69-75 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java (-2 / +2 lines)
69	remote += ":"; //$NON-NLS-1$	69	remote += ":"; //$NON-NLS-1$
70	remote += config.getAttribute(IGDBServerMILaunchConfigurationConstants.ATTR_PORT, "invalid"); //$NON-NLS-1$	70	remote += config.getAttribute(IGDBServerMILaunchConfigurationConstants.ATTR_PORT, "invalid"); //$NON-NLS-1$
71	String[] args = new String[] {"remote", remote}; //$NON-NLS-1$	71	String[] args = new String[] {"remote", remote}; //$NON-NLS-1$
72	session = (Session)MIPlugin.getDefault().createCSession(gdb, exe.getLocation().toFile(), 0, args, cwd, gdbinit);	72	session = (Session)MIPlugin.getDefault().createCSession(gdb, exe, 0, args, cwd, gdbinit);
73	} else {	73	} else {
74	MIPlugin plugin = MIPlugin.getDefault();	74	MIPlugin plugin = MIPlugin.getDefault();
75	Preferences prefs = plugin.getPluginPreferences();	75	Preferences prefs = plugin.getPluginPreferences();
Lines 77-83 Link Here
77		77
78	String remote = config.getAttribute(IGDBServerMILaunchConfigurationConstants.ATTR_DEV, "invalid"); //$NON-NLS-1$	78	String remote = config.getAttribute(IGDBServerMILaunchConfigurationConstants.ATTR_DEV, "invalid"); //$NON-NLS-1$
79	String remoteBaud = config.getAttribute(IGDBServerMILaunchConfigurationConstants.ATTR_DEV_SPEED, "invalid"); //$NON-NLS-1$	79	String remoteBaud = config.getAttribute(IGDBServerMILaunchConfigurationConstants.ATTR_DEV_SPEED, "invalid"); //$NON-NLS-1$
80	session = (Session)MIPlugin.getDefault().createCSession(gdb, exe.getLocation().toFile(), -1, null, cwd, gdbinit);	80	session = (Session)MIPlugin.getDefault().createCSession(gdb, exe, -1, null, cwd, gdbinit);
81	ICDITarget[] targets = session.getTargets();	81	ICDITarget[] targets = session.getTargets();
82	for (int i = 0; i < targets.length; ++i) {	82	for (int i = 0; i < targets.length; ++i) {
83	Target target = (Target)targets[i];	83	Target target = (Target)targets[i];

Lines 14-20 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/output/MIAsm.java (-4 / +4 lines)
14	* Represent a GDB Tuple MI assembly response.	14	* Represent a GDB Tuple MI assembly response.
15	*/	15	*/
16	public class MIAsm {	16	public class MIAsm {
17	long address;	17	String address;
18	String function = ""; //$NON-NLS-1$	18	String function = ""; //$NON-NLS-1$
19	String opcode = ""; //$NON-NLS-1$	19	String opcode = ""; //$NON-NLS-1$
20	String args = ""; //$NON-NLS-1$	20	String args = ""; //$NON-NLS-1$
Lines 24-30 Link Here
24	parse(tuple);	24	parse(tuple);
25	}	25	}
26		26
27	public long getAddress() {	27	public String getAddress() {
28	return address;	28	return address;
29	}	29	}
30		30
Lines 43-49 Link Here
43	public String toString() {	43	public String toString() {
44	StringBuffer buffer = new StringBuffer();	44	StringBuffer buffer = new StringBuffer();
45	buffer.append('{');	45	buffer.append('{');
46	buffer.append("address=\"" + Long.toHexString(address) +"\""); //$NON-NLS-1$//$NON-NLS-2$	46	buffer.append("address=\"" + address +"\""); //$NON-NLS-1$//$NON-NLS-2$
47	buffer.append(",func-name=\"" + function + "\""); //$NON-NLS-1$//$NON-NLS-2$	47	buffer.append(",func-name=\"" + function + "\""); //$NON-NLS-1$//$NON-NLS-2$
48	buffer.append(",offset=\"").append(offset).append('"'); //$NON-NLS-1$	48	buffer.append(",offset=\"").append(offset).append('"'); //$NON-NLS-1$
49	buffer.append(",inst=\"" + getInstruction() + "\""); //$NON-NLS-1$//$NON-NLS-2$	49	buffer.append(",inst=\"" + getInstruction() + "\""); //$NON-NLS-1$//$NON-NLS-2$
Lines 64-70 Link Here
64		64
65	if (var.equals("address")) { //$NON-NLS-1$	65	if (var.equals("address")) { //$NON-NLS-1$
66	try {	66	try {
67	address = Long.decode(str.trim()).longValue();	67	address = str.trim();
68	} catch (NumberFormatException e) {	68	} catch (NumberFormatException e) {
69	}	69	}
70	} else if (var.equals("func-name")) { //$NON-NLS-1$	70	} else if (var.equals("func-name")) { //$NON-NLS-1$

Lines 54-60 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/output/MIBreakpoint.java (-3 / +3 lines)
54	String type = ""; //$NON-NLS-1$	54	String type = ""; //$NON-NLS-1$
55	String disp = ""; //$NON-NLS-1$	55	String disp = ""; //$NON-NLS-1$
56	boolean enabled;	56	boolean enabled;
57	long address;	57	String address;
58	String func = ""; //$NON-NLS-1$	58	String func = ""; //$NON-NLS-1$
59	String file = ""; //$NON-NLS-1$	59	String file = ""; //$NON-NLS-1$
60	int line;	60	int line;
Lines 146-152 Link Here
146	enabled = e;	146	enabled = e;
147	}	147	}
148		148
149	public long getAddress() {	149	public String getAddress() {
150	return address;	150	return address;
151	}	151	}
152		152
Lines 228-234 Link Here
228	enabled = str.equals("y"); //$NON-NLS-1$	228	enabled = str.equals("y"); //$NON-NLS-1$
229	} else if (var.equals("addr")) { //$NON-NLS-1$	229	} else if (var.equals("addr")) { //$NON-NLS-1$
230	try {	230	try {
231	address = Long.decode(str.trim()).longValue();	231	address = str.trim();
232	} catch (NumberFormatException e) {	232	} catch (NumberFormatException e) {
233	}	233	}
234	} else if (var.equals("func")) { //$NON-NLS-1$	234	} else if (var.equals("func")) { //$NON-NLS-1$

Lines 18-24 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/output/MIDataReadMemoryInfo.java (-3 / +3 lines)
18	*/	18	*/
19	public class MIDataReadMemoryInfo extends MIInfo {	19	public class MIDataReadMemoryInfo extends MIInfo {
20		20
21	long addr;	21	String addr;
22	long nextRow;	22	long nextRow;
23	long prevRow;	23	long prevRow;
24	long nextPage;	24	long nextPage;
Lines 33-39 Link Here
33	parse();	33	parse();
34	}	34	}
35		35
36	public long getAddress() {	36	public String getAddress() {
37	return addr;	37	return addr;
38	}	38	}
39		39
Lines 96-102 Link Here
96		96
97	if (var.equals("addr")) { //$NON-NLS-1$	97	if (var.equals("addr")) { //$NON-NLS-1$
98	try {	98	try {
99	addr = Long.decode(str.trim()).longValue();	99	addr = str.trim();
100	} catch (NumberFormatException e) {	100	} catch (NumberFormatException e) {
101	}	101	}
102	} else if (var.equals("nr-bytes")) { //$NON-NLS-1$	102	} else if (var.equals("nr-bytes")) { //$NON-NLS-1$

Lines 16-22 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/output/MIFrame.java (-4 / +4 lines)
16	public class MIFrame {	16	public class MIFrame {
17		17
18	int level;	18	int level;
19	long addr;	19	String addr;
20	String func = ""; //$NON-NLS-1$	20	String func = ""; //$NON-NLS-1$
21	String file = ""; //$NON-NLS-1$	21	String file = ""; //$NON-NLS-1$
22	int line;	22	int line;
Lines 42-48 Link Here
42	return line;	42	return line;
43	}	43	}
44		44
45	public long getAddress() {	45	public String getAddress() {
46	return addr;	46	return addr;
47	}	47	}
48		48
Lines 53-59 Link Here
53	public String toString() {	53	public String toString() {
54	StringBuffer buffer = new StringBuffer();	54	StringBuffer buffer = new StringBuffer();
55	buffer.append("level=\"" + level + "\""); //$NON-NLS-1$//$NON-NLS-2$	55	buffer.append("level=\"" + level + "\""); //$NON-NLS-1$//$NON-NLS-2$
56	buffer.append(",addr=\"" + Long.toHexString(addr) + "\""); //$NON-NLS-1$//$NON-NLS-2$	56	buffer.append(",addr=\"" + addr + "\""); //$NON-NLS-1$//$NON-NLS-2$
57	buffer.append(",func=\"" + func + "\""); //$NON-NLS-1$//$NON-NLS-2$	57	buffer.append(",func=\"" + func + "\""); //$NON-NLS-1$//$NON-NLS-2$
58	buffer.append(",file=\"" + file + "\""); //$NON-NLS-1$//$NON-NLS-2$	58	buffer.append(",file=\"" + file + "\""); //$NON-NLS-1$//$NON-NLS-2$
59	buffer.append(",line=\"").append(line).append('"'); //$NON-NLS-1$	59	buffer.append(",line=\"").append(line).append('"'); //$NON-NLS-1$
Lines 86-92 Link Here
86	}	86	}
87	} else if (var.equals("addr")) { //$NON-NLS-1$	87	} else if (var.equals("addr")) { //$NON-NLS-1$
88	try {	88	try {
89	addr = Long.decode(str.trim()).longValue();	89	addr = str.trim();
90	} catch (NumberFormatException e) {	90	} catch (NumberFormatException e) {
91	}	91	}
92	} else if (var.equals("func")) { //$NON-NLS-1$	92	} else if (var.equals("func")) { //$NON-NLS-1$

Line 0 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/output/MIGDBShowAddressSizeInfo.java (+25 lines)
	1	/*
	2	* Created on Jun 7, 2004
	3	*
	4	* To change the template for this generated file go to
	5	* Window>Preferences>Java>Code Generation>Code and Comments
	6	*/
	7	package org.eclipse.cdt.debug.mi.core.output;
	8
	9	/**
	10	* @author root
	11	*
	12	* To change the template for this generated type comment go to
	13	* Window>Preferences>Java>Code Generation>Code and Comments
	14	*/
	15	public class MIGDBShowAddressSizeInfo extends MIGDBShowInfo {
	16
	17	public MIGDBShowAddressSizeInfo(MIOutput o) {
	18	super(o);
	19	}
	20
	21	public int getAddressSize()
	22	{
	23	return Integer.parseInt(getValue());
	24	}
	25	}

Lines 80-87 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/output/MIInfoSharedLibraryInfo.java (-16 / +7 lines)
80	if (str.length() > 0) {	80	if (str.length() > 0) {
81	// Pass the header	81	// Pass the header
82	int index = -1;	82	int index = -1;
83	long from = 0;	83	String from = "";
84	long to = 0;	84	String to = "";
85	boolean syms = false;	85	boolean syms = false;
86	String name = ""; //$NON-NLS-1$	86	String name = ""; //$NON-NLS-1$
87		87
Lines 102-117 Link Here
102	}	102	}
103	break;	103	break;
104	case 2 : // second column is "To"	104	case 2 : // second column is "To"
105	try {	105	to = sub;
106	to = Long.decode(sub).longValue();
107	} catch (NumberFormatException e) {
108	}
109	break;	106	break;
110	case 3 : // first column is "From"	107	case 3 : // first column is "From"
111	try {	108	from = sub;
112	from = Long.decode(sub).longValue();
113	} catch (NumberFormatException e) {
114	}
115	break;	109	break;
116	}	110	}
117	}	111	}
Lines 123-130 Link Here
123	}	117	}
124		118
125	void parseWinShared(String str, List aList) {	119	void parseWinShared(String str, List aList) {
126	long from = 0;	120	String from = "";
127	long to = 0;	121	String to = "";
128	boolean syms = true;	122	boolean syms = true;
129		123
130	int index = str.lastIndexOf(' ');	124	int index = str.lastIndexOf(' ');
Lines 134-143 Link Here
134	if (!sub.startsWith("0x")) { //$NON-NLS-1$	128	if (!sub.startsWith("0x")) { //$NON-NLS-1$
135	sub = "0x" + sub; //$NON-NLS-1$	129	sub = "0x" + sub; //$NON-NLS-1$
136	}	130	}
137	try {	131	from = sub;
138	from = Long.decode(sub).longValue();
139	} catch (NumberFormatException e) {
140	}
141	str = str.substring(0, index).trim();	132	str = str.substring(0, index).trim();
142	}	133	}
143	MIShared s = new MIShared(from, to, syms, str.trim());	134	MIShared s = new MIShared(from, to, syms, str.trim());

Lines 14-20 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/output/MIMemory.java (-4 / +4 lines)
14	* GDB/MI memory parsing.	14	* GDB/MI memory parsing.
15	*/	15	*/
16	public class MIMemory {	16	public class MIMemory {
17	long addr;	17	String addr;
18	long [] data = new long[0];	18	long [] data = new long[0];
19	String ascii = ""; //$NON-NLS-1$	19	String ascii = ""; //$NON-NLS-1$
20		20
Lines 22-28 Link Here
22	parse(tuple);	22	parse(tuple);
23	}	23	}
24		24
25	public long getAddress() {	25	public String getAddress() {
26	return addr;	26	return addr;
27	}	27	}
28		28
Lines 36-42 Link Here
36		36
37	public String toSting() {	37	public String toSting() {
38	StringBuffer buffer = new StringBuffer();	38	StringBuffer buffer = new StringBuffer();
39	buffer.append("addr=\"" + Long.toHexString(addr) + "\""); //$NON-NLS-1$ //$NON-NLS-2$	39	buffer.append("addr=\"" + addr + "\""); //$NON-NLS-1$ //$NON-NLS-2$
40	buffer.append("data=["); //$NON-NLS-1$	40	buffer.append("data=["); //$NON-NLS-1$
41	for (int i = 0 ; i < data.length; i++) {	41	for (int i = 0 ; i < data.length; i++) {
42	if (i != 0) {	42	if (i != 0) {
Lines 63-69 Link Here
63		63
64	if (var.equals("addr")) { //$NON-NLS-1$	64	if (var.equals("addr")) { //$NON-NLS-1$
65	try {	65	try {
66	addr = Long.decode(str.trim()).longValue();	66	addr = str.trim();
67	} catch (NumberFormatException e) {	67	} catch (NumberFormatException e) {
68	}	68	}
69	} else if (var.equals("data")) { //$NON-NLS-1$	69	} else if (var.equals("data")) { //$NON-NLS-1$

Lines 16-38 Link Here

(-)workspace-old/org.eclipse.cdt.debug.mi.core/src-cdtmicore/org/eclipse/cdt/debug/mi/core/output/MIShared.java (-5 / +5 lines)
16	*/	16	*/
17	public class MIShared {	17	public class MIShared {
18		18
19	long from;	19	String from;
20	long to;	20	String to;
21	boolean isread;	21	boolean isread;
22	String name;	22	String name;
23		23
24	public MIShared (long start, long end, boolean read, String location) {	24	public MIShared (String start, String end, boolean read, String location) {
25	from = start;	25	from = start;
26	to = end;	26	to = end;
27	isread = read;	27	isread = read;
28	name = location;	28	name = location;
29	}	29	}
30		30
31	public long getFrom() {	31	public String getFrom() {
32	return from;	32	return from;
33	}	33	}
34		34
35	public long getTo() {	35	public String getTo() {
36	return to;	36	return to;
37	}	37	}
38		38

Lines 24-39 Link Here

(-)workspace-old/org.eclipse.cdt.debug.ui/src-cdtdebugui/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java (-10 / +1 lines)
24	*/	24	*/
25	public class CDebugUIUtils	25	public class CDebugUIUtils
26	{	26	{
27	static public String toHexAddressString( long address )	27
28	{
29	String tmp = Long.toHexString( address );
30	char[] prefix = new char[10 - tmp.length()];
31	prefix[0] = '0';
32	prefix[1] = 'x';
33	for ( int i = 2; i < prefix.length; ++i )
34	prefix[i] = '0';
35	return new String( prefix ) + tmp;
36	}
37		28
38	static public IRegion findWord( IDocument document, int offset )	29	static public IRegion findWord( IDocument document, int offset )
39	{	30	{