st/lama_byterun
1
0
Fork 0
mirror of https://github.com/ProgramSnail/Lama.git synced 2025-12-05 22:38:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SM fixes, add fixes to vork with sysargs Std variable

Browse source
This commit is contained in:
ProgramSnail 2025-04-12 22:19:28 +03:00
parent d8eb21c066
commit 474b0a8ed2
3 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
byterun/src/interpreter.c
View file

@ -72,7 +72,8 @@ void set_argc_argv(int argc, char **argv) {
void *args_array = Barray((aint *)s_peek(), BOX(argc));
s_popn(argc);
s_push(args_array);
*var_by_category(VAR_GLOBAL, 0) = args_array; // NOTE: implementation detail, stdlib/test26.lama
// NOTE: V,sysargs from Std
*var_by_category(VAR_GLOBAL, 0) = args_array;
#ifdef DEBUG_VERSION
print_stack(&s);

23
byterun/src/module_manager.cpp
View file

@ -108,8 +108,13 @@ void rewrite_code_with_offsets(Bytefile *bytefile, const Offsets &offsets) {
case Cmd::LDA:
case Cmd::ST:
if (to_var_category(l) == VAR_GLOBAL) {
ip_write_int_unsafe(write_ip,
ip_read_int_unsafe(&read_ip) + offsets.globals);
aint id = ip_read_int_unsafe(&read_ip);
if (id > 0) { // NOTE: do not rewrite sysargs usages
ip_write_int_unsafe(
write_ip,
id - 1 + offsets.globals); // rewrite with exclusion of local
// module sysargs reference
}
}
break;
default:
@ -239,7 +244,8 @@ Offsets calc_merge_sizes(const std::vector<Bytefile *> &bytefiles) {
Offsets sizes{.strings = 0, .globals = 0, .code = 0, .publics_num = 0};
for (size_t i = 0; i < bytefiles.size(); ++i) {
sizes.strings += bytefiles[i]->stringtab_size;
sizes.globals += bytefiles[i]->global_area_size;
sizes.globals += bytefiles[i]->global_area_size -
1; // NOTE: exclude default variable sysargs
sizes.code += bytefiles[i]->code_size;
// sizes.publics_num += bytefiles[i]->public_symbols_number;
}
@ -268,6 +274,9 @@ MergeResult merge_files(std::vector<Bytefile *> &&bytefiles) {
gen_builtins(sizes.code, builtins_map);
sizes.code += builtins_code_size;
// V,sysparams fro, Std
++sizes.globals;
Bytefile *result =
(Bytefile *)malloc(sizeof(Bytefile) + sizes.strings + sizes.code +
public_symbols_size); // globals are on the stack
@ -322,7 +331,10 @@ MergeResult merge_files(std::vector<Bytefile *> &&bytefiles) {
result->substs_ptr = NULL;
// update & merge code segments
Offsets offsets{.strings = 0, .globals = 0, .code = 0, .publics_num = 0};
Offsets offsets{.strings = 0,
.globals = 1,
.code = 0,
.publics_num = 0}; // NOTE: one global: sysargs
// REMOVE printf("merge bytefiles\n");
for (size_t i = 0; i < bytefiles.size(); ++i) {
// REMOVE printf("rewrite offsets %zu\n", i);
@ -346,7 +358,8 @@ MergeResult merge_files(std::vector<Bytefile *> &&bytefiles) {
// update offsets
offsets.strings += bytefiles[i]->stringtab_size;
offsets.globals += bytefiles[i]->global_area_size;
offsets.globals +=
bytefiles[i]->global_area_size - 1; // NOTE: exclude sysargs
offsets.code += bytefiles[i]->code_size;
// offsets.publics_num += bytefiles[i]->public_symbols_number;