Skip to content

Annotate LOADBOOLs #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SquidDev merged 1 commit into from
Apr 20, 2025
Merged

Annotate LOADBOOLs #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/main/java/org/squiddev/cobalt/Print.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,13 @@ public static void printOpcode(StringBuilder out, Prototype f, int pc, boolean e
out.append("\t; ");
printConstant(out, f, bx);
}
case OP_LOADBOOL -> {
out.append("\t; ");
out.append(b != 0 ? "true" : "false");
if (c != 0) {
out.append(", to ").append(pc + 3);
}
}
case OP_GETUPVAL, OP_SETUPVAL -> {
out.append("\t; ");
printUpvalueName(out, f, b);
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/bytecode-compiler/listing/goto-close-1.lc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
7 [12] GETTABUP 1 0 -1 ; _ENV "assert"
8 [12] EQ 1 0 -2 ; - true
9 [12] JMP 0 1 ; to 11
10 [12] LOADBOOL 2 0 1
11 [12] LOADBOOL 2 1 0
10 [12] LOADBOOL 2 0 1 ; false, to 12
11 [12] LOADBOOL 2 1 0 ; true
12 [12] CALL 1 2 1
13 [12] RETURN 0 1
constants (2) for goto-close-1.lua:0:
Expand Down
10 changes: 5 additions & 5 deletions src/test/resources/bytecode-compiler/listing/goto-if-1.lc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@

%main <goto-if-1.lua:0,0> (15 instructions, 60 bytes at goto-if-1.lua:0)
0 param, 4 slots, 1 upvalues, 2 locals, 1 constants, 0 functions
1 [1] LOADBOOL 0 1 0
2 [2] LOADBOOL 1 0 0
3 [3] LOADBOOL 2 1 0
1 [1] LOADBOOL 0 1 0 ; true
2 [2] LOADBOOL 1 0 0 ; false
3 [3] LOADBOOL 2 1 0 ; true
4 [3] TEST 2 1
5 [3] JMP 0 2 ; to 8
6 [4] JMP 0 5 ; to 12
7 [6] LOADBOOL 1 1 0
7 [6] LOADBOOL 1 1 0 ; true
8 [8] TEST 0 0
9 [8] JMP 0 2 ; to 12
10 [9] LOADBOOL 0 0 0
10 [9] LOADBOOL 0 0 0 ; false
11 [9] JMP 0 -5 ; to 7
12 [13] GETTABUP 2 0 -1 ; _ENV "assert"
13 [13] MOVE 3 1
Expand Down
10 changes: 5 additions & 5 deletions src/test/resources/bytecode-compiler/listing/goto-nil.lc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
3 [4] GETTABUP 2 0 -1 ; _ENV "assert"
4 [4] EQ 1 1 -2 ; - nil
5 [4] JMP 0 1 ; to 7
6 [4] LOADBOOL 3 0 1
7 [4] LOADBOOL 3 1 0
6 [4] LOADBOOL 3 0 1 ; false, to 8
7 [4] LOADBOOL 3 1 0 ; true
8 [4] CALL 2 2 1
9 [5] LOADBOOL 1 1 0
9 [5] LOADBOOL 1 1 0 ; true
10 [6] EQ 0 0 -2 ; - nil
11 [6] JMP 0 3 ; to 15
12 [7] LOADK 0 -3 ; 1
Expand All @@ -21,8 +21,8 @@
18 [12] JMP 0 2 ; to 21
19 [12] EQ 1 1 -5 ; - true
20 [12] JMP 0 1 ; to 22
21 [12] LOADBOOL 3 0 1
22 [12] LOADBOOL 3 1 0
21 [12] LOADBOOL 3 0 1 ; false, to 23
22 [12] LOADBOOL 3 1 0 ; true
23 [12] CALL 2 2 1
24 [12] RETURN 0 1
constants (5) for goto-nil.lua:0:
Expand Down