Luke/snow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复 syscalls 参数类型加载逻辑

Browse Source 
- 改进参数类型加载逻辑，确保在默认类型非整型时正确处理
- 优化数组读取和写入内置函数的代码结构，提高可读性
- 调整 generateSyscall 方法注释，统一代码风格
This commit is contained in:
Luke 2025-09-01 17:21:06 +08:00
parent 1861d7fe53
commit b017f384ce
1 changed files with 62 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/main/java/org/jcnc/snow/compiler/backend/generator/CallGenerator.java
View File

@ -101,20 +101,62 @@ public class CallGenerator implements InstructionGenerator<CallInstruction> {
// 处理数组读取和写入的内置函数 // 处理数组读取和写入的内置函数
switch (fn) { switch (fn) {
case "__index_b" -> { generateIndexInstruction(ins, out, slotMap, 'B'); return; } case "__index_b" -> {
case "__index_s" -> { generateIndexInstruction(ins, out, slotMap, 'S'); return; } generateIndexInstruction(ins, out, slotMap, 'B');
case "__index_i" -> { generateIndexInstruction(ins, out, slotMap, 'I'); return; } return;
case "__index_l" -> { generateIndexInstruction(ins, out, slotMap, 'L'); return; } }
case "__index_f" -> { generateIndexInstruction(ins, out, slotMap, 'F'); return; } case "__index_s" -> {
case "__index_d" -> { generateIndexInstruction(ins, out, slotMap, 'D'); return; } generateIndexInstruction(ins, out, slotMap, 'S');
case "__index_r" -> { generateIndexInstruction(ins, out, slotMap, 'R'); return; } return;
case "__setindex_b" -> { generateSetIndexInstruction(ins, out, slotMap, 'B'); return; } }
case "__setindex_s" -> { generateSetIndexInstruction(ins, out, slotMap, 'S'); return; } case "__index_i" -> {
case "__setindex_i" -> { generateSetIndexInstruction(ins, out, slotMap, 'I'); return; } generateIndexInstruction(ins, out, slotMap, 'I');
case "__setindex_l" -> { generateSetIndexInstruction(ins, out, slotMap, 'L'); return; } return;
case "__setindex_f" -> { generateSetIndexInstruction(ins, out, slotMap, 'F'); return; } }
case "__setindex_d" -> { generateSetIndexInstruction(ins, out, slotMap, 'D'); return; } case "__index_l" -> {
case "__setindex_r" -> { generateSetIndexInstruction(ins, out, slotMap, 'R'); return; } generateIndexInstruction(ins, out, slotMap, 'L');
return;
}
case "__index_f" -> {
generateIndexInstruction(ins, out, slotMap, 'F');
return;
}
case "__index_d" -> {
generateIndexInstruction(ins, out, slotMap, 'D');
return;
}
case "__index_r" -> {
generateIndexInstruction(ins, out, slotMap, 'R');
return;
}
case "__setindex_b" -> {
generateSetIndexInstruction(ins, out, slotMap, 'B');
return;
}
case "__setindex_s" -> {
generateSetIndexInstruction(ins, out, slotMap, 'S');
return;
}
case "__setindex_i" -> {
generateSetIndexInstruction(ins, out, slotMap, 'I');
return;
}
case "__setindex_l" -> {
generateSetIndexInstruction(ins, out, slotMap, 'L');
return;
}
case "__setindex_f" -> {
generateSetIndexInstruction(ins, out, slotMap, 'F');
return;
}
case "__setindex_d" -> {
generateSetIndexInstruction(ins, out, slotMap, 'D');
return;
}
case "__setindex_r" -> {
generateSetIndexInstruction(ins, out, slotMap, 'R');
return;
}
} }
// 默认：普通函数调用 // 默认：普通函数调用
@ -190,10 +232,10 @@ public class CallGenerator implements InstructionGenerator<CallInstruction> {
* 首个参数为子命令，支持常量或寄存器引用；其余参数均以引用形式加载。 * 首个参数为子命令，支持常量或寄存器引用；其余参数均以引用形式加载。
* 若存在返回寄存器，则将结果存为整数类型。 * 若存在返回寄存器，则将结果存为整数类型。
* *
* @param ins syscall 对应的 IR 调用指令 * @param ins syscall 对应的 IR 调用指令
* @param out VM 指令构建器 * @param out VM 指令构建器
* @param slotMap 寄存器到槽位的映射 * @param slotMap 寄存器到槽位的映射
* @param fn 函数名（"syscall" 或以 ".syscall" 结尾） * @param fn 函数名（"syscall" 或以 ".syscall" 结尾）
*/ */
private void generateSyscall(CallInstruction ins, private void generateSyscall(CallInstruction ins,
VMProgramBuilder out, VMProgramBuilder out,
@ -306,7 +348,9 @@ public class CallGenerator implements InstructionGenerator<CallInstruction> {
throw new IllegalStateException("[CallGenerator] 未找到参数槽位"); throw new IllegalStateException("[CallGenerator] 未找到参数槽位");
} }
char t = out.getSlotType(slot); char t = out.getSlotType(slot);
if (t == '\0') t = defaultType; if (t == '\0' || (t == 'I' && defaultType != 'I')) {
t = defaultType;
}
out.emit(OpHelper.opcode(t + "_LOAD") + " " + slot); out.emit(OpHelper.opcode(t + "_LOAD") + " " + slot);
} }