cozis/WL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Progress on the evaluator

Browse Source
This commit is contained in:
cozis
2025-08-03 15:39:04 +02:00
parent 0f80f95de5
commit ed9db8fe34
1 changed files with 482 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eval.c
+473 -48
View File
@@ -1,3 +1,4 @@
#include <string.h>
#ifndef WL_AMALGAMATION
#include "eval.h"
@@ -18,36 +19,22 @@ bool
none
*/
/*
000 none
001 true
010 false
011 short str
100
101
110
111 pointer
*/
typedef struct {
uint64_t data;
} Value;
typedef struct {
uint64_t data;
} Pointer;
typedef enum {
TYPE_NONE,
TYPE_BOOL,
TYPE_INT,
TYPE_FLOAT,
TYPE_MAP,
TYPE_ARRAY,
TYPE_STRING,
TYPE_ERROR,
} Type;
typedef uint64_t Value;
typedef struct MapItems MapItems;
struct MapItems {
Pointer next;
MapItems *next;
Value keys[8];
Value items[8];
};
@@ -56,8 +43,8 @@ typedef struct {
Type type;
int count;
MapItems head;
Pointer tail;
} Map;
MapItems *tail;
} MapValue;
typedef struct ArrayItems ArrayItems;
struct ArrayItems {
@@ -70,31 +57,185 @@ typedef struct {
int count;
ArrayItems head;
ArrayItems *tail;
} Array;
} ArrayValue;
typedef struct {
Type type;
double raw;
} FloatValue;
typedef struct {
Type type;
int64_t raw;
} IntValue;
typedef struct {
Type type;
int len;
char data[];
} StringValue;
typedef struct {
} Frame;
typedef union {
uint64_t i;
void* p;
} EvalStackItem;
typedef struct {
Program p;
int off;
Arena *a;
int frame_depth;
Frame frames[FRAME_LIMIT];
int eval_depth;
EvalStackItem eval_stack[EVAL_STACK_LIMIT];
Value eval_stack[EVAL_STACK_LIMIT];
} Eval;
#define VALUE_NONE ((Value) 0)
#define VALUE_TRUE ((Value) 1)
#define VALUE_FALSE ((Value) 2)
#define VALUE_ERROR ((Value) 6)
Type type_of(Value v)
{
// 000 none
// 001 true
// 010 false
// 011 int
// 100 string
// 101
// 110 error
// 111 pointer
switch (v & 7) {
case 0: return TYPE_NONE;
case 1: return TYPE_BOOL;
case 2: return TYPE_BOOL;
case 3: return TYPE_INT;
case 4: return TYPE_STRING;
case 5: break;
case 6: return TYPE_ERROR;
case 7: return *(Type*) v;
}
return TYPE_ERROR;
}
int64_t get_int(Value v)
{
if ((v & 7) == 3)
return (int64_t) (v >> 3);
IntValue *p = (IntValue*) v;
return p->raw;
}
float get_float(Value v)
{
FloatValue *p = (FloatValue*) v;
return p->raw;
}
String get_str(Value *v)
{
if ((*v & 7) == 6)
return (String) { (char*) v, strnlen((char*) v, 7) };
StringValue *p = (StringValue*) v;
return (String) { p->data, p->len };
}
Value make_int(Eval *e, int64_t x)
{
if (x <= (1ULL << 60)-1 && x >= -(1ULL << 60))
return ((Value) x >> 3) | 3;
IntValue *v = alloc(e->a, (int) sizeof(IntValue), _Alignof(IntValue));
if (v == NULL)
return VALUE_ERROR;
v->type = TYPE_INT;
v->raw = x;
ASSERT(((uintptr_t) v & 7) == 0);
return ((Value) v) | 7;
}
Value make_float(Eval *e, float x)
{
FloatValue *v = alloc(e->a, (int) sizeof(FloatValue), _Alignof(FloatValue));
if (v == NULL)
return VALUE_ERROR;
v->type = TYPE_FLOAT;
v->raw = x;
ASSERT(((uintptr_t) v & 7) == 0);
return ((Value) v) | 7;
}
Value make_str(Eval *e, String x)
{
if (x.len < 8) {
Value v = 0;
memcpy(&v, x.ptr, x.len);
return v | 4;
}
StringValue *v = alloc(e->a, (int) sizeof(StringValue) + x.len, _Alignof(StringValue));
if (v == NULL)
return VALUE_ERROR;
v->len = x.len;
memcpy(v->data, x.ptr, x.len);
ASSERT(((uintptr_t) v & 7) == 0);
return ((Value) v) | 7;
}
b32 valeq(Value a, Value b)
{
Type t1 = type_of(a);
Type t2 = type_of(b);
if (t1 != t2)
return false;
switch (t1) {
case TYPE_NONE:
return VALUE_TRUE;
case TYPE_BOOL:
return a == b;
case TYPE_INT:
return get_int(a) == get_int(b);
case TYPE_FLOAT:
return get_float(a) == get_float(b);
case TYPE_MAP:
return false; // TODO
case TYPE_ARRAY:
return false; // TODO
case TYPE_STRING:
return streq(get_str(a), get_str(b));
case TYPE_ERROR:
return true;
}
return false;
}
void step(Eval *e)
{
uint8_t b = e->p.ptr[e->off++];
uint8_t b = ((uint8_t*) e->p.ptr)[e->off++];
switch (b) {
@@ -106,7 +247,7 @@ void step(Eval *e)
{
int64_t x;
memcpy(&x, e->p.ptr + e->off, sizeof(x));
memcpy(&x, (uint8_t*) e->p.ptr + e->off, sizeof(x));
e->off += (int) sizeof(x);
e->eval_stack[e->eval_depth++] = x;
@@ -117,7 +258,7 @@ void step(Eval *e)
{
double x;
memcpy(&x, e->p.ptr + e->off, sizeof(x));
memcpy(&x, (uint8_t*) e->p.ptr + e->off, sizeof(x));
e->off += (int) sizeof(x);
e->eval_stack[e->eval_depth++] = x;
@@ -155,8 +296,15 @@ void step(Eval *e)
case OPCODE_NEG:
{
Value a = e->eval_stack[--e->eval_depth];
Type t = type_of(a);
Value r;
if (0) {}
else if (t == TYPE_INT) r = make_int(e, -get_int(a));
else if (t == TYPE_FLOAT) r = make_float(e, -get_float(a));
else {
// TODO
}
e->eval_stack[e->eval_depth++] = r;
}
@@ -168,8 +316,7 @@ void step(Eval *e)
Value b = e->eval_stack[e->eval_depth-1];
e->eval_depth -= 2;
// TODO
Value r = valeq(a, b) ? VALUE_TRUE : VALUE_FALSE;
e->eval_stack[e->eval_depth++] = r;
}
break;
@@ -180,8 +327,7 @@ void step(Eval *e)
Value b = e->eval_stack[e->eval_depth-1];
e->eval_depth -= 2;
// TODO
Value r = valeq(a, b) ? VALUE_FALSE : VALUE_TRUE;
e->eval_stack[e->eval_depth++] = r;
}
break;
@@ -192,8 +338,7 @@ void step(Eval *e)
Value b = e->eval_stack[e->eval_depth-1];
e->eval_depth -= 2;
// TODO
Value r = valgrt(a, b) || valeq(a, b) ? VALUE_FALSE : VALUE_TRUE;
e->eval_stack[e->eval_depth++] = r;
}
break;
@@ -204,8 +349,7 @@ void step(Eval *e)
Value b = e->eval_stack[e->eval_depth-1];
e->eval_depth -= 2;
// TODO
Value r = valgrt(a, b) ? VALUE_TRUE : VALUE_FALSE;
e->eval_stack[e->eval_depth++] = r;
}
break;
@@ -216,7 +360,64 @@ void step(Eval *e)
Value b = e->eval_stack[e->eval_depth-1];
e->eval_depth -= 2;
#define TYPE_PAIR(X, Y) (((uint16_t) (X) << 16) | (uint16_t) (Y))
Type t1 = type_of(a);
Type t2 = type_of(b);
Value r;
switch (TYPE_PAIR(t1, t2)) {
case TYPE_PAIR(TYPE_INT, TYPE_INT):
{
int64_t u = get_int(a);
int64_t v = get_int(b);
// TODO: check overflow and underflow
r = make_int(e, u + v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_INT, TYPE_FLOAT):
{
float u = (float) get_int(a);
float v = get_float(b);
r = make_float(e, u + v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_FLOAT, TYPE_INT):
{
float u = get_float(a);
float v = (float) get_int(b);
r = make_float(e, u + v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_FLOAT, TYPE_FLOAT):
{
float u = get_float(a);
float v = get_float(b);
// TODO: check overflow and underflow
r = make_float(e, u + v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
default:
// TODO
break;
}
e->eval_stack[e->eval_depth++] = r;
}
@@ -228,7 +429,63 @@ void step(Eval *e)
Value b = e->eval_stack[e->eval_depth-1];
e->eval_depth -= 2;
Type t1 = type_of(a);
Type t2 = type_of(b);
Value r;
switch (TYPE_PAIR(t1, t2)) {
case TYPE_PAIR(TYPE_INT, TYPE_INT):
{
int64_t u = get_int(a);
int64_t v = get_int(b);
// TODO: check overflow and underflow
r = make_int(e, u - v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_INT, TYPE_FLOAT):
{
float u = (float) get_int(a);
float v = get_float(b);
r = make_float(e, u - v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_FLOAT, TYPE_INT):
{
float u = get_float(a);
float v = (float) get_int(b);
r = make_float(e, u - v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_FLOAT, TYPE_FLOAT):
{
float u = get_float(a);
float v = get_float(b);
// TODO: check overflow and underflow
r = make_float(e, u - v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
default:
// TODO
break;
}
e->eval_stack[e->eval_depth++] = r;
}
@@ -240,7 +497,63 @@ void step(Eval *e)
Value b = e->eval_stack[e->eval_depth-1];
e->eval_depth -= 2;
Type t1 = type_of(a);
Type t2 = type_of(b);
Value r;
switch (TYPE_PAIR(t1, t2)) {
case TYPE_PAIR(TYPE_INT, TYPE_INT):
{
int64_t u = get_int(a);
int64_t v = get_int(b);
// TODO: check overflow and underflow
r = make_int(e, u * v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_INT, TYPE_FLOAT):
{
float u = (float) get_int(a);
float v = get_float(b);
r = make_float(e, u * v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_FLOAT, TYPE_INT):
{
float u = get_float(a);
float v = (float) get_int(b);
r = make_float(e, u * v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_FLOAT, TYPE_FLOAT):
{
float u = get_float(a);
float v = get_float(b);
// TODO: check overflow and underflow
r = make_float(e, u * v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
default:
// TODO
break;
}
e->eval_stack[e->eval_depth++] = r;
}
@@ -252,7 +565,66 @@ void step(Eval *e)
Value b = e->eval_stack[e->eval_depth-1];
e->eval_depth -= 2;
Type t1 = type_of(a);
Type t2 = type_of(b);
Value r;
switch (TYPE_PAIR(t1, t2)) {
case TYPE_PAIR(TYPE_INT, TYPE_INT):
{
// TODO: check division by 0
int64_t u = get_int(a);
int64_t v = get_int(b);
r = make_int(e, u / v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_INT, TYPE_FLOAT):
{
// TODO: check division by 0
float u = (float) get_int(a);
float v = get_float(b);
r = make_float(e, u / v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_FLOAT, TYPE_INT):
{
// TODO: check division by 0
float u = get_float(a);
float v = (float) get_int(b);
r = make_float(e, u / v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_FLOAT, TYPE_FLOAT):
{
float u = get_float(a);
float v = get_float(b);
r = make_float(e, u / v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
default:
// TODO
break;
}
e->eval_stack[e->eval_depth++] = r;
}
@@ -264,7 +636,66 @@ void step(Eval *e)
Value b = e->eval_stack[e->eval_depth-1];
e->eval_depth -= 2;
Type t1 = type_of(a);
Type t2 = type_of(b);
Value r;
switch (TYPE_PAIR(t1, t2)) {
case TYPE_PAIR(TYPE_INT, TYPE_INT):
{
// TODO: check division by 0
int64_t u = get_int(a);
int64_t v = get_int(b);
r = make_int(e, u % v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_INT, TYPE_FLOAT):
{
// TODO: check division by 0
float u = (float) get_int(a);
float v = get_float(b);
r = make_float(e, u % v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_FLOAT, TYPE_INT):
{
// TODO: check division by 0
float u = get_float(a);
float v = (float) get_int(b);
r = make_float(e, u % v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
case TYPE_PAIR(TYPE_FLOAT, TYPE_FLOAT):
{
float u = get_float(a);
float v = get_float(b);
r = make_float(e, u % v);
if (r == VALUE_ERROR) {
// TODO
}
}
break;
default:
// TODO
break;
}
e->eval_stack[e->eval_depth++] = r;
}
@@ -280,7 +711,7 @@ void step(Eval *e)
{
uint32_t x;
memcpy(&x, e->p.ptr + e->off, (int) sizeof(x));
memcpy(&x, (uint8_t*) e->p.ptr + e->off, (int) sizeof(x));
e->off = (int) sizeof(x);
}
break;
@@ -291,13 +722,7 @@ void step(Eval *e)
}
break;
case OPCODE_SCALL:
{
// TODO
}
break;
case OPCODE_DCALL:
case OPCODE_CALL:
{
// TODO
}