Added "Show as hex" action for debugger data - 6

hajdam · hajdam · commit e5a7cded8d2a · 2018-03-04T23:43:45.000+01:00
diff --git a/src/org/exbin/deltahex/intellij/debug/ByteArrayPageProvider.java b/src/org/exbin/deltahex/intellij/debug/ByteArrayPageProvider.java
@@ -15,9 +15,7 @@
  */
 package org.exbin.deltahex.intellij.debug;
 
-import com.sun.jdi.ArrayReference;
-import com.sun.jdi.ByteValue;
-import com.sun.jdi.Value;
+import com.sun.jdi.*;
 import org.exbin.deltahex.intellij.DebugViewDataSource;
 
 import java.util.List;
@@ -26,7 +24,7 @@
  * Byte array data source for debugger view.
  *
  * @author ExBin Project (http://exbin.org)
- * @version 0.1.6 2018/03/01
+ * @version 0.1.6 2018/03/04
  */
 public class ByteArrayPageProvider implements DebugViewDataSource.PageProvider {
 
@@ -46,7 +44,18 @@ public byte[] getPage(long pageIndex) {
         final List<Value> values = arrayRef.getValues(startPos, length);
         byte[] result = new byte[length];
         for (int i = 0; i < values.size(); i++) {
-            result[i] = ((ByteValue) values.get(i)).value();
+            Value rawValue = values.get(i);
+            byte value = 0;
+            if (rawValue instanceof ByteValue) {
+                value = ((ByteValue) rawValue).value();
+            } else {
+                if (rawValue instanceof ObjectReference) {
+                    ReferenceType referenceType = ((ObjectReference) rawValue).referenceType();
+//                    Value refValue = referenceType.getValue(referenceType.visibleFields().get(3));
+                }
+            }
+
+            result[i] = value;
         }
 
         return result;
diff --git a/src/org/exbin/deltahex/intellij/debug/DoubleArrayPageProvider.java b/src/org/exbin/deltahex/intellij/debug/DoubleArrayPageProvider.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /**
- * Short array data source for debugger view.
+ * Double array data source for debugger view.
  *
  * @author ExBin Project (http://exbin.org)
  * @version 0.1.6 2018/03/03
@@ -42,15 +42,17 @@ public DoubleArrayPageProvider(ArrayReference arrayRef) {
 
     @Override
     public byte[] getPage(long pageIndex) {
-        int startPos = (int) (pageIndex * DebugViewDataSource.PAGE_SIZE / 8);
-        int length = DebugViewDataSource.PAGE_SIZE / 4;
-        if (arrayRef.length() - startPos < DebugViewDataSource.PAGE_SIZE / 8) {
+        int pageSize = DebugViewDataSource.PAGE_SIZE / 8;
+        int startPos = (int) (pageIndex * pageSize);
+        int length = pageSize;
+        if (arrayRef.length() - startPos < pageSize) {
             length = arrayRef.length() - startPos;
         }
         final List<Value> values = arrayRef.getValues(startPos, length);
-        byte[] result = new byte[length];
+        byte[] result = new byte[length * 8];
         for (int i = 0; i < values.size(); i++) {
-            double value = ((DoubleValue) values.get(i)).value();
+            Value rawValue = values.get(i);
+            double value = rawValue instanceof DoubleValue ? ((DoubleValue) rawValue).value() : 0;
 
             byteBuffer.rewind();
             byteBuffer.putDouble(value);
diff --git a/src/org/exbin/deltahex/intellij/debug/FloatArrayPageProvider.java b/src/org/exbin/deltahex/intellij/debug/FloatArrayPageProvider.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /**
- * Short array data source for debugger view.
+ * Float array data source for debugger view.
  *
  * @author ExBin Project (http://exbin.org)
  * @version 0.1.6 2018/03/03
@@ -42,15 +42,17 @@ public FloatArrayPageProvider(ArrayReference arrayRef) {
 
     @Override
     public byte[] getPage(long pageIndex) {
-        int startPos = (int) (pageIndex * DebugViewDataSource.PAGE_SIZE / 4);
-        int length = DebugViewDataSource.PAGE_SIZE / 4;
-        if (arrayRef.length() - startPos < DebugViewDataSource.PAGE_SIZE / 4) {
+        int pageSize = DebugViewDataSource.PAGE_SIZE / 4;
+        int startPos = (int) (pageIndex * pageSize);
+        int length = pageSize;
+        if (arrayRef.length() - startPos < pageSize) {
             length = arrayRef.length() - startPos;
         }
         final List<Value> values = arrayRef.getValues(startPos, length);
-        byte[] result = new byte[length];
+        byte[] result = new byte[length * 4];
         for (int i = 0; i < values.size(); i++) {
-            float value = ((FloatValue) values.get(i)).value();
+            Value rawValue = values.get(i);
+            float value = rawValue instanceof FloatValue ? ((FloatValue) rawValue).value() : 0;
 
             byteBuffer.rewind();
             byteBuffer.putFloat(value);
diff --git a/src/org/exbin/deltahex/intellij/debug/IntegerArrayPageProvider.java b/src/org/exbin/deltahex/intellij/debug/IntegerArrayPageProvider.java
@@ -38,15 +38,18 @@ public IntegerArrayPageProvider(ArrayReference arrayRef) {
 
     @Override
     public byte[] getPage(long pageIndex) {
-        int startPos = (int) (pageIndex * DebugViewDataSource.PAGE_SIZE / 4);
-        int length = DebugViewDataSource.PAGE_SIZE / 4;
-        if (arrayRef.length() - startPos < DebugViewDataSource.PAGE_SIZE / 4) {
+        int pageSize = DebugViewDataSource.PAGE_SIZE / 4;
+        int startPos = (int) (pageIndex * pageSize);
+        int length = pageSize;
+        if (arrayRef.length() - startPos < pageSize) {
             length = arrayRef.length() - startPos;
         }
         final List<Value> values = arrayRef.getValues(startPos, length);
-        byte[] result = new byte[length];
+        byte[] result = new byte[length * 4];
         for (int i = 0; i < values.size(); i++) {
-            int value = ((IntegerValue) values.get(i)).value();
+            Value rawValue = values.get(i);
+            int value = rawValue instanceof IntegerValue ? ((IntegerValue) rawValue).value() : 0;
+
             result[i * 4] = (byte) (value >> 24);
             result[i * 4 + 1] = (byte) ((value >> 16) & 0xff);
             result[i * 4 + 2] = (byte) ((value >> 8) & 0xff);
diff --git a/src/org/exbin/deltahex/intellij/debug/LongArrayPageProvider.java b/src/org/exbin/deltahex/intellij/debug/LongArrayPageProvider.java
@@ -25,7 +25,7 @@
 import java.util.List;
 
 /**
- * Integer array data source for debugger view.
+ * Long array data source for debugger view.
  *
  * @author ExBin Project (http://exbin.org)
  * @version 0.1.6 2018/03/03
@@ -40,19 +40,22 @@ public LongArrayPageProvider(ArrayReference arrayRef) {
 
     @Override
     public byte[] getPage(long pageIndex) {
-        int startPos = (int) (pageIndex * DebugViewDataSource.PAGE_SIZE / 8);
-        int length = DebugViewDataSource.PAGE_SIZE / 8;
-        if (arrayRef.length() - startPos < DebugViewDataSource.PAGE_SIZE / 8) {
+        int pageSize = DebugViewDataSource.PAGE_SIZE / 8;
+        int startPos = (int) (pageIndex * pageSize);
+        int length = pageSize;
+        if (arrayRef.length() - startPos < pageSize) {
             length = arrayRef.length() - startPos;
         }
         final List<Value> values = arrayRef.getValues(startPos, length);
-        byte[] result = new byte[length];
+        byte[] result = new byte[length * 8];
         for (int i = 0; i < values.size(); i++) {
-            long value = ((LongValue) values.get(i)).value();
+            Value rawValue = values.get(i);
+            long value = rawValue instanceof LongValue ? ((LongValue) rawValue).value() : 0;
+
             BigInteger bigInteger = BigInteger.valueOf(value);
             for (int bit = 0; bit < 7; bit++) {
                 BigInteger nextByte = bigInteger.and(ValuesPanel.BIG_INTEGER_BYTE_MASK);
-                result[i * 8 + bit] = nextByte.byteValue();
+                result[i * 8 + 7 - bit] = nextByte.byteValue();
                 bigInteger = bigInteger.shiftRight(8);
             }
         }
diff --git a/src/org/exbin/deltahex/intellij/debug/ShortArrayPageProvider.java b/src/org/exbin/deltahex/intellij/debug/ShortArrayPageProvider.java
@@ -46,8 +46,9 @@ public byte[] getPage(long pageIndex) {
         }
         final List<Value> values = arrayRef.getValues(startPos, length);
         byte[] result = new byte[length * 2];
-        for (int i = 0; i < length; i++) {
-            short value = ((ShortValue) values.get(i)).value();
+        for (int i = 0; i < values.size(); i++) {
+            Value rawValue = values.get(i);
+            short value = rawValue instanceof ShortValue ? ((ShortValue) rawValue).value() : 0;
             result[i * 2] = (byte) (value >> 8);
             result[i * 2 + 1] = (byte) (value & 0xff);
         }

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,9 @@ public byte[] getPage(long pageIndex) {`
`46`	`46`	`}`
`47`	`47`	`final List<Value> values = arrayRef.getValues(startPos, length);`
`48`	`48`	`byte[] result = new byte[length * 2];`
`49`		`- for (int i = 0; i < length; i++) {`
`50`		`- short value = ((ShortValue) values.get(i)).value();`
	`49`	`+ for (int i = 0; i < values.size(); i++) {`
	`50`	`+ Value rawValue = values.get(i);`
	`51`	`+ short value = rawValue instanceof ShortValue ? ((ShortValue) rawValue).value() : 0;`
`51`	`52`	`result[i * 2] = (byte) (value >> 8);`
`52`	`53`	`result[i * 2 + 1] = (byte) (value & 0xff);`
`53`	`54`	`}`