2018-06-12 18:24:45 +00:00
|
|
|
/*
|
2019-01-06 08:23:03 +00:00
|
|
|
* Copyright (c) 2019 Calvin Rose
|
2018-06-12 18:24:45 +00:00
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to
|
|
|
|
* deal in the Software without restriction, including without limitation the
|
|
|
|
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
|
|
* sell copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
|
|
* IN THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2019-01-24 05:15:58 +00:00
|
|
|
#ifndef JANET_AMALG
|
2019-02-19 01:13:35 +00:00
|
|
|
#include <janet.h>
|
2018-08-20 00:21:27 +00:00
|
|
|
#include "state.h"
|
|
|
|
#include "vector.h"
|
|
|
|
#include "gc.h"
|
2018-11-26 23:01:50 +00:00
|
|
|
#include "fiber.h"
|
2019-01-06 06:49:56 +00:00
|
|
|
#include "util.h"
|
2019-01-24 05:15:58 +00:00
|
|
|
#endif
|
2018-08-20 00:21:27 +00:00
|
|
|
|
2018-06-12 18:24:45 +00:00
|
|
|
typedef struct {
|
2018-09-06 02:18:42 +00:00
|
|
|
JanetBuffer *buf;
|
|
|
|
JanetTable seen;
|
2018-10-21 05:35:07 +00:00
|
|
|
JanetTable *rreg;
|
2018-09-06 02:18:42 +00:00
|
|
|
JanetFuncEnv **seen_envs;
|
|
|
|
JanetFuncDef **seen_defs;
|
2018-06-12 18:24:45 +00:00
|
|
|
int32_t nextid;
|
|
|
|
} MarshalState;
|
|
|
|
|
|
|
|
/* Lead bytes in marshaling protocol */
|
|
|
|
enum {
|
2018-12-30 17:37:50 +00:00
|
|
|
LB_REAL = 200,
|
|
|
|
LB_NIL,
|
2018-06-12 18:24:45 +00:00
|
|
|
LB_FALSE,
|
|
|
|
LB_TRUE,
|
|
|
|
LB_FIBER,
|
|
|
|
LB_INTEGER,
|
|
|
|
LB_STRING,
|
|
|
|
LB_SYMBOL,
|
2019-01-03 00:41:07 +00:00
|
|
|
LB_KEYWORD,
|
2018-06-12 18:24:45 +00:00
|
|
|
LB_ARRAY,
|
|
|
|
LB_TUPLE,
|
|
|
|
LB_TABLE,
|
|
|
|
LB_TABLE_PROTO,
|
|
|
|
LB_STRUCT,
|
|
|
|
LB_BUFFER,
|
|
|
|
LB_FUNCTION,
|
2018-08-20 00:21:27 +00:00
|
|
|
LB_REGISTRY,
|
2018-06-12 18:24:45 +00:00
|
|
|
LB_ABSTRACT,
|
2018-08-20 00:21:27 +00:00
|
|
|
LB_REFERENCE,
|
|
|
|
LB_FUNCENV_REF,
|
|
|
|
LB_FUNCDEF_REF
|
2018-06-12 18:24:45 +00:00
|
|
|
} LeadBytes;
|
|
|
|
|
2018-10-21 05:35:07 +00:00
|
|
|
/* Helper to look inside an entry in an environment */
|
|
|
|
static Janet entry_getval(Janet env_entry) {
|
|
|
|
if (janet_checktype(env_entry, JANET_TABLE)) {
|
|
|
|
JanetTable *entry = janet_unwrap_table(env_entry);
|
2019-01-03 00:41:07 +00:00
|
|
|
Janet checkval = janet_table_get(entry, janet_ckeywordv("value"));
|
2018-10-21 05:35:07 +00:00
|
|
|
if (janet_checktype(checkval, JANET_NIL)) {
|
2019-01-03 00:41:07 +00:00
|
|
|
checkval = janet_table_get(entry, janet_ckeywordv("ref"));
|
2018-10-21 05:35:07 +00:00
|
|
|
}
|
|
|
|
return checkval;
|
|
|
|
} else if (janet_checktype(env_entry, JANET_STRUCT)) {
|
|
|
|
const JanetKV *entry = janet_unwrap_struct(env_entry);
|
2019-01-03 00:41:07 +00:00
|
|
|
Janet checkval = janet_struct_get(entry, janet_ckeywordv("value"));
|
2018-10-21 05:35:07 +00:00
|
|
|
if (janet_checktype(checkval, JANET_NIL)) {
|
2019-01-03 00:41:07 +00:00
|
|
|
checkval = janet_struct_get(entry, janet_ckeywordv("ref"));
|
2018-10-21 05:35:07 +00:00
|
|
|
}
|
|
|
|
return checkval;
|
|
|
|
} else {
|
|
|
|
return janet_wrap_nil();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make a forward lookup table from an environment (for unmarshaling) */
|
2018-10-21 15:46:36 +00:00
|
|
|
JanetTable *janet_env_lookup(JanetTable *env) {
|
2018-10-21 05:35:07 +00:00
|
|
|
JanetTable *renv = janet_table(env->count);
|
|
|
|
while (env) {
|
|
|
|
for (int32_t i = 0; i < env->capacity; i++) {
|
|
|
|
if (janet_checktype(env->data[i].key, JANET_SYMBOL)) {
|
|
|
|
janet_table_put(renv,
|
2019-02-20 01:51:34 +00:00
|
|
|
env->data[i].key,
|
|
|
|
entry_getval(env->data[i].value));
|
2018-10-21 05:35:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
env = env->proto;
|
|
|
|
}
|
|
|
|
return renv;
|
|
|
|
}
|
|
|
|
|
2018-06-12 18:24:45 +00:00
|
|
|
/* Marshal an integer onto the buffer */
|
2018-08-20 00:21:27 +00:00
|
|
|
static void pushint(MarshalState *st, int32_t x) {
|
2019-02-08 15:12:25 +00:00
|
|
|
if (x >= 0 && x < 128) {
|
2019-01-06 01:09:03 +00:00
|
|
|
janet_buffer_push_u8(st->buf, x);
|
2019-02-08 15:12:25 +00:00
|
|
|
} else if (x <= 8191 && x >= -8192) {
|
|
|
|
uint8_t intbuf[2];
|
|
|
|
intbuf[0] = ((x >> 8) & 0x3F) | 0x80;
|
|
|
|
intbuf[1] = x & 0xFF;
|
|
|
|
janet_buffer_push_bytes(st->buf, intbuf, 2);
|
2018-06-12 18:24:45 +00:00
|
|
|
} else {
|
|
|
|
uint8_t intbuf[5];
|
|
|
|
intbuf[0] = LB_INTEGER;
|
2019-02-08 15:12:25 +00:00
|
|
|
intbuf[1] = (x >> 24) & 0xFF;
|
|
|
|
intbuf[2] = (x >> 16) & 0xFF;
|
|
|
|
intbuf[3] = (x >> 8) & 0xFF;
|
|
|
|
intbuf[4] = x & 0xFF;
|
2019-01-06 01:09:03 +00:00
|
|
|
janet_buffer_push_bytes(st->buf, intbuf, 5);
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
static void pushbyte(MarshalState *st, uint8_t b) {
|
2019-01-06 01:09:03 +00:00
|
|
|
janet_buffer_push_u8(st->buf, b);
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-06-12 18:24:45 +00:00
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
static void pushbytes(MarshalState *st, const uint8_t *bytes, int32_t len) {
|
2019-01-06 01:09:03 +00:00
|
|
|
janet_buffer_push_bytes(st->buf, bytes, len);
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-06-12 18:24:45 +00:00
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* Forward declaration to enable mutual recursion. */
|
2018-09-06 02:18:42 +00:00
|
|
|
static void marshal_one(MarshalState *st, Janet x, int flags);
|
|
|
|
static void marshal_one_fiber(MarshalState *st, JanetFiber *fiber, int flags);
|
|
|
|
static void marshal_one_def(MarshalState *st, JanetFuncDef *def, int flags);
|
|
|
|
static void marshal_one_env(MarshalState *st, JanetFuncEnv *env, int flags);
|
2018-06-12 18:24:45 +00:00
|
|
|
|
2019-02-22 15:10:41 +00:00
|
|
|
/* Prevent stack overflows */
|
|
|
|
#define MARSH_STACKCHECK if ((flags & 0xFFFF) > JANET_RECURSION_GUARD) janet_panic("stack overflow")
|
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* Marshal a function env */
|
2018-09-06 02:18:42 +00:00
|
|
|
static void marshal_one_env(MarshalState *st, JanetFuncEnv *env, int flags) {
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_STACKCHECK;
|
2018-09-06 02:18:42 +00:00
|
|
|
for (int32_t i = 0; i < janet_v_count(st->seen_envs); i++) {
|
2018-08-20 00:21:27 +00:00
|
|
|
if (st->seen_envs[i] == env) {
|
|
|
|
pushbyte(st, LB_FUNCENV_REF);
|
|
|
|
pushint(st, i);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2018-09-06 02:18:42 +00:00
|
|
|
janet_v_push(st->seen_envs, env);
|
2018-08-20 00:21:27 +00:00
|
|
|
pushint(st, env->offset);
|
|
|
|
pushint(st, env->length);
|
2018-08-23 01:41:25 +00:00
|
|
|
if (env->offset) {
|
2018-08-20 00:21:27 +00:00
|
|
|
/* On stack variant */
|
2018-11-26 14:02:07 +00:00
|
|
|
marshal_one(st, janet_wrap_fiber(env->as.fiber), flags + 1);
|
2018-08-20 00:21:27 +00:00
|
|
|
} else {
|
|
|
|
/* Off stack variant */
|
|
|
|
for (int32_t i = 0; i < env->length; i++)
|
2018-08-24 15:35:08 +00:00
|
|
|
marshal_one(st, env->as.values[i], flags + 1);
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
|
|
|
}
|
2018-06-12 18:24:45 +00:00
|
|
|
|
2018-09-06 02:18:42 +00:00
|
|
|
/* Add function flags to janet functions */
|
|
|
|
static void janet_func_addflags(JanetFuncDef *def) {
|
|
|
|
if (def->name) def->flags |= JANET_FUNCDEF_FLAG_HASNAME;
|
|
|
|
if (def->source) def->flags |= JANET_FUNCDEF_FLAG_HASSOURCE;
|
|
|
|
if (def->defs) def->flags |= JANET_FUNCDEF_FLAG_HASDEFS;
|
|
|
|
if (def->environments) def->flags |= JANET_FUNCDEF_FLAG_HASENVS;
|
|
|
|
if (def->sourcemap) def->flags |= JANET_FUNCDEF_FLAG_HASSOURCEMAP;
|
2018-08-21 19:07:37 +00:00
|
|
|
}
|
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* Marshal a function def */
|
2018-09-06 02:18:42 +00:00
|
|
|
static void marshal_one_def(MarshalState *st, JanetFuncDef *def, int flags) {
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_STACKCHECK;
|
2018-09-06 02:18:42 +00:00
|
|
|
for (int32_t i = 0; i < janet_v_count(st->seen_defs); i++) {
|
2018-08-20 00:21:27 +00:00
|
|
|
if (st->seen_defs[i] == def) {
|
|
|
|
pushbyte(st, LB_FUNCDEF_REF);
|
|
|
|
pushint(st, i);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2018-09-06 02:18:42 +00:00
|
|
|
janet_func_addflags(def);
|
2018-08-21 18:16:55 +00:00
|
|
|
/* Add to lookup */
|
2018-09-06 02:18:42 +00:00
|
|
|
janet_v_push(st->seen_defs, def);
|
2018-08-20 00:21:27 +00:00
|
|
|
pushint(st, def->flags);
|
|
|
|
pushint(st, def->slotcount);
|
|
|
|
pushint(st, def->arity);
|
|
|
|
pushint(st, def->constants_length);
|
|
|
|
pushint(st, def->bytecode_length);
|
2018-09-06 02:18:42 +00:00
|
|
|
if (def->flags & JANET_FUNCDEF_FLAG_HASENVS)
|
2018-08-20 00:21:27 +00:00
|
|
|
pushint(st, def->environments_length);
|
2018-09-06 02:18:42 +00:00
|
|
|
if (def->flags & JANET_FUNCDEF_FLAG_HASDEFS)
|
2018-08-20 00:21:27 +00:00
|
|
|
pushint(st, def->defs_length);
|
2018-09-06 02:18:42 +00:00
|
|
|
if (def->flags & JANET_FUNCDEF_FLAG_HASNAME)
|
|
|
|
marshal_one(st, janet_wrap_string(def->name), flags);
|
|
|
|
if (def->flags & JANET_FUNCDEF_FLAG_HASSOURCE)
|
|
|
|
marshal_one(st, janet_wrap_string(def->source), flags);
|
2018-11-16 21:24:10 +00:00
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* marshal constants */
|
|
|
|
for (int32_t i = 0; i < def->constants_length; i++)
|
|
|
|
marshal_one(st, def->constants[i], flags);
|
2018-11-16 21:24:10 +00:00
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* marshal the bytecode */
|
|
|
|
for (int32_t i = 0; i < def->bytecode_length; i++) {
|
|
|
|
pushbyte(st, def->bytecode[i] & 0xFF);
|
|
|
|
pushbyte(st, (def->bytecode[i] >> 8) & 0xFF);
|
|
|
|
pushbyte(st, (def->bytecode[i] >> 16) & 0xFF);
|
|
|
|
pushbyte(st, (def->bytecode[i] >> 24) & 0xFF);
|
|
|
|
}
|
2018-11-16 21:24:10 +00:00
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* marshal the environments if needed */
|
|
|
|
for (int32_t i = 0; i < def->environments_length; i++)
|
2019-02-09 17:21:11 +00:00
|
|
|
pushint(st, def->environments[i]);
|
2018-11-16 21:24:10 +00:00
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* marshal the sub funcdefs if needed */
|
|
|
|
for (int32_t i = 0; i < def->defs_length; i++)
|
|
|
|
marshal_one_def(st, def->defs[i], flags);
|
|
|
|
|
|
|
|
/* marshal source maps if needed */
|
2018-09-06 02:18:42 +00:00
|
|
|
if (def->flags & JANET_FUNCDEF_FLAG_HASSOURCEMAP) {
|
2019-02-08 05:44:30 +00:00
|
|
|
int32_t current = 0;
|
2018-08-20 00:21:27 +00:00
|
|
|
for (int32_t i = 0; i < def->bytecode_length; i++) {
|
2018-09-06 02:18:42 +00:00
|
|
|
JanetSourceMapping map = def->sourcemap[i];
|
2019-02-08 05:44:30 +00:00
|
|
|
pushint(st, map.start - current);
|
|
|
|
pushint(st, map.end - map.start);
|
|
|
|
current = map.end;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-06-12 18:24:45 +00:00
|
|
|
|
2018-09-06 02:18:42 +00:00
|
|
|
#define JANET_FIBER_FLAG_HASCHILD (1 << 29)
|
2018-11-26 14:02:07 +00:00
|
|
|
#define JANET_STACKFRAME_HASENV (1 << 30)
|
2018-08-23 01:41:25 +00:00
|
|
|
|
|
|
|
/* Marshal a fiber */
|
2018-09-06 02:18:42 +00:00
|
|
|
static void marshal_one_fiber(MarshalState *st, JanetFiber *fiber, int flags) {
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_STACKCHECK;
|
2018-11-26 14:02:07 +00:00
|
|
|
int32_t fflags = fiber->flags;
|
|
|
|
if (fiber->child) fflags |= JANET_FIBER_FLAG_HASCHILD;
|
|
|
|
if (janet_fiber_status(fiber) == JANET_STATUS_ALIVE)
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_panic("cannot marshal alive fiber");
|
2018-11-26 14:02:07 +00:00
|
|
|
pushint(st, fflags);
|
2018-08-23 01:41:25 +00:00
|
|
|
pushint(st, fiber->frame);
|
|
|
|
pushint(st, fiber->stackstart);
|
|
|
|
pushint(st, fiber->stacktop);
|
|
|
|
pushint(st, fiber->maxstack);
|
|
|
|
/* Do frames */
|
|
|
|
int32_t i = fiber->frame;
|
2018-09-06 02:18:42 +00:00
|
|
|
int32_t j = fiber->stackstart - JANET_FRAME_SIZE;
|
2018-08-23 01:41:25 +00:00
|
|
|
while (i > 0) {
|
2018-09-06 02:18:42 +00:00
|
|
|
JanetStackFrame *frame = (JanetStackFrame *)(fiber->data + i - JANET_FRAME_SIZE);
|
|
|
|
if (frame->env) frame->flags |= JANET_STACKFRAME_HASENV;
|
2019-02-22 15:10:41 +00:00
|
|
|
if (!frame->func) janet_panic("cannot marshal fiber with c stackframe");
|
2018-08-23 01:41:25 +00:00
|
|
|
pushint(st, frame->flags);
|
|
|
|
pushint(st, frame->prevframe);
|
2018-12-08 22:40:05 +00:00
|
|
|
int32_t pcdiff = (int32_t)(frame->pc - frame->func->def->bytecode);
|
2018-08-23 01:41:25 +00:00
|
|
|
pushint(st, pcdiff);
|
2018-09-06 02:18:42 +00:00
|
|
|
marshal_one(st, janet_wrap_function(frame->func), flags + 1);
|
2018-08-23 01:41:25 +00:00
|
|
|
if (frame->env) marshal_one_env(st, frame->env, flags + 1);
|
|
|
|
/* Marshal all values in the stack frame */
|
|
|
|
for (int32_t k = i; k < j; k++)
|
|
|
|
marshal_one(st, fiber->data[k], flags + 1);
|
2018-09-06 02:18:42 +00:00
|
|
|
j = i - JANET_FRAME_SIZE;
|
2018-08-23 01:41:25 +00:00
|
|
|
i = frame->prevframe;
|
|
|
|
}
|
|
|
|
if (fiber->child)
|
2018-11-26 14:02:07 +00:00
|
|
|
marshal_one(st, janet_wrap_fiber(fiber->child), flags + 1);
|
2018-08-23 01:41:25 +00:00
|
|
|
}
|
|
|
|
|
2019-02-21 19:52:39 +00:00
|
|
|
|
2019-02-23 16:13:43 +00:00
|
|
|
void janet_marshal_int(JanetMarshalContext *ctx, int32_t value) {
|
|
|
|
MarshalState *st = (MarshalState *)(ctx->m_state);
|
|
|
|
pushint(st, value);
|
2019-02-21 19:52:39 +00:00
|
|
|
};
|
2019-02-22 14:57:48 +00:00
|
|
|
|
2019-02-23 16:13:43 +00:00
|
|
|
void janet_marshal_byte(JanetMarshalContext *ctx, uint8_t value) {
|
|
|
|
MarshalState *st = (MarshalState *)(ctx->m_state);
|
|
|
|
pushbyte(st, value);
|
2019-02-21 19:52:39 +00:00
|
|
|
};
|
2019-02-22 14:57:48 +00:00
|
|
|
|
2019-02-23 16:13:43 +00:00
|
|
|
void janet_marshal_bytes(JanetMarshalContext *ctx, const uint8_t *bytes, int32_t len) {
|
|
|
|
MarshalState *st = (MarshalState *)(ctx->m_state);
|
|
|
|
pushbytes(st, bytes, len);
|
2019-02-21 19:52:39 +00:00
|
|
|
}
|
2019-02-22 14:57:48 +00:00
|
|
|
|
2019-02-23 16:13:43 +00:00
|
|
|
void janet_marshal_janet(JanetMarshalContext *ctx, Janet x) {
|
|
|
|
MarshalState *st = (MarshalState *)(ctx->m_state);
|
|
|
|
marshal_one(st, x, ctx->flags + 1);
|
2019-02-21 19:52:39 +00:00
|
|
|
}
|
|
|
|
|
2019-02-22 14:57:48 +00:00
|
|
|
#define MARK_SEEN() \
|
|
|
|
janet_table_put(&st->seen, x, janet_wrap_integer(st->nextid++))
|
|
|
|
|
|
|
|
|
2019-02-21 19:52:39 +00:00
|
|
|
static int marshal_one_abstract(MarshalState *st, Janet x, int flags) {
|
2019-02-23 16:13:43 +00:00
|
|
|
const JanetAbstractType *at = janet_abstract_type(janet_unwrap_abstract(x));
|
|
|
|
const JanetAbstractTypeInfo *info = janet_get_abstract_type_info_byname(at->name);
|
|
|
|
if (! info) return 1 ; /* unregistered type skip marshalling*/
|
|
|
|
if (info->marshal) {
|
|
|
|
MARK_SEEN();
|
|
|
|
JanetMarshalContext context = {st, NULL, flags, NULL};
|
|
|
|
pushbyte(st, LB_ABSTRACT);
|
|
|
|
pushint(st, info->tag);
|
|
|
|
info->marshal(janet_unwrap_abstract(x), &context);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
2019-02-21 19:52:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-06-12 18:24:45 +00:00
|
|
|
/* The main body of the marshaling function. Is the main
|
|
|
|
* entry point for the mutually recursive functions. */
|
2018-09-06 02:18:42 +00:00
|
|
|
static void marshal_one(MarshalState *st, Janet x, int flags) {
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_STACKCHECK;
|
2018-09-06 02:18:42 +00:00
|
|
|
JanetType type = janet_type(x);
|
2018-06-12 18:24:45 +00:00
|
|
|
|
2018-10-22 05:28:39 +00:00
|
|
|
/* Check simple primitives (non reference types, no benefit from memoization) */
|
2018-06-12 18:24:45 +00:00
|
|
|
switch (type) {
|
|
|
|
default:
|
|
|
|
break;
|
2018-09-06 02:18:42 +00:00
|
|
|
case JANET_NIL:
|
|
|
|
case JANET_FALSE:
|
|
|
|
case JANET_TRUE:
|
2018-08-20 00:21:27 +00:00
|
|
|
pushbyte(st, 200 + type);
|
2019-02-22 15:10:41 +00:00
|
|
|
return;
|
2019-02-20 01:51:34 +00:00
|
|
|
case JANET_NUMBER: {
|
|
|
|
double xval = janet_unwrap_number(x);
|
|
|
|
if (janet_checkintrange(xval)) {
|
|
|
|
pushint(st, (int32_t) xval);
|
2019-02-22 15:10:41 +00:00
|
|
|
return;
|
2018-12-27 18:05:29 +00:00
|
|
|
}
|
2019-02-20 01:51:34 +00:00
|
|
|
break;
|
|
|
|
}
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
|
|
|
|
2018-10-21 05:35:07 +00:00
|
|
|
|
|
|
|
/* Check reference and registry value */
|
2018-06-12 18:24:45 +00:00
|
|
|
{
|
2018-09-06 02:18:42 +00:00
|
|
|
Janet check = janet_table_get(&st->seen, x);
|
2018-12-27 18:05:29 +00:00
|
|
|
if (janet_checkint(check)) {
|
2018-08-20 00:21:27 +00:00
|
|
|
pushbyte(st, LB_REFERENCE);
|
2018-09-06 02:18:42 +00:00
|
|
|
pushint(st, janet_unwrap_integer(check));
|
2019-02-22 15:10:41 +00:00
|
|
|
return;
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
2018-10-21 05:35:07 +00:00
|
|
|
if (st->rreg) {
|
|
|
|
check = janet_table_get(st->rreg, x);
|
|
|
|
if (janet_checktype(check, JANET_SYMBOL)) {
|
|
|
|
MARK_SEEN();
|
|
|
|
const uint8_t *regname = janet_unwrap_symbol(check);
|
|
|
|
pushbyte(st, LB_REGISTRY);
|
|
|
|
pushint(st, janet_string_length(regname));
|
|
|
|
pushbytes(st, regname, janet_string_length(regname));
|
2019-02-22 15:10:41 +00:00
|
|
|
return;
|
2018-10-21 05:35:07 +00:00
|
|
|
}
|
|
|
|
}
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Reference types */
|
|
|
|
switch (type) {
|
2019-02-20 01:51:34 +00:00
|
|
|
case JANET_NUMBER: {
|
|
|
|
union {
|
|
|
|
double d;
|
|
|
|
uint8_t bytes[8];
|
|
|
|
} u;
|
|
|
|
u.d = janet_unwrap_number(x);
|
2018-09-06 02:18:42 +00:00
|
|
|
#ifdef JANET_BIG_ENDIAN
|
2019-02-20 01:51:34 +00:00
|
|
|
/* Swap byte order */
|
|
|
|
uint8_t temp;
|
|
|
|
temp = u.bytes[7];
|
|
|
|
u.bytes[7] = u.bytes[0];
|
|
|
|
u.bytes[0] = temp;
|
|
|
|
temp = u.bytes[6];
|
|
|
|
u.bytes[6] = u.bytes[1];
|
|
|
|
u.bytes[1] = temp;
|
|
|
|
temp = u.bytes[5];
|
|
|
|
u.bytes[5] = u.bytes[2];
|
|
|
|
u.bytes[2] = temp;
|
|
|
|
temp = u.bytes[4];
|
|
|
|
u.bytes[4] = u.bytes[3];
|
|
|
|
u.bytes[3] = temp;
|
2018-06-12 18:24:45 +00:00
|
|
|
#endif
|
2019-02-20 01:51:34 +00:00
|
|
|
pushbyte(st, LB_REAL);
|
|
|
|
pushbytes(st, u.bytes, 8);
|
|
|
|
MARK_SEEN();
|
2019-02-22 15:10:41 +00:00
|
|
|
return;
|
2019-02-20 01:51:34 +00:00
|
|
|
}
|
2018-09-06 02:18:42 +00:00
|
|
|
case JANET_STRING:
|
|
|
|
case JANET_SYMBOL:
|
2019-02-20 01:51:34 +00:00
|
|
|
case JANET_KEYWORD: {
|
|
|
|
const uint8_t *str = janet_unwrap_string(x);
|
|
|
|
int32_t length = janet_string_length(str);
|
|
|
|
/* Record reference */
|
|
|
|
MARK_SEEN();
|
|
|
|
uint8_t lb = (type == JANET_STRING) ? LB_STRING :
|
|
|
|
(type == JANET_SYMBOL) ? LB_SYMBOL :
|
|
|
|
LB_KEYWORD;
|
|
|
|
pushbyte(st, lb);
|
|
|
|
pushint(st, length);
|
|
|
|
pushbytes(st, str, length);
|
2019-02-22 15:10:41 +00:00
|
|
|
return;
|
2019-02-20 01:51:34 +00:00
|
|
|
}
|
|
|
|
case JANET_BUFFER: {
|
|
|
|
JanetBuffer *buffer = janet_unwrap_buffer(x);
|
|
|
|
/* Record reference */
|
|
|
|
MARK_SEEN();
|
|
|
|
pushbyte(st, LB_BUFFER);
|
|
|
|
pushint(st, buffer->count);
|
|
|
|
pushbytes(st, buffer->data, buffer->count);
|
2019-02-22 15:10:41 +00:00
|
|
|
return;
|
2019-02-20 01:51:34 +00:00
|
|
|
}
|
|
|
|
case JANET_ARRAY: {
|
|
|
|
int32_t i;
|
|
|
|
JanetArray *a = janet_unwrap_array(x);
|
|
|
|
MARK_SEEN();
|
|
|
|
pushbyte(st, LB_ARRAY);
|
|
|
|
pushint(st, a->count);
|
|
|
|
for (i = 0; i < a->count; i++)
|
|
|
|
marshal_one(st, a->data[i], flags + 1);
|
2019-02-22 15:10:41 +00:00
|
|
|
return;
|
2019-02-20 01:51:34 +00:00
|
|
|
}
|
|
|
|
case JANET_TUPLE: {
|
|
|
|
int32_t i, count, flag;
|
|
|
|
const Janet *tup = janet_unwrap_tuple(x);
|
|
|
|
count = janet_tuple_length(tup);
|
2019-02-21 16:22:29 +00:00
|
|
|
flag = janet_tuple_flag(tup) >> 16;
|
2019-02-20 01:51:34 +00:00
|
|
|
pushbyte(st, LB_TUPLE);
|
|
|
|
pushint(st, count);
|
|
|
|
pushint(st, flag);
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
marshal_one(st, tup[i], flags + 1);
|
|
|
|
/* Mark as seen AFTER marshaling */
|
|
|
|
MARK_SEEN();
|
2019-02-22 15:10:41 +00:00
|
|
|
return;
|
2019-02-20 01:51:34 +00:00
|
|
|
}
|
|
|
|
case JANET_TABLE: {
|
|
|
|
JanetTable *t = janet_unwrap_table(x);
|
|
|
|
MARK_SEEN();
|
|
|
|
pushbyte(st, t->proto ? LB_TABLE_PROTO : LB_TABLE);
|
|
|
|
pushint(st, t->count);
|
|
|
|
if (t->proto)
|
|
|
|
marshal_one(st, janet_wrap_table(t->proto), flags + 1);
|
|
|
|
for (int32_t i = 0; i < t->capacity; i++) {
|
|
|
|
if (janet_checktype(t->data[i].key, JANET_NIL))
|
|
|
|
continue;
|
|
|
|
marshal_one(st, t->data[i].key, flags + 1);
|
|
|
|
marshal_one(st, t->data[i].value, flags + 1);
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
2019-02-22 15:10:41 +00:00
|
|
|
return;
|
2019-02-20 01:51:34 +00:00
|
|
|
}
|
|
|
|
case JANET_STRUCT: {
|
|
|
|
int32_t count;
|
|
|
|
const JanetKV *struct_ = janet_unwrap_struct(x);
|
|
|
|
count = janet_struct_length(struct_);
|
|
|
|
pushbyte(st, LB_STRUCT);
|
|
|
|
pushint(st, count);
|
|
|
|
for (int32_t i = 0; i < janet_struct_capacity(struct_); i++) {
|
|
|
|
if (janet_checktype(struct_[i].key, JANET_NIL))
|
|
|
|
continue;
|
|
|
|
marshal_one(st, struct_[i].key, flags + 1);
|
|
|
|
marshal_one(st, struct_[i].value, flags + 1);
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
2019-02-20 01:51:34 +00:00
|
|
|
/* Mark as seen AFTER marshaling */
|
|
|
|
MARK_SEEN();
|
2019-02-22 15:10:41 +00:00
|
|
|
return;
|
2019-02-20 01:51:34 +00:00
|
|
|
}
|
2019-02-21 19:52:39 +00:00
|
|
|
case JANET_ABSTRACT: {
|
2019-02-23 16:13:43 +00:00
|
|
|
if (marshal_one_abstract(st, x, flags)) {
|
2019-02-23 16:36:38 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2019-02-20 01:51:34 +00:00
|
|
|
case JANET_FUNCTION: {
|
|
|
|
pushbyte(st, LB_FUNCTION);
|
|
|
|
JanetFunction *func = janet_unwrap_function(x);
|
|
|
|
marshal_one_def(st, func->def, flags);
|
|
|
|
/* Mark seen after reading def, but before envs */
|
|
|
|
MARK_SEEN();
|
|
|
|
for (int32_t i = 0; i < func->def->environments_length; i++)
|
|
|
|
marshal_one_env(st, func->envs[i], flags + 1);
|
2019-02-22 15:10:41 +00:00
|
|
|
return;
|
2019-02-20 01:51:34 +00:00
|
|
|
}
|
|
|
|
case JANET_FIBER: {
|
|
|
|
MARK_SEEN();
|
|
|
|
pushbyte(st, LB_FIBER);
|
|
|
|
marshal_one_fiber(st, janet_unwrap_fiber(x), flags + 1);
|
2019-02-22 15:10:41 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
default: {
|
|
|
|
janet_panicf("no registry value and cannot marshal %p", x);
|
|
|
|
return;
|
2019-02-20 01:51:34 +00:00
|
|
|
}
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
|
|
|
#undef MARK_SEEN
|
|
|
|
}
|
|
|
|
|
2019-02-22 15:10:41 +00:00
|
|
|
void janet_marshal(
|
2019-02-20 01:51:34 +00:00
|
|
|
JanetBuffer *buf,
|
|
|
|
Janet x,
|
|
|
|
JanetTable *rreg,
|
|
|
|
int flags) {
|
2018-11-16 21:24:10 +00:00
|
|
|
MarshalState st;
|
2018-06-12 18:24:45 +00:00
|
|
|
st.buf = buf;
|
|
|
|
st.nextid = 0;
|
2018-08-20 00:21:27 +00:00
|
|
|
st.seen_defs = NULL;
|
|
|
|
st.seen_envs = NULL;
|
2018-10-21 05:35:07 +00:00
|
|
|
st.rreg = rreg;
|
2018-09-06 02:18:42 +00:00
|
|
|
janet_table_init(&st.seen, 0);
|
2019-02-22 15:10:41 +00:00
|
|
|
marshal_one(&st, x, flags);
|
|
|
|
/* Clean up. See comment in janet_unmarshal about autoreleasing memory on panics.*/
|
2018-09-06 02:18:42 +00:00
|
|
|
janet_table_deinit(&st.seen);
|
2018-10-04 21:33:44 +00:00
|
|
|
janet_v_free(st.seen_envs);
|
|
|
|
janet_v_free(st.seen_defs);
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
jmp_buf err;
|
2018-09-06 02:18:42 +00:00
|
|
|
JanetArray lookup;
|
2018-10-21 05:35:07 +00:00
|
|
|
JanetTable *reg;
|
2018-09-06 02:18:42 +00:00
|
|
|
JanetFuncEnv **lookup_envs;
|
|
|
|
JanetFuncDef **lookup_defs;
|
2019-02-22 15:10:41 +00:00
|
|
|
const uint8_t *start;
|
2018-06-12 18:24:45 +00:00
|
|
|
const uint8_t *end;
|
|
|
|
} UnmarshalState;
|
|
|
|
|
2019-02-23 16:36:38 +00:00
|
|
|
<<<<<<< HEAD
|
2018-06-12 18:24:45 +00:00
|
|
|
enum {
|
|
|
|
UMR_OK,
|
|
|
|
UMR_STACKOVERFLOW,
|
|
|
|
UMR_EOS,
|
|
|
|
UMR_UNKNOWN,
|
|
|
|
UMR_EXPECTED_INTEGER,
|
|
|
|
UMR_EXPECTED_TABLE,
|
2018-08-20 00:21:27 +00:00
|
|
|
UMR_EXPECTED_FIBER,
|
|
|
|
UMR_EXPECTED_STRING,
|
|
|
|
UMR_INVALID_REFERENCE,
|
2018-08-24 12:22:43 +00:00
|
|
|
UMR_INVALID_BYTECODE,
|
2019-02-23 15:58:47 +00:00
|
|
|
UMR_INVALID_FIBER,
|
|
|
|
UMR_INVALID_ABSTRACT
|
2018-06-12 18:24:45 +00:00
|
|
|
} UnmarshalResult;
|
|
|
|
|
|
|
|
const char *umr_strings[] = {
|
|
|
|
"",
|
|
|
|
"stack overflow",
|
|
|
|
"unexpected end of source",
|
2018-08-24 12:22:43 +00:00
|
|
|
"unmarshal error",
|
2018-06-12 18:24:45 +00:00
|
|
|
"expected integer",
|
|
|
|
"expected table",
|
2018-08-20 00:21:27 +00:00
|
|
|
"expected fiber",
|
|
|
|
"expected string",
|
|
|
|
"invalid reference",
|
2018-08-24 12:22:43 +00:00
|
|
|
"invalid bytecode",
|
2019-02-23 15:58:47 +00:00
|
|
|
"invalid fiber",
|
|
|
|
"invalid abstract",
|
2018-06-12 18:24:45 +00:00
|
|
|
};
|
2019-02-23 16:36:38 +00:00
|
|
|
=======
|
2019-02-22 15:10:41 +00:00
|
|
|
#define MARSH_EOS(st, data) do { \
|
|
|
|
if ((data) >= (st)->end) janet_panic("unexpected end of source");\
|
|
|
|
} while (0)
|
2019-02-23 16:36:38 +00:00
|
|
|
>>>>>>> upstream/master
|
2018-06-12 18:24:45 +00:00
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* Helper to read a 32 bit integer from an unmarshal state */
|
|
|
|
static int32_t readint(UnmarshalState *st, const uint8_t **atdata) {
|
|
|
|
const uint8_t *data = *atdata;
|
|
|
|
int32_t ret;
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_EOS(st, data);
|
2019-02-08 15:12:25 +00:00
|
|
|
if (*data < 128) {
|
2018-08-20 00:21:27 +00:00
|
|
|
ret = *data++;
|
2019-02-08 15:12:25 +00:00
|
|
|
} else if (*data < 192) {
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_EOS(st, data + 1);
|
2019-02-08 15:12:25 +00:00
|
|
|
ret = ((data[0] & 0x3F) << 8) + data[1];
|
|
|
|
ret = ((ret << 18) >> 18);
|
|
|
|
data += 2;
|
2018-08-20 00:21:27 +00:00
|
|
|
} else if (*data == LB_INTEGER) {
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_EOS(st, data + 4);
|
2019-02-15 19:01:32 +00:00
|
|
|
ret = ((int32_t)(data[1]) << 24) |
|
2019-02-20 01:51:34 +00:00
|
|
|
((int32_t)(data[2]) << 16) |
|
|
|
|
((int32_t)(data[3]) << 8) |
|
|
|
|
(int32_t)(data[4]);
|
2018-08-20 00:21:27 +00:00
|
|
|
data += 5;
|
|
|
|
} else {
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_panicf("expected integer, got byte %x at index %d",
|
|
|
|
*data,
|
|
|
|
data - st->start);
|
|
|
|
ret = 0;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
|
|
|
*atdata = data;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2019-02-22 15:10:41 +00:00
|
|
|
/* Assert a janet type */
|
|
|
|
static void janet_asserttype(Janet x, JanetType t) {
|
|
|
|
if (!janet_checktype(x, t)) {
|
|
|
|
janet_panicf("expected type %T, got %v", 1 << t, x);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-24 15:35:08 +00:00
|
|
|
/* Forward declarations for mutual recursion */
|
2018-08-20 00:21:27 +00:00
|
|
|
static const uint8_t *unmarshal_one(
|
2019-02-20 01:51:34 +00:00
|
|
|
UnmarshalState *st,
|
|
|
|
const uint8_t *data,
|
|
|
|
Janet *out,
|
|
|
|
int flags);
|
2018-08-24 15:35:08 +00:00
|
|
|
static const uint8_t *unmarshal_one_env(
|
2019-02-20 01:51:34 +00:00
|
|
|
UnmarshalState *st,
|
|
|
|
const uint8_t *data,
|
|
|
|
JanetFuncEnv **out,
|
|
|
|
int flags);
|
2018-08-24 15:35:08 +00:00
|
|
|
static const uint8_t *unmarshal_one_def(
|
2019-02-20 01:51:34 +00:00
|
|
|
UnmarshalState *st,
|
|
|
|
const uint8_t *data,
|
|
|
|
JanetFuncDef **out,
|
|
|
|
int flags);
|
2018-08-24 15:35:08 +00:00
|
|
|
static const uint8_t *unmarshal_one_fiber(
|
2019-02-20 01:51:34 +00:00
|
|
|
UnmarshalState *st,
|
|
|
|
const uint8_t *data,
|
|
|
|
JanetFiber **out,
|
|
|
|
int flags);
|
2018-08-20 00:21:27 +00:00
|
|
|
|
|
|
|
/* Unmarshal a funcenv */
|
|
|
|
static const uint8_t *unmarshal_one_env(
|
2019-02-20 01:51:34 +00:00
|
|
|
UnmarshalState *st,
|
|
|
|
const uint8_t *data,
|
|
|
|
JanetFuncEnv **out,
|
|
|
|
int flags) {
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_EOS(st, data);
|
2018-08-20 00:21:27 +00:00
|
|
|
if (*data == LB_FUNCENV_REF) {
|
2018-08-21 17:09:01 +00:00
|
|
|
data++;
|
2018-08-20 00:21:27 +00:00
|
|
|
int32_t index = readint(st, &data);
|
2018-09-06 02:18:42 +00:00
|
|
|
if (index < 0 || index >= janet_v_count(st->lookup_envs))
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_panicf("invalid funcenv reference %d", index);
|
2018-08-20 00:21:27 +00:00
|
|
|
*out = st->lookup_envs[index];
|
|
|
|
} else {
|
2018-09-06 02:18:42 +00:00
|
|
|
JanetFuncEnv *env = janet_gcalloc(JANET_MEMORY_FUNCENV, sizeof(JanetFuncEnv));
|
2018-08-24 12:22:43 +00:00
|
|
|
env->length = 0;
|
|
|
|
env->offset = 0;
|
2018-09-06 02:18:42 +00:00
|
|
|
janet_v_push(st->lookup_envs, env);
|
2018-08-24 12:22:43 +00:00
|
|
|
int32_t offset = readint(st, &data);
|
|
|
|
int32_t length = readint(st, &data);
|
|
|
|
if (offset) {
|
2018-11-26 14:02:07 +00:00
|
|
|
Janet fiberv;
|
2018-08-20 00:21:27 +00:00
|
|
|
/* On stack variant */
|
2018-11-26 14:02:07 +00:00
|
|
|
data = unmarshal_one(st, data, &fiberv, flags);
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_asserttype(fiberv, JANET_FIBER);
|
2018-11-26 14:02:07 +00:00
|
|
|
env->as.fiber = janet_unwrap_fiber(fiberv);
|
2019-01-06 08:23:03 +00:00
|
|
|
/* Unmarshalling fiber may set values */
|
2019-02-22 15:10:41 +00:00
|
|
|
if (env->offset != 0 && env->offset != offset)
|
|
|
|
janet_panic("invalid funcenv offset");
|
|
|
|
if (env->length != 0 && env->length != length)
|
|
|
|
janet_panic("invalid funcenv length");
|
2018-08-20 00:21:27 +00:00
|
|
|
} else {
|
|
|
|
/* Off stack variant */
|
2018-09-06 02:18:42 +00:00
|
|
|
env->as.values = malloc(sizeof(Janet) * length);
|
2018-08-20 00:21:27 +00:00
|
|
|
if (!env->as.values) {
|
2018-09-06 02:18:42 +00:00
|
|
|
JANET_OUT_OF_MEMORY;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-08-24 15:35:08 +00:00
|
|
|
for (int32_t i = 0; i < length; i++)
|
2018-08-20 00:21:27 +00:00
|
|
|
data = unmarshal_one(st, data, env->as.values + i, flags);
|
|
|
|
}
|
2018-08-24 12:22:43 +00:00
|
|
|
env->offset = offset;
|
|
|
|
env->length = length;
|
2018-08-21 17:09:01 +00:00
|
|
|
*out = env;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Unmarshal a funcdef */
|
|
|
|
static const uint8_t *unmarshal_one_def(
|
2019-02-20 01:51:34 +00:00
|
|
|
UnmarshalState *st,
|
|
|
|
const uint8_t *data,
|
|
|
|
JanetFuncDef **out,
|
|
|
|
int flags) {
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_EOS(st, data);
|
2018-08-20 00:21:27 +00:00
|
|
|
if (*data == LB_FUNCDEF_REF) {
|
2018-08-21 17:09:01 +00:00
|
|
|
data++;
|
2018-08-20 00:21:27 +00:00
|
|
|
int32_t index = readint(st, &data);
|
2018-09-06 02:18:42 +00:00
|
|
|
if (index < 0 || index >= janet_v_count(st->lookup_defs))
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_panicf("invalid funcdef reference %d", index);
|
2018-08-20 00:21:27 +00:00
|
|
|
*out = st->lookup_defs[index];
|
|
|
|
} else {
|
2018-08-23 01:41:25 +00:00
|
|
|
/* Initialize with values that will not break garbage collection
|
2019-01-06 08:23:03 +00:00
|
|
|
* if unmarshalling fails. */
|
2018-09-06 02:18:42 +00:00
|
|
|
JanetFuncDef *def = janet_gcalloc(JANET_MEMORY_FUNCDEF, sizeof(JanetFuncDef));
|
2018-08-21 18:16:55 +00:00
|
|
|
def->environments_length = 0;
|
|
|
|
def->defs_length = 0;
|
2018-08-23 01:41:25 +00:00
|
|
|
def->constants_length = 0;
|
|
|
|
def->bytecode_length = 0;
|
2018-08-21 18:16:55 +00:00
|
|
|
def->name = NULL;
|
|
|
|
def->source = NULL;
|
2018-09-06 02:18:42 +00:00
|
|
|
janet_v_push(st->lookup_defs, def);
|
2018-08-23 01:41:25 +00:00
|
|
|
|
|
|
|
/* Set default lengths to zero */
|
|
|
|
int32_t bytecode_length = 0;
|
|
|
|
int32_t constants_length = 0;
|
|
|
|
int32_t environments_length = 0;
|
|
|
|
int32_t defs_length = 0;
|
2018-11-16 21:24:10 +00:00
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* Read flags and other fixed values */
|
2018-08-21 18:16:55 +00:00
|
|
|
def->flags = readint(st, &data);
|
|
|
|
def->slotcount = readint(st, &data);
|
|
|
|
def->arity = readint(st, &data);
|
2018-08-23 01:41:25 +00:00
|
|
|
|
|
|
|
/* Read some lengths */
|
|
|
|
constants_length = readint(st, &data);
|
|
|
|
bytecode_length = readint(st, &data);
|
2018-09-06 02:18:42 +00:00
|
|
|
if (def->flags & JANET_FUNCDEF_FLAG_HASENVS)
|
2018-08-23 01:41:25 +00:00
|
|
|
environments_length = readint(st, &data);
|
2018-09-06 02:18:42 +00:00
|
|
|
if (def->flags & JANET_FUNCDEF_FLAG_HASDEFS)
|
2018-08-23 01:41:25 +00:00
|
|
|
defs_length = readint(st, &data);
|
|
|
|
|
|
|
|
/* Check name and source (optional) */
|
2018-09-06 02:18:42 +00:00
|
|
|
if (def->flags & JANET_FUNCDEF_FLAG_HASNAME) {
|
|
|
|
Janet x;
|
2018-08-20 00:21:27 +00:00
|
|
|
data = unmarshal_one(st, data, &x, flags + 1);
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_asserttype(x, JANET_STRING);
|
2018-09-06 02:18:42 +00:00
|
|
|
def->name = janet_unwrap_string(x);
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-09-06 02:18:42 +00:00
|
|
|
if (def->flags & JANET_FUNCDEF_FLAG_HASSOURCE) {
|
|
|
|
Janet x;
|
2018-08-20 00:21:27 +00:00
|
|
|
data = unmarshal_one(st, data, &x, flags + 1);
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_asserttype(x, JANET_STRING);
|
2018-09-06 02:18:42 +00:00
|
|
|
def->source = janet_unwrap_string(x);
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-11-16 21:24:10 +00:00
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* Unmarshal constants */
|
2018-08-23 01:41:25 +00:00
|
|
|
if (constants_length) {
|
2018-09-06 02:18:42 +00:00
|
|
|
def->constants = malloc(sizeof(Janet) * constants_length);
|
2018-08-21 18:16:55 +00:00
|
|
|
if (!def->constants) {
|
2018-09-06 02:18:42 +00:00
|
|
|
JANET_OUT_OF_MEMORY;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-08-23 01:41:25 +00:00
|
|
|
for (int32_t i = 0; i < constants_length; i++)
|
2018-08-21 18:16:55 +00:00
|
|
|
data = unmarshal_one(st, data, def->constants + i, flags + 1);
|
2018-08-20 00:21:27 +00:00
|
|
|
} else {
|
2018-08-21 18:16:55 +00:00
|
|
|
def->constants = NULL;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-08-23 01:41:25 +00:00
|
|
|
def->constants_length = constants_length;
|
2018-11-16 21:24:10 +00:00
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* Unmarshal bytecode */
|
2018-08-23 01:41:25 +00:00
|
|
|
def->bytecode = malloc(sizeof(uint32_t) * bytecode_length);
|
2018-08-21 18:16:55 +00:00
|
|
|
if (!def->bytecode) {
|
2018-09-06 02:18:42 +00:00
|
|
|
JANET_OUT_OF_MEMORY;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-08-23 01:41:25 +00:00
|
|
|
for (int32_t i = 0; i < bytecode_length; i++) {
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_EOS(st, data + 3);
|
2018-11-16 21:24:10 +00:00
|
|
|
def->bytecode[i] =
|
2018-08-20 00:40:42 +00:00
|
|
|
(uint32_t)(data[0]) |
|
|
|
|
((uint32_t)(data[1]) << 8) |
|
|
|
|
((uint32_t)(data[2]) << 16) |
|
|
|
|
((uint32_t)(data[3]) << 24);
|
2018-08-21 17:09:01 +00:00
|
|
|
data += 4;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-08-23 01:41:25 +00:00
|
|
|
def->bytecode_length = bytecode_length;
|
2018-11-16 21:24:10 +00:00
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* Unmarshal environments */
|
2018-09-06 02:18:42 +00:00
|
|
|
if (def->flags & JANET_FUNCDEF_FLAG_HASENVS) {
|
2018-08-23 01:41:25 +00:00
|
|
|
def->environments = calloc(1, sizeof(int32_t) * environments_length);
|
2018-08-21 18:16:55 +00:00
|
|
|
if (!def->environments) {
|
2018-09-06 02:18:42 +00:00
|
|
|
JANET_OUT_OF_MEMORY;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-08-23 01:41:25 +00:00
|
|
|
for (int32_t i = 0; i < environments_length; i++) {
|
2018-08-21 18:16:55 +00:00
|
|
|
def->environments[i] = readint(st, &data);
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
|
|
|
} else {
|
2018-08-21 18:16:55 +00:00
|
|
|
def->environments = NULL;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-08-23 01:41:25 +00:00
|
|
|
def->environments_length = environments_length;
|
2018-11-16 21:24:10 +00:00
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* Unmarshal sub funcdefs */
|
2018-09-06 02:18:42 +00:00
|
|
|
if (def->flags & JANET_FUNCDEF_FLAG_HASDEFS) {
|
|
|
|
def->defs = calloc(1, sizeof(JanetFuncDef *) * defs_length);
|
2018-08-21 18:16:55 +00:00
|
|
|
if (!def->defs) {
|
2018-09-06 02:18:42 +00:00
|
|
|
JANET_OUT_OF_MEMORY;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-08-23 01:41:25 +00:00
|
|
|
for (int32_t i = 0; i < defs_length; i++) {
|
2018-11-16 21:24:10 +00:00
|
|
|
data = unmarshal_one_def(st, data, def->defs + i, flags + 1);
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
|
|
|
} else {
|
2018-08-21 18:16:55 +00:00
|
|
|
def->defs = NULL;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-08-23 01:41:25 +00:00
|
|
|
def->defs_length = defs_length;
|
2018-11-16 21:24:10 +00:00
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* Unmarshal source maps if needed */
|
2018-09-06 02:18:42 +00:00
|
|
|
if (def->flags & JANET_FUNCDEF_FLAG_HASSOURCEMAP) {
|
2019-02-08 05:44:30 +00:00
|
|
|
int32_t current = 0;
|
2018-09-06 02:18:42 +00:00
|
|
|
def->sourcemap = malloc(sizeof(JanetSourceMapping) * bytecode_length);
|
2018-08-21 18:16:55 +00:00
|
|
|
if (!def->sourcemap) {
|
2018-09-06 02:18:42 +00:00
|
|
|
JANET_OUT_OF_MEMORY;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2018-08-23 01:41:25 +00:00
|
|
|
for (int32_t i = 0; i < bytecode_length; i++) {
|
2019-02-08 05:44:30 +00:00
|
|
|
current += readint(st, &data);
|
|
|
|
def->sourcemap[i].start = current;
|
|
|
|
current += readint(st, &data);
|
|
|
|
def->sourcemap[i].end = current;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
|
|
|
} else {
|
2018-08-21 18:16:55 +00:00
|
|
|
def->sourcemap = NULL;
|
2018-11-16 21:24:10 +00:00
|
|
|
}
|
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
/* Validate */
|
2019-02-22 15:10:41 +00:00
|
|
|
if (janet_verify(def))
|
|
|
|
janet_panic("funcdef has invalid bytecode");
|
2018-11-16 21:24:10 +00:00
|
|
|
|
2018-08-21 17:09:01 +00:00
|
|
|
/* Set def */
|
2018-08-21 18:16:55 +00:00
|
|
|
*out = def;
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
2018-08-24 12:22:43 +00:00
|
|
|
/* Unmarshal a fiber */
|
2018-08-23 01:41:25 +00:00
|
|
|
static const uint8_t *unmarshal_one_fiber(
|
2019-02-20 01:51:34 +00:00
|
|
|
UnmarshalState *st,
|
|
|
|
const uint8_t *data,
|
|
|
|
JanetFiber **out,
|
|
|
|
int flags) {
|
2018-08-24 12:22:43 +00:00
|
|
|
|
|
|
|
/* Initialize a new fiber */
|
2018-09-06 02:18:42 +00:00
|
|
|
JanetFiber *fiber = janet_gcalloc(JANET_MEMORY_FIBER, sizeof(JanetFiber));
|
2018-08-24 12:22:43 +00:00
|
|
|
fiber->flags = 0;
|
|
|
|
fiber->frame = 0;
|
|
|
|
fiber->stackstart = 0;
|
|
|
|
fiber->stacktop = 0;
|
|
|
|
fiber->capacity = 0;
|
2018-11-26 23:01:50 +00:00
|
|
|
fiber->maxstack = 0;
|
|
|
|
fiber->data = NULL;
|
2018-08-24 12:22:43 +00:00
|
|
|
fiber->child = NULL;
|
|
|
|
|
2019-02-22 00:11:28 +00:00
|
|
|
/* Push fiber to seen stack */
|
|
|
|
janet_array_push(&st->lookup, janet_wrap_fiber(fiber));
|
|
|
|
|
2019-01-06 08:23:03 +00:00
|
|
|
/* Set frame later so fiber can be GCed at anytime if unmarshalling fails */
|
2018-08-24 12:22:43 +00:00
|
|
|
int32_t frame = 0;
|
|
|
|
int32_t stack = 0;
|
|
|
|
int32_t stacktop = 0;
|
|
|
|
|
|
|
|
/* Read ints */
|
|
|
|
fiber->flags = readint(st, &data);
|
|
|
|
frame = readint(st, &data);
|
|
|
|
fiber->stackstart = readint(st, &data);
|
|
|
|
fiber->stacktop = readint(st, &data);
|
|
|
|
fiber->maxstack = readint(st, &data);
|
|
|
|
|
|
|
|
/* Check for bad flags and ints */
|
2018-09-06 02:18:42 +00:00
|
|
|
if ((int32_t)(frame + JANET_FRAME_SIZE) > fiber->stackstart ||
|
2018-08-24 12:22:43 +00:00
|
|
|
fiber->stackstart > fiber->stacktop ||
|
|
|
|
fiber->stacktop > fiber->maxstack) {
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_panic("fiber has incorrect stack setup");
|
2018-08-24 15:35:08 +00:00
|
|
|
}
|
2018-08-24 12:22:43 +00:00
|
|
|
|
|
|
|
/* Allocate stack memory */
|
|
|
|
fiber->capacity = fiber->stacktop + 10;
|
2018-09-06 02:18:42 +00:00
|
|
|
fiber->data = malloc(sizeof(Janet) * fiber->capacity);
|
2018-08-24 12:22:43 +00:00
|
|
|
if (!fiber->data) {
|
2018-09-06 02:18:42 +00:00
|
|
|
JANET_OUT_OF_MEMORY;
|
2018-08-24 12:22:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* get frames */
|
|
|
|
stack = frame;
|
2018-09-06 02:18:42 +00:00
|
|
|
stacktop = fiber->stackstart - JANET_FRAME_SIZE;
|
2018-08-24 12:22:43 +00:00
|
|
|
while (stack > 0) {
|
2018-11-26 23:01:50 +00:00
|
|
|
JanetFunction *func = NULL;
|
|
|
|
JanetFuncDef *def = NULL;
|
2018-11-26 14:02:07 +00:00
|
|
|
JanetFuncEnv *env = NULL;
|
2018-08-24 12:22:43 +00:00
|
|
|
int32_t frameflags = readint(st, &data);
|
|
|
|
int32_t prevframe = readint(st, &data);
|
|
|
|
int32_t pcdiff = readint(st, &data);
|
|
|
|
|
|
|
|
/* Get frame items */
|
2018-09-06 02:18:42 +00:00
|
|
|
Janet *framestack = fiber->data + stack;
|
2018-11-26 23:01:50 +00:00
|
|
|
JanetStackFrame *framep = janet_stack_frame(framestack);
|
2018-08-24 12:22:43 +00:00
|
|
|
|
|
|
|
/* Get function */
|
2018-09-06 02:18:42 +00:00
|
|
|
Janet funcv;
|
2018-08-24 12:22:43 +00:00
|
|
|
data = unmarshal_one(st, data, &funcv, flags + 1);
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_asserttype(funcv, JANET_FUNCTION);
|
2018-09-06 02:18:42 +00:00
|
|
|
func = janet_unwrap_function(funcv);
|
2018-08-24 12:22:43 +00:00
|
|
|
def = func->def;
|
|
|
|
|
|
|
|
/* Check env */
|
2018-09-06 02:18:42 +00:00
|
|
|
if (frameflags & JANET_STACKFRAME_HASENV) {
|
|
|
|
frameflags &= ~JANET_STACKFRAME_HASENV;
|
2018-08-24 12:22:43 +00:00
|
|
|
int32_t offset = stack;
|
|
|
|
int32_t length = stacktop - stack;
|
|
|
|
data = unmarshal_one_env(st, data, &env, flags + 1);
|
2019-02-22 15:10:41 +00:00
|
|
|
if (env->offset != 0 && env->offset != offset)
|
|
|
|
janet_panic("funcenv offset does not match fiber frame");
|
2019-02-22 15:16:32 +00:00
|
|
|
if (env->length != 0 && env->length != length)
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_panic("funcenv length does not match fiber frame");
|
2018-08-24 12:22:43 +00:00
|
|
|
env->offset = offset;
|
|
|
|
env->length = length;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Error checking */
|
2018-08-24 15:35:08 +00:00
|
|
|
int32_t expected_framesize = def->slotcount;
|
2019-02-22 15:10:41 +00:00
|
|
|
if (expected_framesize != stacktop - stack) {
|
|
|
|
janet_panic("fiber stackframe size mismatch");
|
|
|
|
}
|
|
|
|
if (pcdiff < 0 || pcdiff >= def->bytecode_length) {
|
|
|
|
janet_panic("fiber stackframe has invalid pc");
|
|
|
|
}
|
|
|
|
if ((int32_t)(prevframe + JANET_FRAME_SIZE) > stack) {
|
|
|
|
janet_panic("fibre stackframe does not align with previous frame");
|
|
|
|
}
|
2018-08-24 12:22:43 +00:00
|
|
|
|
|
|
|
/* Get stack items */
|
2018-08-24 15:35:08 +00:00
|
|
|
for (int32_t i = stack; i < stacktop; i++)
|
|
|
|
data = unmarshal_one(st, data, fiber->data + i, flags + 1);
|
2018-08-24 12:22:43 +00:00
|
|
|
|
|
|
|
/* Set frame */
|
|
|
|
framep->env = env;
|
|
|
|
framep->pc = def->bytecode + pcdiff;
|
|
|
|
framep->prevframe = prevframe;
|
|
|
|
framep->flags = frameflags;
|
|
|
|
framep->func = func;
|
|
|
|
|
|
|
|
/* Goto previous frame */
|
2018-09-06 02:18:42 +00:00
|
|
|
stacktop = stack - JANET_FRAME_SIZE;
|
2018-08-24 12:22:43 +00:00
|
|
|
stack = prevframe;
|
|
|
|
}
|
2019-02-22 15:10:41 +00:00
|
|
|
if (stack < 0) {
|
|
|
|
janet_panic("fiber has too many stackframes");
|
|
|
|
}
|
2018-08-24 12:22:43 +00:00
|
|
|
|
|
|
|
/* Check for child fiber */
|
2018-09-06 02:18:42 +00:00
|
|
|
if (fiber->flags & JANET_FIBER_FLAG_HASCHILD) {
|
2018-11-26 14:02:07 +00:00
|
|
|
Janet fiberv;
|
2018-09-06 02:18:42 +00:00
|
|
|
fiber->flags &= ~JANET_FIBER_FLAG_HASCHILD;
|
2018-11-26 14:02:07 +00:00
|
|
|
data = unmarshal_one(st, data, &fiberv, flags + 1);
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_asserttype(fiberv, JANET_FIBER);
|
2018-11-26 14:02:07 +00:00
|
|
|
fiber->child = janet_unwrap_fiber(fiberv);
|
2018-08-24 12:22:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Return data */
|
|
|
|
fiber->frame = frame;
|
2018-08-24 15:35:08 +00:00
|
|
|
*out = fiber;
|
2018-08-24 12:22:43 +00:00
|
|
|
return data;
|
2018-08-23 01:41:25 +00:00
|
|
|
}
|
|
|
|
|
2019-02-23 15:58:47 +00:00
|
|
|
|
2019-02-23 16:13:43 +00:00
|
|
|
void janet_unmarshal_int(JanetMarshalContext *ctx, int32_t *i) {
|
|
|
|
UnmarshalState *st = (UnmarshalState *)(ctx->u_state);
|
|
|
|
*i = readint(st, &(ctx->data));
|
2019-02-23 15:58:47 +00:00
|
|
|
};
|
|
|
|
|
2019-02-23 16:13:43 +00:00
|
|
|
void janet_unmarshal_uint(JanetMarshalContext *ctx, uint32_t *i) {
|
|
|
|
UnmarshalState *st = (UnmarshalState *)(ctx->u_state);
|
|
|
|
*i = (uint32_t)readint(st, &(ctx->data));
|
2019-02-23 15:58:47 +00:00
|
|
|
};
|
|
|
|
|
2019-02-23 16:13:43 +00:00
|
|
|
void janet_unmarshal_size(JanetMarshalContext *ctx, size_t *i) {
|
|
|
|
UnmarshalState *st = (UnmarshalState *)(ctx->u_state);
|
|
|
|
*i = (size_t)readint(st, &(ctx->data));
|
2019-02-23 15:58:47 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
2019-02-23 16:13:43 +00:00
|
|
|
void janet_unmarshal_byte(JanetMarshalContext *ctx, uint8_t *b) {
|
|
|
|
*b = *(ctx->data++);
|
2019-02-23 15:58:47 +00:00
|
|
|
};
|
|
|
|
|
2019-02-23 16:13:43 +00:00
|
|
|
void janet_unmarshal_bytes(JanetMarshalContext *ctx, uint8_t *dest, int32_t len) {
|
|
|
|
memcpy(dest, ctx->data, len);
|
|
|
|
ctx->data += len;
|
2019-02-23 15:58:47 +00:00
|
|
|
}
|
|
|
|
|
2019-02-23 16:13:43 +00:00
|
|
|
void janet_unmarshal_janet(JanetMarshalContext *ctx, Janet *out) {
|
|
|
|
UnmarshalState *st = (UnmarshalState *)(ctx->u_state);
|
|
|
|
ctx->data = unmarshal_one(st, ctx->data, out, ctx->flags);
|
2019-02-23 15:58:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static const uint8_t *unmarshal_one_abstract(UnmarshalState *st, const uint8_t *data, Janet *out, int flags) {
|
2019-02-23 16:13:43 +00:00
|
|
|
uint32_t tag = readint(st, &data);
|
|
|
|
const JanetAbstractTypeInfo *info = janet_get_abstract_type_info(tag);
|
2019-02-23 16:36:38 +00:00
|
|
|
if (info == NULL) return NULL;
|
2019-02-23 16:13:43 +00:00
|
|
|
if (info->unmarshal) {
|
|
|
|
void *p = janet_abstract(info->at, info->size);
|
|
|
|
JanetMarshalContext context = {NULL, st, flags, data};
|
|
|
|
info->unmarshal(p, &context);
|
|
|
|
*out = janet_wrap_abstract(p);
|
|
|
|
return data;
|
|
|
|
}
|
2019-02-23 15:58:47 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-08-20 00:21:27 +00:00
|
|
|
static const uint8_t *unmarshal_one(
|
2019-02-20 01:51:34 +00:00
|
|
|
UnmarshalState *st,
|
|
|
|
const uint8_t *data,
|
|
|
|
Janet *out,
|
|
|
|
int flags) {
|
2018-06-12 18:24:45 +00:00
|
|
|
uint8_t lead;
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_STACKCHECK;
|
|
|
|
MARSH_EOS(st, data);
|
2018-06-12 18:24:45 +00:00
|
|
|
lead = data[0];
|
|
|
|
if (lead < 200) {
|
2019-02-08 15:12:25 +00:00
|
|
|
*out = janet_wrap_integer(readint(st, &data));
|
|
|
|
return data;
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
|
|
|
switch (lead) {
|
|
|
|
case LB_NIL:
|
2018-09-06 02:18:42 +00:00
|
|
|
*out = janet_wrap_nil();
|
2018-06-12 18:24:45 +00:00
|
|
|
return data + 1;
|
|
|
|
case LB_FALSE:
|
2018-09-06 02:18:42 +00:00
|
|
|
*out = janet_wrap_false();
|
2018-06-12 18:24:45 +00:00
|
|
|
return data + 1;
|
|
|
|
case LB_TRUE:
|
2018-09-06 02:18:42 +00:00
|
|
|
*out = janet_wrap_true();
|
2018-06-12 18:24:45 +00:00
|
|
|
return data + 1;
|
|
|
|
case LB_INTEGER:
|
|
|
|
/* Long integer */
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_EOS(st, data + 4);
|
2018-09-06 02:18:42 +00:00
|
|
|
*out = janet_wrap_integer(
|
2019-02-20 01:51:34 +00:00
|
|
|
(data[4]) |
|
|
|
|
(data[3] << 8) |
|
|
|
|
(data[2] << 16) |
|
|
|
|
(data[1] << 24));
|
2018-06-12 18:24:45 +00:00
|
|
|
return data + 5;
|
|
|
|
case LB_REAL:
|
|
|
|
/* Real */
|
2019-02-20 01:51:34 +00:00
|
|
|
{
|
|
|
|
union {
|
|
|
|
double d;
|
|
|
|
uint8_t bytes[8];
|
|
|
|
} u;
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_EOS(st, data + 8);
|
2018-09-06 02:18:42 +00:00
|
|
|
#ifdef JANET_BIG_ENDIAN
|
2019-02-20 01:51:34 +00:00
|
|
|
u.bytes[0] = data[8];
|
|
|
|
u.bytes[1] = data[7];
|
|
|
|
u.bytes[2] = data[6];
|
|
|
|
u.bytes[5] = data[5];
|
|
|
|
u.bytes[4] = data[4];
|
|
|
|
u.bytes[5] = data[3];
|
|
|
|
u.bytes[6] = data[2];
|
|
|
|
u.bytes[7] = data[1];
|
2018-06-12 18:24:45 +00:00
|
|
|
#else
|
2019-02-20 01:51:34 +00:00
|
|
|
memcpy(&u.bytes, data + 1, sizeof(double));
|
2018-06-12 18:24:45 +00:00
|
|
|
#endif
|
2019-02-20 01:51:34 +00:00
|
|
|
*out = janet_wrap_number(u.d);
|
|
|
|
janet_array_push(&st->lookup, *out);
|
|
|
|
return data + 9;
|
|
|
|
}
|
2018-06-12 18:24:45 +00:00
|
|
|
case LB_STRING:
|
|
|
|
case LB_SYMBOL:
|
|
|
|
case LB_BUFFER:
|
2019-01-03 00:41:07 +00:00
|
|
|
case LB_KEYWORD:
|
2019-02-20 01:51:34 +00:00
|
|
|
case LB_REGISTRY: {
|
|
|
|
data++;
|
|
|
|
int32_t len = readint(st, &data);
|
2019-02-22 15:10:41 +00:00
|
|
|
MARSH_EOS(st, data - 1 + len);
|
2019-02-20 01:51:34 +00:00
|
|
|
if (lead == LB_STRING) {
|
|
|
|
const uint8_t *str = janet_string(data, len);
|
|
|
|
*out = janet_wrap_string(str);
|
|
|
|
} else if (lead == LB_SYMBOL) {
|
|
|
|
const uint8_t *str = janet_symbol(data, len);
|
|
|
|
*out = janet_wrap_symbol(str);
|
|
|
|
} else if (lead == LB_KEYWORD) {
|
|
|
|
const uint8_t *str = janet_keyword(data, len);
|
|
|
|
*out = janet_wrap_keyword(str);
|
|
|
|
} else if (lead == LB_REGISTRY) {
|
|
|
|
if (st->reg) {
|
|
|
|
Janet regkey = janet_symbolv(data, len);
|
|
|
|
*out = janet_table_get(st->reg, regkey);
|
|
|
|
} else {
|
|
|
|
*out = janet_wrap_nil();
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
2019-02-20 01:51:34 +00:00
|
|
|
} else { /* (lead == LB_BUFFER) */
|
|
|
|
JanetBuffer *buffer = janet_buffer(len);
|
|
|
|
buffer->count = len;
|
|
|
|
memcpy(buffer->data, data, len);
|
|
|
|
*out = janet_wrap_buffer(buffer);
|
2018-08-23 01:41:25 +00:00
|
|
|
}
|
2019-02-20 01:51:34 +00:00
|
|
|
janet_array_push(&st->lookup, *out);
|
|
|
|
return data + len;
|
|
|
|
}
|
|
|
|
case LB_FIBER: {
|
|
|
|
JanetFiber *fiber;
|
|
|
|
data = unmarshal_one_fiber(st, data + 1, &fiber, flags);
|
|
|
|
*out = janet_wrap_fiber(fiber);
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
case LB_FUNCTION: {
|
|
|
|
JanetFunction *func;
|
|
|
|
JanetFuncDef *def;
|
|
|
|
data = unmarshal_one_def(st, data + 1, &def, flags + 1);
|
|
|
|
func = janet_gcalloc(JANET_MEMORY_FUNCTION, sizeof(JanetFunction) +
|
|
|
|
def->environments_length * sizeof(JanetFuncEnv));
|
|
|
|
func->def = def;
|
|
|
|
*out = janet_wrap_function(func);
|
|
|
|
janet_array_push(&st->lookup, *out);
|
|
|
|
for (int32_t i = 0; i < def->environments_length; i++) {
|
|
|
|
data = unmarshal_one_env(st, data, &(func->envs[i]), flags + 1);
|
2018-08-20 00:21:27 +00:00
|
|
|
}
|
2019-02-20 01:51:34 +00:00
|
|
|
return data;
|
|
|
|
}
|
2019-02-23 15:58:47 +00:00
|
|
|
case LB_ABSTRACT: {
|
2019-02-23 16:13:43 +00:00
|
|
|
data++;
|
|
|
|
return unmarshal_one_abstract(st, data, out, flags);
|
|
|
|
}
|
2018-06-12 18:24:45 +00:00
|
|
|
case LB_REFERENCE:
|
|
|
|
case LB_ARRAY:
|
|
|
|
case LB_TUPLE:
|
|
|
|
case LB_STRUCT:
|
|
|
|
case LB_TABLE:
|
|
|
|
case LB_TABLE_PROTO:
|
|
|
|
/* Things that open with integers */
|
2019-02-20 01:51:34 +00:00
|
|
|
{
|
|
|
|
data++;
|
|
|
|
int32_t len = readint(st, &data);
|
|
|
|
if (lead == LB_ARRAY) {
|
|
|
|
/* Array */
|
|
|
|
JanetArray *array = janet_array(len);
|
|
|
|
array->count = len;
|
|
|
|
*out = janet_wrap_array(array);
|
|
|
|
janet_array_push(&st->lookup, *out);
|
|
|
|
for (int32_t i = 0; i < len; i++) {
|
|
|
|
data = unmarshal_one(st, data, array->data + i, flags + 1);
|
|
|
|
}
|
|
|
|
} else if (lead == LB_TUPLE) {
|
|
|
|
/* Tuple */
|
|
|
|
Janet *tup = janet_tuple_begin(len);
|
|
|
|
int32_t flag = readint(st, &data);
|
2019-02-21 16:22:29 +00:00
|
|
|
janet_tuple_flag(tup) |= flag << 16;
|
2019-02-20 01:51:34 +00:00
|
|
|
for (int32_t i = 0; i < len; i++) {
|
|
|
|
data = unmarshal_one(st, data, tup + i, flags + 1);
|
|
|
|
}
|
|
|
|
*out = janet_wrap_tuple(janet_tuple_end(tup));
|
|
|
|
janet_array_push(&st->lookup, *out);
|
|
|
|
} else if (lead == LB_STRUCT) {
|
|
|
|
/* Struct */
|
|
|
|
JanetKV *struct_ = janet_struct_begin(len);
|
|
|
|
for (int32_t i = 0; i < len; i++) {
|
|
|
|
Janet key, value;
|
|
|
|
data = unmarshal_one(st, data, &key, flags + 1);
|
|
|
|
data = unmarshal_one(st, data, &value, flags + 1);
|
|
|
|
janet_struct_put(struct_, key, value);
|
|
|
|
}
|
|
|
|
*out = janet_wrap_struct(janet_struct_end(struct_));
|
|
|
|
janet_array_push(&st->lookup, *out);
|
|
|
|
} else if (lead == LB_REFERENCE) {
|
|
|
|
if (len < 0 || len >= st->lookup.count)
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_panicf("invalid reference %d", len);
|
2019-02-20 01:51:34 +00:00
|
|
|
*out = st->lookup.data[len];
|
|
|
|
} else {
|
|
|
|
/* Table */
|
|
|
|
JanetTable *t = janet_table(len);
|
|
|
|
*out = janet_wrap_table(t);
|
|
|
|
janet_array_push(&st->lookup, *out);
|
|
|
|
if (lead == LB_TABLE_PROTO) {
|
|
|
|
Janet proto;
|
|
|
|
data = unmarshal_one(st, data, &proto, flags + 1);
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_asserttype(proto, JANET_TABLE);
|
2019-02-20 01:51:34 +00:00
|
|
|
t->proto = janet_unwrap_table(proto);
|
|
|
|
}
|
|
|
|
for (int32_t i = 0; i < len; i++) {
|
|
|
|
Janet key, value;
|
|
|
|
data = unmarshal_one(st, data, &key, flags + 1);
|
|
|
|
data = unmarshal_one(st, data, &value, flags + 1);
|
|
|
|
janet_table_put(t, key, value);
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
|
|
|
}
|
2019-02-20 01:51:34 +00:00
|
|
|
return data;
|
|
|
|
}
|
2019-02-22 15:10:41 +00:00
|
|
|
default: {
|
|
|
|
janet_panicf("unknown byte %x at index %d",
|
|
|
|
*data,
|
|
|
|
(int)(data - st->start));
|
2018-06-12 18:24:45 +00:00
|
|
|
return NULL;
|
2019-02-22 15:10:41 +00:00
|
|
|
}
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
|
|
|
#undef EXTRA
|
|
|
|
}
|
|
|
|
|
2019-02-22 15:10:41 +00:00
|
|
|
Janet janet_unmarshal(
|
2019-02-20 01:51:34 +00:00
|
|
|
const uint8_t *bytes,
|
|
|
|
size_t len,
|
|
|
|
int flags,
|
|
|
|
JanetTable *reg,
|
|
|
|
const uint8_t **next) {
|
2018-11-16 21:24:10 +00:00
|
|
|
UnmarshalState st;
|
2019-02-22 15:10:41 +00:00
|
|
|
st.start = bytes;
|
2018-06-12 18:24:45 +00:00
|
|
|
st.end = bytes + len;
|
2018-08-20 00:21:27 +00:00
|
|
|
st.lookup_defs = NULL;
|
|
|
|
st.lookup_envs = NULL;
|
2018-10-21 05:35:07 +00:00
|
|
|
st.reg = reg;
|
2018-09-06 02:18:42 +00:00
|
|
|
janet_array_init(&st.lookup, 0);
|
2019-02-22 15:10:41 +00:00
|
|
|
Janet out;
|
|
|
|
const uint8_t *nextbytes = unmarshal_one(&st, bytes, &out, flags);
|
|
|
|
if (next) *next = nextbytes;
|
|
|
|
/* Clean up - this should be auto released on panics, TODO. We should
|
|
|
|
* change the vector implementation to track allocations for auto release, and
|
|
|
|
* make st.lookup auto release as well, or move to heap. */
|
2018-09-06 02:18:42 +00:00
|
|
|
janet_array_deinit(&st.lookup);
|
2018-10-04 21:33:44 +00:00
|
|
|
janet_v_free(st.lookup_defs);
|
|
|
|
janet_v_free(st.lookup_envs);
|
2019-02-22 15:10:41 +00:00
|
|
|
return out;
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* C functions */
|
|
|
|
|
2019-01-06 01:09:03 +00:00
|
|
|
static Janet cfun_env_lookup(int32_t argc, Janet *argv) {
|
2019-01-06 01:45:24 +00:00
|
|
|
janet_fixarity(argc, 1);
|
2019-01-06 01:09:03 +00:00
|
|
|
JanetTable *env = janet_gettable(argv, 0);
|
|
|
|
return janet_wrap_table(janet_env_lookup(env));
|
2018-10-21 05:35:07 +00:00
|
|
|
}
|
|
|
|
|
2019-01-06 01:09:03 +00:00
|
|
|
static Janet cfun_marshal(int32_t argc, Janet *argv) {
|
|
|
|
janet_arity(argc, 1, 2);
|
2018-09-06 02:18:42 +00:00
|
|
|
JanetBuffer *buffer;
|
2019-01-06 01:09:03 +00:00
|
|
|
JanetTable *rreg = NULL;
|
|
|
|
if (argc > 1) {
|
|
|
|
rreg = janet_gettable(argv, 1);
|
2018-10-21 05:35:07 +00:00
|
|
|
}
|
2019-01-06 01:09:03 +00:00
|
|
|
if (argc > 2) {
|
|
|
|
buffer = janet_getbuffer(argv, 2);
|
2018-06-12 18:24:45 +00:00
|
|
|
} else {
|
2018-09-06 02:18:42 +00:00
|
|
|
buffer = janet_buffer(10);
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
2019-02-22 15:10:41 +00:00
|
|
|
janet_marshal(buffer, argv[0], rreg, 0);
|
2019-01-06 01:09:03 +00:00
|
|
|
return janet_wrap_buffer(buffer);
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
|
|
|
|
2019-01-06 01:09:03 +00:00
|
|
|
static Janet cfun_unmarshal(int32_t argc, Janet *argv) {
|
|
|
|
janet_arity(argc, 1, 2);
|
|
|
|
JanetByteView view = janet_getbytes(argv, 0);
|
|
|
|
JanetTable *reg = NULL;
|
|
|
|
if (argc > 1) {
|
|
|
|
reg = janet_gettable(argv, 1);
|
2018-10-21 05:35:07 +00:00
|
|
|
}
|
2019-02-22 15:10:41 +00:00
|
|
|
return janet_unmarshal(view.bytes, (size_t) view.len, 0, reg, NULL);
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|
|
|
|
|
2019-01-24 05:15:58 +00:00
|
|
|
static const JanetReg marsh_cfuns[] = {
|
2019-01-06 06:49:56 +00:00
|
|
|
{
|
|
|
|
"marshal", cfun_marshal,
|
|
|
|
JDOC("(marshal x [,reverse-lookup [,buffer]])\n\n"
|
2019-02-20 01:51:34 +00:00
|
|
|
"Marshal a janet value into a buffer and return the buffer. The buffer "
|
|
|
|
"can the later be unmarshalled to reconstruct the initial value. "
|
|
|
|
"Optionally, one can pass in a reverse lookup table to not marshal "
|
|
|
|
"aliased values that are found in the table. Then a forward"
|
|
|
|
"lookup table can be used to recover the original janet value when "
|
|
|
|
"unmarshalling.")
|
2018-11-16 07:09:38 +00:00
|
|
|
},
|
2019-01-06 06:49:56 +00:00
|
|
|
{
|
|
|
|
"unmarshal", cfun_unmarshal,
|
|
|
|
JDOC("(unmarshal buffer [,lookup])\n\n"
|
2019-02-20 01:51:34 +00:00
|
|
|
"Unmarshal a janet value from a buffer. An optional lookup table "
|
|
|
|
"can be provided to allow for aliases to be resolved. Returns the value "
|
|
|
|
"unmarshalled from the buffer.")
|
2018-11-16 07:09:38 +00:00
|
|
|
},
|
2019-01-06 06:49:56 +00:00
|
|
|
{
|
|
|
|
"env-lookup", cfun_env_lookup,
|
|
|
|
JDOC("(env-lookup env)\n\n"
|
2019-02-20 01:51:34 +00:00
|
|
|
"Creates a forward lookup table for unmarshalling from an environment. "
|
|
|
|
"To create a reverse lookup table, use the invert function to swap keys "
|
|
|
|
"and values in the returned table.")
|
2018-11-16 07:09:38 +00:00
|
|
|
},
|
2018-11-15 20:45:41 +00:00
|
|
|
{NULL, NULL, NULL}
|
2018-06-12 18:24:45 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Module entry point */
|
2019-01-06 01:09:03 +00:00
|
|
|
void janet_lib_marsh(JanetTable *env) {
|
2019-02-08 05:44:30 +00:00
|
|
|
janet_core_cfuns(env, NULL, marsh_cfuns);
|
2018-06-12 18:24:45 +00:00
|
|
|
}
|