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

oprs fix

Browse source
This commit is contained in:
ProgramSnail 2024-11-14 14:02:36 +03:00
parent eb6267defe
commit b198e11416
2 changed files with 43 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

15
byterun/include/parser.h
View file

@ -4,6 +4,21 @@
#include "utils.h" #include "utils.h"
#define FORALL_BINOP(DEF) \
DEF(CMD_BINOP_ADD, +) \
DEF(CMD_BINOP_SUB, -) \
DEF(CMD_BINOP_MULT, *) \
DEF(CMD_BINOP_DIV, /) \
DEF(CMD_BINOP_MOD, %) \
DEF(CMD_BINOP_LEQ, <) \
DEF(CMD_BINOP_LT, <=) \
DEF(CMD_BINOP_GT, >) \
DEF(CMD_BINOP_GEQ, >=) \
DEF(CMD_BINOP_EQ, ==) \
DEF(CMD_BINOP_NEQ, !=) \
DEF(CMD_BINOP_AND, &&) \
DEF(CMD_BINOP_OR, ||)
const char *read_cmd(char *ip); const char *read_cmd(char *ip);
bytefile *read_file(char *fname); bytefile *read_file(char *fname);

77
byterun/src/interpreter.c
View file

@ -8,6 +8,12 @@
#include "types.h" #include "types.h"
#include "utils.h" #include "utils.h"
#define ASSERT_UNBOXED(memo, x) \
do \
if (!UNBOXED(x)) \
failure("unboxed value expected in %s\n", memo); \
while (0)
struct State s; struct State s;
static inline int ip_read_int(char **ip) { static inline int ip_read_int(char **ip) {
@ -80,51 +86,25 @@ void run(bytefile *bf, int argc, char **argv) {
/* BINOP */ /* BINOP */
case CMD_BINOP: { // BINOP ops[l-1] case CMD_BINOP: { // BINOP ops[l-1]
void *left = s_pop(); void *snd = s_pop();
void *right = s_pop(); void *fst = s_pop();
switch (l) { if (l == CMD_BINOP_SUB) {
case CMD_BINOP_ADD: // + s_push_i(Ls__Infix_45(fst, snd));
s_push_i(Ls__Infix_43(right, left)); } else {
break; switch (l) {
case CMD_BINOP_SUB: // - #define BINOP_OPR(val, op) \
s_push_i(Ls__Infix_45(right, left)); case val: \
break; ASSERT_UNBOXED("captured op:1", fst); \
case CMD_BINOP_MULT: // * ASSERT_UNBOXED("captured op:2", snd); \
s_push_i(Ls__Infix_42(right, left)); s_push_i(BOX(UNBOX(fst) op UNBOX(snd))); \
break; break;
case CMD_BINOP_DIV: // / FORALL_BINOP(BINOP_OPR)
s_push_i(Ls__Infix_47(right, left)); #undef BINOP_OPR
break;
case CMD_BINOP_MOD: // % default:
s_push_i(Ls__Infix_37(right, left)); s_failure(&s, "invalid opcode"); // %d-%d\n", h, l);
break; break;
case CMD_BINOP_LEQ: // < }
s_push_i(Ls__Infix_60(right, left));
break;
case CMD_BINOP_LT: // <=
s_push_i(Ls__Infix_6061(right, left));
break;
case CMD_BINOP_GT: // >
s_push_i(Ls__Infix_62(right, left));
break;
case CMD_BINOP_GEQ: // >=
s_push_i(Ls__Infix_6261(right, left));
break;
case CMD_BINOP_EQ: // ==
s_push_i(Ls__Infix_6161(right, left));
break;
case CMD_BINOP_NEQ: // !=
s_push_i(Ls__Infix_3361(right, left));
break;
case CMD_BINOP_AND: // &&
s_push_i(Ls__Infix_3838(right, left));
break;
case CMD_BINOP_OR: // !!
s_push_i(Ls__Infix_3333(right, left));
break;
default:
s_failure(&s, "invalid opcode"); // %d-%d\n", h, l);
break;
} }
break; break;
} }
@ -454,10 +434,9 @@ void run(bytefile *bf, int argc, char **argv) {
s_rotate_n(elem_count); s_rotate_n(elem_count);
// void *array = // void *array =
// Barray((aint *)opr_buffer, // Barray((aint *)opr_buffer,
// BOX(elem_count)); // NOTE: not shure if elems should be added // BOX(elem_count)); // NOTE: not shure if elems should be
void *array = // added
Barray((aint *)s_peek(), void *array = Barray((aint *)s_peek(), BOX(elem_count));
BOX(elem_count));
s_push(array); s_push(array);
break; break;
} }