toString() for debugging

i-net-software · May 22, 2022 · 20c6516 · 20c6516
1 parent 5a22c94
commit 20c6516
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 3 deletions.
diff --git a/src/de/inetsoftware/jwebassembly/module/WasmBlockInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmBlockInstruction.java
@@ -1,5 +1,5 @@
 /*
-   Copyright 2018 - 2021 Volker Berlin (i-net software)
+   Copyright 2018 - 2022 Volker Berlin (i-net software)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -103,6 +103,7 @@ public void writeTo( @Nonnull ModuleWriter writer ) throws IOException {
     AnyType getPushValueType() {
         switch( op ) {
             case IF:
+            case BLOCK:
                 return data != ValueType.empty ? (AnyType)data : null;
             case RETURN:
                 return (AnyType)data;
@@ -151,4 +152,12 @@ AnyType[] getPopValueTypes() {
                 return null;
         }
     }
+
+    /**
+     * Only used for debugging
+     */
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + ": " + op + (data == null || data == ValueType.empty ? "" : " " + data);
+    }
 }
diff --git a/src/de/inetsoftware/jwebassembly/module/WasmConstInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmConstInstruction.java
@@ -1,5 +1,5 @@
 /*
-   Copyright 2018 - 2021 Volker Berlin (i-net software)
+   Copyright 2018 - 2022 Volker Berlin (i-net software)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -129,4 +129,12 @@ int getPopCount() {
     AnyType[] getPopValueTypes() {
         return null;
     }
+
+    /**
+     * Only used for debugging
+     */
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + ": " + value;
+    }
 }
diff --git a/src/de/inetsoftware/jwebassembly/module/WasmLocalInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmLocalInstruction.java
@@ -150,4 +150,12 @@ int getPopCount() {
     AnyType[] getPopValueTypes() {
         return op == get  ? null : new AnyType[] { localVariables.getValueType( getIndex() ) };
     }
+
+    /**
+     * Only used for debugging
+     */
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + ": local." + op + ' ' + idx;
+    }
 }
diff --git a/src/de/inetsoftware/jwebassembly/module/WasmNumericInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmNumericInstruction.java
@@ -1,5 +1,5 @@
 /*
-   Copyright 2018 - 2021 Volker Berlin (i-net software)
+   Copyright 2018 - 2022 Volker Berlin (i-net software)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -133,4 +133,12 @@ AnyType[] getPopValueTypes() {
                 return new AnyType[] { valueType, valueType };
         }
     }
+
+    /**
+     * Only used for debugging
+     */
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + ": " + valueType + '.' + numOp;
+    }
 }