Skip to content

P1 Bytecode: fix lookup/lookdown with string argument #507

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
totalspectrum merged 1 commit into from
Feb 22, 2026
+125 −1
Merged

P1 Bytecode: fix lookup/lookdown with string argument #507

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
103 changes: 103 additions & 0 deletions Test/Expect/bctest005.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
00 B4 C4 04 ' CLKFREQ
6F ' CLKMODE
00 ' Placeholder for checksum
10 00 ' PBASE
8C 00 ' VBASE
94 00 ' DBASE
18 00 ' PCURR
A4 00 ' DCURR
'--- Object Header for bctest005
7C 00 ' Object size
02 ' Method count + 1
00 ' OBJ count
08 00 08 00 ' Function lookupdowns @0018 (local size 8)
'--- Function lookupdowns
36 ' CONSTANT 1
38 15 ' FUNDATA_PUSHADDRESS +21
64 ' MEM_READ LONG DBASE+$0004 (short)
36 ' CONSTANT 1
10 ' LOOKUP
38 02 ' CONSTANT 2
10 ' LOOKUP
38 03 ' CONSTANT 3
10 ' LOOKUP
0F ' LOOKEND
'LABEL
3F B4 ' REG_WRITE 1F4(OUTA)
36 ' CONSTANT 1
38 22 ' FUNDATA_PUSHADDRESS +34
64 ' MEM_READ LONG DBASE+$0004 (short)
3F 92 ' REG_READ 1F2(INA)
10 ' LOOKUP
3F 93 ' REG_READ 1F3(INB)
10 ' LOOKUP
0F ' LOOKEND
'LABEL
3F B4 ' REG_WRITE 1F4(OUTA)
36 ' CONSTANT 1
38 32 ' FUNDATA_PUSHADDRESS +50
64 ' MEM_READ LONG DBASE+$0004 (short)
38 61 ' CONSTANT 97
10 ' LOOKUP
38 62 ' CONSTANT 98
10 ' LOOKUP
38 63 ' CONSTANT 99
10 ' LOOKUP
0F ' LOOKEND
'LABEL
3F B4 ' REG_WRITE 1F4(OUTA)
36 ' CONSTANT 1
38 41 ' FUNDATA_PUSHADDRESS +65
64 ' MEM_READ LONG DBASE+$0004 (short)
36 ' CONSTANT 1
11 ' LOOKDOWN
38 02 ' CONSTANT 2
11 ' LOOKDOWN
38 03 ' CONSTANT 3
11 ' LOOKDOWN
0F ' LOOKEND
'LABEL
3F B4 ' REG_WRITE 1F4(OUTA)
36 ' CONSTANT 1
38 4E ' FUNDATA_PUSHADDRESS +78
64 ' MEM_READ LONG DBASE+$0004 (short)
3F 92 ' REG_READ 1F2(INA)
11 ' LOOKDOWN
3F 93 ' REG_READ 1F3(INB)
11 ' LOOKDOWN
0F ' LOOKEND
'LABEL
3F B4 ' REG_WRITE 1F4(OUTA)
36 ' CONSTANT 1
38 5E ' FUNDATA_PUSHADDRESS +94
64 ' MEM_READ LONG DBASE+$0004 (short)
38 61 ' CONSTANT 97
11 ' LOOKDOWN
38 62 ' CONSTANT 98
11 ' LOOKDOWN
38 63 ' CONSTANT 99
11 ' LOOKDOWN
0F ' LOOKEND
'LABEL
3F B4 ' REG_WRITE 1F4(OUTA)
35 ' CONSTANT 0
38 79 ' FUNDATA_PUSHADDRESS +121
64 ' MEM_READ LONG DBASE+$0004 (short)
38 61 ' CONSTANT 97
11 ' LOOKDOWN
38 62 ' CONSTANT 98
11 ' LOOKDOWN
38 63 ' CONSTANT 99
11 ' LOOKDOWN
36 ' CONSTANT 1
11 ' LOOKDOWN
38 02 ' CONSTANT 2
11 ' LOOKDOWN
38 03 ' CONSTANT 3
11 ' LOOKDOWN
3F 92 ' REG_READ 1F2(INA)
11 ' LOOKDOWN
0F ' LOOKEND
'LABEL
3F B4 ' REG_WRITE 1F4(OUTA)
32 ' RETURN_PLAIN
12 changes: 12 additions & 0 deletions Test/bctest005.spin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@


PUB lookupdowns(i)
outa := lookup(i : 1,2,3)
outa := lookup(i : ina,inb)
outa := lookup(i : "abc")

outa := lookdown(i : 1,2,3)
outa := lookdown(i : ina,inb)
outa := lookdown(i : "abc")

outa := lookdownz(i: "abc",1,2,3,ina)
11 changes: 10 additions & 1 deletion backends/bytecode/outbc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2239,11 +2239,20 @@ BCCompileExpression(BCIRBuffer *irbuf,AST *node,BCContext context,bool asStateme
BCCompileExpression(irbuf,list->left->left,context,false);
BCCompileExpression(irbuf,list->left->right,context,false);
lookOp.kind = isLookdown ? BOK_LOOKDOWN_RANGE : BOK_LOOKUP_RANGE;
BIRB_PushCopy(irbuf,&lookOp);
} else if (list->left->kind == AST_STRING) {
lookOp.kind = isLookdown ? BOK_LOOKDOWN : BOK_LOOKUP;
const char *str = list->left->d.string;
char chr;
while ((chr = *str++)) {
BCCompileInteger(irbuf, chr&0xff);
BIRB_PushCopy(irbuf,&lookOp);
}
} else {
BCCompileExpression(irbuf,list->left,context,false);
lookOp.kind = isLookdown ? BOK_LOOKDOWN : BOK_LOOKUP;
BIRB_PushCopy(irbuf,&lookOp);
}
BIRB_PushCopy(irbuf,&lookOp);
}

ByteOpIR lookEnd = {.kind = BOK_LOOKEND};
Expand Down