FCL/sftools/ana/dynaanaapps: comparison sysperfana/perfinvestigator/com.nokia.carbide.cpp.pi.instr/src/com/nokia/carbide/cpp/pi/instr/BinaryReader.java

equal deleted inserted replaced

-:615035072f7e
+:844b047e260d
 return findSequence(sample,(ProcessedBinary)null);
 }
 public BinaryReaderResult findSequence(IttSample sample, Binary b)
 {
-if (this.processedFiles.containsKey(b.binaryName))
+if (this.processedFiles.containsKey(b.getBinaryName()))
 {
-ProcessedBinary pf = (ProcessedBinary)this.processedFiles.get(b.binaryName);
+ProcessedBinary pf = (ProcessedBinary)this.processedFiles.get(b.getBinaryName());
 return this.findSequence(sample,pf);
 }
 return null;
 }
 	return null;
 }
 public boolean checkSampleInBinary(IttSample sample,Binary binary,int differencesAllowed)
 {
-	ProcessedBinary pb = this.getProcessedBinaryForName(binary.binaryName);
+	ProcessedBinary pb = this.getProcessedBinaryForName(binary.getBinaryName());
 	if (pb == null)
 	{
-		System.out.println(Messages.getString("BinaryReader.cannotFindBinary")+binary.binaryName); //$NON-NLS-1$
+		System.out.println(Messages.getString("BinaryReader.cannotFindBinary")+binary.getBinaryName()); //$NON-NLS-1$
 		return false;
 	}
-	if (binary.startAddress <= sample.programCounter &&
+	if (binary.getStartAddress() <= sample.programCounter &&
-	   binary.startAddress+binary.length >= sample.programCounter)
+	   binary.getStartAddress()+binary.getLength() >= sample.programCounter)
 	{
 		// the program counter value indicates that the sample
 		// is within the binary
 		long[] reversedInstructions = sample.reversedInstructions();
 		int matches = 0;
 		for (int i=0;i<reversedInstructions.length;i++)
 		{
 			long instruction = reversedInstructions[i];
-			long offset = (long)(sample.programCounter-binary.startAddress);
+			long offset = (long)(sample.programCounter-binary.getStartAddress());
-			if (offset < binary.length)
+			if (offset < binary.getLength())
 			{
 				// add the amount of bytes that match in the next 4 bytes
 				matches += this.testNextFourBytes((int)offset+(i*4),instruction,pb);
 			}
 		}
 {
 int i = indicesToCheck[k];
 int match = 0;
-if (i < pf.length - 5)
+if (i < pf.getLength() - 5)
 {
 if (pf.data[i] == (byte) first) match++;
 if (pf.data[i + 1] == (byte) second) match++;
 // search pattern
 if ( (checksum & 0xffffffff) == (sample.checksum & 0xffffffff) )
 {
 // add this location to possible binaries
-Binary b = new Binary(pf.binaryName);
+Binary b = new Binary(pf.getBinaryName());
-b.length = pf.length;
+b.setLength(pf.getLength());
-b.offsetToCodeStart = pf.offsetToCodeStart;
+b.setOffsetToCodeStart(pf.getOffsetToCodeStart());
-b.type = pf.type;
+b.setType(pf.getType());
 // binary start address is the this address - this offset
-b.startAddress = sample.programCounter-i;
+b.setStartAddress(sample.programCounter-i);
 possibleBinaries.add(b);
 //System.out.println (	"CHECKSUM MATCH at "+pf.binaryName+"@0x"+Long.toHexString(b.startAddress-b.offsetToCodeStart)+
 //						" pos:"+i+"!! Checksum:"+checksum+" "+pf.file.getAbsolutePath());
 else
 {
 // add this location to possible binaries
-Binary b = new Binary(pf.binaryName);
+Binary b = new Binary(pf.getBinaryName());
-b.length = pf.length;
+b.setLength(pf.getLength());
-b.offsetToCodeStart = pf.offsetToCodeStart;
+b.setOffsetToCodeStart(pf.getOffsetToCodeStart());
-b.type = pf.type;
+b.setType(pf.getType());
 // binary start address is this address - this offset
-b.startAddress = sample.programCounter-i;
+b.setStartAddress(sample.programCounter-i);
 possibleBinaries.add(b);
 //System.out.println(	"MATCH at "+pf.binaryName+"@0x"+Long.toHexString(b.startAddress-b.offsetToCodeStart)+
 //						" pos:"+i+"!! "+pf.file.getAbsolutePath());
 }
 public void printBinaryFromOffset(ProcessedBinary pf, int offset, int length)
 {
-if (pf.length < offset+length) return;
+if (pf.getLength() < offset+length) return;
 int c = 0;
 for (int i=offset;i<offset+length;i++)
 {
 String hex = Integer.toHexString((int)pf.data[i] & 0xff);
 int third = (int) ((data & (long)0x0000ff00) >> 8);
 int fourth = (int) ((data & (long)0x000000ff));
 int matches = 0;
-if (pf.length > offset+4)
+if (pf.getLength() > offset+4)
 {
 if (pf.data[offset] == (byte)first) matches++;
 if (pf.data[offset+1] == (byte)second) matches++;
 {
 ProcessedBinary pf = (ProcessedBinary)this.processedFiles.get(fileName);
 if (length == -1)
 {
 startOffset = 0;
-length = pf.length;
+length = pf.getLength();
 }
 for (int i=startOffset;i<startOffset+length;i++)
 {
 String hex = Integer.toHexString((int)pf.data[i] & 0xff);
 File f = (File) enumer.nextElement();
 String name = f.getAbsolutePath();
 name = name.substring(name.indexOf(File.separator),name.length());
 if (!(this.processedFiles.containsKey(name) &&
-(((ProcessedBinary)this.processedFiles.get(name)).length == f.length())))
+(((ProcessedBinary)this.processedFiles.get(name)).getLength() == f.length())))
 {
 try
 {
 ProcessedBinary pf = processFile(f);
 //System.out.println(f.getName());
-this.processedFiles.put(pf.binaryName, pf);
+this.processedFiles.put(pf.getBinaryName(), pf);
-length += pf.length;
+length += pf.getLength();
 addedFiles++;
 }
 catch (Exception e)
 {
 e.printStackTrace();

changeset 5	844b047e260d
parent 2	b9ab3b238396
child 12	ae255c9aa552