Merge pull request #19843 from keithc-ca/dtfj-whitespace

Remove trailing whitespace

Author: pshipton

jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/CommonAddressSpace.java

@@ -38,29 +38,29 @@
 public abstract class CommonAddressSpace implements IAbstractAddressSpace {
 	private static final int BUFFER_MAX = 4096;
 	private static final int MEMORY_CHECK_THRESHOLD = 0x100000;
-	
+
 	private MemoryRange[] _translations;
 	private Integer _lastTranslationUsed = Integer.valueOf(0);
 	private boolean _isLittleEndian;
 	private boolean _is64Bit;
 	private int lastAsid;
 	private int _is64BitAsid[];
-	
+
 	protected CommonAddressSpace(MemoryRange[] translations, boolean isLittleEndian, boolean is64Bit)
 	{
 		_translations = _sortRanges(translations);
 		_isLittleEndian = isLittleEndian;
 		_is64Bit = is64Bit;
 		set64Bitness();
 	}
-	
+
 	private static MemoryRange[] _sortRanges(MemoryRange[] ranges)
 	{
 		Arrays.sort(ranges, new Comparator<MemoryRange>() {
 			@Override
 			public int compare(MemoryRange one, MemoryRange two)
 			{
-				return compareAddress(one.getAsid(), one.getVirtualAddress(), two.getAsid(), two.getVirtualAddress()); 
+				return compareAddress(one.getAsid(), one.getVirtualAddress(), two.getAsid(), two.getVirtualAddress());
 			}
 		});
 		return ranges;
@@ -78,17 +78,17 @@ private void set64Bitness() {
 			if (_translations[i].getVirtualAddress()+_translations[i].getSize() >= 0x100000000L) {
 				// Found 64-bit entry
 				int asid = _translations[i].getAsid();
-				
+
 				// Remember the ASID
 				int newa[] = new int[count+1];
 				for (int j = 0; j < count; ++j) {
 					newa[j] = _is64BitAsid[j];
 				}
 				newa[count] = asid;
 				_is64BitAsid = newa;
-				
+
 				++count;
-				
+
 				// Skip to the end of the ASID range
 				while (i < _translations.length && _translations[i].getAsid() == asid) ++i;
 			}
@@ -106,59 +106,59 @@ public Iterator getMemoryRanges()
 	protected MemoryRange _residentRange(int asid, long address) throws MemoryAccessException
 	{
 		int range = findWhichMemoryRange(asid, address, _translations, _lastTranslationUsed, true);
-		
+
 		if (range >= 0) {
 			return _translations[range];
 		} else {
 			throw new MemoryAccessException(asid, address);
 		}
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * This searches memory ranges for an addr using a binary chop and returns an int indicating the memory range
-	 *  or -1 if address is not within any memory range...... 
+	 *  or -1 if address is not within any memory range......
 	 * @param asid TODO
 	 */
 	protected static int findWhichMemoryRange(int asid, long addr, MemoryRange[] ranges, Integer lastRange, boolean doLinearIfNotFound)
 	{
 		int retI=-1; //assume we won't find it
 		int last = lastRange.intValue();
 		int lastPlusOne = last+1;
-		
-		if ((last < ranges.length) && 
-			(ranges[last].contains(asid, addr)) && 
+
+		if ((last < ranges.length) &&
+			(ranges[last].contains(asid, addr)) &&
 			(ranges[last].isInCoreFile() || (!ranges[last].isInCoreFile() && ranges[last].getLibraryReader() != null))) { //TLB hit
 			retI = last;
-		} else if ((lastPlusOne < ranges.length) && 
-				   (ranges[lastPlusOne].contains(asid, addr)) && 
+		} else if ((lastPlusOne < ranges.length) &&
+				   (ranges[lastPlusOne].contains(asid, addr)) &&
 				   (ranges[last].isInCoreFile() || (!ranges[last].isInCoreFile() && ranges[last].getLibraryReader() != null))) { //TLB hit
 			retI = lastPlusOne;
 		} else {
 			// TLB failed to do the search
-			
+
 			// Now effectively do a binary search find the right range....
 			// note: on some platforms we can have overlapping memory ranges!!
 			//   (ie. AIX, zOs and linux) so we always give back the first
 
 			int highpos = ranges.length-1;
 			int lowpos  = 0;
-			
+
 			while (lowpos <= highpos) {
 				int currentPos = lowpos + ((highpos-lowpos) >>> 1);
 				long mraStartAddr = ranges[currentPos].getVirtualAddress();
 				int mraAsid = ranges[currentPos].getAsid();
 
 				if (compareAddress(asid, addr, mraAsid, mraStartAddr) >= 0) { 	//addr above base of range
-					if(compareAddress(asid, addr, mraAsid, mraStartAddr + ranges[currentPos].getSize()) < 0 && 
+					if(compareAddress(asid, addr, mraAsid, mraStartAddr + ranges[currentPos].getSize()) < 0 &&
 					  (ranges[currentPos].isInCoreFile() || !ranges[currentPos].isInCoreFile() && ranges[currentPos].getLibraryReader() != null)) {
 						retI = currentPos;
 						break;
 					}
 					lowpos = currentPos + 1;
 				} else {
 					highpos = currentPos-1;
-				}					
+				}
 			}
 
 			// No match using binary chop, probably due to overlapping ranges => revert to a linear search
@@ -168,8 +168,8 @@ protected static int findWhichMemoryRange(int asid, long addr, MemoryRange[] ran
 				for (int i = 0; i < lowpos; i++) {
 					long mraStartAddr = ranges[i].getVirtualAddress();
 					int mraAsid = ranges[i].getAsid();
-					if ((compareAddress(asid, addr, mraAsid, mraStartAddr) >= 0) && 
-						(compareAddress(asid, addr, mraAsid, mraStartAddr + ranges[i].getSize()) < 0) && 
+					if ((compareAddress(asid, addr, mraAsid, mraStartAddr) >= 0) &&
+						(compareAddress(asid, addr, mraAsid, mraStartAddr + ranges[i].getSize()) < 0) &&
 						(ranges[i].isInCoreFile() || (!ranges[i].isInCoreFile() && ranges[i].getLibraryReader() != null))) {
 						retI = i;
 						break;
@@ -182,7 +182,7 @@ protected static int findWhichMemoryRange(int asid, long addr, MemoryRange[] ran
 		}
 		return retI;
 	}
-	
+
 	protected static int compareAddress(int lasid, long lhs, int rasid, long rhs) {
 		if (lasid < rasid) return -1;
 		if (lasid > rasid) return 1;
@@ -194,7 +194,7 @@ protected static int compareAddress(int lasid, long lhs, int rasid, long rhs) {
 			return lhs < rhs ? 1 : -1;
 		}
 	}
-	
+
 	private boolean isMemoryAccessible(int asid, long address, int size)
 	{
 		// CMVC 125071 - jextract failing with OOM error
@@ -205,13 +205,13 @@ private boolean isMemoryAccessible(int asid, long address, int size)
 		int startRange;
 		long hi;
 		long memhi;
-		
+
 		startRange = findWhichMemoryRange(asid, address, _translations, _lastTranslationUsed, true);
 		if (startRange == -1) {
 			// Range not found, so return false
 			return rc;
 		}
-		
+
 		// Now we have a start range, check if the size fits
 		hi = _translations[startRange].getVirtualAddress() + _translations[startRange].getSize();
 		memhi = address + size;
@@ -222,12 +222,12 @@ private boolean isMemoryAccessible(int asid, long address, int size)
 			// size goes beyond the end of this range, so walk the contiguous
 			// ranges to find if it will still fit
 			cumulativeSize = hi - address;
-			
+
 			for (int i = startRange+1; i < _translations.length; i++) {
 				long rangeBaseAddress = _translations[i].getVirtualAddress();
 				long rangeSize = _translations[i].getSize();
 				long rangeTopAddress = rangeBaseAddress + rangeSize;
-				
+
 				if (rangeBaseAddress == hi) {
 					// contiguous range
 					cumulativeSize += rangeSize;
@@ -279,23 +279,23 @@ public byte[] getMemoryBytes(int asid, long vaddr, int size)
 	{
 		// CMVC 125071 - jextract failing with OOM error
 		// This check is to help protect from OOM situations where a damaged core
-		// has given us a ridiculously large memory size to allocate. If size is 
+		// has given us a ridiculously large memory size to allocate. If size is
 		// sufficiently large, then check if the memory really exists before trying
 		// to allocate it. Obviously, this does not stop OOM occurring, if the memory
 		// exists in the core file we may pass the test and still OOM on the allocation.
 		boolean getMem = true;
 		lastAsid = asid;
 		byte[] buffer = null;
-		
+
 		if (size < 0) {
 			return null;
 		}
-		
+
 		if (0 != vaddr) {
 			if (size > MEMORY_CHECK_THRESHOLD) {
 				getMem = isMemoryAccessible(0, vaddr, size);
 			}
-		
+
 			if (getMem) {
 				buffer = new byte[size];
 
@@ -321,7 +321,7 @@ else if (0 != bufferMax % align)
 
 		long location = -1;
 		Iterator ranges = getMemoryRanges();
-		
+
 		while ((-1 == location) && ranges.hasNext()) {
 			MemoryRange range = (MemoryRange) ranges.next();
 			// Skip over previous asids
@@ -334,15 +334,15 @@ else if (0 != bufferMax % align)
 		if (location == -1) lastAsid = 0;
 		return location;
 	}
-	
+
 	private static int match(byte[] whatBytes, int matchedSoFar, byte[] buffer, int index) {
 		int matched = matchedSoFar;
 		for (int i = index; i < buffer.length && matched < whatBytes.length; i++, matched++)
 			if (buffer[i] != whatBytes[matched])
 				return 0;
 		return matched;
 	}
-	
+
 	private long findPatternInRange(byte[] whatBytes, int alignment, long start, MemoryRange range, int bufferMax) {
 		if (range.getVirtualAddress() >= start || range.contains(start)) {
 			// Ensure the address is within the range and aligned
@@ -353,7 +353,7 @@ private long findPatternInRange(byte[] whatBytes, int alignment, long start, Mem
 				addr += alignment - (addr % alignment);
 
 			long edge = range.getVirtualAddress() + range.getSize();
-			
+
 			int asid = range.getAsid();
 
 			// FIXME this is somewhat inefficient - should use Boyer-Moore
@@ -362,22 +362,22 @@ private long findPatternInRange(byte[] whatBytes, int alignment, long start, Mem
 			while (addr < edge) {
 				long bytesLeftInRange = edge - addr;
 				long count = bufferMax < bytesLeftInRange ? bufferMax : bytesLeftInRange;
-				
+
 				if (0 != addr) {
 					byte[] buffer = getMemoryBytes(asid, addr, (int)count);
-					
+
 					if (null != buffer) {
 						// Handle partial match
 						if (0 != matched) {
 							matched = match(whatBytes, matched, buffer, 0);
 						}
-						
+
 						// Handle no match
 						for (int i = 0; i < buffer.length && 0 == matched; i += alignment) {
 							matchAddr = addr + i;
 							matched = match(whatBytes, 0, buffer, i);
 						}
-						
+
 						// Check for a full match
 						if (whatBytes.length == matched) {
 							return matchAddr;
@@ -392,7 +392,7 @@ private long findPatternInRange(byte[] whatBytes, int alignment, long start, Mem
 		}
 		return -1;
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see com.ibm.dtfj.addressspace.IAbstractAddressSpace#getLongAt(int, long)
 	 */

jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/DumpReaderAddressSpace.java

@@ -35,13 +35,13 @@
 public class DumpReaderAddressSpace extends CommonAddressSpace
 {
 	private DumpReader _reader;
-	
+
 	public DumpReaderAddressSpace(MemoryRange[] ranges, DumpReader reader, boolean isLittleEndian, boolean is64Bit)
 	{
 		super(ranges, isLittleEndian, is64Bit);
 		_reader = reader;
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see com.ibm.dtfj.addressspace.IAbstractAddressSpace#isExecutable(int, long)
 	 */
@@ -71,8 +71,7 @@ public boolean isShared(int asid, long address)
 		MemoryRange match = _residentRange(asid, address);
 		return match.isShared();
 	}
-	
-	
+
 	/* (non-Javadoc)
 	 * @see com.ibm.dtfj.addressspace.IAbstractAddressSpace#getBytesAt(int, long, byte[])
 	 */
@@ -118,15 +117,14 @@ public int getBytesAt(int asid, long address, byte[] buffer) throws MemoryAccess
 		}
 		return bytesRead;
 	}
-	
-	
+
 	/* (non-Javadoc)
 	 * @see com.ibm.dtfj.addressspace.IAbstractAddressSpace#getLongAt(int, long)
 	 */
 	public long getLongAt(int asid, long address) throws MemoryAccessException
 	{
 		MemoryRange match = _residentRange(asid, address);
-		
+
 		if (null != match) {
 			if (match.isInCoreFile()) {
 				long fileOffset = match.getFileOffset() + (address - match.getVirtualAddress());
@@ -143,14 +141,14 @@ public long getLongAt(int asid, long address) throws MemoryAccessException
 			throw new MemoryAccessException(asid, address);
 		}
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see com.ibm.dtfj.addressspace.IAbstractAddressSpace#getIntAt(int, long)
 	 */
 	public int getIntAt(int asid, long address) throws MemoryAccessException
 	{
 		MemoryRange match = _residentRange(asid, address);
-		
+
 		if (null != match) {
 			if (match.isInCoreFile()) {
 				long fileOffset = match.getFileOffset() + (address - match.getVirtualAddress());
@@ -175,7 +173,7 @@ public short getShortAt(int asid, long address)
 			throws MemoryAccessException
 	{
 		MemoryRange match = _residentRange(asid, address);
-		
+
 		if (null != match) {
 			if (match.isInCoreFile()) {
 				long fileOffset = match.getFileOffset() + (address - match.getVirtualAddress());
@@ -198,9 +196,9 @@ public short getShortAt(int asid, long address)
 	 */
 	public byte getByteAt(int asid, long address) throws MemoryAccessException
 	{
-		
+
 		MemoryRange match = _residentRange(asid, address);
-		
+
 		if (null != match) {
 			if (match.isInCoreFile()) {
 				long fileOffset = match.getFileOffset() + (address - match.getVirtualAddress());