Skip to content

Commit 95b77db

Browse files
DSouzaMDSouzaM
committed
Minor: be consistent about using snake_case for built-in immediate names
1 parent c23c4bd commit 95b77db

File tree

13 files changed

+879
-879
lines changed

13 files changed

+879
-879
lines changed

‎truffle/mxbuild/jdk21/com.oracle.truffle.api.bytecode.test/src_gen/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreterBase.java‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
* signature: void (Object)
252252
* - Instruction store.local
253253
* kind: STORE_LOCAL
254-
* encoding: [7 : short, localOffset : short]
254+
* encoding: [7 : short, local_offset : short]
255255
* signature: void (Object)
256256
* - Instruction throw
257257
* kind: THROW
@@ -271,19 +271,19 @@
271271
* signature: Object ()
272272
* - Instruction load.exception
273273
* kind: LOAD_EXCEPTION
274-
* encoding: [12 : short, exceptionSp (sp) : short]
274+
* encoding: [12 : short, exception_sp (sp) : short]
275275
* signature: Object ()
276276
* - Instruction load.local
277277
* kind: LOAD_LOCAL
278-
* encoding: [13 : short, localOffset : short]
278+
* encoding: [13 : short, local_offset : short]
279279
* signature: Object ()
280280
* - Instruction load.local.mat
281281
* kind: LOAD_LOCAL_MATERIALIZED
282-
* encoding: [14 : short, localOffset : short]
282+
* encoding: [14 : short, local_offset : short]
283283
* signature: Object (Object)
284284
* - Instruction store.local.mat
285285
* kind: STORE_LOCAL_MATERIALIZED
286-
* encoding: [15 : short, localOffset : short]
286+
* encoding: [15 : short, local_offset : short]
287287
* signature: void (Object, Object)
288288
* - Instruction yield
289289
* kind: YIELD
@@ -355,7 +355,7 @@
355355
* signature: Object ()
356356
* - Instruction clear.local
357357
* kind: CLEAR_LOCAL
358-
* encoding: [33 : short, localOffset : short]
358+
* encoding: [33 : short, local_offset : short]
359359
* signature: void ()
360360
* - Instruction c.EarlyReturn
361361
* kind: CUSTOM
@@ -1116,7 +1116,7 @@ public List<Argument> getArguments() {
11161116
case Instructions.STORE_LOCAL_MAT :
11171117
case Instructions.CLEAR_LOCAL :
11181118
return List.of(
1119-
new LocalOffsetArgument(bytecode, "localOffset", bci + 2));
1119+
new LocalOffsetArgument(bytecode, "local_offset", bci + 2));
11201120
case Instructions.LOAD_CONSTANT :
11211121
return List.of(
11221122
new ConstantArgument(bytecode, "constant", bci + 2));
@@ -1125,7 +1125,7 @@ public List<Argument> getArguments() {
11251125
new IntegerArgument(bytecode, "index", bci + 2, 2));
11261126
case Instructions.LOAD_EXCEPTION :
11271127
return List.of(
1128-
new IntegerArgument(bytecode, "exceptionSp", bci + 2, 2));
1128+
new IntegerArgument(bytecode, "exception_sp", bci + 2, 2));
11291129
case Instructions.YIELD :
11301130
return List.of(
11311131
new ConstantArgument(bytecode, "location", bci + 2));
@@ -2065,9 +2065,9 @@ private final boolean validateBytecodes() {
20652065
case Instructions.LOAD_LOCAL :
20662066
case Instructions.CLEAR_LOCAL :
20672067
{
2068-
short localOffset = BYTES.getShort(bc, bci + 2 /* imm localOffset */);
2068+
short local_offset = BYTES.getShort(bc, bci + 2 /* imm local_offset */);
20692069
root = this.getRoot();
2070-
if (localOffset < USER_LOCALS_START_INDEX || localOffset >= root.maxLocals) {
2070+
if (local_offset < USER_LOCALS_START_INDEX || local_offset >= root.maxLocals) {
20712071
throw CompilerDirectives.shouldNotReachHere(String.format("Bytecode validation error at index: %s. local offset is out of bounds%n%s", bci, dumpInvalid(findLocation(bci))));
20722072
}
20732073
bci = bci + 4;
@@ -2090,10 +2090,10 @@ private final boolean validateBytecodes() {
20902090
}
20912091
case Instructions.LOAD_EXCEPTION :
20922092
{
2093-
short exceptionSp = BYTES.getShort(bc, bci + 2 /* imm exceptionSp */);
2093+
short exception_sp = BYTES.getShort(bc, bci + 2 /* imm exception_sp */);
20942094
root = this.getRoot();
20952095
int maxStackHeight = root.getFrameDescriptor().getNumberOfSlots() - root.maxLocals;
2096-
if (exceptionSp < 0 || exceptionSp > maxStackHeight) {
2096+
if (exception_sp < 0 || exception_sp > maxStackHeight) {
20972097
throw CompilerDirectives.shouldNotReachHere(String.format("Bytecode validation error at index: %s. stack pointer is out of bounds%n%s", bci, dumpInvalid(findLocation(bci))));
20982098
}
20992099
bci = bci + 4;
@@ -2102,8 +2102,8 @@ private final boolean validateBytecodes() {
21022102
case Instructions.LOAD_LOCAL_MAT :
21032103
case Instructions.STORE_LOCAL_MAT :
21042104
{
2105-
short localOffset = BYTES.getShort(bc, bci + 2 /* imm localOffset */);
2106-
if (localOffset < USER_LOCALS_START_INDEX) {
2105+
short local_offset = BYTES.getShort(bc, bci + 2 /* imm local_offset */);
2106+
if (local_offset < USER_LOCALS_START_INDEX) {
21072107
throw CompilerDirectives.shouldNotReachHere(String.format("Bytecode validation error at index: %s. local offset is out of bounds%n%s", bci, dumpInvalid(findLocation(bci))));
21082108
}
21092109
bci = bci + 4;
@@ -3275,7 +3275,7 @@ long continueAt(BasicInterpreterBase $root, VirtualFrame frame, VirtualFrame loc
32753275
}
32763276
case Instructions.LOAD_EXCEPTION :
32773277
{
3278-
FRAMES.setObject(frame, sp, FRAMES.getObject(frame, $root.maxLocals + BYTES.getShort(bc, bci + 2 /* imm exceptionSp */)));
3278+
FRAMES.setObject(frame, sp, FRAMES.getObject(frame, $root.maxLocals + BYTES.getShort(bc, bci + 2 /* imm exception_sp */)));
32793279
sp += 1;
32803280
bci += 4;
32813281
break;
@@ -3415,7 +3415,7 @@ long continueAt(BasicInterpreterBase $root, VirtualFrame frame, VirtualFrame loc
34153415
}
34163416
case Instructions.CLEAR_LOCAL :
34173417
{
3418-
FRAMES.clear(frame, BYTES.getShort(bc, bci + 2 /* imm localOffset */));
3418+
FRAMES.clear(frame, BYTES.getShort(bc, bci + 2 /* imm local_offset */));
34193419
bci += 4;
34203420
break;
34213421
}
@@ -3788,21 +3788,21 @@ private long doBranchBackward(VirtualFrame frame, VirtualFrame localFrame, byte[
37883788

37893789
private void doStoreLocal(Frame stackFrame, Frame frame, byte[] bc, int bci, int sp) {
37903790
Object local = FRAMES.requireObject(stackFrame, sp - 1);
3791-
FRAMES.setObject(frame, BYTES.getShort(bc, bci + 2 /* imm localOffset */), local);
3791+
FRAMES.setObject(frame, BYTES.getShort(bc, bci + 2 /* imm local_offset */), local);
37923792
FRAMES.clear(stackFrame, sp - 1);
37933793
}
37943794

37953795
private void doLoadLocal(AbstractBytecodeNode $this, Frame stackFrame, Frame frame, byte[] bc, int bci, int sp) {
3796-
FRAMES.setObject(stackFrame, sp, FRAMES.requireObject(frame, BYTES.getShort(bc, bci + 2 /* imm localOffset */)));
3796+
FRAMES.setObject(stackFrame, sp, FRAMES.requireObject(frame, BYTES.getShort(bc, bci + 2 /* imm local_offset */)));
37973797
}
37983798

37993799
private void doLoadLocalMat(AbstractBytecodeNode $this, Frame stackFrame, Frame frame, byte[] bc, int bci, int sp) {
3800-
FRAMES.setObject(stackFrame, sp - 1, FRAMES.requireObject(frame, BYTES.getShort(bc, bci + 2 /* imm localOffset */)));
3800+
FRAMES.setObject(stackFrame, sp - 1, FRAMES.requireObject(frame, BYTES.getShort(bc, bci + 2 /* imm local_offset */)));
38013801
}
38023802

38033803
private void doStoreLocalMat(Frame stackFrame, Frame frame, byte[] bc, int bci, int sp) {
38043804
Object local = FRAMES.requireObject(stackFrame, sp - 1);
3805-
FRAMES.setObject(frame, BYTES.getShort(bc, bci + 2 /* imm localOffset */), local);
3805+
FRAMES.setObject(frame, BYTES.getShort(bc, bci + 2 /* imm local_offset */), local);
38063806
FRAMES.clear(stackFrame, sp - 1);
38073807
FRAMES.clear(stackFrame, sp - 2);
38083808
}
@@ -10447,7 +10447,7 @@ private boolean doEmitInstructionS(short instruction, int stackEffect, short dat
1044710447
ensureBytecodeCapacity(newBci);
1044810448
}
1044910449
BYTES.putShort(bc, bci + 0, instruction);
10450-
BYTES.putShort(bc, bci + 2 /* imm localOffset */, data0);
10450+
BYTES.putShort(bc, bci + 2 /* imm local_offset */, data0);
1045110451
bci = newBci;
1045210452
return true;
1045310453
}
@@ -11590,7 +11590,7 @@ private static final class Instructions {
1159011590
/*
1159111591
* Instruction store.local
1159211592
* kind: STORE_LOCAL
11593-
* encoding: [7 : short, localOffset : short]
11593+
* encoding: [7 : short, local_offset : short]
1159411594
* signature: void (Object)
1159511595
*/
1159611596
private static final short STORE_LOCAL = 7;
@@ -11625,28 +11625,28 @@ private static final class Instructions {
1162511625
/*
1162611626
* Instruction load.exception
1162711627
* kind: LOAD_EXCEPTION
11628-
* encoding: [12 : short, exceptionSp (sp) : short]
11628+
* encoding: [12 : short, exception_sp (sp) : short]
1162911629
* signature: Object ()
1163011630
*/
1163111631
private static final short LOAD_EXCEPTION = 12;
1163211632
/*
1163311633
* Instruction load.local
1163411634
* kind: LOAD_LOCAL
11635-
* encoding: [13 : short, localOffset : short]
11635+
* encoding: [13 : short, local_offset : short]
1163611636
* signature: Object ()
1163711637
*/
1163811638
private static final short LOAD_LOCAL = 13;
1163911639
/*
1164011640
* Instruction load.local.mat
1164111641
* kind: LOAD_LOCAL_MATERIALIZED
11642-
* encoding: [14 : short, localOffset : short]
11642+
* encoding: [14 : short, local_offset : short]
1164311643
* signature: Object (Object)
1164411644
*/
1164511645
private static final short LOAD_LOCAL_MAT = 14;
1164611646
/*
1164711647
* Instruction store.local.mat
1164811648
* kind: STORE_LOCAL_MATERIALIZED
11649-
* encoding: [15 : short, localOffset : short]
11649+
* encoding: [15 : short, local_offset : short]
1165011650
* signature: void (Object, Object)
1165111651
*/
1165211652
private static final short STORE_LOCAL_MAT = 15;
@@ -11772,7 +11772,7 @@ private static final class Instructions {
1177211772
/*
1177311773
* Instruction clear.local
1177411774
* kind: CLEAR_LOCAL
11775-
* encoding: [33 : short, localOffset : short]
11775+
* encoding: [33 : short, local_offset : short]
1177611776
* signature: void ()
1177711777
*/
1177811778
private static final short CLEAR_LOCAL = 33;

0 commit comments

Comments
 (0)