Skip to content

Commit 0161c27

Browse files
chumerDSouzaM
authored andcommitted
Move BytecodeDebugListener to the bytecode DSL API.
1 parent 245dc7f commit 0161c27

File tree

4 files changed

+71
-4
lines changed

4 files changed

+71
-4
lines changed

truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/DebugBytecodeRootNode.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,12 @@
4343
import java.util.concurrent.atomic.AtomicInteger;
4444

4545
import com.oracle.truffle.api.TruffleLanguage;
46+
import com.oracle.truffle.api.bytecode.debug.BytecodeDebugListener;
4647
import com.oracle.truffle.api.bytecode.introspection.Instruction;
4748
import com.oracle.truffle.api.frame.FrameDescriptor;
4849
import com.oracle.truffle.api.nodes.RootNode;
4950

50-
public abstract class DebugBytecodeRootNode extends RootNode implements SpecializationDebugListener {
51+
public abstract class DebugBytecodeRootNode extends RootNode implements BytecodeDebugListener {
5152

5253
static boolean traceQuickening = false;
5354

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.truffle.api.bytecode.test;
41+
package com.oracle.truffle.api.bytecode.debug;
4242

4343
import com.oracle.truffle.api.bytecode.introspection.Instruction;
4444

4545
/**
4646
* Subclass this bytecode node to get additional debug event that are normally not available. Useful
4747
* for testing and debugging.
4848
*/
49-
public interface SpecializationDebugListener {
49+
public interface BytecodeDebugListener {
5050

5151
@SuppressWarnings("unused")
5252
default void onSpecialize(Instruction instruction, String specialization) {
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/*
2+
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.truffle.api.bytecode.debug;
42+
43+
import java.io.PrintStream;
44+
45+
import com.oracle.truffle.api.bytecode.introspection.Instruction;
46+
47+
public interface BytecodeDebugTraceListener extends BytecodeDebugListener {
48+
49+
default void onQuicken(Instruction before, Instruction after) {
50+
PrintStream out = System.out;
51+
out.printf("Quicken %s: %n %s%n -> %s%n", before.getName(), before, after);
52+
}
53+
54+
default void onQuickenOperand(Instruction base, int operandIndex, Instruction operandBefore, Instruction operandAfter) {
55+
PrintStream out = System.out;
56+
out.printf("Quicken operand index %s for %s: %n %s%n -> %s%n", operandIndex, base.getName(),
57+
operandBefore, operandAfter);
58+
}
59+
60+
@Override
61+
default void onSpecialize(Instruction instruction, String specialization) {
62+
PrintStream out = System.out;
63+
out.printf("Specialize %s: %n %s%n", specialization, instruction);
64+
}
65+
66+
}

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public class TruffleTypes {
8787
}
8888
ExpectErrorTypes = Collections.unmodifiableList(types);
8989
}
90-
public final DeclaredType SpecializationDebugListener = c.getDeclaredTypeOptional("com.oracle.truffle.api.bytecode.test.SpecializationDebugListener");
90+
public final DeclaredType BytecodeDebugListener = c.getDeclaredTypeOptional("com.oracle.truffle.api.bytecode.debug.BytecodeDebugListener");
9191

9292
// Graal SDK
9393
public static final String OptionCategory_Name = "org.graalvm.options.OptionCategory";

0 commit comments

Comments
 (0)